wayang-ai 0.9.2 → 0.9.3

package/README.md

@@ -82,6 +82,8 @@ On first run, an interactive setup wizard will guide you through configuring you
 
 On first run, Wayang launches an interactive setup wizard. Just fill in your LLM provider details.
 
+For every field, worker type, and troubleshooting, see the [configuration guide](docs/guides/configuration.md).
+
 Or create `~/.wayang.config.json` manually:
 
 ```json
@@ -149,8 +151,8 @@ wayang --resume --all             # list all sessions to pick
 
 ```json
 "workers": {
-  "codebuddy": { "type": "codebuddy-acp", "description": "Tencent CodeBuddy Code (ACP)", "capabilities": ["code","refactor","shell"] },
-  "opencode":  { "type": "opencode-acp", "description": "OpenCode (ACP)", "capabilities": ["code","refactor","shell"] }
+  "codebuddy": { "type": "codebuddy", "description": "Tencent CodeBuddy Code (ACP)", "capabilities": ["code","refactor","shell"] },
+  "opencode":  { "type": "opencode", "description": "OpenCode (ACP)", "capabilities": ["code","refactor","shell"] }
 }
 ```
 

package/dist/cli.js

@@ -1411,9 +1411,24 @@ import { join as join7 } from "path";
 import { get, set, cloneDeep } from "lodash-es";
 
 // src/types/config.ts
-var WORKER_TYPES = ["claude-code", "codebuddy-acp", "opencode-acp"];
+var WORKER_TYPES = ["claude-code", "acp", "codebuddy", "opencode"];
+var DEPRECATED_WORKER_TYPES = {
+  "codebuddy-acp": "codebuddy",
+  "opencode-acp": "opencode"
+};
+function normalizeWorkerTypes(config, warn) {
+  for (const [id, worker] of Object.entries(config.workers ?? {})) {
+    if (typeof worker !== "object" || worker === null) continue;
+    const current = worker.type;
+    if (typeof current !== "string") continue;
+    const canonical = DEPRECATED_WORKER_TYPES[current];
+    if (!canonical) continue;
+    worker.type = canonical;
+    warn(`worker type '${current}' is deprecated, use '${canonical}' (workers.${id})`);
+  }
+}
 function isAcpWorkerType(type) {
-  return type === "codebuddy-acp" || type === "opencode-acp";
+  return type === "acp" || type === "codebuddy" || type === "opencode";
 }
 var ACP_TIMEOUT_KEYS = ["handshakeMs", "sessionNewMs", "promptMs", "permissionMs", "cancelGraceMs", "sigtermWaitMs"];
 var ACP_CAPABILITY_KEYS = ["permissionRequests", "toolCalls"];
@@ -1442,16 +1457,22 @@ function validateWorkerEntry(id, worker) {
     return `${at}.emoji must be a string (got ${JSON.stringify(worker.emoji)})`;
   }
   if (type === "claude-code") {
-    for (const key of ["command", "args", "env", "protocol"]) {
+    for (const key of ["command", "args", "env", "protocol", "trustUpdatesAfterCancel"]) {
       if (worker[key] !== void 0) {
         return `${at}.${key} is not supported for type "claude-code" (claude-code uses cliPath)`;
       }
     }
   }
   if (isAcpWorkerType(worker.type)) {
+    if (worker.type === "acp" && (worker.command === void 0 || worker.command === "")) {
+      return `${at}.command is required for type "acp" (set workers.${id}.command to the ACP agent executable)`;
+    }
     if (worker.command !== void 0 && (typeof worker.command !== "string" || worker.command.length === 0)) {
       return `${at}.command must be a non-empty string (got ${JSON.stringify(worker.command)})`;
     }
+    if (worker.trustUpdatesAfterCancel !== void 0 && typeof worker.trustUpdatesAfterCancel !== "boolean") {
+      return `${at}.trustUpdatesAfterCancel must be a boolean (got ${JSON.stringify(worker.trustUpdatesAfterCancel)})`;
+    }
     if (worker.args !== void 0 && (!Array.isArray(worker.args) || worker.args.some((a) => typeof a !== "string"))) {
       return `${at}.args must be an array of strings (got ${JSON.stringify(worker.args)})`;
     }
@@ -1561,7 +1582,7 @@ function collectWorkerWarnings(config) {
       warnings.push(`workers.${id}.maxTurns has no effect on type "${worker.type}" (ACP has no turn cap)`);
     }
     if (worker.cliPath !== void 0) {
-      warnings.push(`workers.${id}.cliPath has no effect on type "${worker.type}" (*-acp workers use "command")`);
+      warnings.push(`workers.${id}.cliPath has no effect on type "${worker.type}" (ACP workers use "command")`);
     }
   }
   return warnings;
@@ -3381,9 +3402,11 @@ var PUPPET_DEFAULTS = {
   capabilities: ["code", "debug", "refactor", "search", "file-io", "web-search", "shell"]
 };
 var ACP_PROVIDER_EMOJIS = {
-  "codebuddy-acp": "\u{1F427}",
+  acp: "\u{1F9E9}",
+  // 🧩 generic config-driven ACP worker
+  codebuddy: "\u{1F427}",
   // 🐧 Tencent CodeBuddy
-  "opencode-acp": "\u{1F989}"
+  opencode: "\u{1F989}"
   // 🦉 OpenCode (experimental)
 };
 function getWorkerMeta(workerType, workerConfigs) {
@@ -5671,7 +5694,7 @@ function AppContent() {
 // package.json
 var package_default = {
   name: "wayang-ai",
-  version: "0.9.2",
+  version: "0.9.3",
   description: "Multi-agent orchestration platform",
   type: "module",
   license: "MIT",
@@ -5945,7 +5968,7 @@ async function buildConfigInteractive() {
   if (workerConfig) {
     config.workers = { "claude-code": workerConfig };
   }
-  console.log('  Tip: ACP workers (codebuddy-acp / opencode-acp) can be added later under "workers" in the config file.');
+  console.log('  Tip: ACP workers (acp / codebuddy / opencode) can be added later under "workers" in the config file.');
   return config;
 }
 async function loadConfig(configPath2, options = {}) {
@@ -5987,6 +6010,7 @@ async function loadConfig(configPath2, options = {}) {
     }
   }
   fillApiKeys(config);
+  normalizeWorkerTypes(config, (message) => console.warn(`Warning: ${message}`));
   warnDeprecatedPermissionKeys(config.permission, (message) => console.warn(`Warning: ${message}`));
   for (const warning of collectWorkerWarnings(config)) {
     console.warn(`Warning: ${warning}`);
@@ -7698,12 +7722,25 @@ var HARD_CONSTRAINTS = section(
 - NEVER mention internal concepts (Controller, Worker, signals) to the user. You are just "Wayang".`
 );
 var ACP_WORKER_HINT = "external ACP agent: no update_progress/done tools (it ends each turn by itself); chat_worker messages are delivered at its next turn boundary; sensitive operations still surface as permission requests you must answer; it needs its CLI installed and logged in \u2014 a missing CLI fails the task fast with an install hint";
+function acpTagFor(config) {
+  switch (config.type) {
+    case "acp":
+      return `acp:${config.command ?? "acp"}`;
+    case "codebuddy":
+      return "acp:codebuddy";
+    case "opencode":
+      return "acp:opencode";
+    default:
+      return null;
+  }
+}
 function buildWorkerList(workers) {
   const lines = [`- \`puppet\` \u2014 ${PUPPET_DEFAULTS.description} [${PUPPET_DEFAULTS.capabilities.join(", ")}]`];
   if (workers) {
     for (const [id, config] of Object.entries(workers)) {
       const caps = config.capabilities?.length ? ` [${config.capabilities.join(", ")}]` : "";
-      const acp = config.type.endsWith("-acp") ? ` [acp:${config.type.slice(0, -"-acp".length)}] \u2014 ${ACP_WORKER_HINT}` : "";
+      const acpTag = acpTagFor(config);
+      const acp = acpTag ? ` [${acpTag}] \u2014 ${ACP_WORKER_HINT}` : "";
       lines.push(`- \`${id}\` \u2014 ${config.description}${caps}${acp}`);
     }
   }
@@ -13422,6 +13459,22 @@ var BaseAcpWorker = class {
       ctx.sessionId
     );
   }
+  // --- Five hooks (02 §2) — all defaulted, override optional ---
+  /**
+   * 1) Launch: command/args (user overrides win), env merged, cwd. The
+   * default is the config-driven pass-through: `workers.<id>.command` /
+   * `.args` (empty when unset). No default executable exists — a missing
+   * command fails fast here so the run layer surfaces an explicit error
+   * instead of spawning an empty argv. Missing CLI on PATH is preflighted by
+   * the skeleton. Provider subclasses keep overriding with their measured
+   * default executable and fallbacks.
+   */
+  buildLaunch(view) {
+    if (!view.command) {
+      throw new AcpError("agent-error", 'workers.<id>.command is required for the generic "acp" worker type (no default executable)');
+    }
+    return { command: view.command, args: view.args ?? [], env: view.env, cwd: view.cwd, timeouts: view.timeouts };
+  }
   /**
    * 2) Permission: the default implementation walks the shared bridge
    * (04 booklet); providers override only when they must not.
@@ -13484,6 +13537,17 @@ var BaseAcpWorker = class {
     if (ctx.handshake.protocolVersion === 1) return { ready: true };
     return { ready: false, message: acpUserMessage("protocol-mismatch", { command: this._launchCommand }) };
   }
+  /**
+   * 5) Stop strategy — provider-measured values override (03 booklet). The
+   * default is CLI-neutral and conservative, chosen because no specific CLI
+   * behavior backs anything wider: cancelGraceMs 5000 / sigtermWaitMs 2000 /
+   * trustUpdatesAfterCancel FALSE — post-cancel updates are dropped and
+   * counted rather than written, so steps that ran after a user cancel are
+   * never recorded as if they were sanctioned.
+   */
+  stopPolicy() {
+    return { cancelGraceMs: 5e3, sigtermWaitMs: 2e3, trustUpdatesAfterCancel: false };
+  }
   // --- IWorkerInstance surface (aligned with ClaudeCodeWorker) ---
   /** Wire signal context. Called by the engine before run(); grants/approvalMemory are the 04 §3 additions. */
   setSignalContext(deps) {
@@ -14124,6 +14188,14 @@ var OpenCodeAcpWorker = class _OpenCodeAcpWorker extends AcpWorkerRun {
   }
 };
 
+// src/services/agents/acp/generic-acp-worker.ts
+var GenericAcpWorker = class extends AcpWorkerRun {
+  /** Neutral grace ladder (see the base default); trust is config-driven. */
+  stopPolicy() {
+    return { cancelGraceMs: 5e3, sigtermWaitMs: 2e3, trustUpdatesAfterCancel: this.config.trustUpdatesAfterCancel ?? false };
+  }
+};
+
 // src/utils/llm-error.ts
 function formatLlmError(err) {
   if (!(err instanceof Error)) return String(err);
@@ -16472,9 +16544,11 @@ var WorkerDispatchEngine = class extends WorkerWiringEngine {
       // ACP workers: same constructor shape as ClaudeCodeWorker (freeze §7 ①).
       // Construction never spawns — a missing CLI fails fast in run() (C1
       // preflight), so the createWorker stage cannot crash on it.
-      case "codebuddy-acp":
+      case "acp":
+        return new GenericAcpWorker(config, this.ctx.sessionDir, workspaceDir2, this.ctx, this.skills);
+      case "codebuddy":
         return new CodebuddyAcpWorker(config, this.ctx.sessionDir, workspaceDir2, this.ctx, this.skills);
-      case "opencode-acp":
+      case "opencode":
         return new OpenCodeAcpWorker(config, this.ctx.sessionDir, workspaceDir2, this.ctx, this.skills);
       default: {
         const _exhaustive = config.type;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wayang-ai",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Multi-agent orchestration platform",
   "type": "module",
   "license": "MIT",