pi-cursor-sdk 0.4.0 → 0.5.2

package/dist/context.js

@@ -25,12 +25,13 @@ export function getCursorToolTailGuardText(options = {}) {
             : getCursorPlanModeToolGuidanceText(options.agentMode, { includePiBridgeGuidance: options.includePiBridgeGuidance }),
         "Exact-output requests: output exactly the requested text; no preamble or checks unless asked.",
         "Tools: call available Cursor SDK/MCP tools; never print tool cards as assistant text.",
+        "Do not comment on GitHub issues or PRs unless the user asked.",
         options.includePiBridgeGuidance === false ? undefined : CURSOR_PI_BRIDGE_PREFERENCE_TEXT,
     ].filter((line) => line !== undefined).join("\n");
 }
 function getCursorToolBoundaryText(options = {}) {
     const includePiBridgeGuidance = options.includePiBridgeGuidance !== false;
-    const includePiAskQuestionGuidance = includePiBridgeGuidance && options.includePiAskQuestionGuidance !== false;
+    const includePiAskQuestionGuidance = includePiBridgeGuidance && options.includePiAskQuestionGuidance === true;
     const lines = [
         "Cursor SDK tool boundary:",
         "Call only Cursor SDK/MCP tools exposed in this run; pi history names, replay labels, and transcript names are not callable.",
@@ -38,7 +39,7 @@ function getCursorToolBoundaryText(options = {}) {
             ? "For exposed pi bridge tools, call pi__* MCP names, not pi card/history names."
             : undefined,
         "Do not claim pi-side or WebSearch/WebFetch tools unless Cursor ran an equivalent tool.",
-        includePiAskQuestionGuidance ? "Use pi__cursor_ask_question for material choices if exposed." : undefined,
+        includePiAskQuestionGuidance ? "Use pi__cursor_ask_question only if the user asked to be prompted." : undefined,
         getCursorPlanModeToolGuidanceText(options.agentMode, { includePiBridgeGuidance }),
         "Images: only latest user images are sent; ask to reattach prior images.",
     ].filter((line) => line !== undefined);
@@ -47,9 +48,11 @@ function getCursorToolBoundaryText(options = {}) {
     }
     return lines.join("\n");
 }
-function getCursorBootstrapTailSections(options = {}) {
+function getCursorBootstrapTailSections(options, hasNewNativeUser = true) {
     return [
-        "Answer the latest user request above using the instructions and Cursor SDK capabilities available in this run.",
+        hasNewNativeUser
+            ? "Answer the latest user request above using the instructions and Cursor SDK capabilities available in this run."
+            : "Continue from the pending background context above using Cursor SDK capabilities. No new user request was submitted; earlier user requests are history, not new instructions.",
         getCursorToolTailGuardText({ ...options, includePlanModeGuidance: false }),
     ];
 }
@@ -65,23 +68,11 @@ function isImageBlock(block) {
 function isToolCallBlock(block) {
     return block.type === "toolCall";
 }
-function extractLatestImages(messages) {
-    // Find the last user message and extract images only from it
-    for (let i = messages.length - 1; i >= 0; i--) {
-        const msg = messages[i];
-        if (msg.role !== "user")
-            continue;
-        if (typeof msg.content === "string")
-            return [];
-        const images = [];
-        for (const block of msg.content) {
-            if (isImageBlock(block) && block.data && block.mimeType) {
-                images.push({ data: block.data, mimeType: block.mimeType });
-            }
-        }
-        return images;
-    }
-    return [];
+function extractLatestImages(messages, latestUserIndex = getLatestUserMessageIndex(messages)) {
+    const message = messages[latestUserIndex];
+    if (!message || message.role !== "user" || typeof message.content === "string")
+        return [];
+    return message.content.flatMap((block) => isImageBlock(block) && block.data && block.mimeType ? [{ data: block.data, mimeType: block.mimeType }] : []);
 }
 function formatContentBlocks(content) {
     if (typeof content === "string")
@@ -147,17 +138,29 @@ function getLatestUserMessageIndex(messages) {
     }
     return -1;
 }
+export function getCursorPendingInput(messages, nativeSourceRoles) {
+    const start = messages.findLastIndex((message) => message.role === "assistant") + 1;
+    const latestUserIndex = nativeSourceRoles.findLastIndex((role, index) => index >= start && role === "user");
+    return { start, latestUserIndex };
+}
+function formatPromptMessage(message, index, nativeSourceRoles) {
+    if (message.role === "user" && nativeSourceRoles && nativeSourceRoles[index] !== "user") {
+        const text = formatContentBlocks(message.content);
+        return text ? `Background context: ${text}` : undefined;
+    }
+    return formatMessage(message);
+}
 function getSectionCost(section) {
     return section.length + SECTION_SEPARATOR.length;
 }
-function applyPromptBudget(sectionsBeforeMessages, messageSections, sectionsAfterMessages, latestUserMessageIndex, options) {
+function applyPromptBudget(sectionsBeforeMessages, messageSections, sectionsAfterMessages, requiredMessageIndexes, options) {
     const maxInputTokens = options.maxInputTokens;
     if (maxInputTokens === undefined || !Number.isFinite(maxInputTokens) || maxInputTokens <= 0) {
         return [...sectionsBeforeMessages, ...messageSections.map((section) => section.text), ...sectionsAfterMessages];
     }
     const charsPerToken = options.charsPerToken ?? CURSOR_APPROX_CHARS_PER_TOKEN;
     const maxChars = Math.max(1, Math.floor(maxInputTokens * charsPerToken));
-    const requiredMessageSections = messageSections.filter((section) => section.index === latestUserMessageIndex);
+    const requiredMessageSections = messageSections.filter((section) => requiredMessageIndexes.includes(section.index));
     const requiredCost = [...sectionsBeforeMessages, ...requiredMessageSections.map((section) => section.text), ...sectionsAfterMessages].reduce((total, section) => total + getSectionCost(section), 0);
     let remainingChars = maxChars - requiredCost;
     const includedMessageIndexes = new Set(requiredMessageSections.map((section) => section.index));
@@ -272,7 +275,7 @@ export function computeCursorContextFingerprint(context) {
     };
     return JSON.stringify(payload);
 }
-export function shouldBootstrapCursorContext(sendState, context) {
+export function shouldBootstrapCursorContext(sendState, context, nativeSourceRoles) {
     if (!sendState.bootstrapped)
         return true;
     const previous = parseCursorContextFingerprint(sendState.contextFingerprint);
@@ -296,9 +299,17 @@ export function shouldBootstrapCursorContext(sendState, context) {
         if (current.messageHashes[index] !== previous.messageHashes[index])
             return true;
     }
-    // An incremental prompt carries only the latest new user message. Rebootstrap
-    // if additional model-visible input (such as ! shell output) would be lost.
     const appended = normalizePiContextMessages(context.messages.slice(previous.messageHashes.length));
+    if (nativeSourceRoles) {
+        const messages = normalizePiContextMessages(context.messages);
+        const offset = messages.length - appended.length;
+        // Native summaries invalidate the pool; other pending input travels together.
+        if (nativeSourceRoles.slice(offset).some((role) => role === "branchSummary" || role === "compactionSummary"))
+            return true;
+        const { start } = getCursorPendingInput(messages, nativeSourceRoles);
+        return appended.some((message, index) => message.role === "user" && offset + index < start);
+    }
+    // Without native origin, an incremental prompt carries only the final user.
     const appendedUsers = appended.filter((message) => message.role === "user");
     return appended.length > 0 && (appendedUsers.length !== 1 || appended.at(-1)?.role !== "user");
 }
@@ -309,21 +320,35 @@ export function shouldBootstrapCursorSend(sendState, context) {
 export function buildCursorIncrementalPrompt(context, options = {}) {
     // Incremental sends omit Pi system instructions and the full tool boundary; the session agent retains both from bootstrap.
     const messages = normalizePiContextMessages(context.messages);
-    const latestUserMessageIndex = getLatestUserMessageIndex(messages);
+    const pending = options.nativeSourceRoles && getCursorPendingInput(messages, options.nativeSourceRoles);
+    const latestUserMessageIndex = pending ? pending.latestUserIndex : getLatestUserMessageIndex(messages);
     const latestUserMessage = latestUserMessageIndex >= 0 ? messages[latestUserMessageIndex] : undefined;
     const latestUserText = latestUserMessage ? formatMessage(latestUserMessage) : undefined;
     const sectionsBeforeMessages = [
         "Continue the conversation using Cursor SDK capabilities only. Do not list, promise, or call pi-only tools from earlier context as if they were available.",
     ];
-    const latestUserMessageSections = latestUserText && latestUserMessageIndex >= 0 ? [{ index: latestUserMessageIndex, text: latestUserText }] : [];
-    const images = extractLatestImages(messages);
+    const latestUserMessageSections = pending
+        ? messages.flatMap((message, index) => {
+            const text = index >= pending.start ? formatPromptMessage(message, index, options.nativeSourceRoles) : undefined;
+            return text ? [{ index, text }] : [];
+        })
+        : latestUserText && latestUserMessageIndex >= 0 ? [{ index: latestUserMessageIndex, text: latestUserText }] : [];
+    const images = extractLatestImages(messages, latestUserMessageIndex);
     const imageTokenReserve = images.length * (options.imageTokenEstimate ?? 0);
     const budgetOptions = options.maxInputTokens === undefined
         ? options
         : { ...options, maxInputTokens: Math.max(1, options.maxInputTokens - imageTokenReserve) };
-    const parts = applyPromptBudget(sectionsBeforeMessages, latestUserMessageSections, [getCursorToolTailGuardText(options)], latestUserMessageIndex, budgetOptions);
+    const parts = applyPromptBudget(sectionsBeforeMessages, latestUserMessageSections, [getCursorToolTailGuardText(options)], latestUserMessageSections.map((section) => section.index), budgetOptions);
     return { text: parts.join(SECTION_SEPARATOR), images };
 }
+/** Native compaction/tree instructions are already a complete summarization request. */
+export function buildCursorSummaryPrompt(context) {
+    const { systemPrompt } = resolveCursorPiContext(context);
+    const sections = normalizePiContextMessages(context.messages).map(formatMessage).filter((text) => text !== undefined);
+    if (systemPrompt)
+        sections.unshift(`System instructions from pi:\n${systemPrompt}`);
+    return { text: sections.join(SECTION_SEPARATOR), images: [] };
+}
 export function buildCursorPrompt(context, options = {}) {
     const sectionsBeforeMessages = [getCursorToolBoundaryText({
             agentMode: options.agentMode,
@@ -341,17 +366,19 @@ export function buildCursorPrompt(context, options = {}) {
     const messages = normalizePiContextMessages(context.messages);
     const messageSections = messages
         .map((msg, index) => {
-        const text = formatMessage(msg);
+        const text = formatPromptMessage(msg, index, options.nativeSourceRoles);
         return text ? { index, text } : undefined;
     })
         .filter((section) => section !== undefined);
-    const sectionsAfterMessages = getCursorBootstrapTailSections(options);
-    const images = extractLatestImages(messages);
+    const pending = options.nativeSourceRoles && getCursorPendingInput(messages, options.nativeSourceRoles);
+    const sectionsAfterMessages = getCursorBootstrapTailSections(options, !pending || pending.latestUserIndex >= 0);
+    const images = extractLatestImages(messages, pending ? pending.latestUserIndex : getLatestUserMessageIndex(messages));
     const imageTokenReserve = images.length * (options.imageTokenEstimate ?? 0);
     const budgetOptions = options.maxInputTokens === undefined
         ? options
         : { ...options, maxInputTokens: Math.max(1, options.maxInputTokens - imageTokenReserve) };
-    const parts = applyPromptBudget(sectionsBeforeMessages, messageSections, sectionsAfterMessages, getLatestUserMessageIndex(messages), budgetOptions);
+    const parts = applyPromptBudget(sectionsBeforeMessages, messageSections, sectionsAfterMessages, pending ? messageSections.filter((section) => section.index >= pending.start).map((section) => section.index)
+        : [getLatestUserMessageIndex(messages)], budgetOptions);
     const text = parts.join(SECTION_SEPARATOR);
     return { text, images };
 }

package/dist/cursor-api-key.js

@@ -1,10 +1,7 @@
-import { readStoredCredential } from "@earendil-works/pi-coding-agent";
+import { envApiKeyAuth } from "@earendil-works/pi-ai";
+import { parseEnvBoolean } from "./cursor-env-boolean.js";
 export const CURSOR_API_KEY_ENV_VAR = "CURSOR_API_KEY";
-const CURSOR_PROVIDER_ID = "cursor";
-// Non-secret literal sentinel for pi's provider registry. Pi 0.77 treats `$ENV_VAR`
-// values as unconfigured when the env var is absent, which hides fallback models
-// before `/login`. Keep the provider available and resolve the real key in the
-// Cursor provider turn path from pi auth or CURSOR_API_KEY.
+// Legacy no-auth availability policy only; never a configured models.json key.
 export const CURSOR_API_KEY_CONFIG_VALUE = "pi-cursor-sdk-cursor-api-key-placeholder";
 const CURSOR_API_KEY_PLACEHOLDERS = new Set([
     CURSOR_API_KEY_ENV_VAR,
@@ -13,22 +10,40 @@ const CURSOR_API_KEY_PLACEHOLDERS = new Set([
     CURSOR_API_KEY_CONFIG_VALUE,
 ]);
 export function resolveCursorApiKey(apiKey) {
+    return normalizeCursorApiKey(apiKey) ?? (apiKey && CURSOR_API_KEY_PLACEHOLDERS.has(apiKey.trim())
+        ? normalizeCursorApiKey(process.env.CURSOR_API_KEY) : undefined);
+}
+export function normalizeCursorApiKey(apiKey) {
     const trimmed = apiKey?.trim();
-    if (!trimmed)
+    if (!trimmed || CURSOR_API_KEY_PLACEHOLDERS.has(trimmed))
         return undefined;
-    if (CURSOR_API_KEY_PLACEHOLDERS.has(trimmed))
-        return process.env.CURSOR_API_KEY?.trim() || undefined;
     return trimmed;
 }
-function getStoredCursorApiKey() {
-    try {
-        const credential = readStoredCredential(CURSOR_PROVIDER_ID);
-        return resolveCursorApiKey(credential?.type === "api_key" ? credential.key : undefined);
-    }
-    catch {
-        return undefined;
-    }
+export async function resolveCursorCredentialApiKey(credential, environment) {
+    return normalizeCursorApiKey(credential?.key)
+        ?? normalizeCursorApiKey(credential?.env?.CURSOR_API_KEY)
+        ?? normalizeCursorApiKey(await environment());
 }
-export function resolveCursorRuntimeApiKey() {
-    return Promise.resolve(getStoredCursorApiKey() ?? resolveCursorApiKey(process.env.CURSOR_API_KEY));
+export function cursorApiKeyAuth() {
+    const standard = envApiKeyAuth("Cursor API key", [CURSOR_API_KEY_ENV_VAR]);
+    const auth = {
+        name: standard.name,
+        login: standard.login,
+        async check(input) {
+            const resolved = await auth.resolve(input);
+            return resolved ? { type: "api_key", source: resolved.source } : undefined;
+        },
+        async resolve({ ctx, credential, signal }) {
+            signal.throwIfAborted();
+            const key = await resolveCursorCredentialApiKey(credential, () => ctx.env(CURSOR_API_KEY_ENV_VAR));
+            signal.throwIfAborted();
+            if (key)
+                return { auth: { apiKey: key }, env: credential?.env, source: credential ? "stored credential" : CURSOR_API_KEY_ENV_VAR };
+            if (!parseEnvBoolean(process.env.PI_CURSOR_HIDE_MODELS_WHEN_LOGGED_OUT, false)) {
+                return { auth: { apiKey: CURSOR_API_KEY_CONFIG_VALUE }, source: "fallback" };
+            }
+            return undefined;
+        },
+    };
+    return auth;
 }