@velum-labs/routekit-tool-cursor 0.18.6 → 1.0.0

package/README.md

@@ -1,13 +1,12 @@
 # @velum-labs/routekit-tool-cursor
 
-Product-neutral retained Cursor custom-endpoint setup and canonical ACP driver.
+Product-neutral Cursor custom-endpoint setup and canonical ACP driver.
 
 ## Architecture
 
-This package remains available as an internal compatibility integration, but
-Cursor Desktop and `cursor-agent` are not current RouteKit client-support
-surfaces. Cursor Desktop 3.12.30 rejected RouteKit model names before sending a
-request to the retained `/v1/cursor` door. RouteKit also does not proxy or
+This package is internal. Cursor Desktop and `cursor-agent` are not current
+RouteKit client-support surfaces. Cursor Desktop 3.12.30 rejected RouteKit model
+names before sending a request to `/v1/cursor`. RouteKit also does not proxy or
 emulate Cursor's backend protocol, so `cursor-agent` cannot use the gateway.
 
 ## Usage

package/dist/driver.d.ts

@@ -1,5 +1,5 @@
-import { z } from "zod";
 import type { HarnessDriver } from "@velum-labs/routekit-harness-core";
+import { z } from "zod";
 export declare const cursorDriverConfigSchema: z.ZodObject<{
     command: z.ZodDefault<z.ZodString>;
     endpoint: z.ZodOptional<z.ZodString>;

package/dist/driver.js

@@ -1,8 +1,8 @@
 import { spawn } from "node:child_process";
 import { Readable, Writable } from "node:stream";
+import { ClientSideConnection, ndJsonStream, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
+import { AsyncChannel, asHarnessError, buildChildEnv, createCachedHarnessDriver, DEFAULT_AUTOMATION_APPROVAL_POLICY, decideApproval, HarnessError, nowIso, PendingRequests, probeCliVersion, resolveDriverEnv, resumeStringField, SessionResourceRegistry, SingleFlightTurnController, terminate } from "@velum-labs/routekit-harness-core";
 import { z } from "zod";
-import { ClientSideConnection, PROTOCOL_VERSION, ndJsonStream } from "@agentclientprotocol/sdk";
-import { AsyncChannel, HarnessError, DEFAULT_AUTOMATION_APPROVAL_POLICY, PendingRequests, asHarnessError, buildChildEnv, createCachedHarnessDriver, decideApproval, probeCliVersion, resolveDriverEnv, terminate } from "@velum-labs/routekit-harness-core";
 const RESUME_CURSOR_VERSION = 1;
 const DEFAULT_COMMAND = "cursor-agent";
 const AUTH_METHOD_ID = "cursor_login";
@@ -16,9 +16,6 @@ export const cursorDriverConfigSchema = z.object({
     endpoint: z.string().optional(),
     model: z.string().optional()
 });
-function nowIso() {
-    return new Date().toISOString();
-}
 function cursorReasoningEffort(reasoning) {
     if (reasoning === undefined || reasoning.mode === "auto")
         return undefined;
@@ -82,6 +79,7 @@ class CursorSession {
     #turnId;
     #openItems = new Set();
     #stopped = false;
+    #turns = new SingleFlightTurnController();
     constructor(input) {
         this.#child = input.child;
         this.#connection = input.connection;
@@ -108,12 +106,24 @@ class CursorSession {
         switch (update.sessionUpdate) {
             case "agent_message_chunk":
                 if (update.content.type === "text") {
-                    channel.push({ ...base, type: "content.delta", stream: "assistant_text", text: update.content.text, raw });
+                    channel.push({
+                        ...base,
+                        type: "content.delta",
+                        stream: "assistant_text",
+                        text: update.content.text,
+                        raw
+                    });
                 }
                 return;
             case "agent_thought_chunk":
                 if (update.content.type === "text") {
-                    channel.push({ ...base, type: "content.delta", stream: "reasoning_text", text: update.content.text, raw });
+                    channel.push({
+                        ...base,
+                        type: "content.delta",
+                        stream: "reasoning_text",
+                        text: update.content.text,
+                        raw
+                    });
                 }
                 return;
             case "tool_call": {
@@ -215,77 +225,88 @@ class CursorSession {
     async *sendTurn(input) {
         if (this.#stopped)
             throw new HarnessError("session_closed", "cursor session is stopped");
-        const channel = new AsyncChannel();
+        const turn = this.#turns.start(input.signal);
+        const channel = new AsyncChannel({
+            capacity: 256,
+            onConsumerReturn: () => turn.dispose()
+        });
         this.#channel = channel;
         this.#turnId = `${this.#sessionId}:turn:${Date.now()}`;
         const turnId = this.#turnId;
         const base = { kind: this.#kind, sessionId: this.#sessionId, at: nowIso(), turnId };
-        channel.push({ ...base, type: "turn.started" });
-        // An already-aborted turn never reaches the agent: settle it directly so
-        // it cannot resolve as completed off a prompt the agent ignored.
-        if (input.signal?.aborted === true) {
-            channel.push({ ...base, type: "turn.completed", endReason: "aborted" });
-            channel.close();
-            try {
-                yield* channel;
-            }
-            finally {
-                this.#channel = undefined;
-                this.#turnId = undefined;
-            }
-            return;
-        }
-        if (input.reasoning !== undefined &&
-            JSON.stringify(input.reasoning) !== JSON.stringify(this.#reasoning)) {
-            const effort = cursorReasoningEffort(input.reasoning);
-            if (effort !== undefined) {
-                await this.#connection.extMethod("session/set_config_option", {
-                    sessionId: this.#sessionId,
-                    configId: "reasoning",
-                    value: effort
-                });
-            }
-            this.#reasoning = input.reasoning;
-        }
+        let abortAttached = false;
+        let settled = false;
         const onAbort = () => {
             this.#pending.settleAll("cancel");
             void this.#connection.cancel({ sessionId: this.#sessionId }).catch(() => undefined);
         };
-        if (input.signal !== undefined) {
-            input.signal.addEventListener("abort", onAbort, { once: true });
-        }
-        this.#connection
-            .prompt({
-            sessionId: this.#sessionId,
-            prompt: [{ type: "text", text: input.prompt }]
-        })
-            .then((response) => {
-            channel.push({
-                ...base,
-                type: "turn.completed",
-                endReason: response.stopReason === "cancelled" ? "aborted" : "completed",
-                raw: { source: "acp.prompt.response", payload: { stopReason: response.stopReason } }
-            });
-            channel.close();
-        })
-            .catch((error) => {
-            const harnessError = asHarnessError(error);
-            channel.push({
-                ...base,
-                type: "turn.failed",
-                errorCode: harnessError.code,
-                message: harnessError.message
-            });
-            channel.close();
-        });
         try {
+            channel.push({ ...base, type: "turn.started" });
+            // An already-aborted turn never reaches the agent: settle it directly so
+            // it cannot resolve as completed off a prompt the agent ignored.
+            if (turn.signal.aborted) {
+                channel.push({ ...base, type: "turn.completed", endReason: "aborted" });
+                channel.close();
+                yield* channel;
+                turn.complete();
+                return;
+            }
+            if (input.reasoning !== undefined &&
+                JSON.stringify(input.reasoning) !== JSON.stringify(this.#reasoning)) {
+                const effort = cursorReasoningEffort(input.reasoning);
+                if (effort !== undefined) {
+                    await this.#connection.extMethod("session/set_config_option", {
+                        sessionId: this.#sessionId,
+                        configId: "reasoning",
+                        value: effort
+                    });
+                }
+                this.#reasoning = input.reasoning;
+            }
+            turn.signal.addEventListener("abort", onAbort, { once: true });
+            abortAttached = true;
+            this.#connection
+                .prompt({
+                sessionId: this.#sessionId,
+                prompt: [{ type: "text", text: input.prompt }]
+            })
+                .then((response) => {
+                settled = true;
+                channel.push({
+                    ...base,
+                    type: "turn.completed",
+                    endReason: response.stopReason === "cancelled" ? "aborted" : "completed",
+                    raw: { source: "acp.prompt.response", payload: { stopReason: response.stopReason } }
+                });
+                channel.close();
+            })
+                .catch((error) => {
+                settled = true;
+                const harnessError = asHarnessError(error);
+                channel.push({
+                    ...base,
+                    type: "turn.failed",
+                    errorCode: harnessError.code,
+                    message: harnessError.message
+                });
+                channel.close();
+            });
             yield* channel;
         }
         finally {
-            input.signal?.removeEventListener("abort", onAbort);
+            if (abortAttached)
+                turn.signal.removeEventListener("abort", onAbort);
+            if (turn.signal.aborted) {
+                this.#pending.settleAll("cancel");
+                await this.#connection.cancel({ sessionId: this.#sessionId }).catch(() => undefined);
+            }
+            channel.close();
             this.#channel = undefined;
             this.#turnId = undefined;
             this.#openItems.clear();
+            if (settled)
+                turn.complete();
+            turn.dispose();
         }
     }
     async respondToRequest(requestId, decision) {
@@ -294,6 +315,7 @@ class CursorSession {
         }
     }
     async interrupt() {
+        this.#turns.interrupt();
         this.#pending.settleAll("cancel");
         await this.#connection.cancel({ sessionId: this.#sessionId }).catch(() => undefined);
     }
@@ -308,23 +330,21 @@ class CursorSession {
         if (this.#stopped)
             return;
         this.#stopped = true;
+        this.#turns.interrupt(new Error("cursor session stopped"));
         this.#pending.settleAll("cancel");
         this.#channel?.close();
         terminate(this.#child);
     }
 }
 function resumeSessionId(resume) {
-    if (resume === undefined || resume.kind !== "cursor")
-        return undefined;
-    const data = resume.data;
-    return typeof data.sessionId === "string" ? data.sessionId : undefined;
+    return resumeStringField(resume, "cursor", "sessionId");
 }
 class CursorInstance {
     kind = "cursor";
     #config;
     #context;
     #status;
-    #sessions = new Set();
+    #sessions = new SessionResourceRegistry();
     constructor(config, context, status) {
         this.#config = config;
         this.#context = context;
@@ -334,6 +354,7 @@ class CursorInstance {
         return this.#status;
     }
     async startSession(options) {
+        this.#sessions.assertOpen();
         const args = this.#config.endpoint !== undefined ? ["-e", this.#config.endpoint, "acp"] : ["acp"];
         const child = spawn(this.#config.command, args, {
             cwd: options.cwd,
@@ -394,8 +415,7 @@ class CursorInstance {
                 approvalPolicy: options.approvalPolicy ?? DEFAULT_AUTOMATION_APPROVAL_POLICY,
                 reasoning: options.reasoning
             });
-            this.#sessions.add(session);
-            return session;
+            return this.#sessions.manage(session);
         }
         catch (error) {
             terminate(child);
@@ -403,9 +423,7 @@ class CursorInstance {
         }
     }
     async dispose() {
-        for (const session of this.#sessions)
-            await session.stop();
-        this.#sessions.clear();
+        await this.#sessions.dispose();
     }
 }
 /** Probe cursor-agent: version via `cursor-agent --version`. */

package/dist/launch.js

@@ -1,5 +1,5 @@
 import { cursorModelName, EFFORT_QUALIFIED_MODEL_CODEC, effortQualifiedClientModel } from "@velum-labs/routekit-contracts";
-import { normalizeApiBaseUrl } from "@velum-labs/routekit-runtime";
+import { normalizeApiBaseUrl } from "@velum-labs/routekit-runtime/network";
 import { scaffoldCursorSubagents } from "./subagents.js";
 /** Base URL for Cursor's "Override OpenAI Base URL" setting. */
 export function cursorByokBaseUrl(gatewayUrl) {

package/dist/test/driver.test.js

@@ -70,6 +70,28 @@ test("cursor driver forwards effort through the ACP config option", async () =>
         await instance.dispose();
     }
 });
+test("cursor driver releases the turn after reasoning validation fails", async () => {
+    const instance = await driver.createInstance(driver.configSchema.parse({ command: wrapperCommand() }));
+    try {
+        const session = await instance.startSession({ cwd: here });
+        await assert.rejects(async () => {
+            for await (const _event of session.sendTurn({
+                prompt: "invalid override",
+                reasoning: { mode: "budget", budgetTokens: 1024 }
+            })) {
+                // Drain.
+            }
+        }, /cannot represent reasoning mode "budget"/);
+        const events = [];
+        for await (const event of session.sendTurn({ prompt: "valid retry" })) {
+            events.push(event);
+        }
+        assert.equal(events.find((event) => event.type === "turn.completed")?.endReason, "completed");
+    }
+    finally {
+        await instance.dispose();
+    }
+});
 test("cursor driver auto-approves under the automation policy", async () => {
     const instance = await driver.createInstance(driver.configSchema.parse({ command: wrapperCommand() }));
     try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@velum-labs/routekit-tool-cursor",
   "private": false,
-  "version": "0.18.6",
+  "version": "1.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/velum-labs/routekit.git",
@@ -14,6 +14,14 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
+    },
+    "./driver": {
+      "types": "./dist/driver.d.ts",
+      "default": "./dist/driver.js"
+    },
+    "./launch": {
+      "types": "./dist/launch.d.ts",
+      "default": "./dist/launch.js"
     }
   },
   "files": [
@@ -28,10 +36,10 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "0.4.5",
     "zod": "4.4.3",
-    "@velum-labs/routekit-contracts": "0.18.6",
-    "@velum-labs/routekit-harness-core": "0.18.6",
-    "@velum-labs/routekit-runtime": "0.18.6",
-    "@velum-labs/routekit-tools": "0.18.6"
+    "@velum-labs/routekit-contracts": "1.0.0",
+    "@velum-labs/routekit-harness-core": "1.0.0",
+    "@velum-labs/routekit-runtime": "1.0.0",
+    "@velum-labs/routekit-tools": "1.0.0"
   },
   "keywords": [
     "llm",
@@ -41,7 +49,7 @@
     "adapter"
   ],
   "scripts": {
-    "build": "tsc -b",
+    "build": "tsc -p tsconfig.json",
     "clean": "tsc -b --clean",
     "test": "node --test \"dist/test/*.test.js\""
   }