@stablekernel/opencode-cursor 0.4.4 → 0.4.5-next.0

package/dist/provider/index.js

@@ -1,10 +1,14 @@
 import {
   acquireAgent,
+  dropSessionRecord,
+  extractSystemText,
   getSessionRecord,
   resolveControls,
   resolveCursorApiKey,
+  resolveSystemDelivery,
+  sendAgentTurnSilently,
   streamAgentTurn
-} from "../chunk-KGDYXGZL.js";
+} from "../chunk-734L3SKU.js";
 
 // src/provider/index.ts
 import { NoSuchModelError } from "@ai-sdk/provider";
@@ -13,6 +17,7 @@ import { NoSuchModelError } from "@ai-sdk/provider";
 import { LoadAPIKeyError } from "@ai-sdk/provider";
 
 // src/provider/message-map.ts
+import { fileURLToPath } from "url";
 var TOOL_RESULT_CAP = 2e3;
 var TOOL_ARGS_CAP = 500;
 function stringify(value) {
@@ -26,25 +31,21 @@ function stringify(value) {
 function truncate(text, cap) {
   return text.length > cap ? `${text.slice(0, cap)}\u2026[+${text.length - cap} chars]` : text;
 }
-function promptToCursorMessage(prompt) {
+function promptToCursorMessage(prompt, systemPrompt = "rules") {
   const lines = [];
-  const images = [];
-  prompt.forEach((message, index) => {
-    const isLast = index === prompt.length - 1;
+  prompt.forEach((message) => {
     switch (message.role) {
       case "system":
-        lines.push(`# System
+        if (systemPrompt === "message") {
+          lines.push(`# System
 ${message.content}`);
+        }
         break;
       case "user": {
         const text = [];
         for (const part of message.content) {
           if (part.type === "text") text.push(part.text);
-          else if (part.type === "file" && part.mediaType.startsWith("image/")) {
-            const image = fileToImage(part.data, part.mediaType);
-            if (isLast && image) images.push(image);
-            text.push("[image attached]");
-          }
+          else if (part.type === "file") text.push(fileNote(part));
         }
         lines.push(`# User
 ${text.join("\n")}`);
@@ -82,37 +83,49 @@ ${truncate(stringify(part.output), TOOL_RESULT_CAP)}`
       }
     }
   });
-  const out = { text: lines.join("\n\n") };
-  if (images.length > 0) out.images = images;
-  return out;
+  return { text: lines.join("\n\n") };
+}
+function fileNote(part) {
+  const name = part.filename ?? describeSource(part.data) ?? "file";
+  return `[attached file: ${name} (${part.mediaType}) \u2014 not forwarded to Cursor]`;
 }
-function fileToImage(data, mediaType) {
-  if (data instanceof URL) return { url: data.toString() };
-  if (typeof data === "string") {
-    if (/^https?:\/\//i.test(data)) return { url: data };
-    return { data, mimeType: mediaType };
+var URL_SCHEME = /^[a-z][a-z0-9+.-]*:\/\//i;
+function describeSource(data) {
+  if (data instanceof URL)
+    return data.protocol === "file:" ? fileUrlToPath(data) : data.href;
+  if (typeof data === "string" && URL_SCHEME.test(data))
+    return data.startsWith("file://") ? fileUrlToPath(data) : data;
+  return void 0;
+}
+function fileUrlToPath(url) {
+  try {
+    return fileURLToPath(url);
+  } catch {
+    return typeof url === "string" ? url : url.href;
   }
-  if (data instanceof Uint8Array) {
-    return { data: Buffer.from(data).toString("base64"), mimeType: mediaType };
+}
+function userTurnToCursorMessage(message) {
+  const text = [];
+  for (const part of message.content) {
+    if (part.type === "text") text.push(part.text);
+    else if (part.type === "file") text.push(fileNote(part));
   }
-  return void 0;
+  return { text: text.join("\n") };
 }
 function latestUserMessage(prompt) {
   const last = prompt[prompt.length - 1];
   if (!last || last.role !== "user") return void 0;
-  const text = [];
-  const images = [];
-  for (const part of last.content) {
-    if (part.type === "text") text.push(part.text);
-    else if (part.type === "file" && part.mediaType.startsWith("image/")) {
-      const image = fileToImage(part.data, part.mediaType);
-      if (image) images.push(image);
-      text.push("[image attached]");
-    }
+  return userTurnToCursorMessage(last);
+}
+function trailingUserMessages(prompt, count) {
+  if (count <= 0) return [];
+  const collected = [];
+  for (let i = prompt.length - 1; i >= 0 && collected.length < count; i--) {
+    const message = prompt[i];
+    if (!message || message.role !== "user") break;
+    collected.push(userTurnToCursorMessage(message));
   }
-  const out = { text: text.join("\n") };
-  if (images.length > 0) out.images = images;
-  return out;
+  return collected.reverse();
 }
 
 // src/provider/stream-map.ts
@@ -954,9 +967,14 @@ function classifyTurn(prev, prompt) {
   if (prev.systemHash !== fp.systemHash)
     return { kind: "side-call", fingerprint: fp };
   const lastIsUser = prompt[prompt.length - 1]?.role === "user";
-  const exactlyOneNew = fp.userHashes.length === prev.userHashes.length + 1;
-  if (lastIsUser && exactlyOneNew && isStrictPrefix(prev.userHashes, fp.userHashes)) {
-    return { kind: "continuation", fingerprint: fp };
+  const newUserCount = fp.userHashes.length - prev.userHashes.length;
+  const isPrefix = isStrictPrefix(prev.userHashes, fp.userHashes);
+  if (lastIsUser && isPrefix && newUserCount === 1) {
+    return { kind: "continuation", fingerprint: fp, newUserCount: 1 };
+  }
+  const tailContiguous = newUserCount >= 2 && prompt.length >= newUserCount && prompt.slice(prompt.length - newUserCount).every((m) => m.role === "user");
+  if (lastIsUser && isPrefix && tailContiguous) {
+    return { kind: "continuation-multi", fingerprint: fp, newUserCount };
   }
   return { kind: "divergence", fingerprint: fp };
 }
@@ -972,8 +990,17 @@ var CursorLanguageModel = class {
   specificationVersion = "v3";
   modelId;
   provider;
-  // Images are passed inline as base64 data, so no URLs are fetched natively.
+  // The local Cursor agent has no attachment channel, so file parts (images,
+  // directories, other media) are noted as text in message-map rather than
+  // fetched or attached; no URLs are resolved natively.
   supportedUrls = {};
+  /** Messages already emitted, so degradation warnings fire once, not per turn. */
+  warned = /* @__PURE__ */ new Set();
+  warnOnce(message) {
+    if (this.warned.has(message)) return;
+    this.warned.add(message);
+    console.warn(`[${this.provider}] ${message}`);
+  }
   requireApiKey() {
     const apiKey = resolveCursorApiKey(this.config.apiKey);
     if (!apiKey) {
@@ -1001,19 +1028,24 @@ var CursorLanguageModel = class {
     let resumeAgentId = explicitAgentId;
     let poolKey;
     let record;
+    let multiNewUserCount = 0;
     if (usePool) {
       const classification = ephemeral ? {
         kind: "side-call",
         fingerprint: fingerprint(options.prompt)
       } : classifyTurn(getSessionRecord(sessionID), options.prompt);
       switch (classification.kind) {
-        case "continuation": {
+        case "continuation":
+        case "continuation-multi": {
           const prev = getSessionRecord(sessionID);
           if (prev?.mcpHash === mcpHash) {
             resumeAgentId = prev?.agentId;
           }
           poolKey = sessionID;
           record = { ...classification.fingerprint, mcpHash };
+          if (classification.kind === "continuation-multi") {
+            multiNewUserCount = classification.newUserCount ?? 0;
+          }
           break;
         }
         case "new":
@@ -1025,34 +1057,127 @@ var CursorLanguageModel = class {
           break;
       }
       if (process.env["OPENCODE_CURSOR_DEBUG"] === "1") {
-        const label = classification.kind === "continuation" ? "resume" : `fresh:${classification.kind}`;
+        const label = classification.kind === "continuation" ? "resume" : classification.kind === "continuation-multi" ? `resume-multi:${multiNewUserCount}` : `fresh:${classification.kind}`;
         console.error(
           `[cursor:debug] turn classification=${label} session=${sessionID}`
         );
       }
     }
-    const acquired = await acquireAgent({
+    let multiTurns;
+    if (multiNewUserCount >= 2) {
+      const turns = trailingUserMessages(options.prompt, multiNewUserCount);
+      if (turns.length === multiNewUserCount) {
+        multiTurns = turns;
+      } else {
+        resumeAgentId = void 0;
+      }
+    }
+    const delivery = resolveSystemDelivery({
+      mode: this.config.systemPrompt ?? "rules",
+      settingSources: this.config.settingSources,
+      cwd: this.config.cwd,
+      systemText: extractSystemText(options.prompt),
+      warn: (message) => this.warnOnce(message)
+    });
+    const systemMode = delivery.mode;
+    const settingSources = delivery.settingSources;
+    const baseAcquire = {
       apiKey: this.requireApiKey(),
       modelSelection,
       mode,
       cwd: this.config.cwd,
-      ...this.config.settingSources ? { settingSources: this.config.settingSources } : {},
+      ...settingSources ? { settingSources } : {},
       ...this.config.sandbox !== void 0 ? { sandbox: this.config.sandbox } : {},
       ...mcpServers ? { mcpServers } : {},
       ...this.config.agents ? { agents: this.config.agents } : {},
       ...poolKey ? { name: `opencode/${sessionID.slice(-8)}` } : {},
-      ...resumeAgentId ? { resumeAgentId } : {},
       ...poolKey ? { poolKey } : {},
       ...record ? { record } : {}
+    };
+    const acquired = await acquireAgent({
+      ...baseAcquire,
+      ...resumeAgentId ? { resumeAgentId } : {}
     });
-    const message = acquired.resumed ? latestUserMessage(options.prompt) ?? promptToCursorMessage(options.prompt) : promptToCursorMessage(options.prompt);
+    let yielded = false;
+    let releasedOriginal = false;
     try {
-      yield* streamAgentTurn(acquired.agent, message, {
-        mode,
-        abortSignal: options.abortSignal
-      });
+      if (acquired.resumed && multiTurns) {
+        let delivered = false;
+        try {
+          let aborted = false;
+          for (let i = 0; i < multiTurns.length - 1; i++) {
+            if (options.abortSignal?.aborted) {
+              aborted = true;
+              break;
+            }
+            await sendAgentTurnSilently(acquired.agent, multiTurns[i], {
+              mode,
+              abortSignal: options.abortSignal
+            });
+          }
+          if (!aborted && !options.abortSignal?.aborted) {
+            for await (const event of streamAgentTurn(
+              acquired.agent,
+              multiTurns[multiTurns.length - 1],
+              { mode, abortSignal: options.abortSignal }
+            )) {
+              yielded = true;
+              yield event;
+            }
+            delivered = true;
+          }
+        } finally {
+          if (!delivered && sessionID) dropSessionRecord(sessionID);
+        }
+      } else {
+        const message = acquired.resumed ? latestUserMessage(options.prompt) ?? promptToCursorMessage(options.prompt, systemMode) : promptToCursorMessage(options.prompt, systemMode);
+        try {
+          for await (const event of streamAgentTurn(acquired.agent, message, {
+            mode,
+            abortSignal: options.abortSignal
+          })) {
+            yielded = true;
+            yield event;
+          }
+        } catch (err) {
+          if (acquired.resumed && !yielded && !options.abortSignal?.aborted) {
+            if (process.env["OPENCODE_CURSOR_DEBUG"] === "1") {
+              console.error(
+                "[cursor:debug] resumed turn failed before emitting; retrying with a fresh agent"
+              );
+            }
+            acquired.release();
+            releasedOriginal = true;
+            let retry;
+            try {
+              retry = await acquireAgent({ ...baseAcquire });
+            } catch (retryErr) {
+              if (retryErr instanceof Error && retryErr.cause === void 0) {
+                retryErr.cause = err;
+              } else if (process.env["OPENCODE_CURSOR_DEBUG"] === "1") {
+                console.error(
+                  "[cursor:debug] original resume failure (not attachable as cause):",
+                  err
+                );
+              }
+              throw retryErr;
+            }
+            try {
+              const replay = promptToCursorMessage(options.prompt, systemMode);
+              yield* streamAgentTurn(retry.agent, replay, {
+                mode,
+                abortSignal: options.abortSignal
+              });
+            } finally {
+              retry.release();
+            }
+          } else {
+            throw err;
+          }
+        }
+      }
     } finally {
-      acquired.release();
+      if (!releasedOriginal) acquired.release();
     }
   }
   async doStream(options) {
@@ -1086,7 +1211,8 @@ function createCursor(options = {}) {
     ...options.sandbox !== void 0 ? { sandbox: options.sandbox } : {},
     ...options.agents ? { agents: options.agents } : {},
     session: options.session ?? "auto",
-    toolDisplay: options.toolDisplay ?? "blocks"
+    toolDisplay: options.toolDisplay ?? "blocks",
+    systemPrompt: options.systemPrompt ?? "rules"
   };
   const notImplemented = (kind, modelId) => {
     throw new NoSuchModelError({