pi-cursor-sdk 0.1.39 → 0.1.41

package/src/cursor-question-tool.ts

@@ -1,6 +1,7 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
+import { arePiToolsDisabled } from "./cursor-active-tools.js";
 import { isCursorModel } from "./cursor-model.js";
 import { registerCursorModelLifecycle, type CursorModelLifecycleExtensionApi } from "./cursor-model-lifecycle.js";
 import { resolveCursorPiToolBridgeEnabled } from "./cursor-pi-tool-bridge-env.js";
@@ -175,7 +176,7 @@ async function askOneQuestion(question: CursorQuestion, ctx: { ui: ExtensionCont
 
 function syncCursorQuestionToolForModel(pi: Pick<ExtensionAPI, "getActiveTools" | "setActiveTools">, model: ExtensionContext["model"]): void {
 	const activeToolNames = new Set(pi.getActiveTools());
-	const shouldBeActive = isCursorModel(model) && resolveCursorPiToolBridgeEnabled();
+	const shouldBeActive = !arePiToolsDisabled(pi) && isCursorModel(model) && resolveCursorPiToolBridgeEnabled();
 	const alreadyActive = activeToolNames.has(CURSOR_ASK_QUESTION_TOOL_NAME);
 	if (shouldBeActive === alreadyActive) return;
 	if (shouldBeActive) {

package/src/cursor-sdk-event-debug.ts

@@ -78,12 +78,14 @@ export interface CursorSdkEventDebugSendMeta {
 
 export interface CursorSdkEventDebugRunMeta {
 	runId: string;
+	requestId?: string;
 	agentId: string;
 	status: string;
 }
 
 interface CursorSdkRunLike {
 	id: string;
+	requestId?: string;
 	agentId?: string;
 	status?: string;
 	stream?: () => AsyncIterable<unknown>;
@@ -373,7 +375,7 @@ export class CursorSdkEventDebugSink {
 	attachRunStream(run: unknown): void {
 		const sdkRun = run as CursorSdkRunLike;
 		if (typeof sdkRun.stream !== "function") {
-			this.recordProviderEvent("run_stream_unavailable", { runId: sdkRun.id });
+			this.recordProviderEvent("run_stream_unavailable", { runId: sdkRun.id, requestId: sdkRun.requestId });
 			return;
 		}
 		this.streamCapturePromise = (async () => {

package/src/cursor-setting-sources.ts

@@ -2,10 +2,12 @@ import type { SettingSource } from "@cursor/sdk";
 /** Provider-facing wrapper; canonical parsing lives in shared/cursor-setting-sources.mjs. */
 import {
 	CURSOR_SETTING_SOURCES_ENV as CURSOR_SETTING_SOURCES_ENV_JS,
+	DEFAULT_CURSOR_SETTING_SOURCES as DEFAULT_CURSOR_SETTING_SOURCES_JS,
 	resolveCursorSettingSources as resolveCursorSettingSourcesJs,
 } from "../shared/cursor-setting-sources.mjs";
 
 export const CURSOR_SETTING_SOURCES_ENV = CURSOR_SETTING_SOURCES_ENV_JS;
+export const DEFAULT_CURSOR_SETTING_SOURCES = DEFAULT_CURSOR_SETTING_SOURCES_JS as readonly SettingSource[];
 
 export function resolveCursorSettingSources(raw?: string): SettingSource[] | undefined {
 	return resolveCursorSettingSourcesJs(raw) as SettingSource[] | undefined;

package/src/cursor-skill-tool.ts

@@ -8,6 +8,7 @@ import type {
 	Skill,
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
+import { arePiToolsDisabled } from "./cursor-active-tools.js";
 import { isCursorModel } from "./cursor-model.js";
 import { registerCursorModelLifecycle, type CursorModelLifecycleExtensionApi } from "./cursor-model-lifecycle.js";
 import { resolveCursorPiToolBridgeEnabled } from "./cursor-pi-tool-bridge-env.js";
@@ -62,7 +63,7 @@ function shouldExposeSkillTool(model: ExtensionContext["model"]): boolean {
 
 function syncCursorSkillToolForModel(pi: Pick<ExtensionAPI, "getActiveTools" | "setActiveTools">, model: ExtensionContext["model"]): void {
 	const activeToolNames = new Set(pi.getActiveTools());
-	const shouldBeActive = shouldExposeSkillTool(model);
+	const shouldBeActive = !arePiToolsDisabled(pi) && shouldExposeSkillTool(model);
 	const alreadyActive = activeToolNames.has(CURSOR_ACTIVATE_SKILL_TOOL_NAME);
 	if (shouldBeActive === alreadyActive) return;
 	if (shouldBeActive) {

package/src/cursor-state.ts

@@ -15,6 +15,7 @@ import {
 } from "./cursor-pi-tool-bridge-snapshot.js";
 import {
 	CURSOR_SETTING_SOURCES_ENV,
+	DEFAULT_CURSOR_SETTING_SOURCES,
 	resolveCursorSettingSources,
 } from "./cursor-setting-sources.js";
 import { isCursorModel } from "./cursor-model.js";
@@ -298,7 +299,7 @@ function notifyInvalidCursorModeIfCursorActive(ctx: Pick<ExtensionContext, "hasU
 function formatEffectiveCursorSettingSourcesLabel(raw: string | undefined = process.env[CURSOR_SETTING_SOURCES_ENV]): string {
 	const effective = resolveCursorSettingSources(raw);
 	const effectiveLabel = effective === undefined ? "none" : effective.join(",");
-	const rawLabel = raw?.trim() ? raw.trim() : "(unset → all)";
+	const rawLabel = raw?.trim() ? raw.trim() : `(unset → ${DEFAULT_CURSOR_SETTING_SOURCES.join(",")})`;
 	return `${rawLabel} (effective: ${effectiveLabel})`;
 }
 

package/src/cursor-tool-manifest.ts

@@ -4,7 +4,7 @@ import type { CursorPiToolBridgeSnapshot } from "./cursor-pi-tool-bridge-types.j
 export const CURSOR_TOOL_MANIFEST_ENV = "PI_CURSOR_TOOL_MANIFEST";
 
 /**
- * Representative @cursor/sdk@1.0.17 local-agent ToolType values; actual exposure can vary by run.
+ * Representative @cursor/sdk@1.0.18 local-agent ToolType values; actual exposure can vary by run.
  * See docs/cursor-native-tool-replay.md#sdk-tooltype-replay-matrix.
  */
 export const CURSOR_HOST_TOOL_MANIFEST_SUMMARY =
@@ -26,6 +26,7 @@ export function buildCursorToolManifestText(options: {
 		"Callable tool surfaces this run:",
 		`- Cursor SDK host tools (callable; not listed in MCP listTools): ${CURSOR_HOST_TOOL_MANIFEST_SUMMARY}.`,
 		"- Configured Cursor MCP servers: discovered at runtime via MCP listTools (depends on Cursor settings and PI_CURSOR_SETTING_SOURCES).",
+		"- Pi CLI tool toggles such as --no-tools affect pi tools and bridge exposure only; they do not disable Cursor SDK host tools or configured Cursor MCP.",
 	];
 	const bridgeTools = options.bridgeSnapshot?.tools ?? [];
 	if (!piBridgeEnabled) {

package/src/cursor-usage-accounting.ts

@@ -56,10 +56,11 @@ export function estimateCursorContextTotalTokens(partial: AssistantMessage, mode
 	return estimateCursorContextTokens(withAssistantMessage(context, partial), getCursorPromptOptions(model));
 }
 
-export function applyCursorApproximateUsage(partial: AssistantMessage, model: Model<Api>, context: Context, sessionInputTokens: number): void {
-	partial.usage.input = sessionInputTokens;
-	partial.usage.output = estimateCursorAssistantSessionOutputTokens(partial);
+export function applyCursorApproximateUsage(partial: AssistantMessage, _model: Model<Api>, _context: Context, sessionInputTokens: number): void {
+	const outputTokens = estimateCursorAssistantSessionOutputTokens(partial);
+	partial.usage.input = Math.max(0, sessionInputTokens);
+	partial.usage.output = outputTokens;
 	partial.usage.cacheRead = 0;
 	partial.usage.cacheWrite = 0;
-	partial.usage.totalTokens = estimateCursorContextTotalTokens(partial, model, context);
+	partial.usage.totalTokens = partial.usage.input + partial.usage.output + partial.usage.cacheRead + partial.usage.cacheWrite;
 }