@spotpatch/vite 1.1.0 → 1.2.0

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { Plugin } from 'vite';
-import { ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiProviderProtocol, AiProviderAuthentication, AiExecutionOptions, AiOptions } from '@spotpatch/shared';
-export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderAuthentication, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions } from '@spotpatch/shared';
+import { SpotPatchEditorPreference, ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiProviderProtocol, AiProviderAuthentication, AiExecutionOptions, AiOptions } from '@spotpatch/shared';
+export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderAuthentication, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions, SpotPatchEditorPreference } from '@spotpatch/shared';
 
 type FilterEntry = string | RegExp;
 interface SimpleAiOptions {
@@ -18,7 +18,7 @@ interface SpotPatchOptions {
     readonly enabled?: boolean;
     readonly include?: readonly FilterEntry[];
     readonly exclude?: readonly FilterEntry[];
-    readonly editor?: "vscode";
+    readonly editor?: SpotPatchEditorPreference;
     readonly redact?: boolean;
     readonly budget?: Partial<ContextBudget>;
     readonly shortcut?: string;
@@ -32,7 +32,7 @@ interface ResolvedSpotPatchOptions {
     readonly enabled: boolean;
     readonly include: readonly FilterEntry[];
     readonly exclude: readonly FilterEntry[];
-    readonly editor: "vscode";
+    readonly editor: SpotPatchEditorPreference;
     readonly redact: boolean;
     readonly budget: Readonly<ContextBudget>;
     readonly shortcut: string;
@@ -46,7 +46,7 @@ declare const DEFAULT_OPTIONS: Readonly<{
     enabled: true;
     include: readonly RegExp[];
     exclude: readonly RegExp[];
-    editor: "vscode";
+    editor: "auto";
     redact: true;
     budget: Readonly<{
         totalCharacters: number;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Plugin } from 'vite';
-import { ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiProviderProtocol, AiProviderAuthentication, AiExecutionOptions, AiOptions } from '@spotpatch/shared';
-export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderAuthentication, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions } from '@spotpatch/shared';
+import { SpotPatchEditorPreference, ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiProviderProtocol, AiProviderAuthentication, AiExecutionOptions, AiOptions } from '@spotpatch/shared';
+export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderAuthentication, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions, SpotPatchEditorPreference } from '@spotpatch/shared';
 
 type FilterEntry = string | RegExp;
 interface SimpleAiOptions {
@@ -18,7 +18,7 @@ interface SpotPatchOptions {
     readonly enabled?: boolean;
     readonly include?: readonly FilterEntry[];
     readonly exclude?: readonly FilterEntry[];
-    readonly editor?: "vscode";
+    readonly editor?: SpotPatchEditorPreference;
     readonly redact?: boolean;
     readonly budget?: Partial<ContextBudget>;
     readonly shortcut?: string;
@@ -32,7 +32,7 @@ interface ResolvedSpotPatchOptions {
     readonly enabled: boolean;
     readonly include: readonly FilterEntry[];
     readonly exclude: readonly FilterEntry[];
-    readonly editor: "vscode";
+    readonly editor: SpotPatchEditorPreference;
     readonly redact: boolean;
     readonly budget: Readonly<ContextBudget>;
     readonly shortcut: string;
@@ -46,7 +46,7 @@ declare const DEFAULT_OPTIONS: Readonly<{
     enabled: true;
     include: readonly RegExp[];
     exclude: readonly RegExp[];
-    editor: "vscode";
+    editor: "auto";
     redact: true;
     budget: Readonly<{
         totalCharacters: number;

package/dist/index.js

@@ -67,6 +67,7 @@ function resolveEnvironmentAiConfiguration(environment) {
 import {
   DEFAULT_AGENT_LIMITS,
   MAX_ANNOTATION_TARGETS,
+  SPOTPATCH_EDITOR_PREFERENCES,
   SPOTPATCH_LOCALE_PREFERENCES
 } from "@spotpatch/shared";
 import { z } from "zod";
@@ -91,7 +92,7 @@ var DEFAULT_OPTIONS = Object.freeze({
   enabled: true,
   include: DEFAULT_INCLUDE,
   exclude: DEFAULT_EXCLUDE,
-  editor: "vscode",
+  editor: "auto",
   redact: true,
   budget: DEFAULT_BUDGET,
   shortcut: "Mod+Shift+S",
@@ -399,9 +400,13 @@ function resolveOptions(options = {}, environmentAi) {
   assertPositiveBudget(budget);
   const maxTargets = options.maxTargets ?? DEFAULT_OPTIONS.maxTargets;
   const locale = options.locale ?? DEFAULT_OPTIONS.locale;
+  const editor = options.editor ?? DEFAULT_OPTIONS.editor;
   if (!SPOTPATCH_LOCALE_PREFERENCES.includes(locale)) {
     throw new RangeError("SpotPatch locale must be auto, en-US, or zh-CN.");
   }
+  if (!SPOTPATCH_EDITOR_PREFERENCES.includes(editor)) {
+    throw new RangeError("SpotPatch editor must be auto, vscode, or cursor.");
+  }
   if (!Number.isSafeInteger(maxTargets) || maxTargets < 1 || maxTargets > MAX_ANNOTATION_TARGETS) {
     throw new RangeError(
       `SpotPatch maxTargets must be an integer between 1 and ${String(MAX_ANNOTATION_TARGETS)}.`
@@ -411,7 +416,7 @@ function resolveOptions(options = {}, environmentAi) {
     enabled: options.enabled ?? DEFAULT_OPTIONS.enabled,
     include: Object.freeze([...options.include ?? DEFAULT_OPTIONS.include]),
     exclude: Object.freeze([...options.exclude ?? DEFAULT_OPTIONS.exclude]),
-    editor: options.editor ?? DEFAULT_OPTIONS.editor,
+    editor,
     redact: options.redact ?? DEFAULT_OPTIONS.redact,
     budget,
     shortcut: options.shortcut ?? DEFAULT_OPTIONS.shortcut,
@@ -476,7 +481,7 @@ import path2 from "path";
 // package.json
 var package_default = {
   name: "@spotpatch/vite",
-  version: "1.1.0",
+  version: "1.2.0",
   description: "Vite development plugin for SpotPatch.",
   license: "MIT",
   repository: {
@@ -573,6 +578,7 @@ function createClientModule(input, clientBundle, viteVersion) {
     ai: createRuntimeAiConfig(options.ai),
     budget: options.budget,
     debug: options.debug,
+    editor: options.editor,
     locale: options.locale,
     maxTargets: options.maxTargets,
     redact: options.redact,
@@ -1813,9 +1819,36 @@ async function handleAgentRequest(request, response, options, route, writeSucces
 
 // src/server/editor.ts
 import launchEditor from "launch-editor";
-var launchVSCode = (target, onError) => {
-  launchEditor(target, "code", onError);
-};
+var EDITOR_STARTUP_GRACE_MS = 150;
+function editorCommand(editor) {
+  if (editor === "vscode") {
+    return "code";
+  }
+  if (editor === "cursor") {
+    return "cursor";
+  }
+  return void 0;
+}
+var launchConfiguredEditor = (target, editor) => new Promise((resolve, reject) => {
+  let settled = false;
+  const startupTimer = setTimeout(() => {
+    settled = true;
+    resolve();
+  }, EDITOR_STARTUP_GRACE_MS);
+  const rejectStartup = () => {
+    if (settled) {
+      return;
+    }
+    settled = true;
+    clearTimeout(startupTimer);
+    reject(new Error("The configured editor could not be started."));
+  };
+  try {
+    launchEditor(target, editorCommand(editor), rejectStartup);
+  } catch {
+    rejectStartup();
+  }
+});
 
 // src/server/request-security.ts
 import { timingSafeEqual } from "crypto";
@@ -1996,17 +2029,18 @@ async function handleOpenEditor(request, options) {
     root: options.root
   });
   const target = `${sourcePath}:${String(body.line)}:${String(body.column)}`;
-  const editorLauncher = options.editorLauncher ?? launchVSCode;
+  const editorLauncher = options.editorLauncher ?? launchConfiguredEditor;
   try {
-    editorLauncher(target, () => {
-      options.logger?.warn("[spotpatch:server] VS Code rejected an editor request.");
-    });
+    await editorLauncher(target, options.options.editor);
   } catch (error) {
+    options.logger?.warn(
+      `[spotpatch:server] ${options.options.editor === "auto" ? "The detected editor" : options.options.editor} rejected an editor request.`
+    );
     throw new SpotPatchError8(ERROR_CODES8.EDITOR_OPEN_FAILED, void 0, {
       cause: error
     });
   }
-  return Object.freeze({});
+  return Object.freeze({ editor: options.options.editor });
 }
 function createSpotPatchMiddleware(options) {
   return (request, response, next) => {