@borgee/agents-host 0.2.62 → 0.2.68

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

@@ -9,5 +9,6 @@ export declare class ClaudeProviderAdapter implements ProviderAdapter {
     readonly capabilities: import("../provider-adapter.js").ProviderCapabilities;
     constructor(cli: ClaudeCliClient, turnPreparer: ProviderTurnPreparer);
     generateReply(input: ProviderInput, options?: ProviderGenerateOptions): Promise<ProviderReply>;
+    cancelTurn(channelId: string): Promise<boolean>;
     dispose(): Promise<void>;
 }

package/dist/providers/claude/adapter.js

@@ -25,6 +25,9 @@ export class ClaudeProviderAdapter {
         // session as it runs, so before this point there is nothing to report.
         return { ...parseProviderReply(text), sessionId: this.cli.sessionIdForChannel(input.channelId) };
     }
+    async cancelTurn(channelId) {
+        return this.cli.cancelTurn(channelId);
+    }
     async dispose() {
         await this.cli.dispose();
     }

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

@@ -43,6 +43,7 @@ export declare class ClaudeCliClient {
      * worked a task without the agent being asked to report its own id.
      */
     sessionIdForChannel(channelId: string): string | undefined;
+    cancelTurn(channelId: string): Promise<boolean>;
     private readonly persistedSessions;
     private readonly closingSessions;
     private readonly pendingSessionStarts;

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

@@ -9,6 +9,7 @@ import { assertClaudeCommandCompatibility, DEFAULT_CLAUDE_COMMAND, isLegacyClaud
 import { PROTOCOL_VERSION, client, methods, ndJsonStream, } from '@agentclientprotocol/sdk';
 import { HostLogger, summarizeChildStderr, summarizeError } from '../../debug.js';
 import { AcpProgressCollector } from '../acp-progress-collector.js';
+import { ProviderTurnCancelledError } from '../provider-adapter.js';
 import { readClaudeActivityMetadata } from './activity-metadata.js';
 import { resolveCopilotPermissionResponse } from '../../policy/copilot-permission.js';
 import { buildClaudeSessionPromptAppend } from '../../context/prompt.js';
@@ -32,6 +33,7 @@ const DEFAULT_SESSION_CAPABILITIES = {
 };
 const CLAUDE_SDK_COMPACTION_EXPERIMENT_CONTEXT_TOKEN_THRESHOLD_ENV = 'CLAUDE_SDK_COMPACTION_EXPERIMENT_CONTEXT_TOKEN_THRESHOLD';
 const require = createRequire(import.meta.url);
+const CLAUDE_CANCELLED_REPLY_TEXT = 'Info: Operation cancelled by user';
 const DEFAULT_RUNTIME = {
     spawn,
     client,
@@ -495,6 +497,22 @@ export class ClaudeCliClient {
     sessionIdForChannel(channelId) {
         return this.channels.get(channelId)?.session?.sessionId;
     }
+    async cancelTurn(channelId) {
+        const state = this.channels.get(channelId);
+        const session = state?.session;
+        if (!state?.activeTurn || !session) {
+            return false;
+        }
+        this.idleBackendShutdown.cancel();
+        const activeSession = session;
+        if (typeof activeSession.cancel === 'function') {
+            await activeSession.cancel({ sessionId: session.sessionId });
+            return true;
+        }
+        const cancelMethod = this.runtime.methods.agent.session?.cancel ?? 'session/cancel';
+        await this.connection?.agent.notify(cancelMethod, { sessionId: session.sessionId });
+        return true;
+    }
     persistedSessions = new Map();
     closingSessions = new WeakSet();
     pendingSessionStarts = new Set();
@@ -975,6 +993,11 @@ export class ClaudeCliClient {
                     throw markSessionTainted(error);
                 }
                 const output = collector.getFinalText();
+                if (response.stopReason === 'cancelled') {
+                    throw new ProviderTurnCancelledError('Claude ACP turn cancelled', {
+                        publicReplyText: hasVisibleText(output) ? output : CLAUDE_CANCELLED_REPLY_TEXT,
+                    });
+                }
                 if (response.stopReason !== 'end_turn' && !hasVisibleText(output)) {
                     throw new Error(`Claude ACP turn stopped with stopReason "${response.stopReason}"`);
                 }

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

@@ -9,5 +9,6 @@ export declare class CodexProviderAdapter implements ProviderAdapter {
     readonly capabilities: import("../provider-adapter.js").ProviderCapabilities;
     constructor(cli: CodexCliClient, turnPreparer: ProviderTurnPreparer);
     generateReply(input: ProviderInput, options?: ProviderGenerateOptions): Promise<ProviderReply>;
+    cancelTurn(channelId: string): Promise<boolean>;
     dispose(): Promise<void>;
 }

package/dist/providers/codex/adapter.js

@@ -25,6 +25,9 @@ export class CodexProviderAdapter {
         // session as it runs, so before this point there is nothing to report.
         return { ...parseProviderReply(text), sessionId: this.cli.sessionIdForChannel(input.channelId) };
     }
+    async cancelTurn(channelId) {
+        return this.cli.cancelTurn(channelId);
+    }
     async dispose() {
         await this.cli.dispose();
     }

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

@@ -49,6 +49,7 @@ export declare class CodexCliClient {
      * worked a task without the agent being asked to report its own id.
      */
     sessionIdForChannel(channelId: string): string | undefined;
+    cancelTurn(channelId: string): Promise<boolean>;
     private readonly persistedSessions;
     private readonly closingSessions;
     private readonly pendingSessionStarts;

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

@@ -6,6 +6,7 @@ import spawn from 'cross-spawn';
 import { PROTOCOL_VERSION, client, methods, ndJsonStream, } from '@agentclientprotocol/sdk';
 import { HostLogger, summarizeChildStderr, summarizeError } from '../../debug.js';
 import { AcpProgressCollector } from '../acp-progress-collector.js';
+import { ProviderTurnCancelledError } from '../provider-adapter.js';
 import { assertCodexProjectDocumentSize, buildCodexProjectDocument } from './project-doc.js';
 import { isGatewayCredentialSidecarBasename } from '../../context/injection.js';
 import { isDiscussionOnlyResolvedWorkspace } from '../../context/resolved-workspace.js';
@@ -34,6 +35,7 @@ const CODEX_CONTEXT_ROOT_DIRNAME = 'codex-context';
 const PROJECTION_UNAVAILABLE_PLACEHOLDER = '[codex-projection-unavailable]';
 const QUEUED_TURN_DROPPED_MESSAGE = 'Codex ACP session was reset after a failed turn; queued turns were dropped instead of replaying them on a fresh session';
 const require = createRequire(import.meta.url);
+const CODEX_CANCELLED_REPLY_TEXT = 'Info: Operation cancelled by user';
 const DEFAULT_RUNTIME = {
     spawn,
     client,
@@ -230,6 +232,23 @@ export class CodexCliClient {
     sessionIdForChannel(channelId) {
         return this.channels.get(channelId)?.session?.sessionId;
     }
+    async cancelTurn(channelId) {
+        const state = this.channels.get(channelId);
+        const session = state?.session;
+        if (!state?.activeTurn || !session) {
+            return false;
+        }
+        this.clearIdleTimer(state);
+        this.idleBackendShutdown.cancel();
+        const activeSession = session;
+        if (typeof activeSession.cancel === 'function') {
+            await activeSession.cancel({ sessionId: session.sessionId });
+            return true;
+        }
+        const cancelMethod = this.runtime.methods.agent.session?.cancel ?? 'session/cancel';
+        await this.connection?.agent.notify(cancelMethod, { sessionId: session.sessionId });
+        return true;
+    }
     persistedSessions = new Map();
     closingSessions = new WeakSet();
     pendingSessionStarts = new Set();
@@ -831,10 +850,15 @@ export class CodexCliClient {
                 catch (error) {
                     throw markSessionTainted(error);
                 }
+                const output = collector.getFinalText();
+                if (response.stopReason === 'cancelled') {
+                    throw new ProviderTurnCancelledError('Codex ACP turn cancelled', {
+                        publicReplyText: output || CODEX_CANCELLED_REPLY_TEXT,
+                    });
+                }
                 if (response.stopReason !== 'end_turn') {
                     throw new Error(`Codex ACP turn stopped with stopReason "${response.stopReason}"`);
                 }
-                const output = collector.getFinalText();
                 if (!output) {
                     throw new Error('Codex ACP returned empty output');
                 }

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

@@ -9,5 +9,6 @@ export declare class CopilotProviderAdapter implements ProviderAdapter {
     readonly capabilities: import("../provider-adapter.js").ProviderCapabilities;
     constructor(cli: CopilotCliClient, turnPreparer: ProviderTurnPreparer);
     generateReply(input: ProviderInput, options?: ProviderGenerateOptions): Promise<ProviderReply>;
+    cancelTurn(channelId: string): Promise<boolean>;
     dispose(): Promise<void>;
 }

package/dist/providers/copilot/adapter.js

@@ -25,6 +25,9 @@ export class CopilotProviderAdapter {
         // session as it runs, so before this point there is nothing to report.
         return { ...parseProviderReply(text), sessionId: this.cli.sessionIdForChannel(input.channelId) };
     }
+    async cancelTurn(channelId) {
+        return this.cli.cancelTurn(channelId);
+    }
     async dispose() {
         await this.cli.dispose();
     }

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

@@ -51,6 +51,7 @@ export declare class CopilotCliClient {
      * worked a task without the agent being asked to report its own id.
      */
     sessionIdForChannel(channelId: string): string | undefined;
+    cancelTurn(channelId: string): Promise<boolean>;
     private readonly persistedSessions;
     private readonly closingSessions;
     private readonly pendingSessionStarts;

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

@@ -3,6 +3,7 @@ import spawn from 'cross-spawn';
 import { PROTOCOL_VERSION, client, methods, ndJsonStream, } from '@agentclientprotocol/sdk';
 import { HostLogger, summarizeChildStderr, summarizeError } from '../../debug.js';
 import { AcpProgressCollector } from '../acp-progress-collector.js';
+import { ProviderTurnCancelledError } from '../provider-adapter.js';
 import { resolveCopilotPermissionResponse } from '../../policy/copilot-permission.js';
 import { isDiscussionOnlyResolvedWorkspace } from '../../context/resolved-workspace.js';
 import { IDLE_BACKEND_SHUTDOWN_DISABLED_MS, IdleBackendShutdownScheduler, } from '../idle-backend-shutdown.js';
@@ -170,6 +171,23 @@ export class CopilotCliClient {
     sessionIdForChannel(channelId) {
         return this.channels.get(channelId)?.session?.sessionId;
     }
+    async cancelTurn(channelId) {
+        const state = this.channels.get(channelId);
+        const session = state?.session;
+        if (!state?.activeTurn || !session) {
+            return false;
+        }
+        this.clearIdleTimer(state);
+        this.idleBackendShutdown.cancel();
+        const activeSession = session;
+        if (typeof activeSession.cancel === 'function') {
+            await activeSession.cancel({ sessionId: session.sessionId });
+            return true;
+        }
+        const cancelMethod = this.runtime.methods.agent.session?.cancel ?? 'session/cancel';
+        await this.connection?.agent.notify(cancelMethod, { sessionId: session.sessionId });
+        return true;
+    }
     persistedSessions = new Map();
     closingSessions = new WeakSet();
     pendingSessionStarts = new Set();
@@ -651,6 +669,9 @@ export class CopilotCliClient {
                 catch (error) {
                     throw markSessionTainted(error);
                 }
+                if (response.stopReason === 'cancelled') {
+                    throw new ProviderTurnCancelledError('Copilot ACP turn cancelled');
+                }
                 if (response.stopReason !== 'end_turn') {
                     throw new Error(`Copilot ACP turn stopped with stopReason "${response.stopReason}"`);
                 }

package/dist/providers/create-provider.js

@@ -30,6 +30,9 @@ class ProviderV2CompatibilityAdapter {
             turn: preparedTurn,
         }, options);
     }
+    async cancelTurn(channelId) {
+        return this.provider.cancelTurn?.(channelId) ?? false;
+    }
     async dispose() {
         await this.provider.shutdown?.();
     }
@@ -47,6 +50,9 @@ class CliBackedProviderV2 {
         // session as it runs, so before this point there is nothing to report.
         return { ...parseProviderReply(text), sessionId: this.cli.sessionIdForChannel(input.turn.channelId) };
     }
+    async cancelTurn(channelId) {
+        return this.cli.cancelTurn(channelId);
+    }
     async shutdown() {
         await this.cli.dispose();
     }

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

@@ -33,8 +33,15 @@ export declare function createHostedProviderCapabilities(params: {
     sharedHostFallback?: SharedHostAttachmentMetadataFallbackCapability;
 }): ProviderCapabilities;
 export declare const TEXT_ONLY_HOSTED_PROVIDER_CAPABILITIES: ProviderCapabilities;
+export declare class ProviderTurnCancelledError extends Error {
+    readonly publicReplyText?: string;
+    constructor(message?: string, options?: {
+        publicReplyText?: string;
+    });
+}
 export interface ProviderAdapter {
     readonly capabilities: ProviderCapabilities;
     generateReply(input: ProviderInput, options?: ProviderGenerateOptions): Promise<ProviderReply>;
+    cancelTurn?(channelId: string): Promise<boolean>;
     dispose?(): Promise<void>;
 }

package/dist/providers/provider-adapter.js

@@ -42,3 +42,11 @@ export const TEXT_ONLY_HOSTED_PROVIDER_CAPABILITIES = createHostedProviderCapabi
         delivery: [],
     },
 });
+export class ProviderTurnCancelledError extends Error {
+    publicReplyText;
+    constructor(message = 'provider turn cancelled', options) {
+        super(message);
+        this.name = 'ProviderTurnCancelledError';
+        this.publicReplyText = options?.publicReplyText;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@borgee/agents-host",
-  "version": "0.2.62",
+  "version": "0.2.68",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -35,7 +35,7 @@
     "tsx": "^4.20.5",
     "typescript": "^5.9.3",
     "vitest": "^4.1.5",
-    "@borgee/plugin-sdk": "0.12.0"
+    "@borgee/plugin-sdk": "0.12.1"
   },
   "scripts": {
     "predev": "pnpm --filter @borgee/plugin-sdk build",