dsh-vscode-mode 0.14.7 → 0.14.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.14.7",
+  "version": "0.14.8",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 DSH 0.1.5+ 官方右侧 Sidebar 与对话同屏）+ 命令栏（Ctrl+Shift+P）与可扩展指令系统 + VS Code 兼容代码片段（.code-snippets 全局/项目，IntelliSense 展开）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚）+ SVN 集成（侧栏变更面板/日志弹窗/并排差异）+ 语言服务器（LSP）智能（跳转定义/引用/hover/大纲 + VSIX 扩展市场安装），状态持久化到工作区旁车，界面状态（页签/光标/侧栏/编辑 Tab/导航历史）镜像到 DSH home 跨重启恢复",
   "icon": "assets/icon.svg",
   "keywords": [

package/src/client/openFlow.ts

@@ -10,7 +10,7 @@ import { rpc } from './rpc.js'
 import { chooseWorkspace } from './chooseDialog.js'
 import { requestOpen } from './openReceipt.js'
 import { toastDom } from './externalOpen.js'
-import { createAddToConversation } from './addToConversation.js'
+import { createAddToConversation, newDraftSession } from './addToConversation.js'
 import type { AddOutcome, CtxLike } from './addToConversation.js'
 import type { OpenParams } from '../shared/externalOpen.js'
 
@@ -307,12 +307,42 @@ function realDeps(ctx: unknown, overrides: Partial<OpenDeps> = {}): OpenDeps {
       const snap = (service('sessions')?.list?.getSnapshot?.() ?? {}) as { ids?: string[]; byId?: Record<string, SessionRow>; phase?: string }
       return { ids: snap.ids ?? [], byId: snap.byId ?? {}, ready: snap.phase !== 'pending' }
     },
-    createSession: async (opts) => await service('sessions').create(opts),
+    createSession: async (opts) => {
+      // 桌面端 sessions 服务面缺 create（实证缺 open；create 同代面可能缺）——
+      // 直连 create 不可用时回落 newDraftSession 的多通道建会话（宽松解析 id）。
+      const sessions = service('sessions') as { create?: (o: object) => unknown } | undefined
+      if (typeof sessions?.create === 'function') {
+        try {
+          const created = await sessions.create(opts)
+          const id = typeof created === 'string' && created ? created
+            : typeof (created as { id?: unknown } | null)?.id === 'string' ? (created as { id: string }).id
+            : typeof (created as { sessionId?: unknown } | null)?.sessionId === 'string' ? (created as { sessionId: string }).sessionId
+            : ''
+          if (id) return id
+        } catch { /* 回落下一通道 */ }
+      }
+      const draft = await newDraftSession(ctx as CtxLike, opts.cwd)
+      if (draft.ok && draft.id) return draft.id
+      throw new Error('新建会话失败')
+    },
     createWorkspace: async (path) => {
       const ws = await service('workspaces').create({ path })
       return { workspaceId: ws.workspaceId, title: ws.title }
     },
-    openSession: (id) => service('sessions').open(id),
+    openSession: (id) => {
+      // 桌面端 sessions 服务面缺 .open（实证 TypeError）——按 startDraftSession 同款
+      // 多面切换：materializeScope 铸 scope → manager.select 切会话 → open 兜底，缺面静默。
+      try {
+        const sessions = service('sessions') as {
+          materializeScope?: (id: string) => unknown
+          manager?: { select?: (id: string) => void }
+          open?: (id: string) => void
+        } | undefined
+        sessions?.materializeScope?.(id)
+        void sessions?.manager?.select?.(id)
+        void sessions?.open?.(id)
+      } catch { /* 面能力缺失不致命：打开失败由 openChecked 抛错兜底 */ }
+    },
     reference: async (sessionId, path, appearance) => {
       const outcome: AddOutcome = await add.appendReference(sessionId, path, undefined, appearance)
       // ok/busy（纯文本降级）都算已落点；unavailable/failed 交给 settleRef 继续重试

package/src/index.ts

@@ -2,7 +2,7 @@
 import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
 import { closeArchiveDbs } from './archiveDb.js'
-import { handleRpc } from './rpc.js'
+import { handleRpc, integrationBaseUrlOf } from './rpc.js'
 import { newSearcher } from './search/orchestrator.js'
 import { newContentSearcher } from './search/content.js'
 import { installIsolation } from './mcpIsolation.js'
@@ -13,6 +13,7 @@ import type { SettingsDeps } from './fileOpenSettings.js'
 import z from '@deepseek-ai/schemastery'
 import { shellMenuLifecycle } from './integrate.js'
 import { startOpenInbox } from './openInbox.js'
+import { ensureActiveBridge } from './openBridge.js'
 import { installPlanTool } from './svnPlanTool.js'
 import { disposeIndex } from './treeIndex.js'
 import { sweepTreeCache } from './paths.js'
@@ -142,6 +143,13 @@ export async function apply(ctx: Ctx, config?: unknown): Promise<void> {
   await installPlanTool(ctx, submitPlan)
   ctx.effect(mountInbox, 'vscode-mode:open-inbox')
   ctx.effect(() => shellMenuLifecycle(ctx), 'vscode-mode:integration')
+  /** @author ddj 2026年10月12号 @returns Active-profile bridge disposer; failures never block boot. */
+  async function provisionBridge(): Promise<() => void> {
+    try { await ensureActiveBridge(ctx, await integrationBaseUrlOf(ctx)) }
+    catch (error) { noteWarning('外部打开桥接未就绪：' + String(error)) }
+    return () => {}
+  }
+  ctx.effect(provisionBridge, 'vscode-mode:bridge')
   void sweepTreeCache()
   await logCompatSummary(ctx, warnings)
   log.info('编辑差异审查已装配（认证路由、项目 MCP 作用域、SVN 方案工具与外部打开通道）')

package/src/openBridge.ts

@@ -56,6 +56,19 @@ export async function ensureOpenBridge(ctx: Ctx, baseUrl: string): Promise<strin
   return join(dir, 'dsh-open.ini')
 }
 
+/** @public @author ddj 2026年10月12号
+ * Provision the active profile's independent bridge at startup (desktop or web).
+ * Mirrors unityInstall's per-profile bridge without requiring a registered project,
+ * so Unity can select either target. Unknown profile returns null instead of failing.
+ * @param ctx Active host context.
+ * @param baseUrl Selected public Web URL (unused for desktop wake).
+ * @returns Absolute profile bridge INI path, or null when no owned profile is active.
+ */
+export async function ensureActiveBridge(ctx: Ctx, baseUrl: string): Promise<string | null> {
+  if (!findProfileDir(ctx)) return null
+  return ensureOpenBridge(ctx, baseUrl)
+}
+
 /** @private @author ddj 2026年09月28号
  * Replace a bridge file atomically without following a preexisting file link.
  * @param path Destination in the validated bridge directory.

package/src/rpc.ts

@@ -461,7 +461,7 @@ async function latestPatchBackup(patchPath: string): Promise<string | undefined>
 }
 
 /** 读取设置中的深链基址（缺省/非法回退默认 3080）。 */
-async function integrationBaseUrlOf(ctx: Ctx): Promise<string> {
+export async function integrationBaseUrlOf(ctx: Ctx): Promise<string> {
   const settings = ctx.get('settings')
   const value = sectionOf(settings, FILE_OPEN_SETTINGS_NS)?.value as { integrationBaseUrl?: unknown } | undefined
   const raw = typeof value?.integrationBaseUrl === 'string' ? value.integrationBaseUrl.trim() : ''

package/unity/com.dsh.editor/Editor/DshCodeEditor.cs

@@ -15,8 +15,13 @@ namespace Dsh.EditorIntegration
     {
         private const string EditorName = "DSH 文件编辑";
         private const string VirtualPath = "dsh-editor://vscode-mode";
-        private const string DshVersion = "0.3.0";
+        private const string DshVersion = "0.3.1";
         internal const string VersionText = DshVersion;
+        private const string TargetAuto = "auto";
+        private const string TargetWeb = "web";
+        private const string TargetDesktop = "desktop";
+        private static readonly string[] TargetLabels = { "自动", "DSH Web", "DSH 桌面端" };
+        private static readonly string[] TargetValues = { TargetAuto, TargetWeb, TargetDesktop };
 
         /// <summary>Register this editor without changing the user's selection. @author ddj 2026-09-28</summary>
         static DshCodeEditor()
@@ -57,7 +62,13 @@ namespace Dsh.EditorIntegration
             string selected = EditorPrefs.GetString(key, string.Empty);
             string value = EditorGUILayout.TextField("DSH 桥接配置", selected);
             if (value != selected) EditorPrefs.SetString(key, value.Trim());
-            EditorGUILayout.HelpBox("留空时自动读取本项目 UserSettings/dsh-editor.ini；没有安装提示时使用 DSH_HOME 中的旧 shell 配置。填写绝对路径可覆盖自动选择。请求须收到 ACK 才确认成功。", MessageType.Info);
+            string targetKey = TargetKey();
+            string current = EditorPrefs.GetString(targetKey, TargetAuto);
+            int picked = System.Array.IndexOf(TargetValues, current);
+            if (picked < 0) picked = 0;
+            int chosen = EditorGUILayout.Popup("打开目标", picked, TargetLabels);
+            if (TargetValues[chosen] != current) EditorPrefs.SetString(targetKey, TargetValues[chosen]);
+            EditorGUILayout.HelpBox("留空时自动读取本项目 UserSettings/dsh-editor.ini；没有安装提示时使用 DSH_HOME 中的旧 shell 配置。填写绝对路径可覆盖自动选择。打开目标选择 DSH 桌面端或 DSH Web 时优先使用对应 profile 的独立 bridge。请求须收到 ACK 才确认成功。", MessageType.Info);
             if (GUILayout.Button("测试：在 DSH 中打开当前项目")) BeginOpen(ProjectRoot(), 0, 0);
         }
 
@@ -134,7 +145,8 @@ namespace Dsh.EditorIntegration
         private static void BeginOpen(string path, int line, int column)
         {
             string config = EditorPrefs.GetString(ConfigKey(), string.Empty);
-            var worker = new DshOpenWorker(config, path, line, column, ProjectRoot(), LegacyConfig());
+            string target = EditorPrefs.GetString(TargetKey(), TargetAuto);
+            var worker = new DshOpenWorker(config, path, line, column, ProjectRoot(), LegacyConfig(), target);
             var thread = new Thread(worker.Run) { IsBackground = true };
             thread.Start();
         }
@@ -143,6 +155,10 @@ namespace Dsh.EditorIntegration
         /// <returns>Project-local editor preference key.</returns>
         private static string ConfigKey() { return "DshEditor.Config." + ProjectRoot(); }
 
+        /// <summary>Derive a project-specific open-target preference key. @author ddj 2026-10-12</summary>
+        /// <returns>Project-local open-target preference key.</returns>
+        private static string TargetKey() { return "DshEditor.Target." + ProjectRoot(); }
+
         /// <summary>Read the project's installed profile hint on the worker. @author ddj 2026-09-28</summary>
         /// <param name="root">Project root captured on the main thread.</param><param name="fallback">Legacy shell INI.</param>
         /// <returns>The hinted absolute INI, or legacy path only when the hint is absent.</returns>
@@ -171,10 +187,48 @@ namespace Dsh.EditorIntegration
         /// <summary>Honor custom DSH_HOME for legacy installations. @author ddj 2026-09-28</summary>
         /// <returns>Legacy installed shell INI path, without filesystem IO.</returns>
         private static string LegacyConfig()
+        {
+            return Path.Combine(Path.Combine(Path.Combine(Home(), "dsh-vscode-mode"), "shell"), "dsh-open.ini");
+        }
+
+        /// <summary>Resolve the user DSH home honoring DSH_HOME. @author ddj 2026-10-12</summary>
+        /// <returns>Absolute user DSH home directory.</returns>
+        internal static string Home()
         {
             string home = Environment.GetEnvironmentVariable("DSH_HOME");
             if (string.IsNullOrEmpty(home)) home = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".dsh");
-            return Path.Combine(Path.Combine(Path.Combine(home, "dsh-vscode-mode"), "shell"), "dsh-open.ini");
+            return home;
+        }
+
+        /// <summary>Find the first profile bridge whose mode matches a requested target. @author ddj 2026-10-12</summary>
+        /// <param name="mode">Target mode (web or desktop) stored in the bridge INI.</param>
+        /// <returns>Absolute matching bridge INI path, or null when no profile provides it.</returns>
+        internal static string FindBridge(string mode)
+        {
+            string profiles = Path.Combine(Home(), "profiles");
+            if (!Directory.Exists(profiles)) return null;
+            foreach (string profile in Directory.GetDirectories(profiles))
+            {
+                string ini = Path.Combine(Path.Combine(Path.Combine(profile, "dsh-vscode-mode"), "bridge"), "dsh-open.ini");
+                if (!File.Exists(ini) || ModeOf(ini) != mode) continue;
+                return Path.GetFullPath(ini);
+            }
+            return null;
+        }
+
+        /// <summary>Read the mode value of a bridge INI without guessing a profile. @author ddj 2026-10-12</summary>
+        /// <param name="ini">Absolute bridge INI path.</param><returns>mode value, or empty when absent.</returns>
+        private static string ModeOf(string ini)
+        {
+            foreach (string text in File.ReadAllLines(ini))
+            {
+                int equal = text.IndexOf('=');
+                if (equal < 0) continue;
+                string key = text.Substring(0, equal).Trim();
+                if (!string.Equals(key, "mode", StringComparison.OrdinalIgnoreCase)) continue;
+                return text.Substring(equal + 1).Trim();
+            }
+            return string.Empty;
         }
 
         /// <summary>Resolve asset paths from the Unity project root. @author ddj 2026-09-28</summary>

package/unity/com.dsh.editor/Editor/DshOpenWorker.cs

@@ -16,6 +16,7 @@ namespace Dsh.EditorIntegration
         private readonly string targetPath;
         private readonly string projectRoot;
         private readonly string legacyConfig;
+        private readonly string target;
         private readonly int line;
         private readonly int column;
 
@@ -23,12 +24,14 @@ namespace Dsh.EditorIntegration
         /// <param name="config">Selected INI path.</param><param name="path">Absolute asset or project.</param>
         /// <param name="row">One-based line.</param><param name="col">One-based column.</param>
         /// <param name="root">Project root.</param><param name="fallback">Legacy shell INI path.</param>
-        internal DshOpenWorker(string config, string path, int row, int col, string root, string fallback)
+        /// <param name="mode">Requested target (auto/web/desktop); empty means auto. @author ddj 2026-10-12</param>
+        internal DshOpenWorker(string config, string path, int row, int col, string root, string fallback, string mode)
         {
             configPath = config;
             targetPath = path;
             projectRoot = root;
             legacyConfig = fallback;
+            target = string.IsNullOrEmpty(mode) ? "auto" : mode;
             line = row;
             column = col;
         }
@@ -105,7 +108,15 @@ namespace Dsh.EditorIntegration
         /// <returns>Selected bridge INI path; missing or malformed hints are handled by the caller.</returns>
         internal string SelectConfig()
         {
-            return string.IsNullOrEmpty(configPath) ? DshCodeEditor.DefaultConfig(projectRoot, legacyConfig) : configPath;
+            if (!string.IsNullOrEmpty(configPath)) return configPath;
+            if (target == "web") return DshCodeEditor.FindBridge("web") ?? DshCodeEditor.DefaultConfig(projectRoot, legacyConfig);
+            if (target == "desktop")
+            {
+                string desktop = DshCodeEditor.FindBridge("desktop");
+                if (desktop != null) return desktop;
+                throw new FileNotFoundException("No DSH desktop bridge configuration found. Open the DSH desktop app once, then retry, or set an explicit bridge configuration in External Tools.");
+            }
+            return DshCodeEditor.DefaultConfig(projectRoot, legacyConfig);
         }
 
         /// <summary>Build helper arguments without routing files through a URL. @author ddj 2026-09-28</summary>

package/unity/com.dsh.editor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.dsh.editor",
   "displayName": "DSH 文件编辑",
-  "description": "DSH（dsh-vscode-mode）外部脚本编辑器：通过当前用户私有 OPEN REQUEST/ACK 文件队列打开脚本、Console 行列或项目；确认匹配 ACK 后才报告成功，支持官方桌面与所选 Web profile。",
-  "version": "0.3.0",
+  "description": "DSH（dsh-vscode-mode）外部脚本编辑器：通过当前用户私有 OPEN REQUEST/ACK 文件队列打开脚本、Console 行列或项目；确认匹配 ACK 后才报告成功，支持官方桌面与所选 Web profile，可在外部工具面板选择打开目标（自动/DSH Web/DSH 桌面端）。",
+  "version": "0.3.1",
   "unity": "2019.4"
 }