relaymessenger 0.1.6-staging.8 → 0.1.6

package/README.md

@@ -53,9 +53,9 @@ With no terminal, a command that needs an answer prints the flags that would
 have answered it and exits 2 rather than a usage block. With `--json`, every
 error is `{ "error": …, "next_step": … }`.
 
-`relay --help` puts the commands in three groups: Get started (`connect`), Every
-day (`watch`, `doctor`, `agents`), and Everything else behind one line. Every
-command has a description; run `relay help <command>` for any of them.
+`relay` and `relaymessenger` open with the Relay mark, version, usage, topics,
+and concise commands, like the Linq CLI. Run `relay help <command>` for the
+full options for any command.
 
 Before interactive creation or sign-in setup, the CLI may offer the Relay skill
 once if it is absent from the standard install locations. Declining skips skill
@@ -108,6 +108,16 @@ typed carries on afterwards.
 `docs` prints `https://docs.relayapp.im/llms.txt`: its contents when there is no
 terminal, and its address when there is one or when Relay cannot reach it.
 
+## Authentication
+
+`relay login` signs this computer into Relay Console using a browser/device
+flow. It stores the Console session locally; Relay Console names your first
+organization after you. Use `organization update --name` to rename it and
+optional `--website` to set its website.
+
+For legacy integrations, `relay auth login --with-token` keeps the explicit
+Agent Token import path. The token is read from stdin and is never printed.
+
 ## Agent Token authentication
 
 Use `agents create` for a new agent, or import an existing Agent Token. Tokens
@@ -190,7 +200,7 @@ Messages to users remain supported subject to Contacts eligibility and blocking.
 There are no add-request, phone address-book, mutual-contact, human discovery, or
 human invite-link commands.
 
-## Developer-managed agents
+## Organization creation and saved agents
 
 ```sh
 relay agents create
@@ -203,7 +213,7 @@ Creation stores the one-time Agent Token in a new named profile and prints only
 public metadata, a share link, and a terminal QR. JSON output includes
 `token: "stored"`, never the secret. Use an explicit `--profile <new-name>` to
 choose a new profile name; existing profiles and the current profile selection
-are preserved. `--token-name` labels the token, not a machine identity.
+are preserved. New agents are provisioned in the signed-in Console organization.
 
 `agents list` shows the agents saved on this computer, not every agent on your
 account. Each row is `profile`, `handle`, `display_name`, `image_url`, `api_url`
@@ -231,13 +241,14 @@ agent, and it never overwrites a token that is already there.
 
 ```sh
 relay agents create \
-  --handle my_helper.dev --name "My Helper" \
+  --handle my_helper --name "My Helper" \
   --image-url https://images.example.com/helper.png
 ```
 
-Omit any option to keep the server's assigned handle/readable bird name/default
-image. Custom handles are full lowercase `.dev` handles; a collision is an error,
-never a request for a random replacement. Interactive creation asks `Handle (optional)`, `Name (optional)`, and `Image
+A handle is one word, such as `my_helper`: 3 to 32 lowercase letters, numbers
+or underscores. Dotted handles such as `my_helper.dev` are rejected, not
+reinterpreted. Names are at most 30 characters. A collision is
+an error, never a request for a different handle. Interactive creation asks `Handle (optional)`, `Name (optional)`, and `Image
 (optional)` with a single help line; blank answers preserve defaults. Selecting
 Create already expresses intent, so no second create confirmation is shown.
 Recipe files remain an advanced `--image-recipe` flag, not another setup question.
@@ -265,24 +276,42 @@ server's response supplies the permanent public image URL.
 
 ## Local event forwarding
 
-`relay events listen` is a development convenience backed only by the SDK's
-source-backed Agent WebSocket. It refuses Relay's production API, requires an
-explicit profile, and asks you to confirm that the profile belongs to a test agent.
-Reading events here can make Relay stop resending them elsewhere, so never point it
-at an agent something else is reading:
+There are two ways to run an agent backend, the way Slack has Socket Mode for
+local work and request URLs once deployed, and Stripe has `stripe listen
+--forward-to` for local work and a registered endpoint once deployed. Deployed,
+Relay POSTs events to your webhook. While you develop, `relay listen` reads the
+same events over the socket and POSTs each one to a route on this computer,
+signed exactly like a deployed webhook, so the same handler runs unchanged:
 
 ```sh
-relay --profile staging events listen --acknowledge-events
-relay --profile staging events listen --acknowledge-events \
-  --forward-to http://127.0.0.1:3000/relay-events
+relay listen --forward-to http://localhost:3000/relay-events
+```
+
+It prints the address it forwards to and the local signing secret, then one
+line per event, the way `relay watch` shows them:
+
+```
+Forwarding events to http://localhost:3000/relay-events
+Local signing secret  whsec_…   (set RELAY_WEBHOOK_SECRET to it while you develop)
+Events read here count as delivered; a deployed webhook for this agent does not get them.
 ```
 
-`--forward-to` must be an address on your own computer, such as
-`http://127.0.0.1:3000`. Each copy is the original Relay event, but it is **not
-signed**, and it carries `x-relay-dev-forwarded: 1`. Use a real webhook to test
-signature checking. If your own address answers with an error, this command stops
-rather than let the event be lost, so Relay can send it again. Your receiver must
-ignore an `event_id` it has already seen.
+Set `RELAY_WEBHOOK_SECRET` to that secret where your handler runs. Each POST
+carries `webhook-id`, `webhook-timestamp` and `webhook-signature` (Standard
+Webhooks, HMAC-SHA256 over the exact bytes sent), plus `x-relay-event-id` and
+`x-relay-event-type`, so `verifyWebhookSignature` and the Chat SDK adapter accept
+it as they accept Relay's own deliveries. The secret is made once per profile and
+kept in the CLI's private config, the way Stripe keeps one per account, so a
+restart does not make you change it. `--forward-to` must be an address on your
+own computer, such as `http://127.0.0.1:3000`. If your route answers with an
+error, this command stops rather than let the event be lost, so Relay can send
+it again. Your receiver must ignore an `event_id` it has already seen.
+
+Reading events here delivers them: a deployed webhook for this agent does not get
+them, so run it against the agent you are developing, never one something else
+is reading. The older `relay --profile <name> events listen --acknowledge-events
+[--forward-to <url>]` still works for scripts, prints the raw envelope, and signs
+its forwards the same way.
 
 If the agent has been away longer than Relay keeps its events, Relay wants to send
 everything it missed. This command cannot go back over old events and says so

package/dist/acp-bridge.d.ts

@@ -0,0 +1,129 @@
+import type Relay from "@relaymessenger/sdk";
+import { ClientSideConnection, type RequestPermissionRequest, type RequestPermissionResponse, type McpServer } from "@agentclientprotocol/sdk";
+import type { AcpSessionStore } from "./acp-threads.js";
+/**
+ * What `relay connect cursor|gemini-cli|cline|opencode` leaves running so the
+ * agent answers Relay messages by itself.
+ *
+ * These agents reach Relay through MCP, and MCP cannot start a turn, so a
+ * message waits until somebody asks the agent to read it. This is the process
+ * that asks. It speaks the Agent Client Protocol (ACP) — the same protocol Zed
+ * uses to drive Cursor, Gemini CLI and OpenCode in the background — over the
+ * official `@agentclientprotocol/sdk`. It runs the agent's own ACP command
+ * (`cursor-agent acp`, `gemini --experimental-acp`, `opencode acp`), gives every
+ * chat its own ACP session, and sends the final answer back to the same chat.
+ *
+ * Relay's own tools travel through the session, natively: the Relay MCP server
+ * connect would otherwise write into the agent's `mcp.json` is handed to
+ * `session/new` instead, so the agent keeps Relay's send, read and react tools
+ * while this process drives its turns. This mirrors `codex-bridge.ts`, which
+ * does the same over Codex's `app-server`; the two never share a session file.
+ */
+/** Relay takes 1 to 255 characters for an idempotency key (contracts/relay-v1-openapi.yaml). */
+export declare const replyKey: (eventId: string) => string;
+/** What the agent is told this client is (`clientInfo`, InitializeRequest). */
+export declare const CLIENT_NAME = "relaymessenger";
+/**
+ * One message, as the prompt the agent is given. The agent keeps its Relay
+ * tools during the turn, so the prompt says who answers the person: this
+ * process sends the final message, and the agent must not send a second one.
+ * Copied word for word from `codexPrompt` (codex-bridge.ts) so both bridges say
+ * the same thing.
+ */
+export declare const acpPrompt: (sender: string, text: string) => string;
+/** What to run for the agent: the file, and the words that put it in ACP mode. */
+export interface AcpCommand {
+    /** The executable, e.g. `cursor-agent`, or the absolute path connect found. */
+    command: string;
+    /** The ACP sub-command and flags, e.g. `["acp"]` or `["--experimental-acp"]`. */
+    args: readonly string[];
+}
+/**
+ * The file to run for the agent. connect hands over the one its own sniff found
+ * on PATH, and the bare name when it found none (connect.ts). Windows has no
+ * file called `cursor-agent`: npm installs a `.cmd` shim, so a bare name is
+ * looked up again here and, failing that, left with the extension `cmd.exe` can
+ * find. The ACP words are kept as they are (runtime-sniff.ts, spawn-command.ts).
+ */
+export declare const acpCommand: (found: string, args: readonly string[], env?: NodeJS.ProcessEnv, platform?: NodeJS.Platform) => Promise<AcpCommand>;
+/** The Relay MCP server as ACP takes it (`McpServerStdio`, schema/types.gen). */
+export declare const relayMcpServer: (spec: {
+    command: string;
+    args: readonly string[];
+    env: Record<string, string>;
+}) => McpServer;
+/**
+ * Nobody is at the keyboard, so a tool the agent asks to run is allowed the
+ * same way Codex's `approvalPolicy: "never"` allows it: the agent proceeds. The
+ * first `allow` option is chosen; when none is offered the request is cancelled
+ * (`RequestPermissionOutcome`, schema/types.gen), which the reference client
+ * does too (openclaw/src/acp/client-helpers.ts, `resolvePermissionRequest`).
+ */
+export declare const autoPermission: (params: RequestPermissionRequest) => RequestPermissionResponse;
+/** One running ACP agent, and the calls this bridge makes to it. */
+export interface AcpAgent {
+    client: Pick<ClientSideConnection, "initialize" | "newSession" | "loadSession" | "prompt" | "cancel">;
+    /**
+     * Collect the answer streamed for one session's running turn. Every
+     * `agent_message_chunk` of text is handed to the sink until the returned
+     * function is called. Turns are serial within a session, so at most one sink
+     * is registered per session at a time.
+     */
+    collect(sessionId: string, sink: (text: string) => void): () => void;
+    /** True once the agent advertised `session/load`; set after `initialize`. */
+    canLoad: boolean;
+    /** Resolves, with the line to show the person, when the process is gone. */
+    stopped: Promise<string>;
+    /** True once the process is gone, so the next message starts a new one. */
+    gone(): boolean;
+}
+/** Starts the agent's ACP command and drives it over the official SDK. */
+export declare const startAcpAgent: (acp: AcpCommand, cwd: string, signal: AbortSignal) => AcpAgent;
+/** The turn the agent is running for one chat right now. */
+export interface LiveTurn {
+    sessionId: string;
+    /** A newer message for this chat replaced it, so its answer is not sent. */
+    dropped: boolean;
+}
+/** How a turn ended (`StopReason`, schema/types.gen), and what it said. */
+export interface TurnOutcome {
+    /** `end_turn`, `cancelled`, `refusal`, `max_tokens` or `max_turn_requests`. */
+    stopReason: string;
+    answer: string;
+}
+/**
+ * Runs one turn in one session, and gives back what the agent answered.
+ *
+ * The answer is every `agent_message_chunk` of text the agent streamed before
+ * `session/prompt` returned its stop reason, joined in order.
+ */
+export declare const runTurn: (agent: AcpAgent, input: {
+    sessionId: string;
+    prompt: string;
+    onStarted(turn: LiveTurn): void;
+}) => Promise<TurnOutcome>;
+export interface AcpBridgeInput {
+    client: Pick<Relay, "chats" | "websocket">;
+    /** The agent's ACP command, and the folder to run it in. */
+    acp: AcpCommand;
+    cwd: string;
+    /** The Relay MCP server handed to every session, so Relay's tools travel with it. */
+    mcpServers: readonly McpServer[];
+    /** The label shown to the person, e.g. "Cursor". */
+    label: string;
+    /** Which ACP session belongs to which chat, across restarts. */
+    sessions: AcpSessionStore;
+    signal: AbortSignal;
+    /** One line to the terminal the person is watching. */
+    say(line: string): void;
+}
+/**
+ * Answers every message that arrives until the signal stops it.
+ *
+ * Turns run one at a time inside a chat and at the same time across chats,
+ * which is what one agent with one session per chat allows. A message for a
+ * chat whose turn is still running cancels that turn (`session/cancel`) and
+ * takes its place; the cancelled turn sends nothing.
+ */
+export declare const runAcpBridge: (input: AcpBridgeInput) => Promise<void>;
+//# sourceMappingURL=acp-bridge.d.ts.map

package/dist/acp-bridge.d.ts.map

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

package/dist/acp-bridge.js

@@ -0,0 +1,324 @@
+import { ClientSideConnection, PROTOCOL_VERSION, ndJsonStream, } from "@agentclientprotocol/sdk";
+import { Readable, Writable } from "node:stream";
+import { isAbsolute } from "node:path";
+import { bridgeTurn, MAX_RELAY_TEXT } from "./codex-bridge.js";
+import { findExecutable } from "./runtime-sniff.js";
+import { packageVersion } from "./config.js";
+import { spawnCommand } from "./spawn-command.js";
+/**
+ * What `relay connect cursor|gemini-cli|cline|opencode` leaves running so the
+ * agent answers Relay messages by itself.
+ *
+ * These agents reach Relay through MCP, and MCP cannot start a turn, so a
+ * message waits until somebody asks the agent to read it. This is the process
+ * that asks. It speaks the Agent Client Protocol (ACP) — the same protocol Zed
+ * uses to drive Cursor, Gemini CLI and OpenCode in the background — over the
+ * official `@agentclientprotocol/sdk`. It runs the agent's own ACP command
+ * (`cursor-agent acp`, `gemini --experimental-acp`, `opencode acp`), gives every
+ * chat its own ACP session, and sends the final answer back to the same chat.
+ *
+ * Relay's own tools travel through the session, natively: the Relay MCP server
+ * connect would otherwise write into the agent's `mcp.json` is handed to
+ * `session/new` instead, so the agent keeps Relay's send, read and react tools
+ * while this process drives its turns. This mirrors `codex-bridge.ts`, which
+ * does the same over Codex's `app-server`; the two never share a session file.
+ */
+/** Relay takes 1 to 255 characters for an idempotency key (contracts/relay-v1-openapi.yaml). */
+export const replyKey = (eventId) => `acp-bridge-${eventId}`;
+/** What the agent is told this client is (`clientInfo`, InitializeRequest). */
+export const CLIENT_NAME = "relaymessenger";
+/**
+ * One message, as the prompt the agent is given. The agent keeps its Relay
+ * tools during the turn, so the prompt says who answers the person: this
+ * process sends the final message, and the agent must not send a second one.
+ * Copied word for word from `codexPrompt` (codex-bridge.ts) so both bridges say
+ * the same thing.
+ */
+export const acpPrompt = (sender, text) => [
+    `@${sender} sent you this message on Relay:`,
+    "",
+    text.slice(0, MAX_RELAY_TEXT),
+    "",
+    "Write your answer as your final message. Relay sends that answer to the chat for you, so do not send it yourself.",
+].join("\n");
+/**
+ * The file to run for the agent. connect hands over the one its own sniff found
+ * on PATH, and the bare name when it found none (connect.ts). Windows has no
+ * file called `cursor-agent`: npm installs a `.cmd` shim, so a bare name is
+ * looked up again here and, failing that, left with the extension `cmd.exe` can
+ * find. The ACP words are kept as they are (runtime-sniff.ts, spawn-command.ts).
+ */
+export const acpCommand = async (found, args, env = process.env, platform = process.platform) => {
+    if (isAbsolute(found))
+        return { command: found, args };
+    const onPath = await findExecutable(found, env, platform);
+    return { command: onPath ?? (platform === "win32" ? `${found}.cmd` : found), args };
+};
+/** The Relay MCP server as ACP takes it (`McpServerStdio`, schema/types.gen). */
+export const relayMcpServer = (spec) => ({
+    name: "relay",
+    command: spec.command,
+    args: [...spec.args],
+    env: Object.entries(spec.env).map(([name, value]) => ({ name, value })),
+});
+/**
+ * Nobody is at the keyboard, so a tool the agent asks to run is allowed the
+ * same way Codex's `approvalPolicy: "never"` allows it: the agent proceeds. The
+ * first `allow` option is chosen; when none is offered the request is cancelled
+ * (`RequestPermissionOutcome`, schema/types.gen), which the reference client
+ * does too (openclaw/src/acp/client-helpers.ts, `resolvePermissionRequest`).
+ */
+export const autoPermission = (params) => {
+    const allow = params.options.find((option) => option.kind === "allow_once")
+        ?? params.options.find((option) => option.kind === "allow_always");
+    return allow
+        ? { outcome: { outcome: "selected", optionId: allow.optionId } }
+        : { outcome: { outcome: "cancelled" } };
+};
+/** Starts the agent's ACP command and drives it over the official SDK. */
+export const startAcpAgent = (acp, cwd, signal) => {
+    // Started the way every other command this CLI runs is started, so the `.cmd`
+    // shim npm installs on Windows runs too (spawn-command.ts). Nothing a person
+    // wrote travels on this command line: messages go down the ACP stream.
+    const child = spawnCommand(acp.command, acp.args, {
+        cwd, stdio: ["pipe", "pipe", "pipe"], signal,
+    });
+    const sinks = new Map();
+    let dead = false;
+    let announce;
+    const stopped = new Promise((resolve) => { announce = resolve; });
+    const die = (line) => {
+        if (dead)
+            return;
+        dead = true;
+        announce(line);
+    };
+    // The agent writes its own diagnostics to stderr; the person watching this
+    // terminal is waiting for an answer, not for a log.
+    child.stderr?.resume();
+    child.stdin?.on("error", () => { });
+    child.once("error", () => die("The agent could not be started. Trying again on the next message."));
+    child.once("close", () => die("The agent stopped. Starting it again on the next message."));
+    if (!child.stdin || !child.stdout) {
+        die("The agent gave this bridge no way to talk to it.");
+    }
+    const input = Writable.toWeb(child.stdin);
+    const output = Readable.toWeb(child.stdout);
+    const stream = ndJsonStream(input, output);
+    const handlers = {
+        sessionUpdate: async (params) => {
+            const sink = sinks.get(params.sessionId);
+            if (!sink)
+                return;
+            const update = params.update;
+            if (update.sessionUpdate === "agent_message_chunk" && update.content.type === "text") {
+                sink(update.content.text);
+            }
+        },
+        requestPermission: async (params) => autoPermission(params),
+    };
+    const client = new ClientSideConnection(() => handlers, stream);
+    return {
+        client,
+        collect: (sessionId, sink) => {
+            sinks.set(sessionId, sink);
+            return () => { if (sinks.get(sessionId) === sink)
+                sinks.delete(sessionId); };
+        },
+        canLoad: false,
+        stopped,
+        gone: () => dead,
+    };
+};
+/**
+ * Runs one turn in one session, and gives back what the agent answered.
+ *
+ * The answer is every `agent_message_chunk` of text the agent streamed before
+ * `session/prompt` returned its stop reason, joined in order.
+ */
+export const runTurn = async (agent, input) => {
+    const chunks = [];
+    const stop = agent.collect(input.sessionId, (text) => chunks.push(text));
+    try {
+        input.onStarted({ sessionId: input.sessionId, dropped: false });
+        const response = await Promise.race([
+            agent.client.prompt({ sessionId: input.sessionId, prompt: [{ type: "text", text: input.prompt }] }),
+            agent.stopped.then((line) => { throw new Error(line); }),
+        ]);
+        return { stopReason: response.stopReason, answer: chunks.join("").trim() };
+    }
+    finally {
+        stop();
+    }
+};
+/** One line of what arrived, short enough to read at a glance. */
+const arrival = (turn) => `@${turn.sender}  ${turn.text.replace(/\s+/gu, " ").slice(0, 160)}`;
+/**
+ * Answers every message that arrives until the signal stops it.
+ *
+ * Turns run one at a time inside a chat and at the same time across chats,
+ * which is what one agent with one session per chat allows. A message for a
+ * chat whose turn is still running cancels that turn (`session/cancel`) and
+ * takes its place; the cancelled turn sends nothing.
+ */
+export const runAcpBridge = async (input) => {
+    const answered = new Set();
+    const lanes = new Map();
+    let session;
+    let sessionGone = false;
+    /** The ACP session each chat is holding open in the agent running now. */
+    let opened = new Map();
+    const acpAgent = () => {
+        if (session && !sessionGone)
+            return session;
+        opened = new Map();
+        session = (async () => {
+            const started = startAcpAgent(input.acp, input.cwd, input.signal);
+            // A stop the person asked for, with Control-C, is not news.
+            void started.stopped.then((line) => {
+                sessionGone = true;
+                if (!input.signal.aborted)
+                    input.say(line);
+            });
+            // `initialize` negotiates the protocol version and reads back whether the
+            // agent can take an old session back with `session/load` (ACP spec,
+            // Initialization). The reference client sends the same capabilities
+            // (openclaw/src/acp/client.ts).
+            const info = await started.client.initialize({
+                protocolVersion: PROTOCOL_VERSION,
+                clientCapabilities: { fs: { readTextFile: true, writeTextFile: true }, terminal: true },
+                clientInfo: { name: CLIENT_NAME, title: "Relay", version: packageVersion() },
+            });
+            started.canLoad = info.agentCapabilities?.loadSession === true;
+            return started;
+        })().catch((error) => {
+            sessionGone = true;
+            throw error instanceof Error ? error : new Error(String(error));
+        });
+        sessionGone = false;
+        return session;
+    };
+    /**
+     * The session for this chat: the saved one if the agent still has it, a new
+     * one if it does not. `session/load` is only tried when the agent said it can
+     * (`agentCapabilities.loadSession`); a load the agent refuses starts a new
+     * session, the same fallback the Codex bridge makes for a lost thread.
+     */
+    const openSession = async (agent, chatId) => {
+        const settings = { cwd: input.cwd, mcpServers: [...input.mcpServers] };
+        // This agent already has the session open; it is taken back by id once per
+        // run of the process, not once per message.
+        const open = opened.get(chatId);
+        if (open !== undefined)
+            return open;
+        const saved = input.sessions.get(chatId);
+        if (saved !== undefined && agent.canLoad) {
+            try {
+                await agent.client.loadSession({ ...settings, sessionId: saved });
+                opened.set(chatId, saved);
+                return saved;
+            }
+            catch { /* Named below, once, for the one case a person can act on. */ }
+            input.say(`${input.label} no longer has this chat's session. It starts a new one.`);
+        }
+        const created = await agent.client.newSession(settings);
+        const id = created.sessionId;
+        if (!id)
+            throw new Error("The agent opened a session with no id.");
+        opened.set(chatId, id);
+        await input.sessions.set(chatId, id);
+        return id;
+    };
+    const answerOne = async (turn, lane, started) => {
+        let typing = false;
+        try {
+            await input.client.chats.startTyping(turn.chatId);
+            typing = true;
+        }
+        catch { /* The answer matters more than the typing indicator. */ }
+        const stopTyping = async () => {
+            if (!typing)
+                return;
+            typing = false;
+            try {
+                await input.client.chats.stopTyping(turn.chatId);
+            }
+            catch { /* As above. */ }
+        };
+        let mine;
+        let outcome;
+        try {
+            const agent = await acpAgent();
+            const sessionId = await openSession(agent, turn.chatId);
+            outcome = await runTurn(agent, {
+                sessionId, prompt: acpPrompt(turn.sender, turn.text),
+                onStarted: (live) => { mine = live; lane.live = live; started(); },
+            });
+        }
+        catch { /* Named below, with everything else the agent can fail at. */ }
+        if (lane.live === mine)
+            lane.live = undefined;
+        if (mine?.dropped === true || outcome?.stopReason === "cancelled") {
+            await stopTyping();
+            input.say(`A newer message came in, so the answer to @${turn.sender} was dropped.`);
+            return;
+        }
+        const answer = (outcome?.answer ?? "").trim();
+        if (!answer) {
+            await stopTyping();
+            input.say(`${input.label} gave no answer to @${turn.sender}, so nothing was sent.`);
+            return;
+        }
+        try {
+            await input.client.chats.messages.send(turn.chatId, {
+                message: {
+                    parts: [{ type: "text", value: answer.slice(0, MAX_RELAY_TEXT) }],
+                    // The message that arrived is the key, so a retry after a dropped
+                    // connection cannot answer the same person twice.
+                    idempotency_key: replyKey(turn.eventId),
+                },
+            });
+            input.say(`Sent the answer to @${turn.sender}.`);
+        }
+        catch {
+            input.say(`The answer to @${turn.sender} did not reach Relay.`);
+        }
+        finally {
+            await stopTyping();
+        }
+    };
+    await input.client.websocket.run({
+        signal: input.signal,
+        onEvent: async (event) => {
+            const turn = bridgeTurn(event);
+            if (!turn || answered.has(turn.eventId))
+                return;
+            answered.add(turn.eventId);
+            input.say(arrival(turn));
+            const lane = lanes.get(turn.chatId) ?? { chain: Promise.resolve() };
+            lanes.set(turn.chatId, lane);
+            const live = lane.live;
+            if (live !== undefined) {
+                live.dropped = true;
+                try {
+                    await (await acpAgent()).client.cancel({ sessionId: live.sessionId });
+                }
+                catch { /* The turn ended by itself, which is the same outcome. */ }
+            }
+            let ready;
+            const handed = new Promise((resolve) => { ready = resolve; });
+            // Nothing may be thrown here: a failure would close the connection, and
+            // the agent failing to answer one message is not a reason to stop.
+            lane.chain = lane.chain.then(() => answerOne(turn, lane, ready)).catch(() => undefined).finally(() => { ready(); });
+            // Relay is told the message is handled once the agent is working on it.
+            // The rest of the turn does not hold this connection, because every other
+            // chat's messages, and the next message in this one, arrive down it.
+            await handed;
+        },
+        onFullSync: async () => {
+            // This process keeps no copy of any chat, so there is nothing to rebuild.
+            input.say(`${input.label} was away longer than Relay keeps its messages. It answers the new ones from now on.`);
+        },
+    });
+};
+//# sourceMappingURL=acp-bridge.js.map

package/dist/acp-bridge.js.map

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

package/dist/acp-threads.d.ts

@@ -0,0 +1,33 @@
+import { type ConfigContext } from "./config.js";
+/**
+ * Which ACP session belongs to which Relay chat, kept where the profile that
+ * owns the agent is kept.
+ *
+ * An ACP agent (cursor, gemini-cli, opencode) gives every `session/new` a
+ * session id, and takes an old one back with `session/load` when it advertises
+ * that it can (`agentCapabilities.loadSession`). The bridge is the only thing
+ * that knows which session belongs to which chat, and it would forget on every
+ * restart while the ids lived in memory. They live here instead, beside
+ * `config.json`, so a chat keeps its context across restarts of the bridge and
+ * of the agent itself. This is the shape `codex-threads.ts` uses for Codex,
+ * kept in its own file so the two never share a key.
+ */
+export declare const acpSessionsPath: (context?: ConfigContext) => string;
+/** The agent a set of sessions belongs to. */
+export interface AcpSessionOwner {
+    /** The Relay the agent lives on, so staging and production never share a session. */
+    apiURL: string;
+    /** The agent that answers, so two agents in one folder never share a session. */
+    handle: string;
+}
+/** One chat's key in the file: the Relay, the agent, and the chat. */
+export declare const acpSessionKey: (owner: AcpSessionOwner, chatId: string) => string;
+/** The session ids for one agent, read once and written on every change. */
+export interface AcpSessionStore {
+    /** The session the agent opened for this chat, if this computer still remembers one. */
+    get(chatId: string): string | undefined;
+    /** Remembers the session the agent just opened for this chat. */
+    set(chatId: string, sessionId: string): Promise<void>;
+}
+export declare const openAcpSessions: (owner: AcpSessionOwner, context?: ConfigContext) => Promise<AcpSessionStore>;
+//# sourceMappingURL=acp-threads.d.ts.map

package/dist/acp-threads.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-threads.d.ts","sourceRoot":"","sources":["../src/acp-threads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAK7D;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,GAAI,UAAS,aAAkB,KAAG,MACL,CAAC;AAE1D,8CAA8C;AAC9C,MAAM,WAAW,eAAe;IAC9B,qFAAqF;IACrF,MAAM,EAAE,MAAM,CAAC;IACf,iFAAiF;IACjF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,sEAAsE;AACtE,eAAO,MAAM,aAAa,GAAI,OAAO,eAAe,EAAE,QAAQ,MAAM,KAAG,MAC1B,CAAC;AA0B9C,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,wFAAwF;IACxF,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACxC,iEAAiE;IACjE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD;AAED,eAAO,MAAM,eAAe,GAC1B,OAAO,eAAe,EACtB,UAAS,aAAkB,KAC1B,OAAO,CAAC,eAAe,CAYzB,CAAC"}