dsh-vscode-mode 0.1.26 → 0.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 dsh-better-sidebar 侧边栏与对话同屏）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚），状态持久化到工作区旁车",
   "keywords": [
     "dsh",

package/src/client/compat.ts

@@ -54,17 +54,20 @@ export interface SlotSpec {
  * @param ctx 客户端上下文（slots 服务）
  * @param spec slot 描述
  * @param render 渲染函数
+ * @returns 注销函数（未注册返回 null；形态切换时用于卸载旧 slot）
  */
-export function registerSlotSafely(ctx: { slots?: { inject?: (name: string, register: () => unknown) => unknown; register?: (...args: unknown[]) => unknown } }, spec: SlotSpec, render: (props: unknown) => unknown): void {
+export function registerSlotSafely(ctx: { slots?: { inject?: (name: string, register: () => unknown) => unknown; register?: (...args: unknown[]) => unknown } }, spec: SlotSpec, render: (props: unknown) => unknown): (() => void) | null {
   const slots = ctx?.slots as { inject: (name: string, register: () => unknown) => unknown; register: (...args: unknown[]) => unknown } | undefined
   if (!slots || typeof slots.inject !== 'function' || typeof slots.register !== 'function') {
     console.warn('[' + PLUGIN_NAME + '] slots 服务不可用，跳过 slot ' + spec.name)
-    return
+    return null
   }
   try {
-    slots.inject(spec.name, () => slots.register(spec, render))
+    const disposer = slots.inject(spec.name, () => slots.register(spec, render))
+    return typeof disposer === 'function' ? disposer as () => void : null
   } catch (error) {
     console.warn('[' + PLUGIN_NAME + '] slot ' + spec.name + ' 注册失败（' + String(error) + '），已跳过')
+    return null
   }
 }
 

package/src/client/index.ts

@@ -37,7 +37,10 @@ import { createOutlinePanel } from './outline/index.js'
 import { createOutlineSourceRegistry, registerBuiltinOutlineSources } from './outline/sources.js'
 import type { CompatAdapter } from '../shared/compat.js'
 
-export const inject = ['slots', 'timer', 'locale', 'connection', 'remote', 'workspaces', 'sessions', 'conversation', 'settingsScope', 'webUiSettings']
+// ⚠️ inject 只列必需服务：webUiSettings 是 @linxin666/dsh-client-ui-web-ui-settings 提供的
+// 可选兼容桥（非官方服务），列入 inject 会让未装该桥的部署启动时 entry 永久 pending，
+// web boot 直接失败（'1 entry did not activate'）。兼容层用 ctx.get 运行时探测 + 降级，不靠 inject。
+export const inject = ['slots', 'timer', 'locale', 'connection', 'remote', 'workspaces', 'sessions', 'conversation', 'settingsScope']
 
 /**
  * 装配客户端：注册中央编辑区视图与 header 差异角标。
@@ -76,7 +79,7 @@ export function apply(ctx: any): void {
   const settings = binder.scope
   let selected = autoValue('auto')
   /** 可选探测 betterSidebar 服务（不进 inject：缺失会让插件停靠等待，杀死回退路径）。 */
-  const sideService = detectSidebarService(ctx)
+  let sideService = detectSidebarService(ctx)
   /** 「添加到对话」动作集：编辑区/Tab 右键菜单注入文件引用与代码块（conversation 服务缺失时各动作安全降级）。 */
   const addToConversation = createAddToConversation(ctx)
 
@@ -142,8 +145,8 @@ export function apply(ctx: any): void {
 
   // 中央「文件编辑」页签（旧形态回退）：类 VSCode 编辑器；侧边栏形态可用时编辑器住 betterSidebar Tab，
   // 本页签不注册（避免双实例：Monaco×2 + diff dock 每会话单源抢占）。
-  const registerLegacyTab = (): void => {
-    registerSlotSafely(ctx, {
+  const registerLegacyTab = (): (() => void) | null => {
+    return registerSlotSafely(ctx, {
       name: 'conversation.view',
       id: 'edrv-editor',
       order: 5,
@@ -152,23 +155,52 @@ export function apply(ctx: any): void {
     }, (props: unknown) => React.createElement(EditorView, Object.assign({}, props, { layout: 'tab', sideHint: SIDEBAR_INSTALL_CMD, schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems })))
   }
 
-  if (sideService) {
-    // 侧边栏形态：注册「文件编辑」Tab（单实例、可按会话持久化、内容打开自动展开面板）
-    ctx.effect(() => installSideEditor({
-      service: sideService,
-      renderTab: (props: Record<string, unknown>) => React.createElement(SideEditorTab, Object.assign({}, props, { schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems })),
-      activeSession: () => {
-        const snapshot = sessions?.list?.getSnapshot?.() as { current?: string; byId?: Record<string, { cwd?: string }> } | undefined
-        const sessionId = snapshot?.current
-        if (!sessionId) return undefined
-        return { sessionId, cwd: snapshot?.byId?.[sessionId]?.cwd }
-      },
-      registerLegacyFallback: registerLegacyTab,
-    }), 'vscode-mode: sidebar editor tab')
-  } else {
-    setEnsureSideEditor(null)
-    registerLegacyTab()
+  // 侧边栏/中央页签两形态互斥切换：sideDisposer（侧边栏 Tab）与 legacyDisposer（中央页签）只保留其一。
+  // ⚠️ betterSidebar 服务由 dsh-better-sidebar 的 client bundle（1MB+）在页面加载时提供，本插件
+  // bundle 较小往往先执行完启动检测——一次性探测会误报「未检测到」并永久停在中央页签形态（实测
+  // 竞态：better-sidebar 已装，但「文件编辑」Tab 未注册）。故启动后按 2s 间隔重试（窗口 ~30s），
+  // 命中即自动切换侧边栏形态；始终未命中则保持中央页签回退。
+  let sideDisposer: (() => void) | null = null
+  let legacyDisposer: (() => void) | null = null
+  const applySideForm = (): void => {
+    if (sideService) {
+      if (sideDisposer !== null) return
+      if (legacyDisposer !== null) { legacyDisposer(); legacyDisposer = null }
+      sideDisposer = ctx.effect(() => installSideEditor({
+        service: sideService as NonNullable<typeof sideService>,
+        renderTab: (props: Record<string, unknown>) => React.createElement(SideEditorTab, Object.assign({}, props, { schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems })),
+        activeSession: () => {
+          const snapshot = sessions?.list?.getSnapshot?.() as { current?: string; byId?: Record<string, { cwd?: string }> } | undefined
+          const sessionId = snapshot?.current
+          if (!sessionId) return undefined
+          return { sessionId, cwd: snapshot?.byId?.[sessionId]?.cwd }
+        },
+        registerLegacyFallback: registerLegacyTab,
+      }), 'vscode-mode: sidebar editor tab')
+    } else {
+      if (legacyDisposer !== null) return
+      if (sideDisposer !== null) { sideDisposer(); sideDisposer = null }
+      setEnsureSideEditor(null)
+      legacyDisposer = registerLegacyTab()
+    }
+  }
+  applySideForm()
+  let sideRetries = 0
+  const retrySideService = (): void => {
+    if (sideService !== undefined || sideRetries >= 15) return
+    sideRetries += 1
+    schedule(() => {
+      if (sideService !== undefined) return
+      sideService = detectSidebarService(ctx)
+      if (sideService !== undefined) {
+        console.info('[dsh-vscode-mode] 检测到 ' + SIDEBAR_PLUGIN + '，切换侧边栏编辑形态')
+        applySideForm()
+      } else {
+        retrySideService()
+      }
+    }, 2000)
   }
+  retrySideService()
 
   // 对话输入框上方差异 dock：普通对话显示单文案按钮，文件编辑页由 EditorView 隐藏
   registerSlotSafely(ctx, {