@borgee/agents-host 0.1.4 → 0.1.6

package/README.md

@@ -2,7 +2,7 @@
 
 Minimal local runtime host: connects a local **Claude Code CLI** (`claude`) or
 **GitHub Copilot CLI** (`copilot`) process to a single Borgee agent over
-[`@borgee/plugin-sdk`](../../sdk/plugin-ts) — the same BPP (`/ws/plugin`)
+[`@borgee/plugin-sdk`](../sdk/plugin-ts) — the same BPP (`/ws/plugin`)
 protocol the official OpenClaw plugin uses.
 
 ## What this is (and isn't)
@@ -19,10 +19,9 @@ Borgee channel message
   → Borgee channel
 ```
 
-**In scope:** one agent per process, mention-only gating (with a DM bypass),
-per-channel conversation memory via each CLI's own native session resume
-(Claude `--resume`, Copilot `--session-id`), and dispatching to a local CLI
-provider.
+**In scope:** one agent per process, per-channel conversation memory via each
+provider's native session mechanism (Claude CLI resume, Copilot ACP sessions),
+and dispatching to a local CLI provider.
 
 **Out of scope** (see the larger `feat/multi-agent-runtime-host` work for
 these): remote command execution / shell dispatch, node provisioning,
@@ -51,22 +50,23 @@ pnpm --filter @borgee/agents-host dev
 | --- | --- | --- | --- |
 | `BORGEE_BASE_URL` | yes | — | Borgee server base URL (e.g. `https://borgee.example.com`) |
 | `BORGEE_AGENT_API_KEY` | yes | — | The agent's API key, revealed from the web UI |
-| `BORGEE_AGENT_NAME` | no | `Assistant` | Display name used for mention matching and prompts |
+| `BORGEE_AGENT_NAME` | no | `Assistant` | Display name used in prompts |
 | `RUNTIME_PROVIDER` | no | `claude` | `claude` or `copilot` |
 | `CLAUDE_COMMAND` / `CLAUDE_ARGS` | no | `claude` / `--print` | Local Claude CLI command + args |
-| `COPILOT_COMMAND` / `COPILOT_ARGS` | no | `copilot` / `-s --no-color --allow-all-tools --output-format text` | Local Copilot CLI command + args |
-| `RESPOND_ON_MENTION_ONLY` | no | `true` | If `true`, only replies in non-DM channels when @mentioned; DMs always get a reply |
+| `COPILOT_COMMAND` / `COPILOT_ARGS` | no | `copilot` / empty | Local Copilot CLI command. `COPILOT_ARGS` is accepted for backward-compatible config/CLI parsing but ignored by the persistent Copilot ACP prototype, which always launches `copilot --acp`. |
 
 ## Conversation memory
 
-Each Borgee channel is mapped 1:1 to a native CLI session, keyed by a
-generated UUID kept in memory for the process's lifetime:
+Each Borgee channel is mapped 1:1 to a provider-native session for the
+process's lifetime:
 
 - **Claude**: first turn for a channel uses `--session-id <uuid>`; every
   turn after uses `-r/--resume <uuid>` (Claude treats these as distinct
   operations).
-- **Copilot**: every turn uses `--session-id=<uuid>` — Copilot's CLI treats
-  that flag as create-or-resume for the same UUID.
+- **Copilot**: one persistent `copilot --acp` subprocess is shared by the
+  host, with one ACP session per Borgee channel. Same-channel turns are
+  serialized so they cannot interleave; different channels keep isolated ACP
+  sessions.
 
 There is no separate history/context store on our side; if the runtime host
 process restarts, each channel starts a fresh CLI session (no session-id

package/dist/agents-host.d.ts

@@ -14,6 +14,10 @@ import type { AgentsHostConfig } from './types.js';
  * node provisioning, multi-agent discovery, systemd install, and scheduled
  * (periodic) prompts. Running several agents means running several
  * processes, each with its own `BORGEE_AGENT_API_KEY`.
+ *
+ * Message gating (mention-only / DM rules) is NOT done here: the server
+ * enforces per-agent + per-channel `require_mention` at BPP fan-out, so this
+ * host simply replies to every message it is handed (minus its own).
  */
 export declare class AgentsHost {
     private readonly config;
@@ -28,20 +32,4 @@ export declare class AgentsHost {
     start(): Promise<void>;
     stop(): Promise<void>;
     private handleMessage;
-    /**
-     * Whether `msg` mentions this agent: either via the SDK's structured
-     * mention event kind, or a plain-text substring match on the configured
-     * agent name.
-     */
-    isLikelyMention(message: {
-        type?: string;
-        mentions?: string[];
-    }, content: string): boolean;
-    /**
-     * Channel-type check, based solely on the `channel_type` hint the SDK
-     * derives from the inbound BPP event. There is no REST fallback here (that
-     * would require the excluded control-plane SDK) — an absent hint is
-     * treated as "not a DM".
-     */
-    private isDirectMessage;
 }

package/dist/agents-host.js

@@ -13,6 +13,10 @@ import { createProvider } from './providers/create-provider.js';
  * node provisioning, multi-agent discovery, systemd install, and scheduled
  * (periodic) prompts. Running several agents means running several
  * processes, each with its own `BORGEE_AGENT_API_KEY`.
+ *
+ * Message gating (mention-only / DM rules) is NOT done here: the server
+ * enforces per-agent + per-channel `require_mention` at BPP fan-out, so this
+ * host simply replies to every message it is handed (minus its own).
  */
 export class AgentsHost {
     config;
@@ -55,6 +59,7 @@ export class AgentsHost {
             return;
         this.started = false;
         await this.borgee.close();
+        await this.provider.dispose?.();
     }
     async handleMessage(msg) {
         console.log('[agents-host] received message', {
@@ -70,11 +75,10 @@ export class AgentsHost {
         const content = String(msg.content ?? msg.body ?? '').trim();
         if (!content)
             return;
-        const isDm = this.isDirectMessage(msg.channel_type);
-        if (this.config.agent.respondOnMentionOnly && !isDm) {
-            if (!this.isLikelyMention(msg, content))
-                return;
-        }
+        // No client-side mention/DM gating here: the server already decides which
+        // messages an agent receives (per-agent + per-channel require_mention is
+        // enforced at BPP fan-out via AgentReceivesChannelMessage). If a channel
+        // message reaches this host at all, the agent is meant to handle it.
         try {
             const reply = await this.provider.generateReply({
                 agentName: this.config.agent.agentName,
@@ -93,30 +97,4 @@ export class AgentsHost {
             });
         }
     }
-    /**
-     * Whether `msg` mentions this agent: either via the SDK's structured
-     * mention event kind, or a plain-text substring match on the configured
-     * agent name.
-     */
-    isLikelyMention(message, content) {
-        if (message.type === 'mention') {
-            return true;
-        }
-        if (Array.isArray(message.mentions) && this.selfAgentId) {
-            if (message.mentions.some((mention) => mention === this.selfAgentId)) {
-                return true;
-            }
-        }
-        return this.config.agent.agentName.trim().length > 0
-            && content.toLowerCase().includes(this.config.agent.agentName.toLowerCase());
-    }
-    /**
-     * Channel-type check, based solely on the `channel_type` hint the SDK
-     * derives from the inbound BPP event. There is no REST fallback here (that
-     * would require the excluded control-plane SDK) — an absent hint is
-     * treated as "not a DM".
-     */
-    isDirectMessage(hintedType) {
-        return hintedType === 'dm';
-    }
 }

package/dist/chat/sdk-chat-control-plane.js

@@ -65,7 +65,6 @@ export function mapInboundToChannelMessage(event) {
         sender_id: event.message?.authorId ?? event.reaction?.userId,
         content: event.message?.body,
         body: event.message?.body,
-        mentions: event.message?.mentions,
         content_type: event.message?.contentType,
         created_at: event.createdAt,
     };

package/dist/cli-args.d.ts

@@ -19,4 +19,4 @@ export declare class CliUsageError extends Error {
  * process, so callers (and tests) can decide how to report it.
  */
 export declare function parseStartArgs(argv: string[]): ParsedStartArgs;
-export declare const USAGE = "Usage: agents-host start <serverUrl> <apiKey> [options]\n\nOptions:\n  --name <name>                 Display name (default: Assistant)\n  --provider <claude|copilot>   Runtime provider (default: claude)\n  --claude-command <cmd>        Local Claude CLI command (default: claude)\n  --claude-args <args>          Local Claude CLI args (default: --print)\n  --copilot-command <cmd>       Local Copilot CLI command (default: copilot)\n  --copilot-args <args>         Local Copilot CLI args\n  --mention-only <true|false>   Reply only when @mentioned outside DMs (default: true)\n\nExample:\n  agents-host start https://borgee.example.com bgr_xxxxxxxx --provider copilot\n";
+export declare const USAGE = "Usage: agents-host start <serverUrl> <apiKey> [options]\n\nOptions:\n  --name <name>                 Display name (default: Assistant)\n  --provider <claude|copilot>   Runtime provider (default: claude)\n  --claude-command <cmd>        Local Claude CLI command (default: claude)\n  --claude-args <args>          Local Claude CLI args (default: --print)\n  --copilot-command <cmd>         Local Copilot CLI command (default: copilot)\n  --copilot-args <args>           Ignored by the Copilot ACP prototype\n\nExample:\n  agents-host start https://borgee.example.com bgr_xxxxxxxx --provider copilot\n";

package/dist/cli-args.js

@@ -11,7 +11,6 @@ export const CLI_FLAG_TO_ENV = {
     'claude-args': 'CLAUDE_ARGS',
     'copilot-command': 'COPILOT_COMMAND',
     'copilot-args': 'COPILOT_ARGS',
-    'mention-only': 'RESPOND_ON_MENTION_ONLY',
 };
 export class CliUsageError extends Error {
 }
@@ -59,9 +58,8 @@ Options:
   --provider <claude|copilot>   Runtime provider (default: claude)
   --claude-command <cmd>        Local Claude CLI command (default: claude)
   --claude-args <args>          Local Claude CLI args (default: --print)
-  --copilot-command <cmd>       Local Copilot CLI command (default: copilot)
-  --copilot-args <args>         Local Copilot CLI args
-  --mention-only <true|false>   Reply only when @mentioned outside DMs (default: true)
+  --copilot-command <cmd>         Local Copilot CLI command (default: copilot)
+  --copilot-args <args>           Ignored by the Copilot ACP prototype
 
 Example:
   agents-host start https://borgee.example.com bgr_xxxxxxxx --provider copilot

package/dist/config.d.ts

@@ -3,5 +3,9 @@ import type { AgentsHostConfig } from './types.js';
  * Loads agents-host configuration from environment variables. This process
  * hosts exactly one Borgee agent (`BORGEE_AGENT_API_KEY`) — to run more
  * agents, run more processes with different env vars.
+ *
+ * The Copilot ACP prototype still parses `COPILOT_ARGS` for CLI/env backward
+ * compatibility, but the persistent ACP backend intentionally ignores them and
+ * always launches `copilot --acp`.
  */
 export declare function loadConfigFromEnv(): AgentsHostConfig;

package/dist/config.js

@@ -9,12 +9,6 @@ function envOr(name, fallback) {
     const value = process.env[name];
     return value && value.trim().length > 0 ? value.trim() : fallback;
 }
-function envBoolOr(name, fallback) {
-    const value = process.env[name];
-    if (value === undefined || value.trim().length === 0)
-        return fallback;
-    return ['1', 'true', 'yes', 'on'].includes(value.trim().toLowerCase());
-}
 function parseArgs(value) {
     return value.trim().length > 0 ? value.trim().split(/\s+/) : [];
 }
@@ -28,6 +22,10 @@ function resolveProvider() {
  * Loads agents-host configuration from environment variables. This process
  * hosts exactly one Borgee agent (`BORGEE_AGENT_API_KEY`) — to run more
  * agents, run more processes with different env vars.
+ *
+ * The Copilot ACP prototype still parses `COPILOT_ARGS` for CLI/env backward
+ * compatibility, but the persistent ACP backend intentionally ignores them and
+ * always launches `copilot --acp`.
  */
 export function loadConfigFromEnv() {
     return {
@@ -39,7 +37,6 @@ export function loadConfigFromEnv() {
         agent: {
             agentApiKey: requireEnv('BORGEE_AGENT_API_KEY'),
             agentName: envOr('BORGEE_AGENT_NAME', 'Assistant'),
-            respondOnMentionOnly: envBoolOr('RESPOND_ON_MENTION_ONLY', true),
             provider: resolveProvider(),
         },
     };

package/dist/providers/copilot/adapter.d.ts

@@ -5,4 +5,5 @@ export declare class CopilotProviderAdapter implements ProviderAdapter {
     private readonly cli;
     constructor(cli: CopilotCliClient);
     generateReply(input: ProviderInput): Promise<ProviderReply>;
+    dispose(): Promise<void>;
 }

package/dist/providers/copilot/adapter.js

@@ -15,4 +15,7 @@ export class CopilotProviderAdapter {
         const text = await this.cli.generateReply(input.channelId, prompt);
         return { text };
     }
+    async dispose() {
+        await this.cli.dispose();
+    }
 }

package/dist/providers/copilot/cli-client.d.ts

@@ -1,24 +1,58 @@
+import spawn from 'cross-spawn';
+import { PROTOCOL_VERSION, client, methods, ndJsonStream } from '@agentclientprotocol/sdk';
+interface CopilotAcpRuntime {
+    spawn: typeof spawn;
+    client: typeof client;
+    ndJsonStream: typeof ndJsonStream;
+    methods: typeof methods;
+    protocolVersion: typeof PROTOCOL_VERSION;
+    cwd: string;
+    shutdownGracePeriodMs: number;
+    shutdownForceKillWaitMs: number;
+}
 /**
- * CLI client for the GitHub Copilot CLI (`copilot`) non-interactive mode,
- * with native per-channel session continuity.
- *
- * Unlike the Claude CLI, Copilot's non-interactive mode takes the prompt as
- * a `-p/--prompt` argument rather than reading it from stdin, so the prompt
- * is appended to the configured base args on every invocation instead of
- * being written to the child process's stdin.
+ * Persistent ACP-backed client for the GitHub Copilot CLI (`copilot --acp`).
  *
- * Verified CLI behavior (`copilot --help` + empirical check): `--session-id
- * <uuid>` both *creates* a new session pinned to that UUID (first call) and
- * *resumes* it (subsequent calls with the same UUID) — one flag covers both
- * cases, unlike Claude's `--session-id`/`--resume` split. No message history
- * is kept on our side — the CLI's own session storage is the single source
- * of truth for conversation memory.
+ * The legacy one-shot `COPILOT_ARGS` / constructor args are intentionally
+ * ignored here: the prototype always launches the child as `copilot --acp`,
+ * performs the ACP initialize handshake once, then reuses one ACP session per
+ * Borgee channel for the process lifetime.
  */
 export declare class CopilotCliClient {
     private readonly command;
-    private readonly args;
-    private readonly sessionIdsByChannel;
-    constructor(command: string, args: string[]);
+    private readonly runtime;
+    private readonly channels;
+    private readonly closingSessions;
+    private readonly pendingSessionStarts;
+    private readonly pendingSessionCloses;
+    private readonly fatalPromise;
+    private rejectFatalPromise;
+    private child?;
+    private connection?;
+    private startPromise?;
+    private shutdownPromise?;
+    private childExitPromise?;
+    private resolveChildExit?;
+    private fatalError;
+    private disposing;
+    private backendClosed;
+    constructor(command: string, _ignoredArgs?: string[], runtimeOverrides?: Partial<CopilotAcpRuntime>);
     generateReply(channelId: string, prompt: string): Promise<string>;
-    private run;
+    dispose(): Promise<void>;
+    private ensureStarted;
+    private startBackend;
+    private getOrCreateChannelState;
+    private processChannelQueue;
+    private getOrCreateSession;
+    private runTurn;
+    private raceWithFatal;
+    private failAll;
+    private invalidateSession;
+    private closeSession;
+    private rejectQueuedTurnsAfterSessionTaint;
+    private shutdownBackend;
+    private waitForPendingSessionStarts;
+    private waitForPendingSessionCloses;
+    private waitForChildExit;
 }
+export {};

package/dist/providers/copilot/cli-client.js

@@ -1,65 +1,455 @@
-import { randomUUID } from 'node:crypto';
+import { Readable, Writable } from 'node:stream';
 import spawn from 'cross-spawn';
+import { PROTOCOL_VERSION, client, methods, ndJsonStream, } from '@agentclientprotocol/sdk';
+const SESSION_TAINTED_ERRORS = new WeakSet();
+const DEFAULT_SHUTDOWN_GRACE_PERIOD_MS = 250;
+const DEFAULT_SHUTDOWN_FORCE_KILL_WAIT_MS = 250;
+const QUEUED_TURN_DROPPED_MESSAGE = 'Copilot ACP session was reset after a failed turn; queued turns were dropped instead of replaying them on a fresh session';
+const DEFAULT_RUNTIME = {
+    spawn,
+    client,
+    ndJsonStream,
+    methods,
+    protocolVersion: PROTOCOL_VERSION,
+    cwd: process.cwd(),
+    shutdownGracePeriodMs: DEFAULT_SHUTDOWN_GRACE_PERIOD_MS,
+    shutdownForceKillWaitMs: DEFAULT_SHUTDOWN_FORCE_KILL_WAIT_MS,
+};
+function createDeferredTurn(prompt) {
+    let settled = false;
+    let resolvePromise;
+    let rejectPromise;
+    const promise = new Promise((resolve, reject) => {
+        resolvePromise = resolve;
+        rejectPromise = reject;
+    });
+    return {
+        prompt,
+        promise,
+        resolve(value) {
+            if (settled)
+                return;
+            settled = true;
+            resolvePromise(value);
+        },
+        reject(error) {
+            if (settled)
+                return;
+            settled = true;
+            rejectPromise(normalizeError(error));
+        },
+    };
+}
+function normalizeError(error) {
+    return error instanceof Error ? error : new Error(String(error));
+}
+function markSessionTainted(error) {
+    const normalized = normalizeError(error);
+    SESSION_TAINTED_ERRORS.add(normalized);
+    return normalized;
+}
+function isSessionTainted(error) {
+    return error instanceof Error && SESSION_TAINTED_ERRORS.has(error);
+}
+function selectPermissionOption(options) {
+    const option = options.find((candidate) => candidate.kind === 'allow_always') ??
+        options.find((candidate) => candidate.kind === 'allow_once');
+    if (!option) {
+        throw new Error('Copilot ACP requested permission but did not offer an allow option');
+    }
+    return option.optionId;
+}
 /**
- * CLI client for the GitHub Copilot CLI (`copilot`) non-interactive mode,
- * with native per-channel session continuity.
- *
- * Unlike the Claude CLI, Copilot's non-interactive mode takes the prompt as
- * a `-p/--prompt` argument rather than reading it from stdin, so the prompt
- * is appended to the configured base args on every invocation instead of
- * being written to the child process's stdin.
+ * Persistent ACP-backed client for the GitHub Copilot CLI (`copilot --acp`).
  *
- * Verified CLI behavior (`copilot --help` + empirical check): `--session-id
- * <uuid>` both *creates* a new session pinned to that UUID (first call) and
- * *resumes* it (subsequent calls with the same UUID) — one flag covers both
- * cases, unlike Claude's `--session-id`/`--resume` split. No message history
- * is kept on our side — the CLI's own session storage is the single source
- * of truth for conversation memory.
+ * The legacy one-shot `COPILOT_ARGS` / constructor args are intentionally
+ * ignored here: the prototype always launches the child as `copilot --acp`,
+ * performs the ACP initialize handshake once, then reuses one ACP session per
+ * Borgee channel for the process lifetime.
  */
 export class CopilotCliClient {
     command;
-    args;
-    sessionIdsByChannel = new Map();
-    constructor(command, args) {
+    runtime;
+    channels = new Map();
+    closingSessions = new WeakSet();
+    pendingSessionStarts = new Set();
+    pendingSessionCloses = new Set();
+    fatalPromise;
+    rejectFatalPromise;
+    child;
+    connection;
+    startPromise;
+    shutdownPromise;
+    childExitPromise;
+    resolveChildExit;
+    fatalError = null;
+    disposing = false;
+    backendClosed = false;
+    constructor(command, _ignoredArgs = [], runtimeOverrides = {}) {
         this.command = command;
-        this.args = args;
+        this.runtime = { ...DEFAULT_RUNTIME, ...runtimeOverrides };
+        this.fatalPromise = new Promise((_, reject) => {
+            this.rejectFatalPromise = reject;
+        });
+        void this.fatalPromise.catch(() => { });
     }
     async generateReply(channelId, prompt) {
-        const sessionId = this.sessionIdsByChannel.get(channelId) ?? randomUUID();
-        const text = await this.run([...this.args, `--session-id=${sessionId}`, '-p', prompt]);
-        this.sessionIdsByChannel.set(channelId, sessionId);
-        return text;
-    }
-    async run(args) {
-        return new Promise((resolve, reject) => {
-            const child = spawn(this.command, args, {
-                stdio: ['ignore', 'pipe', 'pipe'],
-            });
-            let stdout = '';
-            let stderr = '';
-            child.stdout.setEncoding('utf8');
-            child.stderr.setEncoding('utf8');
-            child.stdout.on('data', (chunk) => {
-                stdout += chunk;
-            });
-            child.stderr.on('data', (chunk) => {
-                stderr += chunk;
-            });
-            child.on('error', (error) => {
-                reject(error);
+        if (this.fatalError) {
+            throw this.fatalError;
+        }
+        const state = this.getOrCreateChannelState(channelId);
+        const turn = createDeferredTurn(prompt);
+        state.queue.push(turn);
+        this.processChannelQueue(channelId, state);
+        return turn.promise;
+    }
+    async dispose() {
+        const error = new Error('Copilot ACP backend stopped');
+        this.disposing = true;
+        const closed = this.connection?.closed ?? Promise.resolve();
+        this.failAll(error);
+        await Promise.all([closed, this.shutdownPromise ?? Promise.resolve()]);
+    }
+    async ensureStarted() {
+        if (this.fatalError) {
+            throw this.fatalError;
+        }
+        if (!this.startPromise) {
+            this.startPromise = this.startBackend();
+        }
+        await this.startPromise;
+        if (this.fatalError) {
+            throw this.fatalError;
+        }
+        if (!this.connection) {
+            throw new Error('Copilot ACP connection is not available');
+        }
+    }
+    async startBackend() {
+        const child = this.runtime.spawn(this.command, ['--acp'], {
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        this.child = child;
+        child.stderr.resume();
+        child.once('error', (error) => {
+            this.failAll(new Error(`Copilot ACP process error: ${normalizeError(error).message}`));
+        });
+        child.once('exit', (code, signal) => {
+            this.resolveChildExit?.();
+            if (this.disposing)
+                return;
+            const suffix = signal ? `signal ${signal}` : `code ${String(code ?? 'unknown')}`;
+            this.failAll(new Error(`Copilot ACP process exited unexpectedly (${suffix})`));
+        });
+        this.childExitPromise = new Promise((resolve) => {
+            this.resolveChildExit = resolve;
+        });
+        const output = Writable.toWeb(child.stdin);
+        const input = Readable.toWeb(child.stdout);
+        const stream = this.runtime.ndJsonStream(output, input);
+        const app = this.runtime
+            .client({ name: 'borgee-agents-host' })
+            .onRequest(this.runtime.methods.client.session.requestPermission, ({ params }) => ({
+            outcome: {
+                outcome: 'selected',
+                optionId: selectPermissionOption(params.options),
+            },
+        }));
+        const connection = app.connect(stream);
+        this.connection = connection;
+        void connection.closed.then(() => {
+            if (!this.disposing) {
+                this.failAll(new Error('Copilot ACP connection closed unexpectedly'));
+            }
+        });
+        try {
+            await connection.agent.request(this.runtime.methods.agent.initialize, {
+                protocolVersion: this.runtime.protocolVersion,
+                clientCapabilities: {},
+                clientInfo: {
+                    name: '@borgee/agents-host',
+                    version: '0.1.6',
+                },
             });
-            child.on('close', (code) => {
-                if (code !== 0) {
-                    reject(new Error(`Copilot CLI failed with code ${code}: ${stderr.trim()}`));
-                    return;
+        }
+        catch (error) {
+            const normalized = new Error(`Copilot ACP initialize failed: ${normalizeError(error).message}`);
+            this.failAll(normalized);
+            throw normalized;
+        }
+    }
+    getOrCreateChannelState(channelId) {
+        let state = this.channels.get(channelId);
+        if (!state) {
+            state = {
+                processing: false,
+                queue: [],
+            };
+            this.channels.set(channelId, state);
+        }
+        return state;
+    }
+    processChannelQueue(channelId, state) {
+        if (state.processing) {
+            return;
+        }
+        state.processing = true;
+        void (async () => {
+            try {
+                while (!this.fatalError) {
+                    const turn = state.queue.shift();
+                    if (!turn) {
+                        return;
+                    }
+                    state.activeTurn = turn;
+                    try {
+                        await this.ensureStarted();
+                        const session = await this.getOrCreateSession(channelId, state);
+                        let reply;
+                        try {
+                            reply = await this.runTurn(session, turn.prompt);
+                        }
+                        catch (error) {
+                            if (isSessionTainted(error)) {
+                                this.invalidateSession(state, session);
+                                this.rejectQueuedTurnsAfterSessionTaint(state, error);
+                            }
+                            throw error;
+                        }
+                        turn.resolve(reply);
+                    }
+                    catch (error) {
+                        turn.reject(error);
+                    }
+                    finally {
+                        state.activeTurn = undefined;
+                    }
                 }
-                const text = stdout.trim();
-                if (!text) {
-                    reject(new Error('Copilot CLI returned empty output'));
-                    return;
+            }
+            finally {
+                state.processing = false;
+            }
+        })();
+    }
+    async getOrCreateSession(channelId, state) {
+        if (state.session) {
+            return state.session;
+        }
+        if (state.sessionPromise) {
+            return state.sessionPromise;
+        }
+        if (!this.connection) {
+            throw new Error('Copilot ACP connection is not available');
+        }
+        const sessionPromise = this.connection.agent.buildSession(this.runtime.cwd).start();
+        this.pendingSessionStarts.add(sessionPromise);
+        state.sessionPromise = sessionPromise;
+        let sessionAdopted = false;
+        void sessionPromise
+            .then((session) => {
+            if (!sessionAdopted &&
+                (this.fatalError !== null || this.disposing || state.sessionPromise !== sessionPromise)) {
+                this.closeSession(session);
+            }
+        })
+            .finally(() => {
+            this.pendingSessionStarts.delete(sessionPromise);
+        })
+            .catch(() => { });
+        try {
+            const session = await this.raceWithFatal(sessionPromise);
+            if (this.fatalError) {
+                this.closeSession(session);
+                throw this.fatalError;
+            }
+            sessionAdopted = true;
+            state.session = session;
+            return session;
+        }
+        catch (error) {
+            state.session = undefined;
+            throw error;
+        }
+        finally {
+            if (state.sessionPromise === sessionPromise) {
+                state.sessionPromise = undefined;
+            }
+            if (!state.session && state.queue.length === 0 && !state.activeTurn) {
+                this.channels.delete(channelId);
+            }
+        }
+    }
+    async runTurn(session, prompt) {
+        const promptPromise = this.raceWithFatal(session.prompt(prompt));
+        const promptFailure = new Promise((_, reject) => {
+            void promptPromise.catch((error) => reject(markSessionTainted(error)));
+        });
+        let text = '';
+        for (;;) {
+            let update;
+            try {
+                update = await this.raceWithFatal(Promise.race([session.nextUpdate(), promptFailure]));
+            }
+            catch (error) {
+                if (this.fatalError && error === this.fatalError) {
+                    throw error;
                 }
-                resolve(text);
-            });
+                throw markSessionTainted(error);
+            }
+            if (update.kind === 'stop') {
+                let response;
+                try {
+                    response = await promptPromise;
+                }
+                catch (error) {
+                    throw markSessionTainted(error);
+                }
+                if (response.stopReason !== 'end_turn') {
+                    throw new Error(`Copilot ACP turn stopped with stopReason "${response.stopReason}"`);
+                }
+                const output = text.trim();
+                if (!output) {
+                    throw new Error('Copilot ACP returned empty output');
+                }
+                return output;
+            }
+            if (update.update.sessionUpdate === 'agent_message_chunk' &&
+                update.update.content.type === 'text') {
+                text += update.update.content.text;
+            }
+        }
+    }
+    async raceWithFatal(promise) {
+        if (this.fatalError) {
+            throw this.fatalError;
+        }
+        return Promise.race([promise, this.fatalPromise]);
+    }
+    failAll(error) {
+        if (this.fatalError) {
+            return;
+        }
+        this.fatalError = error;
+        this.rejectFatalPromise(error);
+        for (const [channelId, state] of this.channels.entries()) {
+            state.activeTurn?.reject(error);
+            for (const turn of state.queue) {
+                turn.reject(error);
+            }
+            state.queue.length = 0;
+            if (state.session) {
+                this.closeSession(state.session);
+            }
+            state.session = undefined;
+            state.sessionPromise = undefined;
+            state.activeTurn = undefined;
+            if (!state.processing) {
+                this.channels.delete(channelId);
+            }
+        }
+        this.channels.clear();
+        this.shutdownPromise = this.shutdownBackend(error);
+    }
+    invalidateSession(state, session) {
+        if (state.session === session) {
+            state.session = undefined;
+        }
+        this.closeSession(session);
+    }
+    closeSession(session) {
+        if (this.closingSessions.has(session)) {
+            return;
+        }
+        this.closingSessions.add(session);
+        const agent = this.connection?.agent;
+        const closeMethod = this.runtime.methods.agent.session?.close;
+        const closePromise = typeof agent?.closeSession === 'function'
+            ? agent.closeSession({ sessionId: session.sessionId })
+            : closeMethod
+                ? this.connection?.agent.request(closeMethod, { sessionId: session.sessionId })
+                : undefined;
+        session.dispose();
+        if (!closePromise) {
+            return;
+        }
+        let trackedClosePromise;
+        trackedClosePromise = Promise.resolve(closePromise)
+            .then(() => undefined)
+            .catch(() => { })
+            .finally(() => {
+            this.pendingSessionCloses.delete(trackedClosePromise);
+        });
+        this.pendingSessionCloses.add(trackedClosePromise);
+    }
+    rejectQueuedTurnsAfterSessionTaint(state, error) {
+        if (state.queue.length === 0) {
+            return;
+        }
+        const rejection = new Error(QUEUED_TURN_DROPPED_MESSAGE, {
+            cause: normalizeError(error),
         });
+        for (const turn of state.queue) {
+            turn.reject(rejection);
+        }
+        state.queue.length = 0;
+    }
+    async shutdownBackend(error) {
+        if (this.backendClosed) {
+            return;
+        }
+        this.backendClosed = true;
+        const connection = this.connection;
+        const child = this.child;
+        await this.waitForPendingSessionStarts();
+        await this.waitForPendingSessionCloses();
+        connection?.close(error);
+        this.connection = undefined;
+        if (!child) {
+            this.child = undefined;
+            return;
+        }
+        const childExitPromise = this.childExitPromise ?? Promise.resolve();
+        child.kill('SIGTERM');
+        const exitedAfterTerm = await this.waitForChildExit(childExitPromise, this.runtime.shutdownGracePeriodMs);
+        if (exitedAfterTerm) {
+            this.child = undefined;
+            return;
+        }
+        child.kill('SIGKILL');
+        await this.waitForChildExit(childExitPromise, this.runtime.shutdownForceKillWaitMs);
+        this.child = undefined;
+    }
+    async waitForPendingSessionStarts() {
+        if (this.pendingSessionStarts.size === 0) {
+            return;
+        }
+        await Promise.race([
+            Promise.allSettled([...this.pendingSessionStarts]).then(() => undefined),
+            new Promise((resolve) => {
+                setTimeout(resolve, this.runtime.shutdownGracePeriodMs);
+            }),
+        ]);
+    }
+    async waitForPendingSessionCloses() {
+        if (this.pendingSessionCloses.size === 0) {
+            return;
+        }
+        await Promise.race([
+            Promise.allSettled([...this.pendingSessionCloses]).then(() => undefined),
+            new Promise((resolve) => {
+                setTimeout(resolve, this.runtime.shutdownGracePeriodMs);
+            }),
+        ]);
+    }
+    async waitForChildExit(childExitPromise, timeoutMs) {
+        if (timeoutMs <= 0) {
+            return false;
+        }
+        return Promise.race([
+            childExitPromise.then(() => true),
+            new Promise((resolve) => {
+                setTimeout(() => resolve(false), timeoutMs);
+            }),
+        ]);
     }
 }

package/dist/providers/provider-adapter.d.ts

@@ -1,4 +1,5 @@
 import type { ProviderInput, ProviderReply } from '../types.js';
 export interface ProviderAdapter {
     generateReply(input: ProviderInput): Promise<ProviderReply>;
+    dispose?(): Promise<void>;
 }

package/dist/types.d.ts

@@ -16,7 +16,6 @@ export interface ProviderRuntimeConfig extends ProviderCommandConfig {
 export interface HostedAgentConfig {
     agentApiKey: string;
     agentName: string;
-    respondOnMentionOnly: boolean;
     provider: ProviderKind;
 }
 export interface AgentsHostConfig extends ProviderCommandConfig {
@@ -34,7 +33,6 @@ export interface ChannelMessageEvent {
     body?: string;
     content_type?: string;
     created_at?: number;
-    mentions?: string[];
     [key: string]: unknown;
 }
 export interface MeResponseUser {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@borgee/agents-host",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -17,11 +17,32 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/codetreker/borgee.git",
-    "directory": "packages/runtimes/agents-host"
+    "directory": "packages/agents-host"
   },
   "license": "MIT",
   "dependencies": {
-    "@borgee/plugin-sdk": "0.1.1",
-    "cross-spawn": "^7.0.6"
+    "@agentclientprotocol/sdk": "^1.2.1",
+    "cross-spawn": "^7.0.6",
+    "@borgee/plugin-sdk": "0.1.1"
+  },
+  "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
+    "@types/node": "^24.3.0",
+    "tsx": "^4.20.5",
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.5"
+  },
+  "scripts": {
+    "predev": "pnpm --filter @borgee/plugin-sdk build",
+    "dev": "tsx src/index.ts",
+    "precli": "pnpm --filter @borgee/plugin-sdk build",
+    "cli": "tsx src/cli.ts",
+    "prestart": "pnpm --filter @borgee/plugin-sdk build",
+    "start": "node dist/index.js",
+    "prebuild": "pnpm --filter @borgee/plugin-sdk build",
+    "build": "tsc",
+    "typecheck": "tsc --noEmit",
+    "pretest": "pnpm --filter @borgee/plugin-sdk build",
+    "test": "vitest run"
   }
-}
+}