@aipanel/provider-deepseek 1.2.7 → 1.2.9

package/es/profile.d.ts

@@ -1,21 +1,37 @@
+import type { AIPanelWidgetTheme } from "@aipanel/core";
+import type { DeepSeekBusyEnter, DeepSeekPermissionPreset } from "./types";
 /** 组装 overlay YAML */
 export declare function buildDshOverlay(options: {
     vitePort: number;
     cwd: string;
-    /** host 插件（@aipanel/dsh-plugin）是否已被同步到 dsh profile；false 时停用该行，避免 fail-loud */
+    /** host 插件（@aipanel/dsh-plugin）是否已同步到 dsh profile；false 时停用该行，避免 fail-loud */
     pluginAvailable?: boolean;
-    /** client 插件（@aipanel/dsh-client）是否可被 dsh 解析（provider 已同步到 dsh profile）；false 时停用该行，避免 fail-loud */
+    /** client 插件（@aipanel/dsh-client）是否可被 dsh 解析；false 时停用该行，避免 fail-loud */
     clientAvailable?: boolean;
     /**
      * 编辑后自动诊断开关（provider option autoDiagnose）。
      * undefined 时不写入 overlay，由 dsh-plugin 回退到 OPENCODE_ENABLE_LINT=1（与 opencode 一致）。
      */
     autoDiagnose?: boolean;
+    /**
+     * 宿主事件推送令牌（core 每轮启动随机）：随 plugin config 注入 dsh-plugin，
+     * 使其把归一化 ProviderEvent POST 到 core 的 HOST_EVENTS_API_PATH。
+     */
+    eventsToken?: string;
     /**
      * 诊断功能总开关（provider option enableDiagnostics）。
-     * true（默认，对齐 opencode enableLsp）时 host 插件注册 run_diagnostics 工具与自动诊断逻辑。
+     * true（默认，对齐 opencode enableLsp）时 host 插件注册 run_diagnostics 工具与自动诊断逻辑，
+     * client 插件注册诊断卡片视图。
      */
     enableDiagnostics?: boolean;
+    /** provider option agentPreset：dsh settings agent-presets.default（随 host 插件 config 下发） */
+    agentPreset?: string;
+    /** provider option permissionPreset：dsh settings permission.defaultPreset（单一来源 ./types） */
+    permissionPreset?: DeepSeekPermissionPreset;
+    /** provider option busyEnter：dsh settings ui-conversation.busyEnter（单一来源 ./types） */
+    busyEnter?: DeepSeekBusyEnter;
+    /** AIPanel 侧主题偏好（applyConfig.theme，AIPanelWidgetTheme）；auto 不干预（沿用 dsh 持久化偏好），light/dark 随 client 插件 config 下发 */
+    theme?: AIPanelWidgetTheme;
 }): string;
 /** 将 overlay 写入项目缓存目录（AIPANEL_CACHE_DIR 下按 provider 分二级目录），不污染用户项目根目录。 */
 export declare function writeDshOverlay(workspaceCwd: string, overlay: string): string;

package/es/profile.js

@@ -4,6 +4,7 @@ import {
   AIPANEL_CACHE_DIR,
   MCP_API_PATH,
   CONTEXT_API_PATH,
+  HOST_EVENTS_API_PATH,
   createLogger
 } from "@aipanel/core/node";
 const log = createLogger("DeepSeekProfile");
@@ -14,7 +15,12 @@ function buildDshOverlay(options) {
     pluginAvailable = true,
     clientAvailable = true,
     autoDiagnose,
-    enableDiagnostics = true
+    enableDiagnostics = true,
+    eventsToken,
+    agentPreset,
+    permissionPreset,
+    busyEnter,
+    theme = "auto"
   } = options;
   const mcpUrl = `http://127.0.0.1:${vitePort}${MCP_API_PATH}`;
   const rows = [];
@@ -40,14 +46,25 @@ function buildDshOverlay(options) {
       `        vitePort: ${vitePort}`,
       `        contextApiPath: ${JSON.stringify(CONTEXT_API_PATH)}`,
       `        enableDiagnostics: ${enableDiagnostics ? "true" : "false"}`,
-      ...autoDiagnose !== void 0 ? [`        autoDiagnose: ${autoDiagnose ? "true" : "false"}`] : []
+      ...autoDiagnose !== void 0 ? [`        autoDiagnose: ${autoDiagnose ? "true" : "false"}`] : [],
+      ...eventsToken ? [
+        `        eventsToken: ${JSON.stringify(eventsToken)}`,
+        `        eventsPath: ${JSON.stringify(HOST_EVENTS_API_PATH)}`
+      ] : [],
+      // providerOptions → 启动期设置（dsh-plugin/applyProviderSettings 经 ctx.settings 写入）
+      ...agentPreset !== void 0 ? [`        agentPreset: ${JSON.stringify(agentPreset)}`] : [],
+      ...permissionPreset !== void 0 ? [`        permissionPreset: ${JSON.stringify(permissionPreset)}`] : [],
+      ...busyEnter !== void 0 ? [`        busyEnter: ${JSON.stringify(busyEnter)}`] : []
     ].join("\n")
   );
   rows.push(
     [
       "    - id: aipanel-client",
       "      name: '@aipanel/dsh-client'",
-      ...clientAvailable ? [] : ["      disabled: true"]
+      ...clientAvailable ? [] : ["      disabled: true"],
+      "      config:",
+      `        enableDiagnostics: ${enableDiagnostics ? "true" : "false"}`,
+      ...theme !== "auto" ? [`        theme: ${JSON.stringify(theme)}`] : []
     ].join("\n")
   );
   return ["- insert:", rows.join("\n"), ""].join("\n");

package/es/provider.d.ts

@@ -13,7 +13,9 @@ export interface DeepSeekWebProviderDeps {
 }
 /**
  * DeepSeek Harness Web Provider
- * 组合 CLI 进程管理、RPC 会话 API、桥接脚本，向核心层暴露 WebProvider 契约。
+ * 组合 CLI 进程管理、RPC 会话 API、dsh 侧插件编排（host 插件 + 浏览器 client 插件），
+ * 向核心层暴露 WebProvider 契约。dsh 页内行为（会话聚焦/主题/布局/选中元素）全部
+ * 由浏览器插件 @aipanel/dsh-client 承担，不再注入 bridge 脚本。
  */
 export declare class DeepSeekWebProvider implements WebProvider {
     readonly id = "deepseek";
@@ -25,20 +27,17 @@ export declare class DeepSeekWebProvider implements WebProvider {
     private readonly api;
     private deps;
     private process;
-    private bridgeOptions;
+    /** AIPanel 侧下发的主题偏好（AIPanelWidgetTheme，default auto）：随 client 插件 config 注入，作为启动初值 */
+    private uiTheme;
     private readonly opts;
     constructor(config: DeepSeekWebProviderConfig, deps: DeepSeekWebProviderDeps, options?: Record<string, unknown>);
-    /** 代理注入到 HTML 的桥接脚本（Provider 资产） */
-    get bridgeScript(): string | undefined;
-    /** 初始化桥接配置（主题、诊断开关等） */
+    /** 记录 AIPanel 侧主题偏好（applyConfig 在 start 前调用；start 时随 client 插件 config 下发） */
     applyConfig(config: ProviderConfig): void;
     checkEnvironment(): Promise<ProviderEnvironmentInfo>;
     start(options: ProviderStartOptions): Promise<ProviderStartResult>;
-    /** 把 providerOptions 配置映射为 dsh settings 命名空间 patch（仅含用户显式配置项） */
-    private buildSettingsToApply;
     stop(): Promise<void>;
     killOrphans(): Promise<number>;
-    listSessions(projectDir: string): Promise<ChatSession[]>;
+    listSessions(projectDir: string, activeSessionId?: string): Promise<ChatSession[]>;
     createSession(projectDir: string, title?: string): Promise<ChatSession>;
     deleteSession(sessionId: string): Promise<void>;
     buildSessionUrl(projectDir: string, sessionId: string): string;

package/es/provider.js

@@ -1,14 +1,20 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import { sleep } from "@aipanel/core";
 import { createLogger } from "@aipanel/core/node";
 import { DEFAULT_DEEPSEEK_PROVIDER_OPTIONS } from "./constants.js";
-import { DSH_LOOPBACK_HOST, DSH_MUX_EVENTS_PATH, DSH_HOST_EVENTS_PATH } from "./constants.js";
+import { DSH_LOOPBACK_HOST } from "./constants.js";
 import { DeepSeekAPI } from "./api.js";
-import { generateBridgeScript } from "./bridge-script.js";
-import { startDeepSeekWeb } from "./deepseek-web.js";
+import { LaunchToken, startDeepSeekWeb } from "./deepseek-web.js";
 import { buildDshOverlay, writeDshOverlay } from "./profile.js";
-import { checkDeepSeekInstalled, getDeepSeekVersion, killOrphanDeepSeekProcesses } from "./system.js";
+import {
+  checkDeepSeekInstalled,
+  getDeepSeekVersion,
+  isDeepSeekVersionAtLeast,
+  killOrphanDeepSeekProcesses,
+  MIN_DSH_VERSION
+} from "./system.js";
 import {
   DSH_CLIENT_PACKAGE,
   DSH_PLUGIN_PACKAGE,
@@ -26,22 +32,17 @@ class DeepSeekWebProvider {
     __publicField(this, "api");
     __publicField(this, "deps");
     __publicField(this, "process", null);
-    __publicField(this, "bridgeOptions", {});
+    /** AIPanel 侧下发的主题偏好（AIPanelWidgetTheme，default auto）：随 client 插件 config 注入，作为启动初值 */
+    __publicField(this, "uiTheme", "auto");
     __publicField(this, "opts");
     this.deps = deps;
     this.opts = resolveDeepSeekOptions(options);
     this.api = new DeepSeekAPI(DSH_LOOPBACK_HOST, deps.getWebPort);
   }
-  /** 代理注入到 HTML 的桥接脚本（Provider 资产） */
-  get bridgeScript() {
-    return generateBridgeScript(this.bridgeOptions);
-  }
-  /** 初始化桥接配置（主题、诊断开关等） */
+  /** 记录 AIPanel 侧主题偏好（applyConfig 在 start 前调用；start 时随 client 插件 config 下发） */
   applyConfig(config) {
-    this.bridgeOptions = {
-      theme: config.theme ?? "auto",
-      diagnosticsEnabled: this.opts.enableDiagnostics ?? false
-    };
+    const t = config.theme;
+    this.uiTheme = t === "light" || t === "dark" || t === "auto" ? t : "auto";
   }
   async checkEnvironment() {
     if (!await checkDeepSeekInstalled()) {
@@ -60,6 +61,18 @@ or run without installing:
       };
     }
     const version = await getDeepSeekVersion();
+    const compatible = version === null ? true : isDeepSeekVersionAtLeast(version);
+    if (compatible === false) {
+      return {
+        ok: false,
+        message: `DeepSeek Harness (dsh) ${version} is too old: this provider requires dsh >= ${MIN_DSH_VERSION} (browser-session auth / Remote RPC protocol).
+
+Please upgrade:
+
+  npm install -g @deepseek-ai/dsh@latest
+`
+      };
+    }
     return { ok: true, version: version ?? void 0 };
   }
   async start(options) {
@@ -90,7 +103,7 @@ or run without installing:
       this.opts.home
     );
     if (!pluginAvailable) {
-      log.warn("@aipanel/dsh-plugin unavailable; run_diagnostics & auto-diagnose disabled", {
+      log.warn("@aipanel/dsh-plugin unavailable; run_diagnostics & settings application disabled", {
         metaUrl: import.meta.url
       });
     }
@@ -100,48 +113,55 @@ or run without installing:
       pluginAvailable,
       clientAvailable,
       autoDiagnose: this.opts.autoDiagnose,
-      enableDiagnostics: this.opts.enableDiagnostics
+      enableDiagnostics: this.opts.enableDiagnostics,
+      // 宿主事件推送令牌（core 每轮启动随机）：随 plugin config 注入 dsh-plugin 用于回推鉴权
+      eventsToken: options.eventsToken,
+      agentPreset: this.opts.agentPreset,
+      permissionPreset: this.opts.permissionPreset,
+      busyEnter: this.opts.busyEnter,
+      theme: this.uiTheme
     });
     const patchPath = writeDshOverlay(options.cwd, overlay);
+    const launchToken = new LaunchToken();
+    this.api.setLaunchTokenSource(() => launchToken.wait());
     const proc = startDeepSeekWeb({
       port: options.port,
       hostname: DSH_LOOPBACK_HOST,
       cwd: options.cwd,
       patchPath,
       home: this.opts.home,
-      verbose: options.verbose
+      verbose: options.verbose,
+      launchToken
     });
     this.process = proc;
-    const settings = this.buildSettingsToApply();
-    if (Object.keys(settings).length > 0) {
-      void this.api.applySettings(settings).catch((e) => {
-        log.warn("failed to apply provider settings to dsh", {
-          settings,
+    let webAuthCookie;
+    try {
+      const token = await launchToken.wait();
+      this.api.setLaunchToken(token);
+      const maxAuthAttempts = 3;
+      for (let attempt = 1; ; attempt++) {
+        try {
+          await this.api.authenticate();
+          break;
+        } catch (e) {
+          if (attempt >= maxAuthAttempts) throw e;
+          log.debug("dsh browser-session auth bootstrap attempt failed, retrying", {
+            attempt,
+            error: e instanceof Error ? e.message : String(e)
+          });
+          await sleep(250 * attempt);
+        }
+      }
+      webAuthCookie = this.api.getAuthCookie();
+    } catch (e) {
+      log.warn(
+        "failed to establish dsh web browser-session auth; UI may show authentication required",
+        {
           error: e instanceof Error ? e.message : String(e)
-        });
-      });
-    }
-    return { url: this.api.shellUrl, processHandle: proc };
-  }
-  /** 把 providerOptions 配置映射为 dsh settings 命名空间 patch（仅含用户显式配置项） */
-  buildSettingsToApply() {
-    const sections = {};
-    if (this.opts.agentPreset !== void 0) {
-      sections["agent-presets"] = { ...sections["agent-presets"], default: this.opts.agentPreset };
-    }
-    if (this.opts.permissionPreset !== void 0) {
-      sections.permission = {
-        ...sections.permission,
-        defaultPreset: this.opts.permissionPreset
-      };
-    }
-    if (this.opts.busyEnter !== void 0) {
-      sections["ui-conversation"] = {
-        ...sections["ui-conversation"],
-        busyEnter: this.opts.busyEnter
-      };
+        }
+      );
     }
-    return sections;
+    return { url: this.api.shellUrl, processHandle: proc, webAuthCookie };
   }
   async stop() {
     if (this.process) {
@@ -153,8 +173,8 @@ or run without installing:
   async killOrphans() {
     return killOrphanDeepSeekProcesses();
   }
-  async listSessions(projectDir) {
-    const sessions = await this.api.listSessions(projectDir);
+  async listSessions(projectDir, activeSessionId) {
+    const sessions = await this.api.listSessions(projectDir, activeSessionId);
     const url = this.buildSessionUrl(projectDir, "");
     return sessions.map((s) => toChatSession(s, url));
   }
@@ -179,104 +199,12 @@ or run without installing:
     return `http://${DSH_LOOPBACK_HOST}:${this.deps.getProxyPort()}/`;
   }
   subscribeEvents(handler) {
-    const port = this.deps.getWebPort();
-    const base = `ws://${DSH_LOOPBACK_HOST}:${port}`;
-    const endpoints = [DSH_MUX_EVENTS_PATH, DSH_HOST_EVENTS_PATH];
-    log.debug("Subscribing to dsh event streams (WebSocket)", {
-      endpoints: endpoints.map((p) => base + p)
-    });
-    let aborted = false;
-    const sockets = /* @__PURE__ */ new Set();
-    const retryTimers = /* @__PURE__ */ new Set();
-    const cleanupAll = () => {
-      for (const timer of retryTimers) clearTimeout(timer);
-      retryTimers.clear();
-      for (const ws of sockets) {
-        try {
-          ws.close();
-        } catch {
-        }
-      }
-      sockets.clear();
-    };
-    const connect = (path, attempt = 0) => {
-      if (aborted) return;
-      let socket;
-      try {
-        socket = new WebSocket(base + path);
-      } catch (e) {
-        log.warn("dsh event WebSocket create failed", { path, error: String(e) });
-        scheduleReconnect(path, attempt + 1);
-        return;
-      }
-      sockets.add(socket);
-      socket.onmessage = (ev) => {
-        try {
-          const frame = JSON.parse(String(ev.data));
-          const event = mapEvent(frame);
-          if (event) handler(event);
-        } catch {
-        }
-      };
-      socket.onclose = () => {
-        sockets.delete(socket);
-        scheduleReconnect(path, attempt + 1);
-      };
-      socket.onerror = () => {
-        try {
-          socket.close();
-        } catch {
-        }
-      };
-    };
-    const scheduleReconnect = (path, attempt) => {
-      if (aborted) return;
-      const delays = [250, 500, 1e3, 2e3, 5e3];
-      const after = delays[Math.min(attempt, delays.length - 1)];
-      const timer = setTimeout(() => {
-        retryTimers.delete(timer);
-        connect(path);
-      }, after);
-      retryTimers.add(timer);
-    };
-    endpoints.forEach((p) => connect(p));
+    void handler;
+    log.debug("dsh \u4E8B\u4EF6\u7ECF\u5BBF\u4E3B\u63D2\u4EF6(dsh-plugin)\u4E2D\u7EE7\u63A8\u9001\uFF0Cprovider \u76F4\u8FDE\u4E8B\u4EF6\u901A\u9053\u4E3A\u7A7A");
     return () => {
-      aborted = true;
-      cleanupAll();
     };
   }
 }
-function mapEvent(frame) {
-  if (!frame || typeof frame.method !== "string" || !frame.payload) return null;
-  const payload = frame.payload;
-  const sessionId = payload.sessionId ?? "";
-  switch (frame.method) {
-    case "host/session-status": {
-      if (!sessionId) return null;
-      const running = payload.running === true;
-      return { type: "session.status", sessionId, status: running ? "running" : "idle" };
-    }
-    case "session/event": {
-      const event = payload.event;
-      const type = event?.type ?? "";
-      if (!sessionId || !type) return null;
-      switch (type) {
-        case "assistant/message":
-        case "turn/end":
-          return { type: "thinking", sessionId, thinking: false };
-        case "assistant/chunk":
-        case "thinking/delta":
-        case "turn/start":
-        case "step/start":
-          return { type: "thinking", sessionId, thinking: true };
-        default:
-          return null;
-      }
-    }
-    default:
-      return null;
-  }
-}
 function toChatSession(s, url) {
   return {
     id: s.sessionId,
@@ -293,7 +221,7 @@ function resolveDeepSeekOptions(options) {
   return {
     ...DEFAULT_DEEPSEEK_PROVIDER_OPTIONS,
     home: po.home ?? options.home,
-    agentPreset: po.agentPreset ?? options.agentPreset ?? DEFAULT_DEEPSEEK_PROVIDER_OPTIONS.agentPreset,
+    agentPreset: po.agentPreset ?? options.agentPreset,
     permissionPreset: po.permissionPreset ?? options.permissionPreset,
     busyEnter: po.busyEnter ?? options.busyEnter,
     autoDiagnose: po.autoDiagnose ?? options.autoDiagnose ?? DEFAULT_DEEPSEEK_PROVIDER_OPTIONS.autoDiagnose,

package/es/system.d.ts

@@ -1,3 +1,10 @@
 export declare function checkDeepSeekInstalled(): Promise<boolean>;
+/** 本 provider 要求的 dsh 最低版本（0.1.2 起：browser-session 认证 + {args} Remote RPC + remote.mux，协议不向下兼容） */
+export declare const MIN_DSH_VERSION = "0.1.2-rc.1";
+/**
+ * 判定 version 是否 >= minimum（semver 风格，含 pre-release 比较：0.1.2 > 0.1.2-rc.1）。
+ * @returns true/false；任一版本无法解析时返回 null（调用方按"无法确认"放行）。
+ */
+export declare function isDeepSeekVersionAtLeast(version: string, minimum?: string): boolean | null;
 export declare function getDeepSeekVersion(): Promise<string | null>;
 export declare function killOrphanDeepSeekProcesses(): Promise<number>;

package/es/system.js

@@ -18,6 +18,45 @@ async function checkDeepSeekInstalled() {
     });
   });
 }
+const MIN_DSH_VERSION = "0.1.2-rc.1";
+function parseDshVersion(version) {
+  const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?/.exec(version.trim());
+  if (!match) return null;
+  return {
+    major: Number(match[1]),
+    minor: Number(match[2]),
+    patch: Number(match[3]),
+    pre: match[4]
+  };
+}
+function isDeepSeekVersionAtLeast(version, minimum = MIN_DSH_VERSION) {
+  const a = parseDshVersion(version);
+  const b = parseDshVersion(minimum);
+  if (!a || !b) return null;
+  for (const key of ["major", "minor", "patch"]) {
+    if (a[key] !== b[key]) return a[key] > b[key];
+  }
+  if (a.pre === void 0 && b.pre === void 0) return true;
+  if (a.pre === void 0) return true;
+  if (b.pre === void 0) return false;
+  const pa = a.pre.split(".");
+  const pb = b.pre.split(".");
+  const len = Math.max(pa.length, pb.length);
+  for (let i = 0; i < len; i++) {
+    const x = pa[i];
+    const y = pb[i];
+    if (x === void 0) return true;
+    if (y === void 0) return false;
+    const xn = /^\d+$/.test(x) ? Number(x) : NaN;
+    const yn = /^\d+$/.test(y) ? Number(y) : NaN;
+    if (!Number.isNaN(xn) && !Number.isNaN(yn)) {
+      if (xn !== yn) return xn > yn;
+    } else if (x !== y) {
+      return x > y;
+    }
+  }
+  return true;
+}
 function getDeepSeekVersion() {
   return new Promise((resolve) => {
     const proc = spawn("dsh", ["--version"], { stdio: "pipe", shell: true });
@@ -164,7 +203,9 @@ function killOrphanProcessesOnUnix(resolve, timer) {
   });
 }
 export {
+  MIN_DSH_VERSION,
   checkDeepSeekInstalled,
   getDeepSeekVersion,
+  isDeepSeekVersionAtLeast,
   killOrphanDeepSeekProcesses
 };