@i14ks/ccv 0.21.0 → 0.22.0

package/bundle/ccv.mjs

@@ -2154,6 +2154,41 @@ var ClaudeSession = class extends EventEmitter {
       throw new Error("\u0421\u0435\u0441\u0441\u0438\u044F \u0435\u0449\u0451 \u043D\u0435 \u0437\u0430\u043F\u0443\u0449\u0435\u043D\u0430");
     await this.#query.reconnectMcpServer(name);
   }
+  /**
+   * Начать OAuth-вход сервера в `needs-auth`.
+   *
+   * `mcpAuthenticate` есть в `Query`, но не в `sdk.d.ts` — отсюда приведение.
+   * CLI сам слушает колбэк на `localhost` и сам переподключает сервер после
+   * входа; нам отдаёт только ссылку. Без `redirectUri` — тогда CLI выбирает
+   * локальный колбэк, единственный, что работает без своего домена.
+   */
+  async authenticateMcpServer(name) {
+    if (!this.#query)
+      throw new Error("\u0421\u0435\u0441\u0441\u0438\u044F \u0435\u0449\u0451 \u043D\u0435 \u0437\u0430\u043F\u0443\u0449\u0435\u043D\u0430");
+    const q = this.#query;
+    if (typeof q.mcpAuthenticate !== "function") {
+      throw new Error("\u042D\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044F Agent SDK \u043D\u0435 \u0443\u043C\u0435\u0435\u0442 \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u043E\u0432\u0430\u0442\u044C MCP-\u0441\u0435\u0440\u0432\u0435\u0440\u044B");
+    }
+    const response = await q.mcpAuthenticate(name) ?? {};
+    return {
+      url: typeof response.authUrl === "string" ? response.authUrl : "",
+      requiresUserAction: response.requiresUserAction === true,
+      callbackExpected: response.callbackExpected === true
+    };
+  }
+  /**
+   * Отдать CLI адрес редиректа, вставленный руками, — когда браузер не на этой
+   * машине и до `localhost` хоста не достучался. Резолвится после входа.
+   */
+  async submitMcpOAuthCallback(name, callbackUrl) {
+    if (!this.#query)
+      throw new Error("\u0421\u0435\u0441\u0441\u0438\u044F \u0435\u0449\u0451 \u043D\u0435 \u0437\u0430\u043F\u0443\u0449\u0435\u043D\u0430");
+    const q = this.#query;
+    if (typeof q.mcpSubmitOAuthCallbackUrl !== "function") {
+      throw new Error("\u042D\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044F Agent SDK \u043D\u0435 \u0443\u043C\u0435\u0435\u0442 \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u043E\u0432\u0430\u0442\u044C MCP-\u0441\u0435\u0440\u0432\u0435\u0440\u044B");
+    }
+    await q.mcpSubmitOAuthCallbackUrl(name, callbackUrl);
+  }
   /** Включить или выключить сервер — тот же обход слэш-команды, что выше. */
   async toggleMcpServer(name, enabled) {
     if (!this.#query)
@@ -3647,6 +3682,12 @@ Attached image${paths.length > 1 ? "s" : ""} (view them with your file viewing t
   async toggleMcpServer(_name, _enabled) {
     throw new Error("MCP-\u0441\u0435\u0440\u0432\u0435\u0440\u044B Antigravity \u043D\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u044E\u0442\u0441\u044F \u0432 \u0441\u0430\u043C\u043E\u043C agy (`agy mcp`)");
   }
+  async authenticateMcpServer(_name) {
+    throw new Error("MCP-\u0441\u0435\u0440\u0432\u0435\u0440\u044B Antigravity \u043D\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u044E\u0442\u0441\u044F \u0432 \u0441\u0430\u043C\u043E\u043C agy (`agy mcp`)");
+  }
+  async submitMcpOAuthCallback(_name, _callbackUrl) {
+    throw new Error("MCP-\u0441\u0435\u0440\u0432\u0435\u0440\u044B Antigravity \u043D\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u044E\u0442\u0441\u044F \u0432 \u0441\u0430\u043C\u043E\u043C agy (`agy mcp`)");
+  }
   setTitle(title) {
     this.#record.title = title;
     this.#titleIsDefault = false;
@@ -7506,6 +7547,8 @@ var FINDER_TITLE = "\xB7 \u043F\u043E\u0438\u0441\u043A \u043F\u0440\u043E\u0435
 var HISTORY_PAGE = 250;
 var HISTORY_PAGE_MAX = 500;
 var AUTO_STOP_SWEEP_MS = 30 * 1e3;
+var MCP_AUTH_POLL_MS = 2 * 1e3;
+var MCP_AUTH_TIMEOUT_MS = 10 * 60 * 1e3;
 var BUSY_STATES2 = /* @__PURE__ */ new Set([
   "running",
   "waiting_permission",
@@ -7521,6 +7564,8 @@ var HostServer = class {
   #settings;
   #finder;
   #sessions = /* @__PURE__ */ new Map();
+  /** Опросы статуса для идущих OAuth-входов MCP, ключ — сессия и сервер. */
+  #mcpAuthWatch = /* @__PURE__ */ new Map();
   #antigravity;
   /** Боковые сессии («вопрос на полях») по id родителя — не больше одной на разговор. */
   #sides = /* @__PURE__ */ new Map();
@@ -8182,6 +8227,56 @@ var HostServer = class {
         await this.#sendMcpList(frame.sessionId);
         return;
       }
+      case "mcp.auth": {
+        const session = this.#requireSession(frame.sessionId);
+        const { name } = frame;
+        const base = { name, url: "", callbackExpected: false, done: false };
+        try {
+          const start = await session.authenticateMcpServer(name);
+          this.#broadcast({
+            type: "mcp.auth",
+            sessionId: frame.sessionId,
+            state: {
+              ...base,
+              active: true,
+              url: start.requiresUserAction ? start.url : "",
+              callbackExpected: start.callbackExpected,
+              error: null
+            }
+          });
+          this.#watchMcpAuth(frame.sessionId, name);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          this.#broadcast({
+            type: "mcp.auth",
+            sessionId: frame.sessionId,
+            state: { ...base, active: false, error: message }
+          });
+          this.#reportOperation(frame.sessionId, "mcp", false, message);
+        }
+        return;
+      }
+      case "mcp.auth_callback": {
+        const session = this.#requireSession(frame.sessionId);
+        try {
+          await session.submitMcpOAuthCallback(frame.name, frame.callbackUrl.trim());
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          this.#broadcast({
+            type: "mcp.auth",
+            sessionId: frame.sessionId,
+            state: {
+              name: frame.name,
+              active: true,
+              url: "",
+              callbackExpected: true,
+              done: false,
+              error: message
+            }
+          });
+        }
+        return;
+      }
       case "plugin.list":
         await this.#sendPluginList(frame.sessionId);
         return;
@@ -8629,6 +8724,66 @@ var HostServer = class {
     this.#reportOperation(sessionId, "plugin", ok, message);
     await this.#sendPluginList(sessionId);
   }
+  /**
+   * Дождаться, пока сервер выйдет из `needs-auth`.
+   *
+   * О конце входа CLI не сообщает ничем: после колбэка он молча меняет токены
+   * и переподключает сервер у себя. Остаётся спрашивать статус, пока не
+   * изменится, — недолго, потому что вход человек либо проходит за минуты,
+   * либо бросает.
+   */
+  #watchMcpAuth(sessionId, name) {
+    const key = `${sessionId}/${name}`;
+    clearInterval(this.#mcpAuthWatch.get(key));
+    const startedAt = Date.now();
+    const finish = () => {
+      clearInterval(this.#mcpAuthWatch.get(key));
+      this.#mcpAuthWatch.delete(key);
+    };
+    const timer = setInterval(() => {
+      void (async () => {
+        const session = this.#sessions.get(sessionId);
+        if (!session)
+          return finish();
+        if (Date.now() - startedAt > MCP_AUTH_TIMEOUT_MS) {
+          finish();
+          this.#broadcast({
+            type: "mcp.auth",
+            sessionId,
+            state: {
+              name,
+              active: false,
+              url: "",
+              callbackExpected: false,
+              done: false,
+              error: "\u0412\u0445\u043E\u0434 \u043D\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0451\u043D \u2014 \u0438\u0441\u0442\u0435\u043A\u043B\u043E \u0432\u0440\u0435\u043C\u044F \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u044F"
+            }
+          });
+          return;
+        }
+        const status = (await session.mcpServerStatus()).find((s) => s.name === name)?.status;
+        if (status === "needs-auth" || status === "pending")
+          return;
+        finish();
+        const ok = status === "connected";
+        this.#broadcast({
+          type: "mcp.auth",
+          sessionId,
+          state: {
+            name,
+            active: false,
+            url: "",
+            callbackExpected: false,
+            done: ok,
+            error: ok ? null : `\u0421\u0435\u0440\u0432\u0435\u0440 \xAB${name}\xBB \u043F\u043E\u0441\u043B\u0435 \u0432\u0445\u043E\u0434\u0430 \u0432 \u0441\u0442\u0430\u0442\u0443\u0441\u0435 ${status ?? "\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E"}`
+          }
+        });
+        this.#reportOperation(sessionId, "mcp", ok, ok ? `\u0421\u0435\u0440\u0432\u0435\u0440 \xAB${name}\xBB \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u043E\u0432\u0430\u043D \u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0451\u043D` : `\u0421\u0435\u0440\u0432\u0435\u0440 \xAB${name}\xBB \u043D\u0435 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0438\u043B\u0441\u044F \u043F\u043E\u0441\u043B\u0435 \u0432\u0445\u043E\u0434\u0430`);
+        await this.#sendMcpList(sessionId);
+      })().catch(() => finish());
+    }, MCP_AUTH_POLL_MS);
+    this.#mcpAuthWatch.set(key, timer);
+  }
   #reportOperation(sessionId, scope, ok, message) {
     this.#broadcast({ type: "operation.result", sessionId, result: { scope, ok, message } });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@i14ks/ccv",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "license": "UNLICENSED",
   "description": "GUI для Claude Code: сессии агента в каталогах проектов, дерево файлов и редактор рядом с разговором.",
   "homepage": "https://claudevisual.com",

package/web/assets/{codemirror-B6QVSqxx.js → codemirror-BVRIW86g.js}

@@ -1 +1 @@
-import{s as r,H as a}from"./index-Zo5hIeFa.js";import{E as e}from"./index-891wE-Rj.js";import{t as o}from"./index-3BSpF-Pn.js";import"./index-BHot-lnj.js";const m=e.theme({"&":{height:"100%",color:"var(--text)",backgroundColor:"var(--bg)",fontSize:"13px"},".cm-scroller":{fontFamily:"var(--mono)",lineHeight:"1.6"},".cm-content":{caretColor:"var(--accent)"},".cm-cursor, .cm-dropCursor":{borderLeftColor:"var(--accent)"},"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":{backgroundColor:"var(--cm-selection)"},".cm-gutters":{backgroundColor:"var(--bg)",color:"var(--muted)",borderRight:"1px solid var(--border-soft)"},".cm-activeLineGutter":{backgroundColor:"var(--surface-2)",color:"var(--text-2)"},".cm-activeLine":{backgroundColor:"var(--cm-active)"},".cm-selectionMatch":{backgroundColor:"var(--cm-match)"},"&.cm-focused .cm-matchingBracket":{backgroundColor:"var(--cm-match)",outline:"1px solid var(--accent-line)"},".cm-foldPlaceholder":{backgroundColor:"var(--surface-2)",border:"1px solid var(--border)",color:"var(--muted)"},".cm-panels":{backgroundColor:"var(--surface)",color:"var(--text)",border:"1px solid var(--border)"},".cm-panels input, .cm-panels button, .cm-panels select":{fontFamily:"var(--sans)",fontSize:"12px",background:"var(--surface-2)",color:"var(--text)",border:"1px solid var(--border)",borderRadius:"6px",padding:"3px 6px"},".cm-searchMatch":{backgroundColor:"var(--cm-match)"},".cm-searchMatch.cm-searchMatch-selected":{backgroundColor:"var(--accent-soft)"},".cm-tooltip":{background:"var(--surface)",border:"1px solid var(--border)",borderRadius:"8px",boxShadow:"var(--shadow-md)",color:"var(--text)"},".cm-tooltip-autocomplete ul li[aria-selected]":{background:"var(--surface-2)",color:"var(--text)"}}),i=r(a.define([{tag:[o.keyword,o.modifier,o.controlKeyword,o.moduleKeyword],color:"var(--cm-key)"},{tag:[o.name,o.deleted,o.character,o.macroName],color:"var(--text)"},{tag:[o.propertyName],color:"var(--cm-prop)"},{tag:[o.function(o.variableName),o.labelName],color:"var(--cm-fn)"},{tag:[o.color,o.constant(o.name),o.standard(o.name),o.bool],color:"var(--cm-const)"},{tag:[o.definition(o.name),o.separator],color:"var(--text)"},{tag:[o.typeName,o.className,o.changed,o.annotation,o.self,o.namespace],color:"var(--cm-type)"},{tag:[o.number,o.integer,o.float],color:"var(--cm-num)"},{tag:[o.string,o.special(o.string),o.regexp],color:"var(--cm-str)"},{tag:[o.operator,o.operatorKeyword,o.escape],color:"var(--cm-op)"},{tag:[o.meta,o.comment],color:"var(--cm-comment)",fontStyle:"italic"},{tag:o.strong,fontWeight:"650"},{tag:o.emphasis,fontStyle:"italic"},{tag:o.strikethrough,textDecoration:"line-through"},{tag:o.link,color:"var(--cm-str)",textDecoration:"underline"},{tag:o.heading,fontWeight:"650",color:"var(--cm-key)"},{tag:o.invalid,color:"var(--danger)"}]));export{i as editorHighlight,m as editorTheme};
+import{s as r,H as a}from"./index-BTHa3RWC.js";import{E as e}from"./index-891wE-Rj.js";import{t as o}from"./index-L8M_w2e-.js";import"./index-BHot-lnj.js";const m=e.theme({"&":{height:"100%",color:"var(--text)",backgroundColor:"var(--bg)",fontSize:"13px"},".cm-scroller":{fontFamily:"var(--mono)",lineHeight:"1.6"},".cm-content":{caretColor:"var(--accent)"},".cm-cursor, .cm-dropCursor":{borderLeftColor:"var(--accent)"},"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":{backgroundColor:"var(--cm-selection)"},".cm-gutters":{backgroundColor:"var(--bg)",color:"var(--muted)",borderRight:"1px solid var(--border-soft)"},".cm-activeLineGutter":{backgroundColor:"var(--surface-2)",color:"var(--text-2)"},".cm-activeLine":{backgroundColor:"var(--cm-active)"},".cm-selectionMatch":{backgroundColor:"var(--cm-match)"},"&.cm-focused .cm-matchingBracket":{backgroundColor:"var(--cm-match)",outline:"1px solid var(--accent-line)"},".cm-foldPlaceholder":{backgroundColor:"var(--surface-2)",border:"1px solid var(--border)",color:"var(--muted)"},".cm-panels":{backgroundColor:"var(--surface)",color:"var(--text)",border:"1px solid var(--border)"},".cm-panels input, .cm-panels button, .cm-panels select":{fontFamily:"var(--sans)",fontSize:"12px",background:"var(--surface-2)",color:"var(--text)",border:"1px solid var(--border)",borderRadius:"6px",padding:"3px 6px"},".cm-searchMatch":{backgroundColor:"var(--cm-match)"},".cm-searchMatch.cm-searchMatch-selected":{backgroundColor:"var(--accent-soft)"},".cm-tooltip":{background:"var(--surface)",border:"1px solid var(--border)",borderRadius:"8px",boxShadow:"var(--shadow-md)",color:"var(--text)"},".cm-tooltip-autocomplete ul li[aria-selected]":{background:"var(--surface-2)",color:"var(--text)"}}),i=r(a.define([{tag:[o.keyword,o.modifier,o.controlKeyword,o.moduleKeyword],color:"var(--cm-key)"},{tag:[o.name,o.deleted,o.character,o.macroName],color:"var(--text)"},{tag:[o.propertyName],color:"var(--cm-prop)"},{tag:[o.function(o.variableName),o.labelName],color:"var(--cm-fn)"},{tag:[o.color,o.constant(o.name),o.standard(o.name),o.bool],color:"var(--cm-const)"},{tag:[o.definition(o.name),o.separator],color:"var(--text)"},{tag:[o.typeName,o.className,o.changed,o.annotation,o.self,o.namespace],color:"var(--cm-type)"},{tag:[o.number,o.integer,o.float],color:"var(--cm-num)"},{tag:[o.string,o.special(o.string),o.regexp],color:"var(--cm-str)"},{tag:[o.operator,o.operatorKeyword,o.escape],color:"var(--cm-op)"},{tag:[o.meta,o.comment],color:"var(--cm-comment)",fontStyle:"italic"},{tag:o.strong,fontWeight:"650"},{tag:o.emphasis,fontStyle:"italic"},{tag:o.strikethrough,textDecoration:"line-through"},{tag:o.link,color:"var(--cm-str)",textDecoration:"underline"},{tag:o.heading,fontWeight:"650",color:"var(--cm-key)"},{tag:o.invalid,color:"var(--danger)"}]));export{i as editorHighlight,m as editorTheme};