@wrongstack/acp 0.284.1 → 0.285.0

package/dist/index.js

@@ -1,12 +1,5 @@
-import { writeErr, expectDefined } from '@wrongstack/core';
-import { fileURLToPath } from 'url';
-import { createServer } from 'http';
-import { SubagentBudget } from '@wrongstack/core/coordination';
-import * as fsp from 'fs/promises';
-import * as path from 'path';
-import { spawn } from 'child_process';
-
 // src/agent/stdio-transport.ts
+import { expectDefined, writeErr } from "@wrongstack/core";
 
 // src/win32-cmd.ts
 var WIN32_CMD_META = /[&|<>"\r\n\0]/;
@@ -138,9 +131,9 @@ var ClientTransport = class {
   async start() {
     if (this.child) return;
     const [{ spawn: spawn3 }, { buildChildEnv }, os] = await Promise.all([
-      import('child_process'),
-      import('@wrongstack/core'),
-      import('os')
+      import("node:child_process"),
+      import("@wrongstack/core"),
+      import("node:os")
     ]);
     return new Promise((resolve3, reject) => {
       const timeout = setTimeout(() => {
@@ -1084,6 +1077,11 @@ function errorToJsonRpc(err) {
   const message = err instanceof Error ? err.message : String(err);
   return { code: -32603, message };
 }
+
+// src/agent/wrongstack-acp-agent.ts
+import { fileURLToPath } from "node:url";
+import { createServer } from "node:http";
+import { writeErr as writeErr2 } from "@wrongstack/core";
 var WrongStackACPServer = class {
   transport;
   handler;
@@ -1190,7 +1188,7 @@ var WrongStackACPServer = class {
     });
     return new Promise((resolve3) => {
       this.httpServer.listen(port, host, () => {
-        writeErr(`[wstack-acp] HTTP server listening on http://${host}:${port}
+        writeErr2(`[wstack-acp] HTTP server listening on http://${host}:${port}
 `);
         this.running = true;
         resolve3();
@@ -1217,7 +1215,7 @@ async function main() {
 var isEntrypoint = process.argv[1] !== void 0 && fileURLToPath(import.meta.url) === process.argv[1];
 if (isEntrypoint) {
   main().catch((err) => {
-    writeErr(`[wstack-acp fatal] ${err}
+    writeErr2(`[wstack-acp fatal] ${err}
 `);
     process.exit(1);
   });
@@ -1331,6 +1329,9 @@ var WebSocketClientTransport = class {
     }
   }
 };
+
+// src/client/tool-translator.ts
+import { expectDefined as expectDefined2 } from "@wrongstack/core";
 var DEFAULT_OPTIONS = {
   asyncTools: true,
   pollIntervalMs: 500,
@@ -1352,7 +1353,7 @@ var ToolTranslator = class {
         const pending = this.pending.get(msg.id);
         if (pending) {
           clearTimeout(pending.timeout);
-          this.pending.delete(expectDefined(msg.id));
+          this.pending.delete(expectDefined2(msg.id));
           pending.resolve(msg);
         }
       }
@@ -1360,7 +1361,7 @@ var ToolTranslator = class {
         const pending = this.pending.get(msg.id);
         if (pending) {
           clearTimeout(pending.timeout);
-          this.pending.delete(expectDefined(msg.id));
+          this.pending.delete(expectDefined2(msg.id));
           pending.reject(new Error("Call cancelled by client"));
         }
       }
@@ -1393,6 +1394,10 @@ var ToolTranslator = class {
     this.pending.clear();
   }
 };
+
+// src/client/file-server.ts
+import * as fsp from "node:fs/promises";
+import * as path from "node:path";
 var FsError = class extends Error {
   code;
   path;
@@ -1536,6 +1541,10 @@ function makePermissionPolicy(decide) {
     return allow ? pickAllow(req.options) : pickReject(req.options);
   };
 }
+
+// src/client/terminal-server.ts
+import { spawn } from "node:child_process";
+import * as path2 from "node:path";
 var TerminalServer = class {
   terminals = /* @__PURE__ */ new Map();
   projectRoot;
@@ -1543,7 +1552,7 @@ var TerminalServer = class {
   outputByteLimit;
   nextId = 1;
   constructor(opts) {
-    this.projectRoot = path.resolve(opts.projectRoot);
+    this.projectRoot = path2.resolve(opts.projectRoot);
     this.commandTimeoutMs = opts.commandTimeoutMs ?? 5 * 6e4;
     this.outputByteLimit = opts.outputByteLimit ?? 1024 * 1024;
     if (opts.signal) {
@@ -1679,8 +1688,8 @@ var TerminalServer = class {
   }
   resolveCwd(cwd) {
     if (!cwd) return this.projectRoot;
-    const resolved = path.resolve(cwd);
-    const rootWithSep = this.projectRoot.endsWith(path.sep) ? this.projectRoot : this.projectRoot + path.sep;
+    const resolved = path2.resolve(cwd);
+    const rootWithSep = this.projectRoot.endsWith(path2.sep) ? this.projectRoot : this.projectRoot + path2.sep;
     if (resolved !== this.projectRoot && !resolved.startsWith(rootWithSep)) {
       return this.projectRoot;
     }
@@ -2891,6 +2900,50 @@ function findAgentDescriptor(id) {
   return AGENTS_CATALOG.find((a) => a.id === id);
 }
 
+// src/integration/run-one-acp-task.ts
+import { SubagentBudget } from "@wrongstack/core/coordination";
+async function runOneAcpTask(opts) {
+  const role = opts.role ?? "acp";
+  const timeoutMs = opts.timeoutMs ?? 5 * 6e4;
+  const { runner, stop } = await makeACPSubagentRunnerWithStop({
+    command: opts.command,
+    ...opts.args !== void 0 ? { args: opts.args } : {},
+    ...opts.env !== void 0 ? { env: opts.env } : {},
+    ...opts.cwd !== void 0 ? { cwd: opts.cwd } : {},
+    ...opts.projectRoot !== void 0 ? { projectRoot: opts.projectRoot } : {},
+    role,
+    timeoutMs,
+    ...opts.onProgress !== void 0 ? { onProgress: opts.onProgress } : {},
+    ...opts.permissionPolicy !== void 0 ? { permissionPolicy: opts.permissionPolicy } : {}
+  });
+  try {
+    const budget = new SubagentBudget({
+      timeoutMs,
+      maxIterations: 2e3,
+      maxToolCalls: 5e3
+    });
+    budget.start();
+    const ctx = {
+      subagentId: role,
+      config: { id: role, name: role, role, provider: "acp", prompt: "" },
+      budget,
+      signal: opts.signal ?? new AbortController().signal,
+      bridge: null
+    };
+    const result = await runner({ id: `acp-${role}`, description: opts.task }, ctx);
+    return {
+      result: result.result == null ? "" : String(result.result),
+      iterations: result.iterations,
+      toolCalls: result.toolCalls
+    };
+  } finally {
+    try {
+      await stop();
+    } catch {
+    }
+  }
+}
+
 // src/integration/acp-subagent-runner.ts
 var ACP_AGENT_COMMANDS = {
   cline: {
@@ -3094,47 +3147,6 @@ function resolveAcpAgentCommand(id, overrides, live) {
   if (fromMap) return fromMap;
   return null;
 }
-async function runOneAcpTask(opts) {
-  const role = opts.role ?? "acp";
-  const timeoutMs = opts.timeoutMs ?? 5 * 6e4;
-  const { runner, stop } = await makeACPSubagentRunnerWithStop({
-    command: opts.command,
-    ...opts.args !== void 0 ? { args: opts.args } : {},
-    ...opts.env !== void 0 ? { env: opts.env } : {},
-    ...opts.cwd !== void 0 ? { cwd: opts.cwd } : {},
-    ...opts.projectRoot !== void 0 ? { projectRoot: opts.projectRoot } : {},
-    role,
-    timeoutMs,
-    ...opts.onProgress !== void 0 ? { onProgress: opts.onProgress } : {},
-    ...opts.permissionPolicy !== void 0 ? { permissionPolicy: opts.permissionPolicy } : {}
-  });
-  try {
-    const budget = new SubagentBudget({
-      timeoutMs,
-      maxIterations: 2e3,
-      maxToolCalls: 5e3
-    });
-    budget.start();
-    const ctx = {
-      subagentId: role,
-      config: { id: role, name: role, role, provider: "acp", prompt: "" },
-      budget,
-      signal: opts.signal ?? new AbortController().signal,
-      bridge: null
-    };
-    const result = await runner({ id: `acp-${role}`, description: opts.task }, ctx);
-    return {
-      result: result.result == null ? "" : String(result.result),
-      iterations: result.iterations,
-      toolCalls: result.toolCalls
-    };
-  } finally {
-    try {
-      await stop();
-    } catch {
-    }
-  }
-}
 async function probeAcpAgent(idOrCmd, opts) {
   const id = typeof idOrCmd === "string" ? idOrCmd : idOrCmd.role ?? idOrCmd.command;
   const cmd = typeof idOrCmd === "string" ? resolveAcpAgentCommand(idOrCmd, opts?.overrides, opts?.live) : idOrCmd;
@@ -3230,6 +3242,9 @@ async function probeAcpAgents(opts) {
   await runPhase(pkg, 2, pkgTimeout);
   return ids.map((id) => byId.get(id) ?? { id, ok: false, ms: 0, error: "not probed" });
 }
+
+// src/registry/ensemble-registry.ts
+import { spawn as spawn2 } from "node:child_process";
 var PROBE_TIMEOUT_MS = 5e3;
 var PROBE_CACHE_MS = 5e3;
 var MAX_PARALLEL_PROBES = 4;
@@ -3272,7 +3287,7 @@ async function defaultProbe(desc, timeoutMs) {
     try {
       const probeArgs = [...desc.probe.args ?? []];
       const shim = process.platform === "win32" ? buildWin32CmdShimInvocation(desc.probe.command, probeArgs) : null;
-      child = spawn(shim?.command ?? desc.probe.command, shim?.args ?? probeArgs, {
+      child = spawn2(shim?.command ?? desc.probe.command, shim?.args ?? probeArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         windowsHide: true,
         ...shim ? { windowsVerbatimArguments: shim.windowsVerbatimArguments } : {}
@@ -3475,6 +3490,9 @@ async function fetchAcpRegistry(opts = {}) {
     opts.signal?.removeEventListener("abort", onParentAbort);
   }
 }
+
+// src/integration/ensemble-runner.ts
+import { SubagentBudget as SubagentBudget2 } from "@wrongstack/core/coordination";
 var DEFAULT_MAX_CONCURRENCY = 4;
 async function mapBound(items, worker, limit) {
   const results = new Array(items.length);
@@ -3513,7 +3531,7 @@ async function runOne(agentId, cmd, task, timeoutMs, signal, onProgress) {
       ...onProgress ? { onProgress: (event) => onProgress(agentId, event) } : {}
     });
     try {
-      const budget = new SubagentBudget({
+      const budget = new SubagentBudget2({
         timeoutMs,
         maxIterations: 2e3,
         maxToolCalls: 5e3
@@ -3689,6 +3707,10 @@ Ensemble summary: ${succeeded} succeeded, ${failed} failed, ${cancelled} cancell
   );
   return lines.join("\n");
 }
+
+// src/integration/acp-bench.ts
+import * as fsp2 from "node:fs/promises";
+import * as path3 from "node:path";
 function firstLine(s) {
   const line = s.split("\n").map((l) => l.trim()).find((l) => l.length > 0) ?? "";
   return line.length > 120 ? `${line.slice(0, 117)}\u2026` : line;
@@ -3755,11 +3777,11 @@ async function benchOne(agentId, cmd, opts) {
     if (opts.checkFs) {
       const fileToken = `FILE_${opts.marker}`;
       const fileName = `acp-bench-${opts.marker}.txt`;
-      const filePath = path.join(opts.projectRoot, fileName);
+      const filePath = path3.join(opts.projectRoot, fileName);
       let fsOk = false;
       let fsDetail;
       try {
-        await fsp.writeFile(filePath, fileToken, "utf8");
+        await fsp2.writeFile(filePath, fileToken, "utf8");
         const fsRes = await session.prompt(
           [
             textContent(
@@ -3773,7 +3795,7 @@ async function benchOne(agentId, cmd, opts) {
       } catch (err) {
         fsDetail = err instanceof Error ? err.message : String(err);
       } finally {
-        await fsp.rm(filePath, { force: true }).catch(() => {
+        await fsp2.rm(filePath, { force: true }).catch(() => {
         });
       }
       checks.push({ name: "fs", ok: fsOk, detail: fsDetail });
@@ -3894,7 +3916,44 @@ function renderAcpBenchText(result) {
   );
   return lines.join("\n");
 }
-
-export { ACPProtocolHandler, ACPSession, ACPSessionError, ACPToolsRegistry, ACP_AGENT_COMMANDS, ACP_REGISTRY_URL, AGENTS_CATALOG, ClientTransport, EnsembleRegistry, FileServer, FsError, REGISTRY_ID_ALIASES, StdioTransport, TerminalServer, ToolTranslator, WebSocketClientTransport, WrongStackACPServer, audioContent, currentPlatformKey, defaultEnsembleCmdResolver, defaultPermissionPolicy, fetchAcpRegistry, findAgentDescriptor, imageContent, makeACPSubagentRunner, makeACPSubagentRunnerWithStop, makePermissionPolicy, mapRegistryEntry, probeAcpAgent, probeAcpAgents, readOnlyPermissionPolicy, renderAcpBenchText, renderEnsembleText, resolveAcpAgentCommand, runAcpBench, runEnsemble, runOneAcpTask, textContent };
+export {
+  ACPProtocolHandler,
+  ACPSession,
+  ACPSessionError,
+  ACPToolsRegistry,
+  ACP_AGENT_COMMANDS,
+  ACP_REGISTRY_URL,
+  AGENTS_CATALOG,
+  ClientTransport,
+  EnsembleRegistry,
+  FileServer,
+  FsError,
+  REGISTRY_ID_ALIASES,
+  StdioTransport,
+  TerminalServer,
+  ToolTranslator,
+  WebSocketClientTransport,
+  WrongStackACPServer,
+  audioContent,
+  currentPlatformKey,
+  defaultEnsembleCmdResolver,
+  defaultPermissionPolicy,
+  fetchAcpRegistry,
+  findAgentDescriptor,
+  imageContent,
+  makeACPSubagentRunner,
+  makeACPSubagentRunnerWithStop,
+  makePermissionPolicy,
+  mapRegistryEntry,
+  probeAcpAgent,
+  probeAcpAgents,
+  readOnlyPermissionPolicy,
+  renderAcpBenchText,
+  renderEnsembleText,
+  resolveAcpAgentCommand,
+  runAcpBench,
+  runEnsemble,
+  runOneAcpTask,
+  textContent
+};
 //# sourceMappingURL=index.js.map
-//# sourceMappingURL=index.js.map