@agentrq/acp-gateway 0.2.4 → 0.2.6

package/dist/agentInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agentInfo.js","sourceRoot":"","sources":["../src/agentInfo.ts"],"names":[],"mappings":"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"}

package/dist/config.js

@@ -6,6 +6,8 @@
  */
 import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
+/** The MCP transports ACP defines that this gateway knows how to hand over. */
+export const MCP_TRANSPORTS = ["http", "sse", "stdio"];
 /**
  * Find and parse the .mcp.json config file.
  * Searches CWD and then up to 3 parent directories.
@@ -18,29 +20,61 @@ export function loadMcpConfig(startDir = process.cwd()) {
         resolve(startDir, "..", "..", "..", ".mcp.json"),
     ];
     for (const candidate of candidates) {
+        // Only reading and parsing may fall through to the next candidate. What the
+        // file *says* is a separate matter: once a .mcp.json has been found, a
+        // mistake inside it is reported rather than hidden behind "no config found".
+        let parsed;
         try {
-            const raw = readFileSync(candidate, "utf-8");
-            const parsed = JSON.parse(raw);
-            const servers = Object.entries(parsed.mcpServers ?? {}).map(([name, cfg]) => ({
-                name,
-                type: cfg.type ?? (cfg.url ? "http" : "stdio"),
-                url: cfg.url,
-                command: cfg.command,
-                args: cfg.args,
-                env: cfg.env,
-                headers: cfg.headers,
-            }));
-            if (servers.length > 0) {
-                console.error(`[config] Loaded .mcp.json from ${candidate}`);
-                return servers;
-            }
+            parsed = JSON.parse(readFileSync(candidate, "utf-8"));
         }
         catch {
-            // Not found here, try next
+            continue;
+        }
+        const servers = Object.entries(parsed.mcpServers ?? {}).map(([name, cfg]) => ({
+            name,
+            type: readTransport(name, cfg.type, cfg.url),
+            url: cfg.url,
+            command: cfg.command,
+            args: cfg.args,
+            env: cfg.env,
+            headers: cfg.headers,
+        }));
+        servers.forEach(assertUsable);
+        if (servers.length > 0) {
+            console.error(`[config] Loaded .mcp.json from ${candidate}`);
+            return servers;
         }
     }
     throw new Error("Could not find .mcp.json — run acp-gateway from your workspace root");
 }
+/**
+ * Reads an entry's transport, defaulting the way MCP clients conventionally do.
+ *
+ * An unknown transport is refused here rather than quietly treated as stdio,
+ * which produced a server with no command and an agent that could not say why.
+ */
+function readTransport(name, type, url) {
+    if (type === undefined)
+        return url ? "http" : "stdio";
+    if (MCP_TRANSPORTS.includes(type))
+        return type;
+    throw new Error(`MCP server "${name}" in .mcp.json has transport "${type}", which this gateway ` +
+        `cannot hand to an agent. Use one of: ${MCP_TRANSPORTS.join(", ")}.`);
+}
+/**
+ * Refuses an entry the agent could never connect to.
+ *
+ * The gateway passes these straight through to the agent, so an entry missing
+ * the one field its transport needs fails inside the agent, long after the
+ * mistake was made and with nothing to point at.
+ */
+function assertUsable(server) {
+    const missing = server.type === "stdio" ? !server.command : !server.url;
+    if (!missing)
+        return;
+    const field = server.type === "stdio" ? "command" : "url";
+    throw new Error(`MCP server "${server.name}" in .mcp.json is ${server.type} but has no ${field}.`);
+}
 /**
  * Pick the primary agentrq MCP server from the list.
  * Prefers servers with "agentrq" in the name; falls back to the first HTTP server.

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0BpC;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,QAAQ,GAAW,OAAO,CAAC,GAAG,EAAE;IAC5D,MAAM,UAAU,GAAG;QACjB,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC;QAC9B,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC;QACpC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;QAC1C,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;KACjD,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,OAAO,GAAsB,MAAM,CAAC,OAAO,CAC/C,MAAM,CAAC,UAAU,IAAI,EAAE,CACxB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;gBACtB,IAAI;gBACJ,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC9C,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB,CAAC,CAAC,CAAC;YAEJ,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;gBAC7D,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,2BAA2B;QAC7B,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA0B;IAE1B,8BAA8B;IAC9B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,GAAG,CAC9E,CAAC;IACF,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IAExB,iCAAiC;IACjC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7D,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAEtB,MAAM,IAAI,KAAK,CACb,4FAA4F,CAC7F,CAAC;AACJ,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,+EAA+E;AAC/E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAU,CAAC;AA4BhE;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,QAAQ,GAAW,OAAO,CAAC,GAAG,EAAE;IAC5D,MAAM,UAAU,GAAG;QACjB,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC;QAC9B,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC;QACpC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;QAC1C,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;KACjD,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,4EAA4E;QAC5E,uEAAuE;QACvE,6EAA6E;QAC7E,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAsB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAC5E,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAChB,IAAI;YACJ,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC;YAC5C,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAC,CACH,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE9B,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;YAC7D,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CACpB,IAAY,EACZ,IAAwB,EACxB,GAAuB;IAEvB,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,IAAK,cAAoC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAoB,CAAC;IACtF,MAAM,IAAI,KAAK,CACb,eAAe,IAAI,iCAAiC,IAAI,wBAAwB;QAC9E,wCAAwC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACvE,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,YAAY,CAAC,MAAuB;IAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;IACxE,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1D,MAAM,IAAI,KAAK,CACb,eAAe,MAAM,CAAC,IAAI,qBAAqB,MAAM,CAAC,IAAI,eAAe,KAAK,GAAG,CAClF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA0B;IAE1B,8BAA8B;IAC9B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,GAAG,CAC9E,CAAC;IACF,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IAExB,iCAAiC;IACjC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7D,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAEtB,MAAM,IAAI,KAAK,CACb,4FAA4F,CAC7F,CAAC;AACJ,CAAC"}

package/dist/index.js

@@ -11,19 +11,45 @@ import { existsSync, readFileSync } from "node:fs";
 import * as path from "node:path";
 import * as acp from "@agentclientprotocol/sdk";
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
-import { loadMcpConfig, pickAgentrqServer } from "./config.js";
+import { loadMcpConfig, pickAgentrqServer, } from "./config.js";
 import { MCPBridge } from "./mcpClient.js";
-export function mapMcpServers(configs) {
-    return configs.map((cfg) => {
-        if (cfg.type === "http") {
-            return {
-                type: "http",
-                name: cfg.name,
-                url: cfg.url,
-                headers: Object.entries(cfg.headers || {}).map(([name, value]) => ({ name, value })),
-            };
+/**
+ * What the agent said about a transport, if anything.
+ *
+ * stdio is the one transport every agent must support. For the others the
+ * answer is only trustworthy when the agent actually stated it: an agent that
+ * advertises no MCP capabilities at all is far more likely to be terse than to
+ * be unable to reach an HTTP server, and dropping its servers on that reading
+ * would take the workspace's own MCP server away from it.
+ */
+function transportSupport(transport, agentCapabilities) {
+    if (transport === "stdio")
+        return "required";
+    const declared = agentCapabilities?.mcpCapabilities?.[transport];
+    if (declared === true)
+        return "declared";
+    if (declared === false)
+        return "refused";
+    return "unstated";
+}
+export function mapMcpServers(configs, agentCapabilities) {
+    return configs
+        .filter((cfg) => {
+        const support = transportSupport(cfg.type, agentCapabilities);
+        if (support === "refused") {
+            console.error(`[acp] ⚠️  Not passing MCP server "${cfg.name}" to the agent: it is ${cfg.type}, ` +
+                `and the agent says it does not support that transport. Passing it anyway ` +
+                `risks the agent refusing the whole session.`);
+            return false;
         }
-        else {
+        if (support === "unstated") {
+            console.error(`[acp] MCP server "${cfg.name}" is ${cfg.type}, which the agent does not ` +
+                `advertise either way — passing it and letting the agent decide.`);
+        }
+        return true;
+    })
+        .map((cfg) => {
+        if (cfg.type === "stdio") {
             return {
                 name: cfg.name,
                 command: cfg.command,
@@ -31,17 +57,61 @@ export function mapMcpServers(configs) {
                 env: Object.entries(cfg.env || {}).map(([name, value]) => ({ name, value })),
             };
         }
+        return {
+            type: cfg.type,
+            name: cfg.name,
+            url: cfg.url,
+            headers: Object.entries(cfg.headers || {}).map(([name, value]) => ({ name, value })),
+        };
     });
 }
-import { AgentRQACPClient } from "./acpClient.js";
+import { AgentRQACPClient, DEFAULT_PERMISSION_TIMEOUT_MS } from "./acpClient.js";
 import { describeAuthMethods, isAuthRequiredError, login, logout, supportsLogout, } from "./auth.js";
 import { resolveAgentLaunch } from "./agentInstall.js";
+import { describeAgentInfo } from "./agentInfo.js";
 import { describeAgents, fetchRegistry, hostPlatformTarget, } from "./registry.js";
 import { extractTaskIdFromMeta, extractTaskIdFromText, } from "./taskIdentity.js";
 const lastTaskContent = new Map();
+// Cancellations are remembered by *where they fall in the stream of events*
+// rather than as a one-shot flag. agentrq reuses a chat's id as the task id, so
+// a flag that outlived the cancellation it describes would swallow the user's
+// next message on that chat; ordered this way, a task is skipped only when the
+// cancel arrived after it was queued. Wall-clock time is too coarse to order
+// two events in the same millisecond, so this is a plain counter.
+let taskSeq = 0;
+export const nextTaskSeq = () => ++taskSeq;
+export const cancelledTaskSeq = new Map();
+// A cancel for a task that never runs (a stale id, a task that already
+// finished) leaves an entry behind, so keep the map from growing without bound.
+const MAX_REMEMBERED_CANCELLATIONS = 200;
+/** Records that `taskId` has just been cancelled. */
+export function markTaskCancelled(taskId) {
+    // Re-inserting moves the id to the end, so eviction stays oldest-first.
+    cancelledTaskSeq.delete(taskId);
+    cancelledTaskSeq.set(taskId, nextTaskSeq());
+    while (cancelledTaskSeq.size > MAX_REMEMBERED_CANCELLATIONS) {
+        const oldest = cancelledTaskSeq.keys().next().value;
+        cancelledTaskSeq.delete(oldest);
+    }
+}
+/**
+ * Whether a task queued at `queuedSeq` has since been cancelled.
+ *
+ * Two notifications for the same task id can be queued at once, so the check is
+ * against the point each was queued: cancelling the older one must not stop the
+ * newer one from running.
+ */
+export function isTaskCancelled(taskId, queuedSeq) {
+    if (!taskId)
+        return false;
+    const seq = cancelledTaskSeq.get(taskId);
+    return seq !== undefined && seq > queuedSeq;
+}
 export const activeSessions = new Map();
 /** Login preferences taken from the CLI, consulted whenever an agent demands auth. */
 export const authConfig = {};
+/** How long tool calls wait for a human, taken from the CLI at startup. */
+export const permissionConfig = {};
 /**
  * Whether a human is sitting in front of this process.
  *
@@ -64,15 +134,22 @@ export async function openAgentConnection({ acpCmdArgs, mcpBridge, env, label, t
         stdio: ["pipe", "pipe", "inherit"],
         env: { ...process.env, ...env },
     });
+    const acpClient = new AgentRQACPClient(mcpBridge, () => taskId, {
+        permissionTimeoutMs: permissionConfig.timeoutMs,
+    });
     // Guard against unhandled child-process failures. Without these listeners a
     // crashed agent (e.g. on network loss) leaves a broken stdin pipe; the next
     // write raises EPIPE as an uncaught error and takes the gateway down with it.
     agentProcess.on("error", (err) => {
         console.error(`[acp] Agent process error for ${label}:`, err.message);
+        acpClient.cancelPendingPermissions(`agent process for ${label} failed`);
         onExit?.();
     });
     agentProcess.on("exit", (code, signal) => {
         console.error(`[acp] Agent process for ${label} exited (code=${code}, signal=${signal})`);
+        // Nothing will act on these answers now, but the tool calls waiting on them
+        // are holding task-queue slots that would never be given back.
+        acpClient.cancelPendingPermissions(`agent process for ${label} exited`);
         onExit?.();
     });
     // stdin can emit EPIPE when the child dies mid-write; swallow it so it
@@ -82,9 +159,11 @@ export async function openAgentConnection({ acpCmdArgs, mcpBridge, env, label, t
     });
     const input = Writable.toWeb(agentProcess.stdin);
     const output = Readable.toWeb(agentProcess.stdout);
-    const acpClient = new AgentRQACPClient(mcpBridge, () => taskId);
     const stream = acp.ndJsonStream(input, output);
     const connection = new acp.ClientSideConnection((_agent) => acpClient, stream);
+    // Stopping a turn is only possible once the connection exists, and the
+    // connection is built around the client — so it is handed over afterwards.
+    acpClient.setSessionCanceller((sessionId) => connection.cancel({ sessionId }));
     const initResult = await connection.initialize({
         protocolVersion: acp.PROTOCOL_VERSION,
         clientCapabilities: {
@@ -144,7 +223,7 @@ export async function getOrCreateSession(taskId, acpCmdArgs, configs, agentrqCon
     });
     const newSessionParams = {
         cwd: process.cwd(),
-        mcpServers: mapMcpServers(configs),
+        mcpServers: mapMcpServers(configs, initResult.agentCapabilities),
     };
     const sessionResult = await createSessionWithAuth(connection, newSessionParams, {
         methods: initResult.authMethods,
@@ -154,6 +233,9 @@ export async function getOrCreateSession(taskId, acpCmdArgs, configs, agentrqCon
     });
     console.error(`[acp] Created session ${sessionResult.sessionId} for task ${key}`);
     await enforceHumanApprovalMode(connection, sessionResult);
+    // The mode is pinned once here, but agents may move themselves back out of
+    // it, so keep watching for the rest of the session's life.
+    acpClient.setModeChangeHandler((changedSessionId, modeId) => handleAgentModeChange(connection, changedSessionId, modeId, sessionResult.modes));
     const sessionInfo = {
         process: agentProcess,
         connection,
@@ -164,6 +246,61 @@ export async function getOrCreateSession(taskId, acpCmdArgs, configs, agentrqCon
     activeSessions.set(key, sessionInfo);
     return sessionInfo;
 }
+/**
+ * Finds the active agent session for a given task ID (or returns the single active session if none specified).
+ */
+export function findActiveSession(taskId) {
+    if (taskId) {
+        const direct = activeSessions.get(taskId);
+        if (direct)
+            return direct;
+        for (const session of activeSessions.values()) {
+            if (session.sessionId === taskId)
+                return session;
+        }
+        // A session opened from a notification that carried no task id is keyed
+        // "default"; when it is the only one running, an id-carrying cancel can
+        // only have meant it. Never fall back to a session keyed under a
+        // *different* task id — that would abort an unrelated task.
+        const untracked = activeSessions.get("default");
+        if (untracked && activeSessions.size === 1) {
+            return untracked;
+        }
+    }
+    else if (activeSessions.size === 1) {
+        return activeSessions.values().next().value;
+    }
+    return undefined;
+}
+/**
+ * Handles task cancellation events from the MCP server.
+ * Cancels the ACP session/turn and immediately cancels any pending permissions.
+ */
+export async function handleTaskCancellation(taskId, reason) {
+    if (taskId) {
+        markTaskCancelled(taskId);
+        const session = findActiveSession(taskId);
+        if (!session) {
+            console.error(`[bridge] Received cancellation for task ${taskId}, but no active session found (queued tasks will be skipped)`);
+            return;
+        }
+        console.error(`[bridge] Cancelling session ${session.sessionId} for task ${taskId}${reason ? ` (${reason})` : ""}`);
+        await session.acpClient.cancelTurn(session.sessionId);
+    }
+    else {
+        const session = findActiveSession(undefined);
+        if (session) {
+            console.error(`[bridge] Received cancellation with no taskId${reason ? ` (${reason})` : ""}. Cancelling active session ${session.sessionId}...`);
+            await session.acpClient.cancelTurn(session.sessionId);
+        }
+        else {
+            console.error(`[bridge] Received cancellation with no taskId${reason ? ` (${reason})` : ""}` +
+                (activeSessions.size === 0
+                    ? ", and no sessions are active"
+                    : `, but ${activeSessions.size} sessions are active (skipping to avoid aborting unrelated tasks)`));
+        }
+    }
+}
 // Modes that approve tool calls without asking the user. codex-acp, for
 // example, defaults to an "agent" mode whose reviewer is "auto_review" — an
 // automated Guardian Review that approves on the human's behalf — and also
@@ -220,6 +357,50 @@ export async function enforceHumanApprovalMode(connection, sessionResult) {
         console.error(`[acp] ⚠️  Failed to set session mode to "${modeId}" — tool calls may execute without agentrq approval:`, err);
     }
 }
+/**
+ * How many times the gateway will drag one session back into a mode that asks
+ * the human. An agent that keeps switching back is not going to stop, and an
+ * unbounded fight with it would be an endless stream of setSessionMode calls.
+ */
+const MAX_MODE_REENFORCEMENTS = 3;
+/** sessionId → how many times its mode has already been put back. */
+const modeReenforcements = new Map();
+/**
+ * Puts a session back into a mode that asks the human, after the agent moved
+ * itself out of one.
+ *
+ * Agents may change modes on their own. If one moves into a mode that approves
+ * tool calls on the user's behalf, every later tool call — including
+ * destructive ones — executes without ever reaching agentrq, and nothing
+ * anywhere says so.
+ */
+export async function handleAgentModeChange(connection, sessionId, currentModeId, modes) {
+    const available = modes?.availableModes;
+    if (!available?.length)
+        return;
+    const mode = available.find((m) => m.id === currentModeId);
+    // A mode the agent never advertised cannot be vouched for either, so it is
+    // treated the same as one that approves on our behalf.
+    if (mode && !AUTO_APPROVING_MODE.test(describeMode(mode))) {
+        modeReenforcements.delete(sessionId);
+        return;
+    }
+    const attempts = modeReenforcements.get(sessionId) ?? 0;
+    if (attempts >= MAX_MODE_REENFORCEMENTS) {
+        console.error(`[acp] ⚠️  Agent keeps returning session ${sessionId} to mode "${currentModeId}", ` +
+            `which approves tool calls without asking. Giving up after ` +
+            `${MAX_MODE_REENFORCEMENTS} attempts — tool calls may now execute without ` +
+            `agentrq approval.`);
+        return;
+    }
+    modeReenforcements.set(sessionId, attempts + 1);
+    console.error(`[acp] ⚠️  Agent moved session ${sessionId} into "${currentModeId}", which approves ` +
+        `tool calls without asking. Putting it back.`);
+    await enforceHumanApprovalMode(connection, {
+        sessionId,
+        modes: { availableModes: available, currentModeId },
+    });
+}
 export function createAcpSessionSwitcher(connection, params, initialSessionId) {
     let currentSessionId = initialSessionId;
     const taskSessionMap = new Map();
@@ -309,6 +490,7 @@ export class TaskQueue {
 export function parseGatewayArgs(args) {
     const options = {
         maxConcurrency: 2,
+        permissionTimeoutMs: DEFAULT_PERMISSION_TIMEOUT_MS,
         command: "run",
         allowUnverifiedAgent: false,
         rest: [],
@@ -328,6 +510,14 @@ export function parseGatewayArgs(args) {
                 }
                 break;
             }
+            case "--permission-timeout": {
+                const minutes = parseInt(value ?? "", 10);
+                if (!isNaN(minutes) && minutes >= 0) {
+                    options.permissionTimeoutMs = minutes * 60_000;
+                    i++;
+                }
+                break;
+            }
             case "--auth-method":
                 if (value) {
                     options.authMethodId = value;
@@ -356,6 +546,9 @@ export function parseGatewayArgs(args) {
             case "--list-agents":
                 options.command = "list-agents";
                 break;
+            case "--agent-info":
+                options.command = "agent-info";
+                break;
             case "--allow-unverified-agent":
                 options.allowUnverifiedAgent = true;
                 break;
@@ -443,12 +636,13 @@ export function assertAgentRunnable(command, usedRegistryId) {
     throw new Error(`Agent command "${command}" was not found. ${hint}`);
 }
 /**
- * Runs a one-shot auth command against the agent and shuts it down again.
+ * Runs a one-shot command against the agent and shuts it down again.
  *
- * These commands exist so a login can be done deliberately — before any task
- * arrives — rather than only when a session is refused.
+ * These commands exist so a login — or a look at what the agent supports — can
+ * be done deliberately, before any task arrives, rather than only when a
+ * session is refused.
  */
-export async function runAuthCommand(command, acpCmdArgs, agentrqConfig, mcpBridge, authMethodId) {
+export async function runAgentCommand(command, acpCmdArgs, agentrqConfig, mcpBridge, authMethodId) {
     const [cmd, ...cmdArgs] = acpCmdArgs;
     const agent = await openAgentConnection({
         acpCmdArgs,
@@ -459,6 +653,10 @@ export async function runAuthCommand(command, acpCmdArgs, agentrqConfig, mcpBrid
     try {
         const connection = agent.connection;
         const { authMethods, agentCapabilities } = agent.initResult;
+        if (command === "agent-info") {
+            console.log(describeAgentInfo(agent.initResult, acpCmdArgs.join(" ")));
+            return;
+        }
         if (command === "list-auth-methods") {
             console.log(`Authentication methods for "${acpCmdArgs.join(" ")}":\n${describeAuthMethods(authMethods)}`);
             if (supportsLogout(agentCapabilities)) {
@@ -504,6 +702,9 @@ AGENT
                               if needed, instead of a command you supply.
   --list-agents               List every agent in the registry, and how each one
                               can run on this machine. Exits.
+  --agent-info                What the agent says it supports — session
+                              lifecycle, prompt content, MCP transports and
+                              logins. Only a live handshake can tell you. Exits.
   --allow-unverified-agent    Install a registry binary that publishes no
                               checksum. Off by default: without a checksum there
                               is no way to tell what was downloaded.
@@ -521,6 +722,10 @@ AUTHENTICATION
 BRIDGE
   --max-concurrency <number>  How many tasks may prompt the agent at once.
                               Defaults to 2.
+  --permission-timeout <min>  How long a tool call waits for someone to approve
+                              it before the turn is cancelled. Defaults to 30.
+                              0 waits indefinitely, which is what a wedged
+                              gateway looks like — use it knowingly.
 
 OTHER
   --help, -h                  Show this help. Exits.
@@ -529,6 +734,7 @@ EXAMPLES
   acp-gateway --agent gemini                     Run Gemini from the registry
   acp-gateway -- gemini --acp                    Run an agent you installed
   acp-gateway --list-agents                      See what the registry offers
+  acp-gateway --agent-info --agent gemini        See what that agent supports
   acp-gateway --login -- gemini --acp            Log in before running anything
   acp-gateway --max-concurrency 4 -- gemini --acp
 
@@ -591,6 +797,7 @@ async function main() {
         agentrqConfig.env = { ...agentrqConfig.env, ...resolved.env };
     }
     authConfig.methodId = authMethodId;
+    permissionConfig.timeoutMs = options.permissionTimeoutMs;
     const taskQueue = new TaskQueue(maxConcurrency);
     // 3. Initialize MCP Bridge
     const mcpBridge = new MCPBridge(agentrqConfig);
@@ -600,7 +807,7 @@ async function main() {
     // actually needs to reach agentrq.
     if (command !== "run") {
         try {
-            await runAuthCommand(command, acpCmdArgs, agentrqConfig, mcpBridge, authMethodId);
+            await runAgentCommand(command, acpCmdArgs, agentrqConfig, mcpBridge, authMethodId);
         }
         finally {
             await mcpBridge.close();
@@ -622,14 +829,25 @@ async function main() {
                 lastTaskContent.set(taskId, content);
             }
             console.error("\n[bridge] Incoming task from MCP server. Forwarding to ACP agent...");
+            const queuedSeq = nextTaskSeq();
             taskQueue.run(async () => {
+                if (isTaskCancelled(taskId, queuedSeq)) {
+                    console.error(`[bridge] Task ${taskId} was cancelled before execution started, skipping`);
+                    return;
+                }
                 try {
                     const sessionInfo = await getOrCreateSession(taskId, acpCmdArgs, configs, agentrqConfig, mcpBridge);
+                    if (isTaskCancelled(taskId, queuedSeq)) {
+                        console.error(`[bridge] Task ${taskId} was cancelled during session setup, cancelling session`);
+                        await sessionInfo.acpClient.cancelTurn(sessionInfo.sessionId);
+                        return;
+                    }
                     const result = await sessionInfo.connection.prompt({
                         sessionId: sessionInfo.sessionId,
                         prompt: [{ type: "text", text: content }],
                     });
                     await sessionInfo.acpClient.flushReply(sessionInfo.sessionId);
+                    await sessionInfo.acpClient.reportStopReason(sessionInfo.sessionId, result.stopReason);
                     console.error(`\n[acp] Agent completed task. Reason: ${result.stopReason}`);
                 }
                 catch (err) {
@@ -639,6 +857,12 @@ async function main() {
                 console.error("[bridge] Error queuing task:", err);
             });
         });
+        // Listen for task cancellation events from the MCP bridge
+        mcpBridge.on("cancel", ({ taskId, reason }) => {
+            handleTaskCancellation(taskId, reason).catch((err) => {
+                console.error("[bridge] Error handling task cancellation:", err);
+            });
+        });
         // Initial check for a pending task
         await checkForNextTask(mcpBridge, acpCmdArgs, configs, agentrqConfig, taskQueue);
         // Keep the process alive
@@ -662,6 +886,9 @@ async function main() {
  */
 export async function checkForNextTask(mcpBridge, acpCmdArgsOrConnection, configsOrSessionSwitcher, agentrqConfigOrAcpClient, taskQueue, acpCmdArgs, configs, agentrqConfig) {
     console.error("[bridge] Checking for next task via MCP server...");
+    // Stamped before the fetch, so a cancel that arrives while `getTask` is in
+    // flight (or while the session is being opened) still stops the task.
+    const queuedSeq = nextTaskSeq();
     try {
         const result = await mcpBridge.callTool("getTask");
         if (result.isError) {
@@ -684,6 +911,10 @@ export async function checkForNextTask(mcpBridge, acpCmdArgsOrConnection, config
             }
             console.error(`[bridge] Found task: "${text.slice(0, 50).replace(/\n/g, " ")}..."`);
             const runFn = async () => {
+                if (isTaskCancelled(taskId, queuedSeq)) {
+                    console.error(`[bridge] Task ${taskId} was cancelled before execution started, skipping`);
+                    return;
+                }
                 let connectionToUse;
                 let acpClientToUse;
                 let sessionIdToUse;
@@ -712,11 +943,20 @@ export async function checkForNextTask(mcpBridge, acpCmdArgsOrConnection, config
                     sessionIdToUse = sessionInfo.sessionId;
                     acpClientToUse = sessionInfo.acpClient;
                 }
+                // Spawning the agent and opening the session takes seconds; a cancel
+                // that lands in that window has no turn to stop yet, so check again
+                // before handing the agent the work.
+                if (isTaskCancelled(taskId, queuedSeq)) {
+                    console.error(`[bridge] Task ${taskId} was cancelled during session setup, cancelling session`);
+                    await acpClientToUse?.cancelTurn(sessionIdToUse);
+                    return;
+                }
                 const promptResult = await connectionToUse.prompt({
                     sessionId: sessionIdToUse,
                     prompt: [{ type: "text", text }],
                 });
                 await acpClientToUse.flushReply(sessionIdToUse);
+                await acpClientToUse.reportStopReason(sessionIdToUse, promptResult.stopReason);
                 console.error(`\n[acp] Agent completed with: ${promptResult.stopReason}`);
             };
             if (taskQueue) {