feat: ACP thread-bound agents (#23580)

* docs: add ACP thread-bound agents plan doc

* docs: expand ACP implementation specification

* feat(acp): route ACP sessions through core dispatch and lifecycle cleanup

* feat(acp): add /acp commands and Discord spawn gate

* ACP: add acpx runtime plugin backend

* fix(subagents): defer transient lifecycle errors before announce

* Agents: harden ACP sessions_spawn and tighten spawn guidance

* Agents: require explicit ACP target for runtime spawns

* docs: expand ACP control-plane implementation plan

* ACP: harden metadata seeding and spawn guidance

* ACP: centralize runtime control-plane manager and fail-closed dispatch

* ACP: harden runtime manager and unify spawn helpers

* Commands: route ACP sessions through ACP runtime in agent command

* ACP: require persisted metadata for runtime spawns

* Sessions: preserve ACP metadata when updating entries

* Plugins: harden ACP backend registry across loaders

* ACPX: make availability probe compatible with adapters

* E2E: add manual Discord ACP plain-language smoke script

* ACPX: preserve streamed spacing across Discord delivery

* Docs: add ACP Discord streaming strategy

* ACP: harden Discord stream buffering for thread replies

* ACP: reuse shared block reply pipeline for projector

* ACP: unify streaming config and adopt coalesceIdleMs

* Docs: add temporary ACP production hardening plan

* Docs: trim temporary ACP hardening plan goals

* Docs: gate ACP thread controls by backend capabilities

* ACP: add capability-gated runtime controls and /acp operator commands

* Docs: remove temporary ACP hardening plan

* ACP: fix spawn target validation and close cache cleanup

* ACP: harden runtime dispatch and recovery paths

* ACP: split ACP command/runtime internals and centralize policy

* ACP: harden runtime lifecycle, validation, and observability

* ACP: surface runtime and backend session IDs in thread bindings

* docs: add temp plan for binding-service migration

* ACP: migrate thread binding flows to SessionBindingService

* ACP: address review feedback and preserve prompt wording

* ACPX plugin: pin runtime dependency and prefer bundled CLI

* Discord: complete binding-service migration cleanup and restore ACP plan

* Docs: add standalone ACP agents guide

* ACP: route harness intents to thread-bound ACP sessions

* ACP: fix spawn thread routing and queue-owner stall

* ACP: harden startup reconciliation and command bypass handling

* ACP: fix dispatch bypass type narrowing

* ACP: align runtime metadata to agentSessionId

* ACP: normalize session identifier handling and labels

* ACP: mark thread banner session ids provisional until first reply

* ACP: stabilize session identity mapping and startup reconciliation

* ACP: add resolved session-id notices and cwd in thread intros

* Discord: prefix thread meta notices consistently

* Discord: unify ACP/thread meta notices with gear prefix

* Discord: split thread persona naming from meta formatting

* Extensions: bump acpx plugin dependency to 0.1.9

* Agents: gate ACP prompt guidance behind acp.enabled

* Docs: remove temp experiment plan docs

* Docs: scope streaming plan to holy grail refactor

* Docs: refactor ACP agents guide for human-first flow

* Docs/Skill: add ACP feature-flag guidance and direct acpx telephone-game flow

* Docs/Skill: add OpenCode and Pi to ACP harness lists

* Docs/Skill: align ACP harness list with current acpx registry

* Dev/Test: move ACP plain-language smoke script and mark as keep

* Docs/Skill: reorder ACP harness lists with Pi first

* ACP: split control-plane manager into core/types/utils modules

* Docs: refresh ACP thread-bound agents plan

* ACP: extract dispatch lane and split manager domains

* ACP: centralize binding context and remove reverse deps

* Infra: unify system message formatting

* ACP: centralize error boundaries and session id rendering

* ACP: enforce init concurrency cap and strict meta clear

* Tests: fix ACP dispatch binding mock typing

* Tests: fix Discord thread-binding mock drift and ACP request id

* ACP: gate slash bypass and persist cleared overrides

* ACPX: await pre-abort cancel before runTurn return

* Extension: pin acpx runtime dependency to 0.1.11

* Docs: add pinned acpx install strategy for ACP extension

* Extensions/acpx: enforce strict local pinned startup

* Extensions/acpx: tighten acp-router install guidance

* ACPX: retry runtime test temp-dir cleanup

* Extensions/acpx: require proactive ACPX repair for thread spawns

* Extensions/acpx: require restart offer after acpx reinstall

* extensions/acpx: remove workspace protocol devDependency

* extensions/acpx: bump pinned acpx to 0.1.13

* extensions/acpx: sync lockfile after dependency bump

* ACPX: make runtime spawn Windows-safe

* fix: align doctor-config-flow repair tests with default-account migration (#23580) (thanks @osolmaz)

src/agents/skills/plugin-skills.test.ts

@@ -0,0 +1,103 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { OpenClawConfig } from "../../config/config.js";
+import type { PluginManifestRegistry } from "../../plugins/manifest-registry.js";
+import { createTrackedTempDirs } from "../../test-utils/tracked-temp-dirs.js";
+
+const hoisted = vi.hoisted(() => ({
+  loadPluginManifestRegistry: vi.fn(),
+}));
+
+vi.mock("../../plugins/manifest-registry.js", () => ({
+  loadPluginManifestRegistry: (...args: unknown[]) => hoisted.loadPluginManifestRegistry(...args),
+}));
+
+const { resolvePluginSkillDirs } = await import("./plugin-skills.js");
+
+const tempDirs = createTrackedTempDirs();
+
+function buildRegistry(params: { acpxRoot: string; helperRoot: string }): PluginManifestRegistry {
+  return {
+    diagnostics: [],
+    plugins: [
+      {
+        id: "acpx",
+        name: "ACPX Runtime",
+        channels: [],
+        providers: [],
+        skills: ["./skills"],
+        origin: "workspace",
+        rootDir: params.acpxRoot,
+        source: params.acpxRoot,
+        manifestPath: path.join(params.acpxRoot, "openclaw.plugin.json"),
+      },
+      {
+        id: "helper",
+        name: "Helper",
+        channels: [],
+        providers: [],
+        skills: ["./skills"],
+        origin: "workspace",
+        rootDir: params.helperRoot,
+        source: params.helperRoot,
+        manifestPath: path.join(params.helperRoot, "openclaw.plugin.json"),
+      },
+    ],
+  };
+}
+
+afterEach(async () => {
+  hoisted.loadPluginManifestRegistry.mockReset();
+  await tempDirs.cleanup();
+});
+
+describe("resolvePluginSkillDirs", () => {
+  it("keeps acpx plugin skills when ACP is enabled", async () => {
+    const workspaceDir = await tempDirs.make("openclaw-");
+    const acpxRoot = await tempDirs.make("openclaw-acpx-plugin-");
+    const helperRoot = await tempDirs.make("openclaw-helper-plugin-");
+    await fs.mkdir(path.join(acpxRoot, "skills"), { recursive: true });
+    await fs.mkdir(path.join(helperRoot, "skills"), { recursive: true });
+
+    hoisted.loadPluginManifestRegistry.mockReturnValue(
+      buildRegistry({
+        acpxRoot,
+        helperRoot,
+      }),
+    );
+
+    const dirs = resolvePluginSkillDirs({
+      workspaceDir,
+      config: {
+        acp: { enabled: true },
+      } as OpenClawConfig,
+    });
+
+    expect(dirs).toEqual([path.resolve(acpxRoot, "skills"), path.resolve(helperRoot, "skills")]);
+  });
+
+  it("skips acpx plugin skills when ACP is disabled", async () => {
+    const workspaceDir = await tempDirs.make("openclaw-");
+    const acpxRoot = await tempDirs.make("openclaw-acpx-plugin-");
+    const helperRoot = await tempDirs.make("openclaw-helper-plugin-");
+    await fs.mkdir(path.join(acpxRoot, "skills"), { recursive: true });
+    await fs.mkdir(path.join(helperRoot, "skills"), { recursive: true });
+
+    hoisted.loadPluginManifestRegistry.mockReturnValue(
+      buildRegistry({
+        acpxRoot,
+        helperRoot,
+      }),
+    );
+
+    const dirs = resolvePluginSkillDirs({
+      workspaceDir,
+      config: {
+        acp: { enabled: false },
+      } as OpenClawConfig,
+    });
+
+    expect(dirs).toEqual([path.resolve(helperRoot, "skills")]);
+  });
+});

src/agents/skills/plugin-skills.ts

@@ -27,6 +27,7 @@ export function resolvePluginSkillDirs(params: {
     return [];
   }
   const normalizedPlugins = normalizePluginsConfig(params.config?.plugins);
+  const acpEnabled = params.config?.acp?.enabled !== false;
   const memorySlot = normalizedPlugins.slots.memory;
   let selectedMemoryPluginId: string | null = null;
   const seen = new Set<string>();
@@ -45,6 +46,10 @@ export function resolvePluginSkillDirs(params: {
     if (!enableState.enabled) {
       continue;
     }
+    // ACP router skills should not be attached when ACP is explicitly disabled.
+    if (!acpEnabled && record.id === "acpx") {
+      continue;
+    }
     const memoryDecision = resolveMemorySlotDecision({
       id: record.id,
       kind: record.kind,