@kodelyth/acpx 2026.5.42 → 2026.6.2

package/src/config.ts

@@ -1,281 +0,0 @@
-import fs from "node:fs";
-import { createRequire } from "node:module";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { formatPluginConfigIssue } from "klaw/plugin-sdk/extension-shared";
-import { normalizeLowercaseStringOrEmpty } from "klaw/plugin-sdk/string-coerce-runtime";
-import { AcpxPluginConfigSchema, DEFAULT_ACPX_TIMEOUT_SECONDS } from "./config-schema.js";
-import type {
-  AcpxPluginConfig,
-  AcpxPermissionMode,
-  AcpxNonInteractivePermissionPolicy,
-  McpServerConfig,
-  AcpxMcpServer,
-  ResolvedAcpxPluginConfig,
-} from "./config-schema.js";
-export { type ResolvedAcpxPluginConfig } from "./config-schema.js";
-
-const ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME = "klaw-plugin-tools";
-const ACPX_KLAW_TOOLS_MCP_SERVER_NAME = "klaw-tools";
-const requireFromHere = createRequire(import.meta.url);
-
-function isAcpxPluginRoot(dir: string): boolean {
-  return (
-    fs.existsSync(path.join(dir, "klaw.plugin.json")) &&
-    fs.existsSync(path.join(dir, "package.json"))
-  );
-}
-
-function resolveNearestAcpxPluginRoot(moduleUrl: string): string {
-  let cursor = path.dirname(fileURLToPath(moduleUrl));
-  for (let i = 0; i < 3; i += 1) {
-    // Bundled entries live at the plugin root while source files still live under src/.
-    if (isAcpxPluginRoot(cursor)) {
-      return cursor;
-    }
-    const parent = path.dirname(cursor);
-    if (parent === cursor) {
-      break;
-    }
-    cursor = parent;
-  }
-  return path.resolve(path.dirname(fileURLToPath(moduleUrl)), "..");
-}
-
-function resolveWorkspaceAcpxPluginRoot(currentRoot: string): string | null {
-  if (
-    path.basename(currentRoot) !== "acpx" ||
-    path.basename(path.dirname(currentRoot)) !== "extensions" ||
-    path.basename(path.dirname(path.dirname(currentRoot))) !== "dist"
-  ) {
-    return null;
-  }
-  const workspaceRoot = path.resolve(currentRoot, "..", "..", "..", "extensions", "acpx");
-  return isAcpxPluginRoot(workspaceRoot) ? workspaceRoot : null;
-}
-
-function resolveRepoAcpxPluginRoot(currentRoot: string): string | null {
-  const workspaceRoot = path.join(currentRoot, "extensions", "acpx");
-  return isAcpxPluginRoot(workspaceRoot) ? workspaceRoot : null;
-}
-
-function resolveAcpxPluginRootFromKlawLayout(moduleUrl: string): string | null {
-  let cursor = path.dirname(fileURLToPath(moduleUrl));
-  for (let i = 0; i < 5; i += 1) {
-    const candidates = [
-      path.join(cursor, "extensions", "acpx"),
-      path.join(cursor, "dist", "extensions", "acpx"),
-      path.join(cursor, "dist-runtime", "extensions", "acpx"),
-    ];
-    for (const candidate of candidates) {
-      if (isAcpxPluginRoot(candidate)) {
-        return candidate;
-      }
-    }
-    const parent = path.dirname(cursor);
-    if (parent === cursor) {
-      break;
-    }
-    cursor = parent;
-  }
-  return null;
-}
-export function resolveAcpxPluginRoot(moduleUrl: string = import.meta.url): string {
-  const resolvedRoot = resolveNearestAcpxPluginRoot(moduleUrl);
-  // In a live repo checkout, dist/ can be rebuilt out from under the running gateway.
-  // Prefer the stable source plugin root when a built extension is running beside it.
-  return (
-    resolveWorkspaceAcpxPluginRoot(resolvedRoot) ??
-    resolveRepoAcpxPluginRoot(resolvedRoot) ??
-    // Shared dist/dist-runtime chunks can load this module outside the plugin tree.
-    // Scan common Klaw layouts before falling back to the nearest path guess.
-    resolveAcpxPluginRootFromKlawLayout(moduleUrl) ??
-    resolvedRoot
-  );
-}
-
-const DEFAULT_PERMISSION_MODE: AcpxPermissionMode = "approve-reads";
-const DEFAULT_NON_INTERACTIVE_POLICY: AcpxNonInteractivePermissionPolicy = "fail";
-const DEFAULT_QUEUE_OWNER_TTL_SECONDS = 0.1;
-const DEFAULT_STRICT_WINDOWS_CMD_WRAPPER = true;
-
-type ParseResult =
-  | { ok: true; value: AcpxPluginConfig | undefined }
-  | { ok: false; message: string };
-
-function parseAcpxPluginConfig(value: unknown): ParseResult {
-  if (value === undefined) {
-    return { ok: true, value: undefined };
-  }
-  const parsed = AcpxPluginConfigSchema.safeParse(value);
-  if (!parsed.success) {
-    return { ok: false, message: formatPluginConfigIssue(parsed.error.issues[0]) };
-  }
-  return {
-    ok: true,
-    value: parsed.data as AcpxPluginConfig,
-  };
-}
-
-function resolveKlawRoot(currentRoot: string): string {
-  if (
-    path.basename(currentRoot) === "acpx" &&
-    path.basename(path.dirname(currentRoot)) === "extensions"
-  ) {
-    const parent = path.dirname(path.dirname(currentRoot));
-    if (path.basename(parent) === "dist") {
-      return path.dirname(parent);
-    }
-    return parent;
-  }
-  return path.resolve(currentRoot, "..");
-}
-
-function resolveTsxImportSpecifier(): string {
-  try {
-    return requireFromHere.resolve("tsx");
-  } catch {
-    return "tsx";
-  }
-}
-
-function shellQuoteCommandArg(arg: string): string {
-  if (!/[\s'"\\$|&;<>{}()*?[\]~`]/.test(arg)) {
-    return arg;
-  }
-  return `'${arg.replace(/'/g, "'\"'\"'")}'`;
-}
-
-function resolvePluginToolsMcpServerConfig(moduleUrl: string = import.meta.url): McpServerConfig {
-  const pluginRoot = resolveAcpxPluginRoot(moduleUrl);
-  const openClawRoot = resolveKlawRoot(pluginRoot);
-  const distEntry = path.join(openClawRoot, "dist", "mcp", "plugin-tools-serve.js");
-  if (fs.existsSync(distEntry)) {
-    return {
-      command: process.execPath,
-      args: [distEntry],
-    };
-  }
-  const sourceEntry = path.join(openClawRoot, "src", "mcp", "plugin-tools-serve.ts");
-  return {
-    command: process.execPath,
-    args: ["--import", resolveTsxImportSpecifier(), sourceEntry],
-  };
-}
-
-function resolveKlawToolsMcpServerConfig(moduleUrl: string = import.meta.url): McpServerConfig {
-  const pluginRoot = resolveAcpxPluginRoot(moduleUrl);
-  const openClawRoot = resolveKlawRoot(pluginRoot);
-  const distEntry = path.join(openClawRoot, "dist", "mcp", "klaw-tools-serve.js");
-  if (fs.existsSync(distEntry)) {
-    return {
-      command: process.execPath,
-      args: [distEntry],
-    };
-  }
-  const sourceEntry = path.join(openClawRoot, "src", "mcp", "klaw-tools-serve.ts");
-  return {
-    command: process.execPath,
-    args: ["--import", resolveTsxImportSpecifier(), sourceEntry],
-  };
-}
-
-function resolveConfiguredMcpServers(params: {
-  mcpServers?: Record<string, McpServerConfig>;
-  pluginToolsMcpBridge: boolean;
-  openClawToolsMcpBridge: boolean;
-  moduleUrl?: string;
-}): Record<string, McpServerConfig> {
-  const resolved = { ...params.mcpServers };
-  if (params.pluginToolsMcpBridge && resolved[ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME]) {
-    throw new Error(
-      `mcpServers.${ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME} is reserved when pluginToolsMcpBridge=true`,
-    );
-  }
-  if (params.openClawToolsMcpBridge && resolved[ACPX_KLAW_TOOLS_MCP_SERVER_NAME]) {
-    throw new Error(
-      `mcpServers.${ACPX_KLAW_TOOLS_MCP_SERVER_NAME} is reserved when openClawToolsMcpBridge=true`,
-    );
-  }
-  if (params.pluginToolsMcpBridge) {
-    resolved[ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME] = resolvePluginToolsMcpServerConfig(
-      params.moduleUrl,
-    );
-  }
-  if (params.openClawToolsMcpBridge) {
-    resolved[ACPX_KLAW_TOOLS_MCP_SERVER_NAME] = resolveKlawToolsMcpServerConfig(params.moduleUrl);
-  }
-  return resolved;
-}
-
-export function toAcpMcpServers(mcpServers: Record<string, McpServerConfig>): AcpxMcpServer[] {
-  return Object.entries(mcpServers).map(([name, server]) => ({
-    name,
-    command: server.command,
-    args: [...(server.args ?? [])],
-    env: Object.entries(server.env ?? {}).map(([envName, value]) => ({
-      name: envName,
-      value,
-    })),
-  }));
-}
-
-export function resolveAcpxPluginConfig(params: {
-  rawConfig: unknown;
-  workspaceDir?: string;
-  moduleUrl?: string;
-}): ResolvedAcpxPluginConfig {
-  const parsed = parseAcpxPluginConfig(params.rawConfig);
-  if (!parsed.ok) {
-    throw new Error(parsed.message);
-  }
-  const normalized = parsed.value ?? {};
-  const workspaceDir = params.workspaceDir?.trim() || process.cwd();
-  const fallbackCwd = workspaceDir;
-  const cwd = path.resolve(normalized.cwd?.trim() || fallbackCwd);
-  const stateDir = path.resolve(normalized.stateDir?.trim() || path.join(workspaceDir, "state"));
-  const pluginToolsMcpBridge = normalized.pluginToolsMcpBridge === true;
-  const openClawToolsMcpBridge = normalized.openClawToolsMcpBridge === true;
-  const mcpServers = resolveConfiguredMcpServers({
-    mcpServers: normalized.mcpServers,
-    pluginToolsMcpBridge,
-    openClawToolsMcpBridge,
-    moduleUrl: params.moduleUrl,
-  });
-  const agents = Object.fromEntries(
-    Object.entries(normalized.agents ?? {}).map(([name, entry]) => {
-      const cmd = entry.command.trim();
-      const cmdArgs = entry.args ?? [];
-      const fullCommand =
-        cmdArgs.length > 0 ? `${cmd} ${cmdArgs.map(shellQuoteCommandArg).join(" ")}` : cmd;
-      return [normalizeLowercaseStringOrEmpty(name), fullCommand];
-    }),
-  );
-
-  // Lowercase probeAgent so lookups match the registry keys built above, which
-  // also go through normalizeLowercaseStringOrEmpty. Without this, a user who
-  // writes `probeAgent: "OpenCode"` would silently miss the stored "opencode"
-  // key.
-  const probeAgent = normalizeLowercaseStringOrEmpty(normalized.probeAgent) || undefined;
-
-  return {
-    cwd,
-    stateDir,
-    probeAgent,
-    permissionMode: normalized.permissionMode ?? DEFAULT_PERMISSION_MODE,
-    nonInteractivePermissions:
-      normalized.nonInteractivePermissions ?? DEFAULT_NON_INTERACTIVE_POLICY,
-    pluginToolsMcpBridge,
-    openClawToolsMcpBridge,
-    strictWindowsCmdWrapper:
-      normalized.strictWindowsCmdWrapper ?? DEFAULT_STRICT_WINDOWS_CMD_WRAPPER,
-    timeoutSeconds: normalized.timeoutSeconds ?? DEFAULT_ACPX_TIMEOUT_SECONDS,
-    queueOwnerTtlSeconds: normalized.queueOwnerTtlSeconds ?? DEFAULT_QUEUE_OWNER_TTL_SECONDS,
-    legacyCompatibilityConfig: {
-      strictWindowsCmdWrapper: normalized.strictWindowsCmdWrapper,
-      queueOwnerTtlSeconds: normalized.queueOwnerTtlSeconds,
-    },
-    mcpServers,
-    agents,
-  };
-}

package/src/manifest.test.ts

@@ -1,21 +0,0 @@
-import fs from "node:fs";
-import { describe, expect, it } from "vitest";
-
-type AcpxPackageManifest = {
-  dependencies?: Record<string, string>;
-  devDependencies?: Record<string, string>;
-};
-
-describe("acpx package manifest", () => {
-  it("keeps runtime dependencies in the package manifest", () => {
-    const packageJson = JSON.parse(
-      fs.readFileSync(new URL("../package.json", import.meta.url), "utf8"),
-    ) as AcpxPackageManifest;
-
-    expect(packageJson.dependencies?.acpx).toBeTypeOf("string");
-    expect(packageJson.dependencies?.acpx).not.toBe("");
-    expect(packageJson.dependencies?.["@zed-industries/codex-acp"]).toBe("0.14.0");
-    expect(packageJson.dependencies?.["@agentclientprotocol/claude-agent-acp"]).toBe("0.33.1");
-    expect(packageJson.devDependencies?.["@agentclientprotocol/claude-agent-acp"]).toBeUndefined();
-  });
-});

package/src/process-lease.test.ts

@@ -1,89 +0,0 @@
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { describe, expect, it } from "vitest";
-import {
-  createAcpxProcessLeaseStore,
-  KLAW_ACPX_LEASE_ID_ARG,
-  KLAW_ACPX_LEASE_ID_ENV,
-  KLAW_GATEWAY_INSTANCE_ID_ARG,
-  KLAW_GATEWAY_INSTANCE_ID_ENV,
-  withAcpxLeaseEnvironment,
-  type AcpxProcessLease,
-} from "./process-lease.js";
-
-function makeLease(index: number): AcpxProcessLease {
-  return {
-    leaseId: `lease-${index}`,
-    gatewayInstanceId: "gateway-test",
-    sessionKey: `agent:codex:acp:${index}`,
-    wrapperRoot: "/tmp/klaw/acpx",
-    wrapperPath: "/tmp/klaw/acpx/codex-acp-wrapper.mjs",
-    rootPid: 1000 + index,
-    commandHash: `hash-${index}`,
-    startedAt: index,
-    state: "open",
-  };
-}
-
-describe("createAcpxProcessLeaseStore", () => {
-  it("serializes concurrent lease saves without dropping records", async () => {
-    const stateDir = await mkdtemp(path.join(tmpdir(), "klaw-acpx-leases-"));
-    try {
-      const store = createAcpxProcessLeaseStore({ stateDir });
-      await Promise.all(Array.from({ length: 25 }, (_, index) => store.save(makeLease(index))));
-
-      const leases = await store.listOpen("gateway-test");
-      expect(leases.map((lease) => lease.leaseId).toSorted()).toEqual(
-        Array.from({ length: 25 }, (_, index) => `lease-${index}`).toSorted(),
-      );
-    } finally {
-      await rm(stateDir, { recursive: true, force: true });
-    }
-  });
-});
-
-describe("withAcpxLeaseEnvironment", () => {
-  it("adds lease environment and wrapper args on POSIX", () => {
-    const command = withAcpxLeaseEnvironment({
-      command: "node /tmp/klaw/acpx/codex-acp-wrapper.mjs",
-      leaseId: "lease-test",
-      gatewayInstanceId: "gateway-test",
-      platform: "darwin",
-    });
-
-    expect(command).toBe(
-      [
-        "env",
-        `${KLAW_ACPX_LEASE_ID_ENV}=lease-test`,
-        `${KLAW_GATEWAY_INSTANCE_ID_ENV}=gateway-test`,
-        "node /tmp/klaw/acpx/codex-acp-wrapper.mjs",
-        KLAW_ACPX_LEASE_ID_ARG,
-        "lease-test",
-        KLAW_GATEWAY_INSTANCE_ID_ARG,
-        "gateway-test",
-      ].join(" "),
-    );
-  });
-
-  it("keeps Windows logs keyed by lease id with wrapper args", () => {
-    const command = withAcpxLeaseEnvironment({
-      command: "node C:/klaw/acpx/codex-acp-wrapper.mjs",
-      leaseId: "lease-test",
-      gatewayInstanceId: "gateway-test",
-      platform: "win32",
-    });
-
-    expect(command).toBe(
-      [
-        "node C:/klaw/acpx/codex-acp-wrapper.mjs",
-        KLAW_ACPX_LEASE_ID_ARG,
-        "lease-test",
-        KLAW_GATEWAY_INSTANCE_ID_ARG,
-        "gateway-test",
-      ].join(" "),
-    );
-    expect(command).not.toContain(`${KLAW_ACPX_LEASE_ID_ENV}=`);
-    expect(command).not.toContain(`${KLAW_GATEWAY_INSTANCE_ID_ENV}=`);
-  });
-});

package/src/process-lease.ts

@@ -1,179 +0,0 @@
-import { randomUUID, createHash } from "node:crypto";
-import fs from "node:fs/promises";
-import path from "node:path";
-import { readJsonFileWithFallback, writeJsonFileAtomically } from "klaw/plugin-sdk/json-store";
-
-export const KLAW_ACPX_LEASE_ID_ENV = "KLAW_ACPX_LEASE_ID";
-export const KLAW_GATEWAY_INSTANCE_ID_ENV = "KLAW_GATEWAY_INSTANCE_ID";
-export const KLAW_ACPX_LEASE_ID_ARG = "--klaw-acpx-lease-id";
-export const KLAW_GATEWAY_INSTANCE_ID_ARG = "--klaw-gateway-instance-id";
-
-export type AcpxProcessLeaseState = "open" | "closing" | "closed" | "lost";
-
-export type AcpxProcessLease = {
-  leaseId: string;
-  gatewayInstanceId: string;
-  sessionKey: string;
-  wrapperRoot: string;
-  wrapperPath: string;
-  rootPid: number;
-  processGroupId?: number;
-  commandHash: string;
-  startedAt: number;
-  state: AcpxProcessLeaseState;
-};
-
-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>;
-};
-
-type LeaseFile = {
-  version: 1;
-  leases: AcpxProcessLease[];
-};
-
-const LEASE_FILE = "process-leases.json";
-
-function normalizeLease(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,
-  };
-}
-
-async function readLeaseFile(filePath: string): Promise<LeaseFile> {
-  const { value } = await readJsonFileWithFallback<Partial<LeaseFile>>(filePath, {
-    version: 1,
-    leases: [],
-  });
-  const leases = Array.isArray(value.leases)
-    ? value.leases.map(normalizeLease).filter((lease): lease is AcpxProcessLease => !!lease)
-    : [];
-  return { version: 1, leases };
-}
-
-function writeLeaseFile(filePath: string, value: LeaseFile): Promise<void> {
-  return writeJsonFileAtomically(filePath, value);
-}
-
-export function createAcpxProcessLeaseStore(params: { stateDir: string }): AcpxProcessLeaseStore {
-  const filePath = path.join(params.stateDir, LEASE_FILE);
-  let updateQueue: Promise<void> = Promise.resolve();
-
-  async function update(
-    mutator: (leases: AcpxProcessLease[]) => AcpxProcessLease[],
-  ): Promise<void> {
-    const run = updateQueue.then(async () => {
-      await fs.mkdir(params.stateDir, { recursive: true });
-      const current = await readLeaseFile(filePath);
-      await writeLeaseFile(filePath, {
-        version: 1,
-        leases: mutator(current.leases),
-      });
-    });
-    updateQueue = run.catch(() => {});
-    await run;
-  }
-
-  async function readCurrent(): Promise<LeaseFile> {
-    await updateQueue;
-    return await readLeaseFile(filePath);
-  }
-
-  return {
-    async load(leaseId) {
-      const current = await readCurrent();
-      return current.leases.find((lease) => lease.leaseId === leaseId);
-    },
-    async listOpen(gatewayInstanceId) {
-      const current = await readCurrent();
-      return current.leases.filter(
-        (lease) =>
-          (lease.state === "open" || lease.state === "closing") &&
-          (!gatewayInstanceId || lease.gatewayInstanceId === gatewayInstanceId),
-      );
-    },
-    async save(lease) {
-      await update((leases) => [
-        ...leases.filter((entry) => entry.leaseId !== lease.leaseId),
-        lease,
-      ]);
-    },
-    async markState(leaseId, state) {
-      await update((leases) =>
-        leases.map((lease) => (lease.leaseId === leaseId ? { ...lease, state } : lease)),
-      );
-    },
-  };
-}
-
-export function createAcpxProcessLeaseId(): string {
-  return randomUUID();
-}
-
-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,
-    KLAW_ACPX_LEASE_ID_ARG,
-    quoteEnvValue(params.leaseId),
-    KLAW_GATEWAY_INSTANCE_ID_ARG,
-    quoteEnvValue(params.gatewayInstanceId),
-  ].join(" ");
-}
-
-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",
-    `${KLAW_ACPX_LEASE_ID_ENV}=${quoteEnvValue(params.leaseId)}`,
-    `${KLAW_GATEWAY_INSTANCE_ID_ENV}=${quoteEnvValue(params.gatewayInstanceId)}`,
-    appendAcpxLeaseArgs(params),
-  ].join(" ");
-}