dsh-ide-git 0.5.1 → 0.5.3

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "main": "./src/index.js",
   "description": "IDE 级 Git 操作面板:分支树 + 提交图谱 + 变更/暂存/提交 + 提交详情。装了 dsh-better-sidebar 时挂成它的原生 tab(右侧栏 + 底部工作台);没装时直接挂 DSH 原生右侧栏,单独安装即可用。JetBrains 风格 Git 工具窗口 for DeepSeek Harness.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ide-git",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "DSH plugin: an IDE-grade Git tool window as a native dsh-better-sidebar tab — branch tree, commit graph, changes, commit details, JetBrains-style actions, in the right sidebar and the bottom panel. | DSH 插件:IDE 级 Git 工具窗口,以 dsh-better-sidebar 原生 Tab 挂载——分支树 / 提交图谱 / 变更与提交详情 / JetBrains 风格操作,右侧栏与底部面板双布局自适应。",
   "type": "module",
   "repository": {

package/src/client.js

@@ -5565,59 +5565,90 @@ window.__ModuleLoader__.load({
          right-sidebar seats are the fallback for a host running this plugin on
          its own — registering both would draw the same panel twice in one
          column, so a late-arriving better-sidebar takes the native one down. */
-      let disposeNative = null
+      let nativeFiber = null
       let hostedByBetterSidebar = false
 
+      /* WAIT for both native seats instead of probing with ctx.get(): on a
+         host without better-sidebar this apply can run BEFORE ui-sidebar-right
+         provides the registry, and the old synchronous probe returned
+         silently — the native seats were then never registered (reproduced
+         on a clean instance and on the desktop app: the right sidebar showed
+         no Git card and the console stayed empty). ctx.inject() retries the
+         registration the moment the services appear. */
       const hostNatively = () => {
-        if (disposeNative !== null) return
-        const tabs = ctx.get('sidebarRightTabs')
-        const slots = ctx.get('slots')
-        if (tabs === undefined || typeof tabs.register !== 'function') return
-        if (slots === undefined || typeof slots.inject !== 'function') return
-        const offType = tabs.register({
-          id: NATIVE_ID,
-          kind: NATIVE_KIND,
-          title: () => t('title'),
-          guide: [{
-            id: 'git',
-            order: 21,
-            title: () => t('title'),
-            description: () => t('description'),
-            icon: (iconProps) => E(Icon, {
-              name: 'commit',
-              size: iconProps === undefined || iconProps.size === undefined ? 16 : iconProps.size,
-            }),
-          }],
+        if (nativeFiber !== null) return
+        nativeFiber = ctx.inject(['sidebarRightTabs', 'slots'], (nativeCtx) => {
+          const tabs = nativeCtx.get('sidebarRightTabs')
+          const slots = nativeCtx.get('slots')
+          if (tabs === undefined || typeof tabs.register !== 'function') return
+          if (slots === undefined || typeof slots.inject !== 'function') return
+          nativeCtx.effect(() => {
+            const offType = tabs.register({
+              id: NATIVE_ID,
+              kind: NATIVE_KIND,
+              title: () => t('title'),
+              guide: [{
+                id: 'git',
+                order: 21,
+                title: () => t('title'),
+                description: () => t('description'),
+                icon: (iconProps) => E(Icon, {
+                  name: 'commit',
+                  size: iconProps === undefined || iconProps.size === undefined ? 16 : iconProps.size,
+                }),
+              }],
+            })
+            const offBody = slots.inject('sidebar.right.pane.tab', () => slots.register(
+              { name: 'sidebar.right.pane.tab', key: NATIVE_ID },
+              (tabProps) => E(NativePanel, Object.assign({}, tabProps, { t: t, ctx: ctx })),
+            ))
+            return () => {
+              try { offBody() } catch (error) { void error }
+              try { offType() } catch (error) { void error }
+            }
+          }, 'dsh-ide-git: native right-sidebar seats')
         })
-        const offBody = slots.inject('sidebar.right.pane.tab', () => slots.register(
-          { name: 'sidebar.right.pane.tab', key: NATIVE_ID },
-          (tabProps) => E(NativePanel, Object.assign({}, tabProps, { t: t, ctx: ctx })),
-        ))
-        disposeNative = () => {
-          try { offBody() } catch (error) { void error }
-          try { offType() } catch (error) { void error }
-        }
+      }
+
+      const takeNativeDown = () => {
+        if (nativeFiber === null) return
+        const fiber = nativeFiber
+        nativeFiber = null
+        void Promise.resolve(fiber.dispose()).catch((error) => { void error })
       }
 
       ctx.inject(['betterSidebar'], (tabCtx) => {
         const betterSidebar = tabCtx.get('betterSidebar')
         if (betterSidebar === undefined || typeof betterSidebar.registerTab !== 'function') return
         hostedByBetterSidebar = true
-        if (disposeNative !== null) { disposeNative(); disposeNative = null }
-        tabCtx.effect(() => betterSidebar.registerTab({
-          id: TAB_ID,
-          title: () => t('title'),
-          description: () => t('description'),
-          icon: (size) => E(Icon, { name: 'commit', size: size === undefined ? 16 : size }),
-          order: 21,
-          single: true,
-          component: (tabProps) => E(LocaleLive, {
-            ctx: ctx,
-            scope: tabProps.scope,
-            t: t,
-            visible: tabProps.visible,
-          }),
-        }), 'dsh-ide-git: Git tab')
+        takeNativeDown()
+        tabCtx.effect(() => {
+          const offTab = betterSidebar.registerTab({
+            id: TAB_ID,
+            title: () => t('title'),
+            description: () => t('description'),
+            icon: (size) => E(Icon, { name: 'commit', size: size === undefined ? 16 : size }),
+            order: 21,
+            single: true,
+            component: (tabProps) => E(LocaleLive, {
+              ctx: ctx,
+              scope: tabProps.scope,
+              t: t,
+              visible: tabProps.visible,
+            }),
+          })
+          /* The base can go away at RUNTIME (disabled in the plugin panel, or
+             uninstalled): cordis unloads this effect when the service
+             disappears, and the panel must fall back to the native
+             right-sidebar seats instead of vanishing with the base. The
+             same inject re-fires when the service returns, and the
+             callback above takes the native seats down again. */
+          return () => {
+            try { offTab() } catch (error) { void error }
+            hostedByBetterSidebar = false
+            hostNatively()
+          }
+        }, 'dsh-ide-git: Git tab')
       })
 
       /* ctx.inject runs its callback straight away when the service is already