Vendor OpenClaw source as Adolf fork baseline
Some checks failed
ClawSweeper Dispatch / dispatch (push) Has been cancelled
CodeQL / Security High (actions) (push) Has been cancelled
CodeQL / Security High (channel-runtime-boundary) (push) Has been cancelled
CodeQL / Security High (core-auth-secrets) (push) Has been cancelled
CodeQL / Security High (mcp-process-tool-boundary) (push) Has been cancelled
CodeQL / Security High (network-ssrf-boundary) (push) Has been cancelled
CodeQL / Security High (plugin-trust-boundary) (push) Has been cancelled
CodeQL / Security High (process-exec-boundary) (push) Has been cancelled
Docs Sync Publish Repo / sync-publish-repo (push) Has been cancelled
Docs / docs (push) Has been cancelled
OpenClaw Stable Main Closeout / Resolve stable release closeout inputs (push) Has been cancelled
OpenClaw Stable Main Closeout / Verify stable main closeout (push) Has been cancelled
Workflow Sanity / no-tabs (push) Has been cancelled
Workflow Sanity / actionlint (push) Has been cancelled
Workflow Sanity / generated-doc-baselines (push) Has been cancelled
CI / runner-admission (push) Has been cancelled
CI / preflight (push) Has been cancelled
CI / security-fast (push) Has been cancelled
CI / pnpm-store-warmup (push) Has been cancelled
CI / build-artifacts (push) Has been cancelled
CI / native-i18n (push) Has been cancelled
CI / ${{ matrix.check_name }} (push) Has been cancelled
CI / ${{ matrix.checkName }} (push) Has been cancelled
CI / checks-node-compat-node22 (push) Has been cancelled
CI / check-bundled-channel-config-metadata (push) Has been cancelled
CI / check-dependencies (push) Has been cancelled
CI / check-guards (push) Has been cancelled
CI / check-lint (push) Has been cancelled
CI / check-prod-types (push) Has been cancelled
CI / check-shrinkwrap (push) Has been cancelled
CI / check-test-types (push) Has been cancelled
CI / check-additional-boundaries-a (push) Has been cancelled
CI / check-additional-boundaries-bcd (push) Has been cancelled
CI / check-additional-extension-bundled (push) Has been cancelled
CI / check-additional-extension-channels (push) Has been cancelled
CI / check-additional-extension-package-boundary (push) Has been cancelled
CI / check-additional-runtime-topology-architecture (push) Has been cancelled
CI / check-session-accessor-boundary (push) Has been cancelled
CI / check-session-transcript-reader-boundary (push) Has been cancelled
CI / check-docs (push) Has been cancelled
CI / skills-python (push) Has been cancelled
CI / macos-swift (push) Has been cancelled
CI / ios-build (push) Has been cancelled
CI / ci-timings-summary (push) Has been cancelled
Native App Locale Refresh / Refresh native fa (push) Has been cancelled
Native App Locale Refresh / Refresh native fr (push) Has been cancelled
Native App Locale Refresh / Refresh native hi (push) Has been cancelled
Native App Locale Refresh / Refresh native id (push) Has been cancelled
Native App Locale Refresh / Refresh native it (push) Has been cancelled
Native App Locale Refresh / Refresh native ja-JP (push) Has been cancelled
Control UI Locale Refresh / plan (push) Has been cancelled
Control UI Locale Refresh / Refresh ${{ matrix.locale }} (push) Has been cancelled
Control UI Locale Refresh / Commit control UI locale refresh (push) Has been cancelled
Live Media Runner Image / Build live media runner image (push) Has been cancelled
Native App Locale Refresh / Refresh native ar (push) Has been cancelled
Native App Locale Refresh / Refresh native de (push) Has been cancelled
Native App Locale Refresh / Refresh native es (push) Has been cancelled
Native App Locale Refresh / Refresh native ko (push) Has been cancelled
Native App Locale Refresh / Refresh native nl (push) Has been cancelled
Native App Locale Refresh / Refresh native pl (push) Has been cancelled
Native App Locale Refresh / Refresh native pt-BR (push) Has been cancelled
Native App Locale Refresh / Refresh native ru (push) Has been cancelled
Native App Locale Refresh / Refresh native sv (push) Has been cancelled
Native App Locale Refresh / Refresh native th (push) Has been cancelled
Native App Locale Refresh / Refresh native tr (push) Has been cancelled
Native App Locale Refresh / Refresh native uk (push) Has been cancelled
Native App Locale Refresh / Refresh native vi (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-CN (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-TW (push) Has been cancelled
Native App Locale Refresh / Commit native locale refresh (push) Has been cancelled
Plugin Init Scaffold Validation / Validate provider scaffold (push) Has been cancelled
Plugin NPM Release / preview_plugins_npm (push) Has been cancelled
Plugin NPM Release / Validate release publish approval (push) Has been cancelled
Plugin NPM Release / preview_plugin_pack (push) Has been cancelled
Plugin NPM Release / publish_plugins_npm (push) Has been cancelled
Sandbox Common Smoke / sandbox-common-smoke (push) Has been cancelled
Website Installer Sync / static (push) Has been cancelled
Website Installer Sync / linux-docker (push) Has been cancelled
Website Installer Sync / macos-installer (push) Has been cancelled
Website Installer Sync / windows-installer (push) Has been cancelled
Website Installer Sync / sync-website (push) Has been cancelled
Some checks failed
ClawSweeper Dispatch / dispatch (push) Has been cancelled
CodeQL / Security High (actions) (push) Has been cancelled
CodeQL / Security High (channel-runtime-boundary) (push) Has been cancelled
CodeQL / Security High (core-auth-secrets) (push) Has been cancelled
CodeQL / Security High (mcp-process-tool-boundary) (push) Has been cancelled
CodeQL / Security High (network-ssrf-boundary) (push) Has been cancelled
CodeQL / Security High (plugin-trust-boundary) (push) Has been cancelled
CodeQL / Security High (process-exec-boundary) (push) Has been cancelled
Docs Sync Publish Repo / sync-publish-repo (push) Has been cancelled
Docs / docs (push) Has been cancelled
OpenClaw Stable Main Closeout / Resolve stable release closeout inputs (push) Has been cancelled
OpenClaw Stable Main Closeout / Verify stable main closeout (push) Has been cancelled
Workflow Sanity / no-tabs (push) Has been cancelled
Workflow Sanity / actionlint (push) Has been cancelled
Workflow Sanity / generated-doc-baselines (push) Has been cancelled
CI / runner-admission (push) Has been cancelled
CI / preflight (push) Has been cancelled
CI / security-fast (push) Has been cancelled
CI / pnpm-store-warmup (push) Has been cancelled
CI / build-artifacts (push) Has been cancelled
CI / native-i18n (push) Has been cancelled
CI / ${{ matrix.check_name }} (push) Has been cancelled
CI / ${{ matrix.checkName }} (push) Has been cancelled
CI / checks-node-compat-node22 (push) Has been cancelled
CI / check-bundled-channel-config-metadata (push) Has been cancelled
CI / check-dependencies (push) Has been cancelled
CI / check-guards (push) Has been cancelled
CI / check-lint (push) Has been cancelled
CI / check-prod-types (push) Has been cancelled
CI / check-shrinkwrap (push) Has been cancelled
CI / check-test-types (push) Has been cancelled
CI / check-additional-boundaries-a (push) Has been cancelled
CI / check-additional-boundaries-bcd (push) Has been cancelled
CI / check-additional-extension-bundled (push) Has been cancelled
CI / check-additional-extension-channels (push) Has been cancelled
CI / check-additional-extension-package-boundary (push) Has been cancelled
CI / check-additional-runtime-topology-architecture (push) Has been cancelled
CI / check-session-accessor-boundary (push) Has been cancelled
CI / check-session-transcript-reader-boundary (push) Has been cancelled
CI / check-docs (push) Has been cancelled
CI / skills-python (push) Has been cancelled
CI / macos-swift (push) Has been cancelled
CI / ios-build (push) Has been cancelled
CI / ci-timings-summary (push) Has been cancelled
Native App Locale Refresh / Refresh native fa (push) Has been cancelled
Native App Locale Refresh / Refresh native fr (push) Has been cancelled
Native App Locale Refresh / Refresh native hi (push) Has been cancelled
Native App Locale Refresh / Refresh native id (push) Has been cancelled
Native App Locale Refresh / Refresh native it (push) Has been cancelled
Native App Locale Refresh / Refresh native ja-JP (push) Has been cancelled
Control UI Locale Refresh / plan (push) Has been cancelled
Control UI Locale Refresh / Refresh ${{ matrix.locale }} (push) Has been cancelled
Control UI Locale Refresh / Commit control UI locale refresh (push) Has been cancelled
Live Media Runner Image / Build live media runner image (push) Has been cancelled
Native App Locale Refresh / Refresh native ar (push) Has been cancelled
Native App Locale Refresh / Refresh native de (push) Has been cancelled
Native App Locale Refresh / Refresh native es (push) Has been cancelled
Native App Locale Refresh / Refresh native ko (push) Has been cancelled
Native App Locale Refresh / Refresh native nl (push) Has been cancelled
Native App Locale Refresh / Refresh native pl (push) Has been cancelled
Native App Locale Refresh / Refresh native pt-BR (push) Has been cancelled
Native App Locale Refresh / Refresh native ru (push) Has been cancelled
Native App Locale Refresh / Refresh native sv (push) Has been cancelled
Native App Locale Refresh / Refresh native th (push) Has been cancelled
Native App Locale Refresh / Refresh native tr (push) Has been cancelled
Native App Locale Refresh / Refresh native uk (push) Has been cancelled
Native App Locale Refresh / Refresh native vi (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-CN (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-TW (push) Has been cancelled
Native App Locale Refresh / Commit native locale refresh (push) Has been cancelled
Plugin Init Scaffold Validation / Validate provider scaffold (push) Has been cancelled
Plugin NPM Release / preview_plugins_npm (push) Has been cancelled
Plugin NPM Release / Validate release publish approval (push) Has been cancelled
Plugin NPM Release / preview_plugin_pack (push) Has been cancelled
Plugin NPM Release / publish_plugins_npm (push) Has been cancelled
Sandbox Common Smoke / sandbox-common-smoke (push) Has been cancelled
Website Installer Sync / static (push) Has been cancelled
Website Installer Sync / linux-docker (push) Has been cancelled
Website Installer Sync / macos-installer (push) Has been cancelled
Website Installer Sync / windows-installer (push) Has been cancelled
Website Installer Sync / sync-website (push) Has been cancelled
Adolf is a fork/vendored clone of github.com/openclaw/openclaw (v2026.6.11), free to diverge. Tree copied sans upstream .git; upstream remote added for future syncs. Node pinned to 24 (.nvmrc); engines already require >=22.19. Preserves docs/ARCHITECTURE.md. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LeqyaxJF2nbRXJtae2kNB2
This commit is contained in:
202
extensions/acpx/src/process-lease.ts
Normal file
202
extensions/acpx/src/process-lease.ts
Normal file
@@ -0,0 +1,202 @@
|
||||
/**
|
||||
* Persistent lease store for ACPX wrapper processes. Leases let OpenClaw attach
|
||||
* gateway/session identity to spawned ACP processes and clean them up later.
|
||||
*/
|
||||
import { randomUUID, createHash } from "node:crypto";
|
||||
import type {
|
||||
OpenKeyedStoreOptions,
|
||||
PluginStateKeyedStore,
|
||||
} from "openclaw/plugin-sdk/plugin-state-runtime";
|
||||
import { ACPX_PROCESS_LEASE_MAX_ENTRIES, ACPX_PROCESS_LEASE_NAMESPACE } from "./state.js";
|
||||
|
||||
/** Environment variable carrying the ACPX process lease id. */
|
||||
export const OPENCLAW_ACPX_LEASE_ID_ENV = "OPENCLAW_ACPX_LEASE_ID";
|
||||
/** Environment variable carrying the owning gateway instance id. */
|
||||
export const OPENCLAW_GATEWAY_INSTANCE_ID_ENV = "OPENCLAW_GATEWAY_INSTANCE_ID";
|
||||
/** CLI argument carrying the ACPX process lease id for platforms without env wrapping. */
|
||||
export const OPENCLAW_ACPX_LEASE_ID_ARG = "--openclaw-acpx-lease-id";
|
||||
/** CLI argument carrying the owning gateway instance id. */
|
||||
export const OPENCLAW_GATEWAY_INSTANCE_ID_ARG = "--openclaw-gateway-instance-id";
|
||||
|
||||
/** Lifecycle state for a tracked ACPX wrapper process. */
|
||||
export type AcpxProcessLeaseState = "open" | "closing" | "closed" | "lost";
|
||||
|
||||
/** Persisted identity and command metadata for one ACPX wrapper process. */
|
||||
export type AcpxProcessLease = {
|
||||
leaseId: string;
|
||||
gatewayInstanceId: string;
|
||||
sessionKey: string;
|
||||
wrapperRoot: string;
|
||||
wrapperPath: string;
|
||||
rootPid: number;
|
||||
processGroupId?: number;
|
||||
commandHash: string;
|
||||
startedAt: number;
|
||||
state: AcpxProcessLeaseState;
|
||||
};
|
||||
|
||||
/** Async lease store used by runtime sessions and cleanup routines. */
|
||||
export type AcpxProcessLeaseStore = {
|
||||
load(leaseId: string): Promise<AcpxProcessLease | undefined>;
|
||||
listOpen(gatewayInstanceId?: string): Promise<AcpxProcessLease[]>;
|
||||
save(lease: AcpxProcessLease): Promise<void>;
|
||||
markState(leaseId: string, state: AcpxProcessLeaseState): Promise<void>;
|
||||
};
|
||||
|
||||
export type AcpxProcessLeaseFile = {
|
||||
version: 1;
|
||||
leases: AcpxProcessLease[];
|
||||
};
|
||||
|
||||
export function normalizeAcpxProcessLease(value: unknown): AcpxProcessLease | undefined {
|
||||
if (typeof value !== "object" || value === null) {
|
||||
return undefined;
|
||||
}
|
||||
const record = value as Record<string, unknown>;
|
||||
if (
|
||||
typeof record.leaseId !== "string" ||
|
||||
typeof record.gatewayInstanceId !== "string" ||
|
||||
typeof record.sessionKey !== "string" ||
|
||||
typeof record.wrapperRoot !== "string" ||
|
||||
typeof record.wrapperPath !== "string" ||
|
||||
typeof record.rootPid !== "number" ||
|
||||
typeof record.commandHash !== "string" ||
|
||||
typeof record.startedAt !== "number" ||
|
||||
!["open", "closing", "closed", "lost"].includes(String(record.state))
|
||||
) {
|
||||
return undefined;
|
||||
}
|
||||
return {
|
||||
leaseId: record.leaseId,
|
||||
gatewayInstanceId: record.gatewayInstanceId,
|
||||
sessionKey: record.sessionKey,
|
||||
wrapperRoot: record.wrapperRoot,
|
||||
wrapperPath: record.wrapperPath,
|
||||
rootPid: record.rootPid,
|
||||
...(typeof record.processGroupId === "number" ? { processGroupId: record.processGroupId } : {}),
|
||||
commandHash: record.commandHash,
|
||||
startedAt: record.startedAt,
|
||||
state: record.state as AcpxProcessLeaseState,
|
||||
};
|
||||
}
|
||||
|
||||
export function normalizeAcpxProcessLeaseFile(value: unknown): AcpxProcessLeaseFile {
|
||||
const root =
|
||||
typeof value === "object" && value !== null ? (value as Record<string, unknown>) : {};
|
||||
const leases = Array.isArray(root.leases)
|
||||
? root.leases
|
||||
.map(normalizeAcpxProcessLease)
|
||||
.filter((lease): lease is AcpxProcessLease => Boolean(lease))
|
||||
: [];
|
||||
return { version: 1, leases };
|
||||
}
|
||||
|
||||
export function openAcpxProcessLeaseStateStore(
|
||||
openKeyedStore: <T>(options: OpenKeyedStoreOptions) => PluginStateKeyedStore<T>,
|
||||
): PluginStateKeyedStore<AcpxProcessLease> {
|
||||
return openKeyedStore<AcpxProcessLease>({
|
||||
namespace: ACPX_PROCESS_LEASE_NAMESPACE,
|
||||
maxEntries: ACPX_PROCESS_LEASE_MAX_ENTRIES,
|
||||
});
|
||||
}
|
||||
|
||||
/** Create a serialized SQLite-backed ACPX process lease store. */
|
||||
export function createAcpxProcessLeaseStore(params: {
|
||||
store: PluginStateKeyedStore<AcpxProcessLease>;
|
||||
}): AcpxProcessLeaseStore {
|
||||
let updateQueue: Promise<void> = Promise.resolve();
|
||||
|
||||
async function update(mutator: () => Promise<void>): Promise<void> {
|
||||
const run = updateQueue.then(async () => {
|
||||
await mutator();
|
||||
});
|
||||
updateQueue = run.catch(() => {});
|
||||
await run;
|
||||
}
|
||||
|
||||
async function readCurrent(): Promise<AcpxProcessLease[]> {
|
||||
await updateQueue;
|
||||
const entries = await params.store.entries();
|
||||
return entries
|
||||
.map((entry) => normalizeAcpxProcessLease(entry.value))
|
||||
.filter((lease): lease is AcpxProcessLease => Boolean(lease));
|
||||
}
|
||||
|
||||
return {
|
||||
async load(leaseId) {
|
||||
await updateQueue;
|
||||
return normalizeAcpxProcessLease(await params.store.lookup(leaseId));
|
||||
},
|
||||
async listOpen(gatewayInstanceId) {
|
||||
const leases = await readCurrent();
|
||||
return leases.filter(
|
||||
(lease) =>
|
||||
(lease.state === "open" || lease.state === "closing") &&
|
||||
(!gatewayInstanceId || lease.gatewayInstanceId === gatewayInstanceId),
|
||||
);
|
||||
},
|
||||
async save(lease) {
|
||||
await update(async () => {
|
||||
await params.store.register(lease.leaseId, lease);
|
||||
});
|
||||
},
|
||||
async markState(leaseId, state) {
|
||||
await update(async () => {
|
||||
if (state === "closed" || state === "lost") {
|
||||
await params.store.delete(leaseId);
|
||||
return;
|
||||
}
|
||||
const lease = normalizeAcpxProcessLease(await params.store.lookup(leaseId));
|
||||
if (lease) {
|
||||
await params.store.register(leaseId, { ...lease, state });
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/** Create a unique lease id for one ACPX wrapper process. */
|
||||
export function createAcpxProcessLeaseId(): string {
|
||||
return randomUUID();
|
||||
}
|
||||
|
||||
/** Hash a wrapper command so process leases can detect command drift. */
|
||||
export function hashAcpxProcessCommand(command: string): string {
|
||||
return createHash("sha256").update(command).digest("hex");
|
||||
}
|
||||
|
||||
function quoteEnvValue(value: string): string {
|
||||
return /^[A-Za-z0-9_./:=@+-]+$/.test(value) ? value : `'${value.replace(/'/g, "'\\''")}'`;
|
||||
}
|
||||
|
||||
function appendAcpxLeaseArgs(params: {
|
||||
command: string;
|
||||
leaseId: string;
|
||||
gatewayInstanceId: string;
|
||||
}): string {
|
||||
return [
|
||||
params.command,
|
||||
OPENCLAW_ACPX_LEASE_ID_ARG,
|
||||
quoteEnvValue(params.leaseId),
|
||||
OPENCLAW_GATEWAY_INSTANCE_ID_ARG,
|
||||
quoteEnvValue(params.gatewayInstanceId),
|
||||
].join(" ");
|
||||
}
|
||||
|
||||
/** Add ACPX lease identity to a command through env vars and portable args. */
|
||||
export function withAcpxLeaseEnvironment(params: {
|
||||
command: string;
|
||||
leaseId: string;
|
||||
gatewayInstanceId: string;
|
||||
platform?: NodeJS.Platform;
|
||||
}): string {
|
||||
if ((params.platform ?? process.platform) === "win32") {
|
||||
return appendAcpxLeaseArgs(params);
|
||||
}
|
||||
return [
|
||||
"env",
|
||||
`${OPENCLAW_ACPX_LEASE_ID_ENV}=${quoteEnvValue(params.leaseId)}`,
|
||||
`${OPENCLAW_GATEWAY_INSTANCE_ID_ENV}=${quoteEnvValue(params.gatewayInstanceId)}`,
|
||||
appendAcpxLeaseArgs(params),
|
||||
].join(" ");
|
||||
}
|
||||
Reference in New Issue
Block a user