@spotpatch/runtime 1.1.0 → 1.1.1

package/dist/index.js

@@ -76,7 +76,6 @@ function createAnnotation(input) {
 // src/api/runtime-api.ts
 import {
   SPOTPATCH_ENDPOINTS,
-  SPOTPATCH_EDITOR_PREFERENCES,
   SPOTPATCH_TOKEN_HEADER,
   getAgentJobEndpoint
 } from "@spotpatch/shared";
@@ -249,9 +248,6 @@ function readSuccessData(value) {
 function isCodeContext(value) {
   return isRecord2(value) && typeof value.relativePath === "string" && (value.language === "tsx" || value.language === "jsx") && typeof value.startLine === "number" && typeof value.endLine === "number" && typeof value.excerpt === "string" && (value.boundary === "component" || value.boundary === "nearby-lines");
 }
-function isEditorOpenResult(value) {
-  return isRecord2(value) && typeof value.editor === "string" && SPOTPATCH_EDITOR_PREFERENCES.includes(value.editor);
-}
 function deepFreezeUnknown(value) {
   if (!isRecord2(value) && !Array.isArray(value)) {
     return;
@@ -479,7 +475,7 @@ function createRuntimeApi(options) {
     },
     async openEditor(request) {
       const data = await requestJson(SPOTPATCH_ENDPOINTS.openEditor, "POST", request);
-      if (!isEditorOpenResult(data)) {
+      if (!isRecord2(data) || data.editor !== "auto" && data.editor !== "vscode" && data.editor !== "cursor") {
         throw new RuntimeApiError();
       }
       return Object.freeze({ editor: data.editor });
@@ -2141,15 +2137,6 @@ var STATUS_ZH = Object.freeze({
   reverted: "\u5DF2\u64A4\u9500",
   failed: "\u5931\u8D25"
 });
-function editorName(editor, automatic) {
-  if (editor === "vscode") {
-    return "VS Code";
-  }
-  if (editor === "cursor") {
-    return "Cursor";
-  }
-  return automatic;
-}
 var ERROR_MESSAGES_EN = Object.freeze({
   [ERROR_CODES2.INVALID_REQUEST]: "The Agent request was rejected as invalid.",
   [ERROR_CODES2.INVALID_TOKEN]: "The local SpotPatch session expired.",
@@ -2288,7 +2275,7 @@ var UI_MESSAGES = Object.freeze({
     brand: Object.freeze({
       name: "SpotPatch",
       context: "Live context",
-      repository: "GitHub",
+      repository: "GitHub \u2197",
       repositoryTitle: "Star SpotPatch on GitHub"
     }),
     trigger: Object.freeze({
@@ -2342,8 +2329,8 @@ var UI_MESSAGES = Object.freeze({
     actions: Object.freeze({
       addElement: "Add element",
       reselect: "Start over",
-      openEditor: (editor) => editor === "auto" ? "Open source" : `Open in ${editorName(editor, "editor")}`,
-      openTarget: (index, editor) => `Open target ${String(index)} in ${editorName(editor, "the detected editor")}`,
+      openEditor: "Open source",
+      openTarget: (index) => `Open source for target ${String(index)}`,
       preview: "Preview prompt",
       copy: "Copy prompt",
       back: "Back to edit"
@@ -2399,9 +2386,9 @@ var UI_MESSAGES = Object.freeze({
       detachedTargetRemoved: "A removed page element was dropped from the selection.",
       contextWarning: "Browser context collection completed with a warning.",
       contextCollected: "Browser context collected.",
-      editorOpening: (editor) => `Opening ${editorName(editor, "the detected editor")}\u2026`,
-      editorOpened: (editor) => `Opened the source in ${editorName(editor, "the detected editor")}.`,
-      editorFailed: (editor) => `Could not open ${editorName(editor, "an editor")}. Start the editor or configure editor: "cursor" / "vscode".`,
+      editorOpening: "Opening source\u2026",
+      editorOpened: "Source opened in the editor.",
+      editorFailed: "Could not open the editor. Start it or configure editor.",
       completeInstructions: "Add an instruction for every target and wait for context collection to finish.",
       promptCopied: "Prompt copied to the clipboard.",
       clipboardUnavailable: "Clipboard access is unavailable. Select the prompt manually.",
@@ -2417,7 +2404,7 @@ var UI_MESSAGES = Object.freeze({
     brand: Object.freeze({
       name: "SpotPatch",
       context: "\u5B9E\u65F6\u4E0A\u4E0B\u6587",
-      repository: "GitHub",
+      repository: "GitHub \u2197",
       repositoryTitle: "\u5728 GitHub \u4E0A Star SpotPatch"
     }),
     trigger: Object.freeze({
@@ -2471,8 +2458,8 @@ var UI_MESSAGES = Object.freeze({
     actions: Object.freeze({
       addElement: "\u6DFB\u52A0\u5143\u7D20",
       reselect: "\u91CD\u65B0\u5F00\u59CB",
-      openEditor: (editor) => editor === "auto" ? "\u6253\u5F00\u6E90\u7801" : `\u5728 ${editorName(editor, "\u7F16\u8F91\u5668")} \u4E2D\u6253\u5F00`,
-      openTarget: (index, editor) => `\u5728${editorName(editor, "\u81EA\u52A8\u68C0\u6D4B\u7684\u7F16\u8F91\u5668")}\u4E2D\u6253\u5F00\u76EE\u6807 ${String(index)} \u7684\u6E90\u7801`,
+      openEditor: "\u6253\u5F00\u6E90\u7801",
+      openTarget: (index) => `\u6253\u5F00\u76EE\u6807 ${String(index)} \u7684\u6E90\u7801`,
       preview: "\u9884\u89C8 Prompt",
       copy: "\u590D\u5236 Prompt",
       back: "\u8FD4\u56DE\u7F16\u8F91"
@@ -2528,9 +2515,9 @@ var UI_MESSAGES = Object.freeze({
       detachedTargetRemoved: "\u9875\u9762\u4E2D\u7684\u76EE\u6807\u5DF2\u5378\u8F7D\uFF0C\u5DF2\u4ECE\u5F53\u524D\u9009\u62E9\u4E2D\u79FB\u9664\u3002",
       contextWarning: "\u6D4F\u89C8\u5668\u4E0A\u4E0B\u6587\u91C7\u96C6\u5B8C\u6210\uFF0C\u4F46\u5B58\u5728\u8B66\u544A\u3002",
       contextCollected: "\u6D4F\u89C8\u5668\u4E0A\u4E0B\u6587\u91C7\u96C6\u5B8C\u6210\u3002",
-      editorOpening: (editor) => `\u6B63\u5728\u6253\u5F00${editorName(editor, "\u81EA\u52A8\u68C0\u6D4B\u7684\u7F16\u8F91\u5668")}\u2026\u2026`,
-      editorOpened: (editor) => `\u5DF2\u5728${editorName(editor, "\u81EA\u52A8\u68C0\u6D4B\u7684\u7F16\u8F91\u5668")}\u4E2D\u6253\u5F00\u6E90\u7801\u3002`,
-      editorFailed: (editor) => `\u65E0\u6CD5\u6253\u5F00${editorName(editor, "\u7F16\u8F91\u5668")}\u3002\u8BF7\u5148\u542F\u52A8\u7F16\u8F91\u5668\uFF0C\u6216\u914D\u7F6E editor: "cursor" / "vscode"\u3002`,
+      editorOpening: "\u6B63\u5728\u6253\u5F00\u6E90\u7801\u2026\u2026",
+      editorOpened: "\u6E90\u7801\u5DF2\u5728\u7F16\u8F91\u5668\u4E2D\u6253\u5F00\u3002",
+      editorFailed: "\u65E0\u6CD5\u6253\u5F00\u7F16\u8F91\u5668\u3002\u8BF7\u5148\u542F\u52A8\u7F16\u8F91\u5668\u6216\u68C0\u67E5 editor \u914D\u7F6E\u3002",
       completeInstructions: "\u8BF7\u4E3A\u6BCF\u4E2A\u76EE\u6807\u586B\u5199\u4FEE\u6539\u8BF4\u660E\uFF0C\u5E76\u7B49\u5F85\u4E0A\u4E0B\u6587\u91C7\u96C6\u5B8C\u6210\u3002",
       promptCopied: "Prompt \u5DF2\u590D\u5236\u5230\u526A\u8D34\u677F\u3002",
       clipboardUnavailable: "\u65E0\u6CD5\u8BBF\u95EE\u526A\u8D34\u677F\uFF0C\u8BF7\u624B\u52A8\u9009\u62E9\u5E76\u590D\u5236 Prompt\u3002",
@@ -2825,36 +2812,27 @@ function createStyles(document) {
       gap: 8px;
       flex: none;
     }
+    .spotpatch-repository,
+    .spotpatch-locale,
+    .spotpatch-close {
+      height: 30px;
+      border: 1px solid rgb(255 255 255 / 11%);
+      border-radius: 9px;
+      background: rgb(255 255 255 / 4%);
+    }
     .spotpatch-repository {
       display: inline-flex;
-      height: 30px;
       align-items: center;
-      gap: 5px;
-      border: 1px solid rgb(68 202 224 / 20%);
-      border-radius: 9px;
       padding: 0 10px;
       color: #bcecf2;
-      background: rgb(8 145 178 / 7%);
       font-size: 11px;
       font-weight: 680;
       text-decoration: none;
-      transition: border-color 150ms ease, color 150ms ease, background 150ms ease, transform 150ms ease;
-    }
-    .spotpatch-repository::after { content: "\u2197"; font-size: 10px; }
-    .spotpatch-repository:hover {
-      border-color: rgb(68 202 224 / 42%);
-      color: #e6fbff;
-      background: rgb(8 145 178 / 12%);
-      transform: translateY(-1px);
     }
     .spotpatch-locale {
       min-width: 38px;
-      height: 30px;
-      border: 1px solid rgb(255 255 255 / 11%);
-      border-radius: 9px;
       padding: 0 9px;
       color: #c5cad5;
-      background: rgb(255 255 255 / 4%);
       cursor: pointer;
       font-size: 12px;
       font-weight: 650;
@@ -2862,20 +2840,17 @@ function createStyles(document) {
     .spotpatch-close {
       display: inline-grid;
       width: 30px;
-      height: 30px;
       padding: 0;
       place-items: center;
-      border: 1px solid rgb(255 255 255 / 11%);
-      border-radius: 9px;
       color: #9da5b4;
-      background: rgb(255 255 255 / 4%);
       cursor: pointer;
       font-size: 17px;
       line-height: 1;
       transition: border-color 150ms ease, color 150ms ease, background 150ms ease;
     }
     .spotpatch-close:hover,
-    .spotpatch-locale:hover { border-color: rgb(129 112 247 / 45%); color: #fff; background: rgb(109 93 246 / 10%); }
+    .spotpatch-locale:hover,
+    .spotpatch-repository:hover { border-color: rgb(129 112 247 / 45%); color: #fff; background: rgb(109 93 246 / 10%); }
     .spotpatch-title {
       margin: 0;
       color: #fff;
@@ -2925,10 +2900,14 @@ function createStyles(document) {
       background: #f59e0b;
       content: "";
     }
-    .spotpatch-context-state[data-state="ready"] { color: #9fe3c4; }
-    .spotpatch-context-state[data-state="ready"]::before { background: #34d399; }
-    .spotpatch-context-state[data-state="warning"] { color: #fecaca; }
-    .spotpatch-context-state[data-state="warning"]::before { background: #fb7185; }
+    .spotpatch-context-state[data-state="ready"],
+    .spotpatch-editor-feedback[data-state="success"] { color: #9fe3c4; }
+    .spotpatch-context-state[data-state="ready"]::before,
+    .spotpatch-editor-feedback[data-state="success"]::before { background: #34d399; }
+    .spotpatch-context-state[data-state="warning"],
+    .spotpatch-editor-feedback[data-state="error"] { color: #fecaca; }
+    .spotpatch-context-state[data-state="warning"]::before,
+    .spotpatch-editor-feedback[data-state="error"]::before { background: #fb7185; }
     .spotpatch-body {
       min-height: 0;
       overflow: auto;
@@ -3167,29 +3146,9 @@ function createStyles(document) {
       background: rgb(8 12 22 / 82%);
     }
     .spotpatch-editor-feedback {
-      display: flex;
-      width: 100%;
-      align-items: center;
-      gap: 7px;
-      margin-bottom: 1px;
-      color: #9ca5b5;
-      font-size: 11px;
-      line-height: 1.45;
-    }
-    .spotpatch-editor-feedback[hidden] { display: none; }
-    .spotpatch-editor-feedback::before {
-      width: 6px;
-      height: 6px;
-      flex: none;
-      border-radius: 999px;
-      background: #94a3b8;
-      content: "";
+      flex-basis: 100%;
+      white-space: normal;
     }
-    .spotpatch-editor-feedback[data-state="opening"]::before { background: #38bdf8; }
-    .spotpatch-editor-feedback[data-state="success"] { color: #9fe3c4; }
-    .spotpatch-editor-feedback[data-state="success"]::before { background: #34d399; }
-    .spotpatch-editor-feedback[data-state="error"] { color: #fecaca; }
-    .spotpatch-editor-feedback[data-state="error"]::before { background: #fb7185; }
     .spotpatch-actions button {
       display: inline-flex;
       min-height: 40px;
@@ -3255,8 +3214,6 @@ function createStyles(document) {
       .spotpatch-actions { padding-left: 16px; padding-right: 16px; }
       .spotpatch-target-select { grid-template-columns: 32px minmax(0, 1fr); }
       .spotpatch-target-state { display: none; }
-      .spotpatch-repository { width: 30px; overflow: hidden; padding: 0; justify-content: center; color: transparent; }
-      .spotpatch-repository::after { color: #bcecf2; content: "\u2197"; }
     }
     ${AGENT_PANEL_STYLES}
   `;
@@ -3266,7 +3223,7 @@ function summaryLine(summary, prefix) {
   const line = summary.split("\n").find((candidate) => candidate.startsWith(`${prefix}: `));
   return line?.slice(prefix.length + 2).trim();
 }
-function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: false }), localePreference = "auto", editorPreference = "auto") {
+function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: false }), localePreference = "auto") {
   const localizer = createUiLocalizer(document, localePreference);
   let messages = localizer.messages();
   const host = document.createElement("spotpatch-root");
@@ -3388,17 +3345,14 @@ function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: fal
   const actions = createMarkedElement(document, "footer");
   actions.className = "spotpatch-actions";
   const editorFeedback = createMarkedElement(document, "div");
-  editorFeedback.className = "spotpatch-editor-feedback";
+  editorFeedback.className = "spotpatch-context-state spotpatch-editor-feedback";
   editorFeedback.dataset.state = "idle";
   editorFeedback.setAttribute("role", "status");
   editorFeedback.setAttribute("aria-live", "polite");
   editorFeedback.hidden = true;
   const addTargetButton = createButton(document, messages.actions.addElement);
   const reselectButton = createButton(document, messages.actions.reselect);
-  const openEditorButton = createButton(
-    document,
-    messages.actions.openEditor(editorPreference)
-  );
+  const openEditorButton = createButton(document, messages.actions.openEditor);
   const previewButton = createButton(
     document,
     messages.actions.preview,
@@ -3446,20 +3400,11 @@ function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: fal
   let currentTargets = [];
   let currentMaximum = 0;
   let currentEditorFeedbackState = "idle";
-  function defaultEditorFeedback(state) {
-    if (state === "opening") {
-      return messages.announcements.editorOpening(editorPreference);
-    }
-    if (state === "success") {
-      return messages.announcements.editorOpened(editorPreference);
-    }
-    return state === "error" ? messages.announcements.editorFailed(editorPreference) : "";
-  }
-  function renderEditorStatus(state, message = defaultEditorFeedback(state)) {
+  function renderEditorStatus(state) {
     currentEditorFeedbackState = state;
     editorFeedback.dataset.state = state;
     editorFeedback.hidden = state === "idle";
-    editorFeedback.textContent = message;
+    editorFeedback.textContent = state === "opening" ? messages.announcements.editorOpening : state === "success" ? messages.announcements.editorOpened : state === "error" ? messages.announcements.editorFailed : "";
     placeDialog();
   }
   function statusText(target) {
@@ -3543,11 +3488,8 @@ function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: fal
       const open = createButton(document, "\u2197", "spotpatch-target-open");
       open.dataset.openTargetId = target.id;
       open.disabled = !target.canOpenEditor;
-      open.setAttribute(
-        "aria-label",
-        messages.actions.openTarget(index + 1, editorPreference)
-      );
-      open.title = messages.actions.openTarget(index + 1, editorPreference);
+      open.setAttribute("aria-label", messages.actions.openTarget(index + 1));
+      open.title = messages.actions.openTarget(index + 1);
       const remove = createButton(document, "\xD7", "spotpatch-target-remove");
       remove.dataset.removeTargetId = target.id;
       remove.disabled = !editingEnabled;
@@ -3745,7 +3687,7 @@ function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: fal
     promptOutput.setAttribute("aria-label", messages.diagnostics.promptAriaLabel);
     addTargetButton.textContent = messages.actions.addElement;
     reselectButton.textContent = messages.actions.reselect;
-    openEditorButton.textContent = messages.actions.openEditor(editorPreference);
+    openEditorButton.textContent = messages.actions.openEditor;
     previewButton.textContent = messages.actions.preview;
     copyButton.textContent = messages.actions.copy;
     backButton.textContent = messages.actions.back;
@@ -4381,13 +4323,7 @@ function resolveBrowserDependencies(dependencies) {
 }
 function createController(config, dependencies = {}) {
   const browser = resolveBrowserDependencies(dependencies);
-  const view = dependencies.view ?? createRuntimeView(
-    browser.document,
-    config.shortcut,
-    config.ai,
-    config.locale,
-    config.editor
-  );
+  const view = dependencies.view ?? createRuntimeView(browser.document, config.shortcut, config.ai, config.locale);
   const api = dependencies.api ?? createRuntimeApi({
     apiBase: config.apiBase,
     fetch: browser.window.fetch.bind(browser.window),
@@ -4926,24 +4862,18 @@ ${summary}`;
     const selectionRevision = sessionRevision;
     const requestRevision = ++editorRequestRevision;
     transition({ type: "OPEN_EDITOR" });
-    const openingMessage = view.messages().announcements.editorOpening(config.editor);
-    view.renderEditorStatus("opening", openingMessage);
-    view.announce(openingMessage);
+    view.renderEditorStatus("opening");
     void api.openEditor({
       fileId: marker.fileId,
       line: marker.line,
       column: marker.column
-    }).then((result) => {
+    }).then(() => {
       if (mounted && state.status === "selected" && selectionRevision === sessionRevision && requestRevision === editorRequestRevision && activeTargetId === current.id && targets.includes(current)) {
-        const message = view.messages().announcements.editorOpened(result.editor);
-        view.renderEditorStatus("success", message);
-        view.announce(message);
+        view.renderEditorStatus("success");
       }
     }).catch(() => {
       if (mounted && state.status === "selected" && selectionRevision === sessionRevision && requestRevision === editorRequestRevision && activeTargetId === current.id && targets.includes(current)) {
-        const message = view.messages().announcements.editorFailed(config.editor);
-        view.renderEditorStatus("error", message);
-        view.announce(message);
+        view.renderEditorStatus("error");
       }
     });
   }