e7558e37e7
- Replaced getTool with getExecutableTool in CursorExecBridgeOptions to prioritize mounted-device permission wrappers over canonical tools. - Updated createAgentSession to check isAutoQaEnabled against restricted tool filtering when configuring system prompts. - Added test coverage verifying execution overrides preserve approval gates and restricted sessions omit auto-qa guidance.
514 lines
19 KiB
TypeScript
514 lines
19 KiB
TypeScript
import { randomUUID } from "node:crypto";
|
|
import * as fs from "node:fs";
|
|
import type {
|
|
AgentEvent,
|
|
AgentTool,
|
|
AgentToolContext,
|
|
AgentToolResult,
|
|
AgentToolUpdateCallback,
|
|
} from "@oh-my-pi/pi-agent-core";
|
|
import type {
|
|
CursorMcpCall,
|
|
CursorShellStreamCallbacks,
|
|
CursorTodoSnapshot,
|
|
CursorExecHandlers as ICursorExecHandlers,
|
|
ToolResultMessage,
|
|
} from "@oh-my-pi/pi-ai";
|
|
import { sanitizeText } from "@oh-my-pi/pi-utils";
|
|
import { resolveToCwd } from "./tools/path-utils";
|
|
import type { TodoPhase, TodoStatus } from "./tools/todo";
|
|
|
|
/** Phase used for Cursor-owned tasks with no local phase grouping. */
|
|
const CURSOR_TODO_PHASE = "Tasks";
|
|
|
|
interface CursorExecBridgeOptions {
|
|
cwd: string;
|
|
getCwd?: () => string;
|
|
tools: Map<string, AgentTool>;
|
|
/** Resolves execution overrides (mounted-device permission wrappers) before the canonical map. */
|
|
getExecutableTool?: (name: string) => AgentTool | undefined;
|
|
getToolContext?: () => AgentToolContext | undefined;
|
|
emitEvent?: (event: AgentEvent) => void;
|
|
/**
|
|
* Whether the Cursor native `delete` frame may remove files. Unlike every
|
|
* other exec handler, `executeDelete` mutates the filesystem directly instead
|
|
* of consulting {@link tools}, so a background read-only advisor could delete
|
|
* workspace files it was never granted a mutating tool for (issue #5680
|
|
* review). Defaults to allowed to preserve the primary agent's behavior;
|
|
* callers with a restricted tool set (advisors) opt out.
|
|
*/
|
|
allowNativeDelete?: boolean;
|
|
/**
|
|
* Mirror Cursor's server-owned todo list into local session state. Cursor
|
|
* resolves `update_todos` / `read_todos` remotely, so without this bridge
|
|
* the provider's list and the local `todo` state diverge silently.
|
|
*/
|
|
setTodoPhases?: (phases: TodoPhase[]) => void;
|
|
getTodoPhases?: () => TodoPhase[];
|
|
/**
|
|
* Persist the mirrored list to the session branch so it survives reloads.
|
|
* Cursor emits no local `todo` toolResult, so nothing else records it.
|
|
*/
|
|
persistTodoPhases?: (phases: TodoPhase[]) => void;
|
|
}
|
|
|
|
function createToolResultMessage(
|
|
toolCallId: string,
|
|
toolName: string,
|
|
result: AgentToolResult<unknown>,
|
|
isError: boolean,
|
|
): ToolResultMessage {
|
|
return {
|
|
role: "toolResult",
|
|
toolCallId,
|
|
toolName,
|
|
content: result.content,
|
|
details: result.details,
|
|
isError,
|
|
timestamp: Date.now(),
|
|
};
|
|
}
|
|
|
|
function buildToolErrorResult(message: string): AgentToolResult<unknown> {
|
|
return {
|
|
content: [{ type: "text", text: message }],
|
|
details: {},
|
|
};
|
|
}
|
|
|
|
async function executeTool(
|
|
options: CursorExecBridgeOptions,
|
|
toolName: string,
|
|
toolCallId: string,
|
|
args: Record<string, unknown>,
|
|
): Promise<ToolResultMessage> {
|
|
const tool = options.getExecutableTool?.(toolName) ?? options.tools.get(toolName);
|
|
if (!tool) {
|
|
const result = buildToolErrorResult(`Tool "${toolName}" not available`);
|
|
return createToolResultMessage(toolCallId, toolName, result, true);
|
|
}
|
|
|
|
options.emitEvent?.({ type: "tool_execution_start", toolCallId, toolName, args });
|
|
|
|
let result: AgentToolResult<unknown>;
|
|
let isError = false;
|
|
|
|
const onUpdate: AgentToolUpdateCallback<unknown> | undefined = options.emitEvent
|
|
? partialResult => {
|
|
const sanitizedResult: AgentToolResult<unknown> = {
|
|
content: partialResult.content.map(c => (c.type === "text" ? { ...c, text: sanitizeText(c.text) } : c)),
|
|
details: partialResult.details,
|
|
};
|
|
options.emitEvent?.({
|
|
type: "tool_execution_update",
|
|
toolCallId,
|
|
toolName,
|
|
args,
|
|
partialResult: sanitizedResult,
|
|
});
|
|
}
|
|
: undefined;
|
|
|
|
try {
|
|
result = await tool.execute(
|
|
toolCallId,
|
|
args as Record<string, unknown>,
|
|
undefined,
|
|
onUpdate,
|
|
options.getToolContext?.(),
|
|
);
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : String(error);
|
|
result = buildToolErrorResult(message);
|
|
isError = true;
|
|
}
|
|
isError ||= result.isError === true;
|
|
|
|
const sanitizedFinalResult: AgentToolResult<unknown> = {
|
|
content: result.content.map(c => (c.type === "text" ? { ...c, text: sanitizeText(c.text) } : c)),
|
|
details: result.details,
|
|
};
|
|
options.emitEvent?.({ type: "tool_execution_end", toolCallId, toolName, result: sanitizedFinalResult, isError });
|
|
|
|
return createToolResultMessage(toolCallId, toolName, result, isError);
|
|
}
|
|
|
|
async function executeDelete(options: CursorExecBridgeOptions, pathArg: string, toolCallId: string) {
|
|
const toolName = "delete";
|
|
|
|
if (options.allowNativeDelete === false) {
|
|
const result = buildToolErrorResult(`Tool "${toolName}" not available`);
|
|
return createToolResultMessage(toolCallId, toolName, result, true);
|
|
}
|
|
|
|
options.emitEvent?.({ type: "tool_execution_start", toolCallId, toolName, args: { path: pathArg } });
|
|
|
|
const absolutePath = resolveToCwd(pathArg, options.getCwd?.() ?? options.cwd);
|
|
let isError = false;
|
|
let result: AgentToolResult<unknown>;
|
|
|
|
try {
|
|
let fileStat: fs.Stats | undefined;
|
|
try {
|
|
fileStat = fs.statSync(absolutePath);
|
|
} catch {
|
|
throw new Error(`File not found: ${pathArg}`);
|
|
}
|
|
if (!fileStat.isFile()) {
|
|
throw new Error(`Path is not a file: ${pathArg}`);
|
|
}
|
|
|
|
fs.rmSync(absolutePath);
|
|
|
|
const sizeText = fileStat.size ? ` (${fileStat.size} bytes)` : "";
|
|
const message = `Deleted ${pathArg}${sizeText}`;
|
|
result = { content: [{ type: "text", text: message }], details: {} };
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : String(error);
|
|
result = buildToolErrorResult(message);
|
|
isError = true;
|
|
}
|
|
|
|
options.emitEvent?.({ type: "tool_execution_end", toolCallId, toolName, result, isError });
|
|
return createToolResultMessage(toolCallId, toolName, result, isError);
|
|
}
|
|
|
|
function decodeToolCallId(toolCallId?: string): string {
|
|
return toolCallId && toolCallId.length > 0 ? toolCallId : randomUUID();
|
|
}
|
|
|
|
function decodeMcpArgs(rawArgs: Record<string, Uint8Array>): Record<string, unknown> {
|
|
const decoded: Record<string, unknown> = {};
|
|
for (const [key, value] of Object.entries(rawArgs)) {
|
|
const text = new TextDecoder().decode(value);
|
|
try {
|
|
decoded[key] = JSON.parse(text);
|
|
} catch {
|
|
decoded[key] = text;
|
|
}
|
|
}
|
|
return decoded;
|
|
}
|
|
|
|
function formatMcpToolErrorMessage(toolName: string, availableTools: string[]): string {
|
|
const list = availableTools.length > 0 ? availableTools.join(", ") : "none";
|
|
return `MCP tool "${toolName}" not found. Available tools: ${list}`;
|
|
}
|
|
|
|
/**
|
|
* One-line summary for the synthesized todo result. Cursor's server-resolved
|
|
* call produces no local tool output, but the transcript entry still needs
|
|
* text content alongside the phases the UI renders.
|
|
*/
|
|
function formatTodoSyncSummary(phases: TodoPhase[]): string {
|
|
const tasks = phases.flatMap(phase => phase.tasks);
|
|
if (tasks.length === 0) return "No todos";
|
|
const done = tasks.filter(task => task.status === "completed").length;
|
|
return `${done}/${tasks.length} tasks completed`;
|
|
}
|
|
|
|
/**
|
|
* Persisted result for a server-resolved todo call.
|
|
*
|
|
* `details` is only attached for an authoritative snapshot, and then
|
|
* `details.phases` is load-bearing rather than decoration: `todoToolRenderer`
|
|
* rebuilds the rendered list exclusively from it, so a mirrored update that
|
|
* omitted it would replay as `Todo 0 tasks` after a reload.
|
|
*
|
|
* A refusal or a server error carries no `details`. Echoing the current phases
|
|
* there would replay a call that changed nothing as if it had re-asserted the
|
|
* whole list — and `event-controller` feeds `details.phases` straight into
|
|
* `setTodos`, so a refused `read_todos` would overwrite live UI state.
|
|
*/
|
|
function buildTodoSyncResult(
|
|
toolCallId: string,
|
|
phases: TodoPhase[] | undefined,
|
|
error: string | null,
|
|
): ToolResultMessage {
|
|
return {
|
|
role: "toolResult",
|
|
toolCallId,
|
|
toolName: "todo",
|
|
content: [
|
|
{ type: "text", text: error ?? (phases ? formatTodoSyncSummary(phases) : "Todo snapshot not mirrored") },
|
|
],
|
|
details: phases ? { phases, storage: "session" } : undefined,
|
|
isError: error !== null,
|
|
timestamp: Date.now(),
|
|
};
|
|
}
|
|
|
|
export class CursorExecHandlers implements ICursorExecHandlers {
|
|
constructor(private options: CursorExecBridgeOptions) {}
|
|
|
|
async read(args: Parameters<NonNullable<ICursorExecHandlers["read"]>>[0]) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
const toolResultMessage = await executeTool(this.options, "read", toolCallId, { path: args.path });
|
|
return toolResultMessage;
|
|
}
|
|
|
|
async ls(args: Parameters<NonNullable<ICursorExecHandlers["ls"]>>[0]) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
// Redirect ls to read tool, which handles directories
|
|
const toolResultMessage = await executeTool(this.options, "read", toolCallId, { path: args.path });
|
|
return toolResultMessage;
|
|
}
|
|
|
|
async grep(args: Parameters<NonNullable<ICursorExecHandlers["grep"]>>[0]) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
const searchPath = args.glob ? `${args.path || "."}/${args.glob}` : args.path || ".";
|
|
const toolResultMessage = await executeTool(this.options, "grep", toolCallId, {
|
|
pattern: args.pattern,
|
|
path: searchPath,
|
|
case: args.caseInsensitive === true ? false : undefined,
|
|
});
|
|
return toolResultMessage;
|
|
}
|
|
|
|
async write(args: Parameters<NonNullable<ICursorExecHandlers["write"]>>[0]) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
const content = args.fileText ?? new TextDecoder().decode(args.fileBytes ?? new Uint8Array());
|
|
const toolResultMessage = await executeTool(this.options, "write", toolCallId, {
|
|
path: args.path,
|
|
content,
|
|
});
|
|
return toolResultMessage;
|
|
}
|
|
|
|
async delete(args: Parameters<NonNullable<ICursorExecHandlers["delete"]>>[0]) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
const toolResultMessage = await executeDelete(this.options, args.path, toolCallId);
|
|
return toolResultMessage;
|
|
}
|
|
|
|
async shell(args: Parameters<NonNullable<ICursorExecHandlers["shell"]>>[0]) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
const timeoutSeconds = args.timeout && args.timeout > 0 ? args.timeout : undefined;
|
|
const toolResultMessage = await executeTool(this.options, "bash", toolCallId, {
|
|
command: args.command,
|
|
cwd: args.workingDirectory || undefined,
|
|
timeout: timeoutSeconds,
|
|
});
|
|
return toolResultMessage;
|
|
}
|
|
|
|
async shellStream(
|
|
args: Parameters<NonNullable<ICursorExecHandlers["shellStream"]>>[0],
|
|
callbacks: CursorShellStreamCallbacks,
|
|
) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
const toolName = "bash";
|
|
const tool = this.options.tools.get(toolName);
|
|
if (!tool) {
|
|
const result = buildToolErrorResult(`Tool "${toolName}" not available`);
|
|
return createToolResultMessage(toolCallId, toolName, result, true);
|
|
}
|
|
|
|
const timeoutSeconds = args.timeout && args.timeout > 0 ? args.timeout : undefined;
|
|
const toolArgs: Record<string, unknown> = {
|
|
command: args.command,
|
|
cwd: args.workingDirectory || undefined,
|
|
timeout: timeoutSeconds,
|
|
};
|
|
|
|
this.options.emitEvent?.({ type: "tool_execution_start", toolCallId, toolName, args: toolArgs });
|
|
|
|
let result: AgentToolResult<unknown>;
|
|
let isError = false;
|
|
|
|
let rawText = "";
|
|
let sanitizedRawText = "";
|
|
let streamedSanitizedText = "";
|
|
let canStreamSanitizedDelta = true;
|
|
const onUpdate: AgentToolUpdateCallback<unknown> = partialResult => {
|
|
const newRawText = partialResult.content.map(c => (c.type === "text" ? c.text : "")).join("");
|
|
if (newRawText === rawText) {
|
|
return;
|
|
}
|
|
rawText = newRawText;
|
|
sanitizedRawText = sanitizeText(newRawText);
|
|
const sanitizedPartialResult: AgentToolResult<unknown> = {
|
|
content: [{ type: "text" as const, text: sanitizedRawText }],
|
|
details: partialResult.details,
|
|
};
|
|
this.options.emitEvent?.({
|
|
type: "tool_execution_update",
|
|
toolCallId,
|
|
toolName,
|
|
args: toolArgs,
|
|
partialResult: sanitizedPartialResult,
|
|
});
|
|
if (!canStreamSanitizedDelta) {
|
|
return;
|
|
}
|
|
if (sanitizedRawText.startsWith(streamedSanitizedText)) {
|
|
const sanitizedDelta = sanitizedRawText.slice(streamedSanitizedText.length);
|
|
streamedSanitizedText = sanitizedRawText;
|
|
if (sanitizedDelta) {
|
|
callbacks.onStdout(sanitizedDelta);
|
|
}
|
|
return;
|
|
}
|
|
// Cursor's shell-stream callback is append-only. Once the sanitized snapshot
|
|
// stops being a prefix extension, we can no longer repair the stream safely.
|
|
// Keep emitting full snapshots via tool_execution_update, but stop stdout deltas.
|
|
canStreamSanitizedDelta = false;
|
|
};
|
|
|
|
try {
|
|
result = await tool.execute(toolCallId, toolArgs, undefined, onUpdate, this.options.getToolContext?.());
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : String(error);
|
|
result = buildToolErrorResult(message);
|
|
isError = true;
|
|
}
|
|
isError ||= result.isError === true;
|
|
|
|
// onUpdate may not fire for every chunk — flush any remaining output
|
|
// from the final result that wasn't already streamed.
|
|
const finalRawText = result.content.map(c => (c.type === "text" ? c.text : "")).join("");
|
|
if (finalRawText !== rawText) {
|
|
rawText = finalRawText;
|
|
sanitizedRawText = sanitizeText(finalRawText);
|
|
}
|
|
if (canStreamSanitizedDelta && sanitizedRawText.startsWith(streamedSanitizedText)) {
|
|
const finalDelta = sanitizedRawText.slice(streamedSanitizedText.length);
|
|
streamedSanitizedText = sanitizedRawText;
|
|
if (finalDelta) {
|
|
callbacks.onStdout(finalDelta);
|
|
}
|
|
}
|
|
|
|
const sanitizedFinalResult: AgentToolResult<unknown> = {
|
|
content: result.content.map(c => (c.type === "text" ? { ...c, text: sanitizeText(c.text) } : c)),
|
|
details: result.details,
|
|
};
|
|
this.options.emitEvent?.({
|
|
type: "tool_execution_end",
|
|
toolCallId,
|
|
toolName,
|
|
result: sanitizedFinalResult,
|
|
isError,
|
|
});
|
|
return createToolResultMessage(toolCallId, toolName, result, isError);
|
|
}
|
|
|
|
async diagnostics(args: Parameters<NonNullable<ICursorExecHandlers["diagnostics"]>>[0]) {
|
|
const toolCallId = decodeToolCallId(args.toolCallId);
|
|
const toolResultMessage = await executeTool(this.options, "lsp", toolCallId, {
|
|
action: "diagnostics",
|
|
file: args.path,
|
|
});
|
|
return toolResultMessage;
|
|
}
|
|
|
|
/**
|
|
* Settle a completed native Cursor todo call, mirroring its list when the
|
|
* server supplied an authoritative one.
|
|
*
|
|
* Cursor's snapshot is a flat list, so tasks already known locally keep
|
|
* their phase and only their status is updated; unknown tasks land in a
|
|
* single fallback phase. Statuses come straight from the server snapshot —
|
|
* no local normalization, or an all-pending remote list would gain a
|
|
* phantom in-progress task the remote list does not have.
|
|
*
|
|
* The snapshot is also persisted to the session branch. Every other
|
|
* provider's todo state survives a reload because `todo` runs locally and
|
|
* its `toolResult` (carrying `details.phases`) lands in the branch, which
|
|
* `#syncTodoPhasesFromBranch` replays. Cursor resolves the tool remotely and
|
|
* emits no such result, so without an explicit entry the list is in-memory
|
|
* only and every reload, rewind, compaction, or session switch drops it.
|
|
*
|
|
* This ALWAYS settles the call and returns the result to persist, even when
|
|
* nothing is mirrored. Two reasons it cannot bail out early:
|
|
*
|
|
* - the interactive card leaves `pendingTools` only on a matching
|
|
* `tool_execution_end`, so staying silent leaves it animating forever;
|
|
* - an unpaired `toolCall` is stripped as dangling by `buildSessionContext`,
|
|
* erasing the interaction from every rebuilt transcript.
|
|
*
|
|
* A `null` snapshot means nothing may be mirrored — a server `error`, or a
|
|
* benign refusal: a filtered, truncated, or empty read, or a snapshot the
|
|
* local model cannot represent. Local state is left untouched, and the result
|
|
* carries no `details` (text `"Todo snapshot not mirrored"`): `event-controller`
|
|
* feeds `details.phases` straight into `setTodos`, so echoing the current list
|
|
* back would let a call that changed nothing overwrite live UI state.
|
|
*/
|
|
todoSync(snapshot: CursorTodoSnapshot | null, toolCallId: string, error: string | null = null): ToolResultMessage {
|
|
const setPhases = this.options.setTodoPhases;
|
|
const existing = this.options.getTodoPhases?.() ?? [];
|
|
|
|
// Mirroring is gated on having both a snapshot and somewhere to put it.
|
|
// Settling the call is NOT: the interactive card leaves `pendingTools`
|
|
// only on a matching `tool_execution_end`, so a refusal, a server error,
|
|
// or a host with no local todo state must still resolve it.
|
|
let phases: TodoPhase[] | undefined;
|
|
if (snapshot && setPhases) {
|
|
const phaseByContent = new Map<string, string>();
|
|
for (const phase of existing) {
|
|
for (const task of phase.tasks) phaseByContent.set(task.content, phase.name);
|
|
}
|
|
|
|
const grouped = new Map<string, TodoPhase["tasks"]>();
|
|
for (const todo of snapshot.todos) {
|
|
const name = phaseByContent.get(todo.content) ?? CURSOR_TODO_PHASE;
|
|
let tasks = grouped.get(name);
|
|
if (!tasks) {
|
|
tasks = [];
|
|
grouped.set(name, tasks);
|
|
}
|
|
tasks.push({ content: todo.content, status: todo.status as TodoStatus });
|
|
}
|
|
|
|
// Preserve the local phase order; phases new to this snapshot append.
|
|
const next: TodoPhase[] = [];
|
|
for (const phase of existing) {
|
|
const tasks = grouped.get(phase.name);
|
|
if (!tasks) continue;
|
|
next.push({ name: phase.name, tasks });
|
|
grouped.delete(phase.name);
|
|
}
|
|
for (const [name, tasks] of grouped) next.push({ name, tasks });
|
|
setPhases(next);
|
|
this.options.persistTodoPhases?.(next);
|
|
phases = next;
|
|
}
|
|
|
|
const result = buildTodoSyncResult(toolCallId, phases, error);
|
|
// This completion is emitted synchronously mid-parse, while the streamed
|
|
// `toolcall_start` that creates the visible card rides
|
|
// `AssistantMessageEventStream` and lands a microtask later. When Cursor
|
|
// packs start and completion into one HTTP/2 chunk the completion arrives
|
|
// first; the interactive controller holds it as an orphan and replays it
|
|
// once the streamed block creates the card (`event-controller.ts`,
|
|
// `#orphanedToolCompletions`). Emitting a synthetic `tool_execution_start`
|
|
// here instead was measured and rejected: settling deletes the pending
|
|
// entry, and the next cumulative `message_update` re-creates the card —
|
|
// one settled card plus one stuck forever.
|
|
this.options.emitEvent?.({
|
|
type: "tool_execution_end",
|
|
toolCallId,
|
|
toolName: "todo",
|
|
result: { content: result.content, details: result.details },
|
|
isError: error !== null,
|
|
});
|
|
return result;
|
|
}
|
|
|
|
async mcp(call: CursorMcpCall) {
|
|
const toolName = call.toolName || call.name;
|
|
const toolCallId = decodeToolCallId(call.toolCallId);
|
|
const tool = this.options.getExecutableTool?.(toolName) ?? this.options.tools.get(toolName);
|
|
if (!tool) {
|
|
const availableTools = Array.from(this.options.tools.keys()).filter(name => name.startsWith("mcp__"));
|
|
const message = formatMcpToolErrorMessage(toolName, availableTools);
|
|
const result = buildToolErrorResult(message);
|
|
return createToolResultMessage(toolCallId, toolName, result, true);
|
|
}
|
|
|
|
const args = Object.keys(call.args ?? {}).length > 0 ? call.args : decodeMcpArgs(call.rawArgs ?? {});
|
|
const toolResultMessage = await executeTool(this.options, toolName, toolCallId, args);
|
|
return toolResultMessage;
|
|
}
|
|
}
|