dsh-auto-open-web 0.1.11 → 0.1.15

package/README.en.md

@@ -39,6 +39,11 @@ selected by `windowKind`:
    (win32 = `cmd /c start`, darwin = `open`, linux = `xdg-open`).
    `appWindow: false` behaves **exactly like the official core**: the GUI is opened in the
    system default browser (plain tab, official `open` method).
+4. **`--no-open` / SSH sessions (official identical suppression)**: `dsh web --no-open`
+   (`webStartup.openBrowser === false`) or an SSH session (`SSH_CONNECTION`/`SSH_TTY`
+   environment variables, the same source as the official `launchedThroughSsh`) opens
+   **nothing** — the plugin reads the **same source** as the official core (the `webStartup`
+   service provided by web-startup) and suppresses opening the same way.
 
 The port comes from the real listening value of the webServer service (`--port` overrides and
 `--port 0` both work). **No waiting needed**: the plugin declares webServer as a hard dependency
@@ -54,15 +59,20 @@ cleanup.
 > plugin's bundle patch, so the opening behavior is fully owned by the plugin: with
 > `appWindow: true` the app-style window opens and no ordinary browser page pops up; with
 > `appWindow: false` the plugin performs **the same default-browser handoff as the official core**
-> (open package → native platform launch), matching the no-plugin behavior. Uninstalling the
-> plugin restores the official default (or use `dsh web --no-open` to disable it temporarily).
+> (open package → native platform launch), matching the no-plugin behavior. With
+> `dsh web --no-open` (or in an SSH session) the plugin, like the official core, opens
+> nothing. Uninstalling the plugin restores the official default.
 
 ### WebView2 host requirements (webview2 mode only)
 
 - Windows 10 1803+ / Windows 11 / Windows Server 2016+
   (Win7/8.1 reached end of support in 2023-01, see Microsoft announcements)
 - WebView2 Runtime (evergreen, usually preinstalled with Edge; verified with 151.x locally)
-- .NET 10 runtime (installed with the SDK; can be switched to a self-contained publish if needed)
+- **No .NET 10 runtime required**: since 0.1.15 the host targets **.NET Framework 4.7.2**,
+  built into Windows 10 1803+ / Windows 11 (4.8.x on Win11) — no .NET Core/10 runtime or
+  self-contained publish is needed. The build machine needs a .NET SDK and the .NET
+  Framework 4.x targeting packs (installed with VS/SDK; without them add the
+  `Microsoft.NETFramework.ReferenceAssemblies` NuGet package to the csproj).
 
 ## Configuration
 
@@ -164,9 +174,10 @@ without touching the package.
 
 - **Zero dependencies**: every runtime dependency is provided by the **DSH deployment** and
   declared as an optional peer (no install warnings):
-  - `@deepseek-ai/dsh` (the host; declares the compatibility range `>=0.1.0-rc.7 <0.2.0` —
-    `settings.plugin.item` became a keyed slot in that release, registration requires
-    `options.key`; no runtime version check is performed)
+  - `@deepseek-ai/dsh` (the host; declares the compatibility range `>=0.1.0-rc.8 <0.2.0` —
+    rc.8 removed `dsh-client-schema-form` from the client frozen table and introduced
+    `dsh-client-runtime`; the plugin's settings card and opening behavior depend on that
+    release; no runtime version check is performed)
   - `@deepseek-ai/schemastery` (config schema validator; resolved at runtime: normal import
     first, then the DSH deployment copy under the Windows global npm layout)
   - `koffi` (Windows only: Job Object / process verification / native file dialog; same runtime
@@ -194,8 +205,13 @@ without touching the package.
   plugin-generated DSH .ico (`~/.dsh/auto-open-web-icon.ico`), independent of browser taskbar
   identity rules. The .ico is built by fetching the local `favicon.svg` and rasterizing it with
   **sharp** (bundled with the deployment, resolved upward at runtime, not declared as a dependency)
-  into 16/32/48/64/128/256 PNGs; when sharp is unavailable the host falls back to the default window
-  icon.
+  into 16/32/48/64/128/256 PNGs.
+- **Fixed-icon policy (since 0.1.14)**: once written, the .ico is cached and reused — later
+  starts return the existing non-empty cache directly (no favicon fetch / rasterization, so the
+  icon cannot vanish on a transient favicon/sharp failure, and starts are faster); it is
+  generated only when the cache is missing. **Extra safety net**: `host/icon.ico` (same source as
+  the cache) is embedded into the host exe via `<ApplicationIcon>`, so even with a missing cache
+  the window/taskbar shows the DSH icon instead of the default one.
 
 ## Platform support
 

package/README.md

@@ -36,6 +36,11 @@ dsh web profile 启动后自动打开独立应用窗口（或网页标签页）
    linux = `xdg-open`）。
    `appWindow: false` 时**与官方相同**:默认浏览器打开(普通标签页,官方
    open 方式)。
+4. **`--no-open` / SSH 会话（与官方相同的不打开）**：`dsh web --no-open`
+   （webStartup 服务的 `openBrowser === false`）或 SSH 会话（`SSH_CONNECTION`/
+   `SSH_TTY` 环境变量，与官方 `launchedThroughSsh` 同源）时不打开任何
+   窗口/页面——插件读取与官方**同一来源**（web-startup 提供的 webStartup
+   服务）做同样的抑制。
 
 端口取自 webServer 服务的真实监听值（`--port` 自定义、`--port 0` 均正确）。
 **无需等待**：插件把 webServer 声明为硬依赖（`inject`），Cordis 会等
@@ -49,15 +54,20 @@ Job Object（强杀也生效）+ 退出清理结束进程树。
 > 安装本插件后，插件的 bundle 补丁会把 `web-runtime.openBrowser` 置为 `false`，
 > 打开行为完全由本插件接管：`appWindow: true` 时打开独立应用窗口，不弹出
 > 普通浏览器页面；`appWindow: false` 时插件执行**与官方核心相同的默认浏览器
-> 交接**（open 包 → 平台原生拉起），行为与未安装插件时一致。卸载插件后恢复
-> 官方默认行为（临时关闭也可用 `dsh web --no-open`）。
+> 交接**（open 包 → 平台原生拉起），行为与未安装插件时一致；`dsh web
+> --no-open`（或 SSH 会话）时与官方一致不打开任何窗口/页面。卸载插件后
+> 恢复官方默认行为。
 
 ### WebView2 宿主要求（仅 webview2 模式）
 
 - Windows 10 1803+ / Windows 11 / Windows Server 2016+
   （Win7/8.1 已于 2023-01 终止支持，见微软公告）
 - WebView2 Runtime（常青版，通常随 Edge 预装；本机已验证 151.x）
-- .NET 10 运行时（随 SDK 安装；也可改为自包含发布，需时再调）
+- **无 .NET 10 运行时要求**：宿主自 0.1.15 起目标 **.NET Framework 4.7.2**，
+  由 Windows 10 1803+ / Windows 11 **操作系统自带**（Win11 为 4.8.x），
+  无需安装任何 .NET Core/10/自包含运行时。构建机需 .NET SDK 与 .NET
+  Framework 4.x 定位包（随 VS/SDK 安装；无定位包时给 csproj 加
+  `Microsoft.NETFramework.ReferenceAssemblies` NuGet 包）。
 
 ## 配置
 
@@ -154,8 +164,9 @@ dsh plugin --profile web remove dsh-auto-open-web   # 同时移除依赖与对
 
 - **本包零 dependencies**:所有运行时依赖均由 **DSH 部署提供**,以 optional
   peer 声明(安装无警告):
-  - `@deepseek-ai/dsh`(宿主,声明兼容范围 `>=0.1.0-rc.7 <0.2.0`,
-    `settings.plugin.item` 自该版本起为 keyed 插槽,注册需 `options.key`;
+  - `@deepseek-ai/dsh`(宿主,声明兼容范围 `>=0.1.0-rc.8 <0.2.0`:
+    自 rc.8 起客户端冻结表移除 `dsh-client-schema-form`、引入
+    `dsh-client-runtime`,本插件的设置卡片与打开行为均依赖该版本;
     不做运行时版本检测)
   - `@deepseek-ai/schemastery`(配置 schema 校验器;运行时解析:常规 import
     优先,其次 Windows 全局 npm 布局下的 DSH 部署副本)
@@ -184,8 +195,12 @@ dsh plugin --profile web remove dsh-auto-open-web   # 同时移除依赖与对
 - **任务栏/窗口图标（WebView2 宿主）**：宿主进程直接设置 `Form.Icon` = 插件生成的
   DSH .ico（`~/.dsh/auto-open-web-icon.ico`），与浏览器任务栏身份机制无关。
   .ico 来源：抓取本机 `favicon.svg`，用 **sharp**（部署自带，运行时向上解析，
-  未声明为依赖）栅格化为 16/32/48/64/128/256 PNG 后组装；sharp 不可用时
-  宿主退回默认窗口图标。
+  未声明为依赖）栅格化为 16/32/48/64/128/256 PNG 后组装。
+- **图标固定策略（自 0.1.14）**：生成的 .ico 一经写盘即**缓存固定**——后续启动
+  检测到缓存存在且非空就直接复用，不再抓取 favicon/栅格化（图标不会因某次
+  favicon 或 sharp 瞬时失败而消失，启动也更快）；仅缓存缺失时生成一次。
+  另有**兜底**：`host/icon.ico`（与缓存同源）已通过 `<ApplicationIcon>`
+  嵌入宿主 exe，即使缓存文件缺失，窗口/任务栏也显示 DSH 图标而非默认图标。
 
 ## 平台支持
 

package/cordis.patch.yml

@@ -12,6 +12,8 @@
 # openBrowser 关闭后打开行为由插件全权接管:appWindow: true → 独立应用窗口;
 # appWindow: false → 插件执行与官方核心相同的默认浏览器交接(open 包 →
 # 平台原生拉起,普通标签页),行为与未安装本插件时一致。
+# `dsh web --no-open`(webStartup.openBrowser === false)或 SSH 会话时,插件
+# 读取**同一 webStartup 服务**判断,与官方一致不打开任何窗口/页面。
 - id: web-runtime
   config:
     openBrowser: false

package/host-publish/DshAppWindow.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
+</configuration>

package/lib/client.js

@@ -3,10 +3,10 @@
 // require 解析浏览器端模块表(react 为壳层静态模块,@deepseek-ai/dsh-client-runtime
 // 为动态包)。**不** require @deepseek-ai/dsh-client-ui-primitives 等官方 UI 包。
 //
-// 依赖边界(与官方数据的对接面,均为公开接口):
-//   - settingsScope:官方 settings 域(命名空间 `auto-open-web`,dsh ≥0.1.0-rc.7
-//     取消第三方命名空间白名单)
-//   - slots:settings.plugin.item 插槽(keyed 注册,同时带 id 兼容旧版)
+// 依赖边界(与官方数据的对接面,均为公开接口;本插件声明 dsh ≥0.1.0-rc.8):
+//   - settingsScope:官方 settings 域(命名空间 `auto-open-web`;第三方命名空间
+//     白名单自 rc.7 起已取消,rc.8 下无限制)
+//   - slots:settings.plugin.item 插槽(keyed 注册,rc.7 起要求 options.key)
 //   - locale:文案注册(zh/en/ja/ko/fr/de/ru,跟随界面语言)
 //   - dsh-client-runtime:createSnapshotStore 快照 store(缺失时内置兜底实现)
 //

package/lib/index.js

@@ -17,6 +17,8 @@
  *     作为最后的兜底;open 包不可用时平台原生 cmd start / open / xdg-open)。
  *  appWindow: false → **与官方相同**:同样执行默认浏览器交接(官方 open 方式),
  *  替代被本插件补丁关闭的官方核心交接,行为与未安装本插件时一致。
+ *  --no-open / SSH 会话 → **与官方相同**:不打开任何窗口/页面(读取官方
+ *  webStartup 服务的 openBrowser 标志;SSH 会话按官方同源环境变量判定)。
  *
  * 配置来源:行配置(cordis.patch.yml)作为启动种子;设置页卡片(客户端 bundle,
  * settings.plugin.item 插槽)经官方 settings 域(settingsScope)读写本命名
@@ -29,7 +31,7 @@
  * (WebView2 宿主例外:随 DSH 退出而关闭)。
  */
 import { spawn } from 'node:child_process';
-import { existsSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
@@ -296,6 +298,33 @@ async function openDefaultBrowser(url) {
   return platform.openDefaultBrowser(url);
 }
 
+// ── 与官方相同的打开抑制(--no-open / SSH 会话) ────────────────────────────
+//
+// 官方(web-app)的默认浏览器交接条件是 handoffBrowser = config.openBrowser &&
+// !launchedThroughSsh(ctx):config.openBrowser 来自 web-startup 插件提供的
+// webStartup 服务(--no-open 时 openBrowser === false,即 commander 对
+// --no-open 的反向选项 options.open);SSH 会话(SSH_CONNECTION/SSH_TTY 进程
+// 环境变量)同样不自动打开。本插件的 bundle 补丁把官方 openBrowser 恒置为
+// false、打开行为由本插件接管,故此处读取**同一来源**做同样的抑制,保证
+// `dsh web --no-open`(及 SSH 会话)与官方行为一致:不打开任何窗口/页面。
+/**
+ * --no-open 是否已传(webStartup.openBrowser === false)。
+ * webStartup 由 web-startup 插件提供(同一 isolate 的根服务表,ctx.get 可见);
+ * 非 web 组合(服务缺失)视为未传,不误伤。
+ */
+function noOpenRequested(ctx) {
+  const webStartup = ctx.get('webStartup');
+  return webStartup !== undefined && webStartup !== null && webStartup.openBrowser === false;
+}
+
+/** 是否 SSH 会话(与官方 launchedThroughSsh 同源:进程环境变量)。 */
+function sshSessionDetected() {
+  return (
+    (process.env.SSH_CONNECTION !== undefined && process.env.SSH_CONNECTION !== '') ||
+    (process.env.SSH_TTY !== undefined && process.env.SSH_TTY !== '')
+  );
+}
+
 // ── 配置与历史迁移(共通) ─────────────────────────────────────────────────
 
 /** 删除 v0.3 遗留的 state 文件(一次性清理,防孤儿数据)。 */
@@ -325,8 +354,13 @@ function normalizeState(next) {
 // ── 图标栅格化(WebView2 宿主窗口图标需要 .ico;共通) ─────────────────────
 //
 // GUI 自带的 manifest 只有 SVG 图标(favicon.svg)。这里抓取本机 favicon.svg,
-// 用 sharp(部署自带,运行时向上解析,未声明为依赖)栅格化为多尺寸 PNG 并缓存,
-// 再组装成 .ico 供宿主窗口的 Form.Icon 使用;失败仅告警(宿主退回默认图标)。
+// 用 sharp(部署自带,运行时向上解析,未声明为依赖)栅格化为多尺寸 PNG,
+// 再组装成 .ico 供宿主窗口的 Form.Icon 使用;失败仅告警(宿主退回内置图标)。
+//
+// **图标固定策略**(0.1.14):生成的 .ico 缓存于 `~/.dsh/auto-open-web-icon.ico`,
+// 缓存存在且非空时**直接复用,不再每次启动抓取 favicon 并栅格化**——图标一经
+// 生成即固定不变,也不会因某次启动的 favicon/sharp 瞬时失败而消失;
+// 仅缓存缺失(首次运行/被删除)时生成一次,之后永不改写。
 let iconCache = null;
 let iconFetching = null;
 
@@ -385,13 +419,15 @@ function buildIco(pngs) {
   return Buffer.concat([header, ...entries, ...sizes.map((s) => pngs.get(s))]);
 }
 
-/** 生成宿主窗口用的 DSH .ico(缓存于 ~/.dsh/auto-open-web-icon.ico),失败返回 null。 */
+/** 生成宿主窗口用的 DSH .ico(缓存于 ~/.dsh/auto-open-web-icon.ico),失败返回 null。
+ *  缓存存在且非空时直接复用(固定图标,不再生成);仅在缓存缺失时生成并写盘。 */
 async function ensureIconFile(server) {
+  const out = join(dshHome(), 'auto-open-web-icon.ico');
   try {
+    if (existsSync(out) && statSync(out).size > 0) return out;
     const icons = await getIcons(server);
     if (icons === null) return null;
     const ico = buildIco(icons.pngs);
-    const out = join(dshHome(), 'auto-open-web-icon.ico');
     writeFileSync(out, ico);
     return out;
   } catch (error) {
@@ -421,6 +457,8 @@ export const internals = {
   spawnHostWindow,
   getOpenPackage,
   openDefaultBrowser,
+  noOpenRequested,
+  sshSessionDetected,
   /** 测试钩子:同步"窗口关闭时退出 DSH"生效标志(模拟设置保存)。 */
   setExitWatcherEnabled(value) {
     exitWatcherEnabled = value === true;
@@ -561,6 +599,15 @@ export function apply(ctx, config) {
     }
     const url = `http://127.0.0.1:${String(server.port)}`;
 
+    // 与官方相同的打开抑制:--no-open(webStartup.openBrowser === false)或
+    // SSH 会话时不打开任何窗口/页面(官方同样不交接)。
+    const noOpen = noOpenRequested(ctx);
+    const ssh = sshSessionDetected();
+    if (noOpen || ssh) {
+      console.log(`[auto-open-web] ${noOpen ? '--no-open given' : 'SSH session'}; not opening anything (official behavior)`);
+      return;
+    }
+
     // 独立应用窗口:按 windowKind 显式选择(webview2 | browser),直接加载 GUI 根地址。
     // 所选类型不可用时降级到最后兜底:默认浏览器打开(官方 dsh web 同款,
     // 普通标签页),保证用户至少能打开 GUI。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-auto-open-web",
-  "version": "0.1.11",
+  "version": "0.1.15",
   "description": "Open the DSH Web GUI in an app-style WebView2 window on profile start, with a settings card for browser paths",
   "repository": {
     "type": "git",
@@ -46,7 +46,7 @@
     "README.en.md"
   ],
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.1.0-rc.7 <0.2.0",
+    "@deepseek-ai/dsh": ">=0.1.0-rc.8 <0.2.0",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "peerDependenciesMeta": {

package/host-publish/DshAppWindow.deps.json

@@ -1,94 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v10.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v10.0": {
-      "DshAppWindow/0.1.5": {
-        "dependencies": {
-          "Microsoft.Web.WebView2": "1.0.3124.44",
-          "Microsoft.Web.WebView2.Core": "1.0.3124.44",
-          "Microsoft.Web.WebView2.WinForms": "1.0.3124.44",
-          "Microsoft.Web.WebView2.Wpf": "1.0.3124.44"
-        },
-        "runtime": {
-          "DshAppWindow.dll": {}
-        }
-      },
-      "Microsoft.Web.WebView2/1.0.3124.44": {
-        "runtimeTargets": {
-          "runtimes/win-arm64/native/WebView2Loader.dll": {
-            "rid": "win-arm64",
-            "assetType": "native",
-            "fileVersion": "1.0.3124.44"
-          },
-          "runtimes/win-x64/native/WebView2Loader.dll": {
-            "rid": "win-x64",
-            "assetType": "native",
-            "fileVersion": "1.0.3124.44"
-          },
-          "runtimes/win-x86/native/WebView2Loader.dll": {
-            "rid": "win-x86",
-            "assetType": "native",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      },
-      "Microsoft.Web.WebView2.Core/1.0.3124.44": {
-        "runtime": {
-          "Microsoft.Web.WebView2.Core.dll": {
-            "assemblyVersion": "1.0.3124.44",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      },
-      "Microsoft.Web.WebView2.WinForms/1.0.3124.44": {
-        "runtime": {
-          "Microsoft.Web.WebView2.WinForms.dll": {
-            "assemblyVersion": "1.0.3124.44",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      },
-      "Microsoft.Web.WebView2.Wpf/1.0.3124.44": {
-        "runtime": {
-          "Microsoft.Web.WebView2.Wpf.dll": {
-            "assemblyVersion": "1.0.3124.44",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      }
-    }
-  },
-  "libraries": {
-    "DshAppWindow/0.1.5": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.Web.WebView2/1.0.3124.44": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-sQb+ACD3ILvHxztxqCWLbhYmFNf5dH0HPhVKFYg020rpeQPkadH0nkVOSsgfSyBDMLypI9iMBeD6uVcVxsKLkg==",
-      "path": "microsoft.web.webview2/1.0.3124.44",
-      "hashPath": "microsoft.web.webview2.1.0.3124.44.nupkg.sha512"
-    },
-    "Microsoft.Web.WebView2.Core/1.0.3124.44": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.Web.WebView2.WinForms/1.0.3124.44": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.Web.WebView2.Wpf/1.0.3124.44": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    }
-  }
-}

package/host-publish/DshAppWindow.runtimeconfig.json

@@ -1,20 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "net10.0",
-    "frameworks": [
-      {
-        "name": "Microsoft.NETCore.App",
-        "version": "10.0.0"
-      },
-      {
-        "name": "Microsoft.WindowsDesktop.App",
-        "version": "10.0.0"
-      }
-    ],
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
-      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false,
-      "CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS": false
-    }
-  }
-}