pi-cursor-sdk 0.1.19 → 0.1.21

package/src/cursor-transcript-utils.ts

@@ -86,50 +86,6 @@ export function getToolResult(toolCall: unknown): unknown {
 	return record?.result;
 }
 
-export function normalizeToolName(name: string): string {
-	const normalized = name.replace(/\s+/g, " ").trim();
-	const normalizedKey = normalized.toLowerCase();
-	switch (normalizedKey) {
-		case "read_file":
-			return "read";
-		case "list_dir":
-			return "ls";
-		case "run_terminal_cmd":
-		case "terminal":
-		case "bash":
-		case "shell":
-			return "shell";
-		case "grep_search":
-		case "search":
-			return "grep";
-		case "file_search":
-			return "glob";
-		case "write_file":
-		case "writefile":
-			return "write";
-		case "strreplace":
-		case "str_replace":
-		case "str-replace":
-		case "edit_file":
-		case "editfile":
-		case "edit_notebook":
-		case "editnotebook":
-		case "notebook_edit":
-		case "notebookedit":
-			return "edit";
-		case "websearch":
-		case "web_search":
-		case "web-search":
-			return "webSearch";
-		case "webfetch":
-		case "web_fetch":
-		case "web-fetch":
-			return "webFetch";
-		default:
-			return normalized || "unknown";
-	}
-}
-
 export function normalizeResult(result: unknown): NormalizedResult {
 	const record = asRecord(result);
 	const status = getString(record, "status");

package/src/cursor-web-tool-activity.ts

@@ -1,32 +1,12 @@
-import { normalizeToolName } from "./cursor-transcript-utils.js";
+import {
+	classifyCursorWebToolKind as classifyCursorWebToolKindFromRegistry,
+	type CursorWebToolKind,
+} from "./cursor-tool-presentation-registry.js";
+import { normalizeCursorToolName as normalizeToolName } from "./cursor-tool-presentation-registry.js";
+import { extractWebFetchTarget, extractWebSearchQuery } from "./cursor-web-tool-args.js";
 
-export type CursorWebToolKind = "webSearch" | "webFetch";
-
-const WEB_SEARCH_NAME_PATTERN =
-	/^(?:web[-_ ]?search|search[-_ ]?web|websearch|browser[-_ ]?search|cursor[-_ ]?web[-_ ]?search)$/i;
-const WEB_FETCH_NAME_PATTERN =
-	/^(?:web[-_ ]?fetch|fetch[-_ ]?web|webfetch|browser[-_ ]?fetch|fetch[-_ ]?url|cursor[-_ ]?web[-_ ]?fetch)$/i;
-
-function normalizeWebToolLookupName(name: string): string {
-	return name.replace(/\s+/g, " ").trim().toLowerCase();
-}
-
-export function classifyCursorWebToolKind(name: string | undefined): CursorWebToolKind | undefined {
-	if (!name) return undefined;
-	const normalized = normalizeWebToolLookupName(name);
-	if (WEB_SEARCH_NAME_PATTERN.test(normalized) || normalized === "websearch" || normalized === "web_search") {
-		return "webSearch";
-	}
-	if (WEB_FETCH_NAME_PATTERN.test(normalized) || normalized === "webfetch" || normalized === "web_fetch") {
-		return "webFetch";
-	}
-	return undefined;
-}
-
-function getNestedMcpArgs(args: Record<string, unknown>): Record<string, unknown> {
-	const nested = args.args;
-	return nested && typeof nested === "object" && !Array.isArray(nested) ? (nested as Record<string, unknown>) : {};
-}
+export type { CursorWebToolKind } from "./cursor-tool-presentation-registry.js";
+export { extractWebFetchTarget, extractWebSearchQuery } from "./cursor-web-tool-args.js";
 
 function getMcpToolName(args: Record<string, unknown>): string | undefined {
 	const toolName = typeof args.toolName === "string" ? args.toolName : typeof args.tool_name === "string" ? args.tool_name : undefined;
@@ -34,38 +14,8 @@ function getMcpToolName(args: Record<string, unknown>): string | undefined {
 	return trimmed || undefined;
 }
 
-function firstNonEmptyString(...values: Array<string | undefined>): string | undefined {
-	for (const value of values) {
-		const trimmed = value?.trim();
-		if (trimmed) return trimmed;
-	}
-	return undefined;
-}
-
-export function extractWebSearchQuery(args: Record<string, unknown>): string | undefined {
-	const nested = getNestedMcpArgs(args);
-	return firstNonEmptyString(
-		typeof args.search_term === "string" ? args.search_term : undefined,
-		typeof args.searchTerm === "string" ? args.searchTerm : undefined,
-		typeof args.query === "string" ? args.query : undefined,
-		typeof args.q === "string" ? args.q : undefined,
-		typeof nested.search_term === "string" ? nested.search_term : undefined,
-		typeof nested.searchTerm === "string" ? nested.searchTerm : undefined,
-		typeof nested.query === "string" ? nested.query : undefined,
-		typeof nested.q === "string" ? nested.q : undefined,
-	);
-}
-
-export function extractWebFetchTarget(args: Record<string, unknown>): string | undefined {
-	const nested = getNestedMcpArgs(args);
-	return firstNonEmptyString(
-		typeof args.url === "string" ? args.url : undefined,
-		typeof args.uri === "string" ? args.uri : undefined,
-		typeof args.href === "string" ? args.href : undefined,
-		typeof nested.url === "string" ? nested.url : undefined,
-		typeof nested.uri === "string" ? nested.uri : undefined,
-		typeof nested.href === "string" ? nested.href : undefined,
-	);
+export function classifyCursorWebToolKind(name: string | undefined): CursorWebToolKind | undefined {
+	return classifyCursorWebToolKindFromRegistry(name);
 }
 
 /**

package/src/cursor-web-tool-args.ts

@@ -0,0 +1,39 @@
+import { asRecord } from "./cursor-record-utils.js";
+
+function getNestedMcpArgs(args: Record<string, unknown>): Record<string, unknown> {
+	return asRecord(args.args) ?? {};
+}
+
+function firstNonEmptyString(...values: Array<string | undefined>): string | undefined {
+	for (const value of values) {
+		const trimmed = value?.trim();
+		if (trimmed) return trimmed;
+	}
+	return undefined;
+}
+
+export function extractWebSearchQuery(args: Record<string, unknown>): string | undefined {
+	const nested = getNestedMcpArgs(args);
+	return firstNonEmptyString(
+		typeof args.search_term === "string" ? args.search_term : undefined,
+		typeof args.searchTerm === "string" ? args.searchTerm : undefined,
+		typeof args.query === "string" ? args.query : undefined,
+		typeof args.q === "string" ? args.q : undefined,
+		typeof nested.search_term === "string" ? nested.search_term : undefined,
+		typeof nested.searchTerm === "string" ? nested.searchTerm : undefined,
+		typeof nested.query === "string" ? nested.query : undefined,
+		typeof nested.q === "string" ? nested.q : undefined,
+	);
+}
+
+export function extractWebFetchTarget(args: Record<string, unknown>): string | undefined {
+	const nested = getNestedMcpArgs(args);
+	return firstNonEmptyString(
+		typeof args.url === "string" ? args.url : undefined,
+		typeof args.uri === "string" ? args.uri : undefined,
+		typeof args.href === "string" ? args.href : undefined,
+		typeof nested.url === "string" ? nested.url : undefined,
+		typeof nested.uri === "string" ? nested.uri : undefined,
+		typeof nested.href === "string" ? nested.href : undefined,
+	);
+}

package/src/index.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ExtensionContext, ProviderConfig, ProviderModelConfig } from "@earendil-works/pi-coding-agent";
 import { discoverModels, type CursorModelFallbackIssue } from "./model-discovery.js";
-import { registerCursorFastControls } from "./cursor-state.js";
+import { registerCursorRuntimeControls } from "./cursor-state.js";
 import { registerCursorNativeToolDisplay } from "./cursor-native-tool-display.js";
 import { registerCursorPiToolBridge } from "./cursor-pi-tool-bridge.js";
 import { registerCursorQuestionTool } from "./cursor-question-tool.js";
@@ -10,16 +10,10 @@ import { registerCursorSessionAgent } from "./cursor-session-agent.js";
 import { streamCursor } from "./cursor-provider.js";
 
 type CursorExtensionApi =
-	& Pick<ExtensionAPI, "registerProvider">
-	& {
-		registerCommand(name: string, options: {
-			description?: string;
-			handler: (args: string, ctx: Pick<ExtensionContext, "hasUI"> & { ui: Pick<ExtensionContext["ui"], "notify"> }) => Promise<void> | void;
-		}): void;
-	}
+	& Pick<ExtensionAPI, "registerProvider" | "registerCommand">
 	& Parameters<typeof registerCursorSessionCwd>[0]
 	& Parameters<typeof registerCursorSessionAgent>[0]
-	& Parameters<typeof registerCursorFastControls>[0]
+	& Parameters<typeof registerCursorRuntimeControls>[0]
 	& Parameters<typeof registerCursorNativeToolDisplay>[0]
 	& Parameters<typeof registerCursorQuestionTool>[0]
 	& Parameters<typeof registerCursorPiToolBridge>[0]
@@ -44,7 +38,7 @@ export default async function (pi: CursorExtensionApi) {
 	// Session cwd must register before other session_start listeners that depend on it.
 	registerCursorSessionCwd(pi);
 	registerCursorSessionAgent(pi);
-	registerCursorFastControls(pi);
+	registerCursorRuntimeControls(pi);
 	registerCursorNativeToolDisplay(pi);
 	registerCursorQuestionTool(pi);
 	registerCursorPiToolBridge(pi);