feat: add Factory Droid aliases (#156)

Author: vincentkoc

CHANGELOG.md

@@ -7,6 +7,7 @@ Repo: https://github.com/openclaw/acpx
 ### Changes
 
 - Conformance/ACP: add a data-driven ACP core v1 conformance suite with CI smoke coverage, nightly coverage, and a hardened runner that reports startup failures cleanly and scopes filesystem checks to the session cwd. (#130) Thanks @lynnzc.
+- Agents/droid: add `factory-droid` and `factorydroid` aliases for the built-in Factory Droid adapter and sync the built-in docs. Thanks @vincentkoc.
 
 ### Breaking
 

README.md

@@ -296,6 +296,8 @@ Built-ins:
 | `opencode` | `npx -y opencode-ai acp`                                               | [OpenCode](https://opencode.ai)                                                                                 |
 | `qwen`     | native (`qwen --acp`)                                                  | [Qwen Code](https://github.com/QwenLM/qwen-code)                                                                |
 
+`factory-droid` and `factorydroid` also resolve to the built-in `droid` adapter.
+
 Additional built-in agent docs live in [agents/README.md](agents/README.md).
 
 Use `--agent` as an escape hatch for custom ACP servers:

agents/Droid.md

@@ -1,5 +1,6 @@
 # Droid
 
 - Built-in name: `droid`
+- Aliases: `factory-droid`, `factorydroid`
 - Default command: `droid exec --output-format acp`
 - Upstream: https://www.factory.ai

agents/README.md

@@ -9,7 +9,7 @@ Built-in agents:
 - `gemini -> gemini --acp`
 - `cursor -> cursor-agent acp`
 - `copilot -> copilot --acp --stdio`
-- `droid -> droid exec --output-format acp`
+- `droid -> droid exec --output-format acp` (`factory-droid` and `factorydroid` also resolve to `droid`)
 - `iflow -> iflow --experimental-acp`
 - `kilocode -> npx -y @kilocode/cli acp`
 - `kimi -> kimi acp`
@@ -21,7 +21,7 @@ Harness-specific docs in this directory:
 
 - [Codex](Codex.md): built-in `codex -> npx @zed-industries/codex-acp`
 - [Copilot](Copilot.md): built-in `copilot -> copilot --acp --stdio`
-- [Droid](Droid.md): built-in `droid -> droid exec --output-format acp`
+- [Droid](Droid.md): built-in `droid -> droid exec --output-format acp` with `factory-droid` and `factorydroid` aliases
 - [Cursor](Cursor.md): built-in `cursor -> cursor-agent acp`
 - [Gemini](Gemini.md): built-in `gemini -> gemini --acp`
 - [iFlow](Iflow.md): built-in `iflow -> iflow --experimental-acp`

docs/2026-02-17-agent-registry.md

@@ -28,6 +28,9 @@ When you run `acpx <agent> ...`:
 
 This means custom names work without any registry file edits.
 
+`factory-droid` and `factorydroid` are built-in aliases for `droid`, so they
+resolve to the same `droid exec --output-format acp` command.
+
 ## `--agent` escape hatch
 
 `--agent <command>` forces a raw adapter command and bypasses positional agent resolution.

skills/acpx/SKILL.md

@@ -78,7 +78,7 @@ Friendly agent names resolve to commands:
 - `gemini` -> `gemini --acp`
 - `cursor` -> `cursor-agent acp`
 - `copilot` -> `copilot --acp --stdio`
-- `droid` -> `droid exec --output-format acp`
+- `droid` -> `droid exec --output-format acp` (`factory-droid` and `factorydroid` also resolve to `droid`)
 - `kimi` -> `kimi acp`
 - `opencode` -> `npx -y opencode-ai acp`
 - `kiro` -> `kiro-cli acp`

src/agent-registry.ts

@@ -21,6 +21,11 @@ export const AGENT_REGISTRY: Record<string, string> = {
   qwen: "qwen --acp",
 };
 
+const AGENT_ALIASES: Record<string, string> = {
+  "factory-droid": "droid",
+  factorydroid: "droid",
+};
+
 export const DEFAULT_AGENT_NAME = "codex";
 
 export function normalizeAgentName(value: string): string {
@@ -46,7 +51,7 @@ export function mergeAgentRegistry(overrides?: Record<string, string>): Record<s
 export function resolveAgentCommand(agentName: string, overrides?: Record<string, string>): string {
   const normalized = normalizeAgentName(agentName);
   const registry = mergeAgentRegistry(overrides);
-  return registry[normalized] ?? agentName;
+  return registry[normalized] ?? registry[AGENT_ALIASES[normalized] ?? normalized] ?? agentName;
 }
 
 export function listBuiltInAgents(overrides?: Record<string, string>): string[] {

test/agent-registry.test.ts

@@ -17,6 +17,21 @@ test("resolveAgentCommand returns raw value for unknown agents", () => {
   assert.equal(resolveAgentCommand("custom-acp-server"), "custom-acp-server");
 });
 
+test("resolveAgentCommand maps factory droid aliases to the droid command", () => {
+  assert.equal(resolveAgentCommand("factory-droid"), AGENT_REGISTRY.droid);
+  assert.equal(resolveAgentCommand("factorydroid"), AGENT_REGISTRY.droid);
+});
+
+test("resolveAgentCommand prefers explicit alias overrides over built-in alias mapping", () => {
+  assert.equal(
+    resolveAgentCommand("factory-droid", {
+      "factory-droid": "custom-factory-droid --acp",
+      droid: "custom-droid --acp",
+    }),
+    "custom-factory-droid --acp",
+  );
+});
+
 test("listBuiltInAgents preserves the required example prefix and alphabetical tail", () => {
   const agents = listBuiltInAgents();
   assert.deepEqual(agents, Object.keys(AGENT_REGISTRY));

test/integration.test.ts

@@ -99,6 +99,33 @@ test("integration: built-in droid agent resolves to droid exec --output-format a
   });
 });
 
+test("integration: factory-droid alias resolves to droid exec --output-format acp", async () => {
+  await withTempHome(async (homeDir) => {
+    const cwd = await fs.mkdtemp(path.join(os.tmpdir(), "acpx-integration-cwd-"));
+    const fakeBinDir = await fs.mkdtemp(path.join(os.tmpdir(), "acpx-fake-droid-"));
+
+    try {
+      await writeFakeDroidAgent(fakeBinDir);
+
+      const result = await runCli(
+        ["--approve-all", "--cwd", cwd, "--format", "quiet", "factory-droid", "exec", "echo hello"],
+        homeDir,
+        {
+          env: {
+            PATH: `${fakeBinDir}${path.delimiter}${process.env.PATH ?? ""}`,
+          },
+        },
+      );
+
+      assert.equal(result.code, 0, result.stderr);
+      assert.match(result.stdout, /hello/);
+    } finally {
+      await fs.rm(fakeBinDir, { recursive: true, force: true });
+      await fs.rm(cwd, { recursive: true, force: true });
+    }
+  });
+});
+
 test("integration: built-in iflow agent resolves to iflow --experimental-acp", async () => {
   await withTempHome(async (homeDir) => {
     const cwd = await fs.mkdtemp(path.join(os.tmpdir(), "acpx-integration-cwd-"));