@stablekernel/opencode-cursor 0.6.2-next.0 → 0.7.0-next.0

package/dist/provider/index.js

@@ -6,13 +6,15 @@ import {
   extractSystemText,
   getSessionRecord,
   linkSubagentSession,
+  pluginLog,
   resolveControls,
   resolveCursorApiKey,
   resolveSystemDelivery,
   sendAgentTurnSilently,
   setPreferredTransport,
-  streamAgentTurn
-} from "../chunk-52IYLL6B.js";
+  streamAgentTurn,
+  withSessionLock
+} from "../chunk-COE6ZXMP.js";
 
 // src/provider/index.ts
 import { NoSuchModelError } from "@ai-sdk/provider";
@@ -1166,7 +1168,7 @@ var CursorLanguageModel = class {
   warnOnce(message) {
     if (this.warned.has(message)) return;
     this.warned.add(message);
-    console.warn(`[${this.provider}] ${message}`);
+    pluginLog("warn", message, { provider: this.provider });
   }
   requireApiKey() {
     const apiKey = resolveCursorApiKey(this.config.apiKey);
@@ -1189,9 +1191,10 @@ var CursorLanguageModel = class {
       providerOptions
     );
     if (process.env["OPENCODE_CURSOR_DEBUG"] === "1") {
-      console.error(
-        `[cursor:debug] model=${this.modelId} selection=${JSON.stringify(modelSelection)}`
-      );
+      pluginLog("debug", "model call", {
+        model: this.modelId,
+        selection: modelSelection
+      });
     }
     const sessionID = typeof providerOptions?.["sessionID"] === "string" ? providerOptions["sessionID"] : void 0;
     const dynamicMcp = providerOptions?.["mcpServers"];
@@ -1201,85 +1204,93 @@ var CursorLanguageModel = class {
     const explicitAgentId = typeof providerOptions?.["agentId"] === "string" ? providerOptions["agentId"] : void 0;
     const ephemeral = providerOptions?.["ephemeral"] === true;
     const usePool = sessionEnabled && Boolean(sessionID) && !explicitAgentId;
-    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-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;
+    const {
+      acquired,
+      multiTurns,
+      idempotencyKey,
+      systemMode,
+      baseAcquire,
+      record
+    } = await withSessionLock(usePool ? sessionID : void 0, async () => {
+      let resumeAgentId = explicitAgentId;
+      let poolKey;
+      let record2;
+      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-multi": {
+            const prev = getSessionRecord(sessionID);
+            if (prev?.mcpHash === mcpHash) {
+              resumeAgentId = prev?.agentId;
+            }
+            poolKey = sessionID;
+            record2 = { ...classification.fingerprint, mcpHash };
+            if (classification.kind === "continuation-multi") {
+              multiNewUserCount = classification.newUserCount ?? 0;
+            }
+            break;
           }
-          break;
+          case "new":
+          case "divergence":
+            poolKey = sessionID;
+            record2 = { ...classification.fingerprint, mcpHash };
+            break;
+          case "side-call":
+            break;
+        }
+        if (process.env["OPENCODE_CURSOR_DEBUG"] === "1") {
+          const label = classification.kind === "continuation" ? "resume" : classification.kind === "continuation-multi" ? `resume-multi:${multiNewUserCount}` : `fresh:${classification.kind}`;
+          pluginLog("debug", "turn classification", { label, session: sessionID });
         }
-        case "new":
-        case "divergence":
-          poolKey = sessionID;
-          record = { ...classification.fingerprint, mcpHash };
-          break;
-        case "side-call":
-          break;
-      }
-      if (process.env["OPENCODE_CURSOR_DEBUG"] === "1") {
-        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}`
-        );
       }
-    }
-    let multiTurns;
-    if (multiNewUserCount >= 2) {
-      const turns = trailingUserMessages(options.prompt, multiNewUserCount);
-      if (turns.length === multiNewUserCount) {
-        multiTurns = turns;
-      } else {
-        resumeAgentId = void 0;
+      let multiTurns2;
+      if (multiNewUserCount >= 2) {
+        const turns = trailingUserMessages(options.prompt, multiNewUserCount);
+        if (turns.length === multiNewUserCount) {
+          multiTurns2 = turns;
+        } else {
+          resumeAgentId = void 0;
+        }
       }
-    }
-    const latestUser = latestUserMessage(options.prompt);
-    const idempotencyKey = sendIdempotencyKey(
-      sessionID,
-      record,
-      latestUser?.text ?? JSON.stringify(options.prompt)
-    );
-    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,
-      ...settingSources ? { settingSources } : {},
-      ...this.config.sandbox !== void 0 ? { sandbox: this.config.sandbox } : {},
-      ...this.config.autoReview !== void 0 ? { autoReview: this.config.autoReview } : {},
-      ...mcpServers ? { mcpServers } : {},
-      ...this.config.agents ? { agents: this.config.agents } : {},
-      ...poolKey ? { name: `opencode/${sessionID.slice(-8)}` } : {},
-      ...poolKey ? { poolKey } : {},
-      ...record ? { record } : {}
-    };
-    const acquired = await acquireAgent({
-      ...baseAcquire,
-      ...resumeAgentId ? { resumeAgentId } : {}
+      const latestUser = latestUserMessage(options.prompt);
+      const idempotencyKey2 = sendIdempotencyKey(
+        sessionID,
+        record2,
+        latestUser?.text ?? JSON.stringify(options.prompt)
+      );
+      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 systemMode2 = delivery.mode;
+      const settingSources = delivery.settingSources;
+      const baseAcquire2 = {
+        apiKey: this.requireApiKey(),
+        modelSelection,
+        mode,
+        cwd: this.config.cwd,
+        ...settingSources ? { settingSources } : {},
+        ...this.config.sandbox !== void 0 ? { sandbox: this.config.sandbox } : {},
+        ...this.config.autoReview !== void 0 ? { autoReview: this.config.autoReview } : {},
+        ...mcpServers ? { mcpServers } : {},
+        ...this.config.agents ? { agents: this.config.agents } : {},
+        ...poolKey ? { name: `opencode/${sessionID.slice(-8)}` } : {},
+        ...poolKey ? { poolKey } : {},
+        ...record2 ? { record: record2 } : {}
+      };
+      const acquired2 = await acquireAgent({
+        ...baseAcquire2,
+        ...resumeAgentId ? { resumeAgentId } : {}
+      });
+      return { acquired: acquired2, multiTurns: multiTurns2, idempotencyKey: idempotencyKey2, systemMode: systemMode2, baseAcquire: baseAcquire2, record: record2 };
     });
     let yielded = false;
     let releasedOriginal = false;
@@ -1358,23 +1369,26 @@ var CursorLanguageModel = class {
           const replayable = classified.kind === "agent-not-found" || classified.kind === "rate-limit" || classified.kind === "network" || classified.kind === "unknown";
           if (replayable && 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"
+              pluginLog(
+                "debug",
+                "resumed turn failed before emitting; retrying with a fresh agent"
               );
             }
             acquired.release();
             releasedOriginal = true;
             let retry;
             try {
-              retry = await acquireAgent({ ...baseAcquire });
+              retry = await withSessionLock(
+                usePool ? sessionID : void 0,
+                () => 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
-                );
+                pluginLog("debug", "original resume failure (not attachable as cause)", {
+                  error: err instanceof Error ? err.message : String(err)
+                });
               }
               throw retryErr;
             }