dsh-ide-git 0.19.6 → 0.19.7

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.19.6",
+  "version": "0.19.7",
   "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.19.6",
+  "version": "0.19.7",
   "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

@@ -9751,6 +9751,24 @@ window.__ModuleLoader__.load({
       /* A host that serves the document but refuses writes gets disabled switches
          and a sentence, not controls that silently do nothing. */
       const readOnly = snapshot.writable !== true
+      /* The three placement switches (conversation tab / immersive / composer
+         pill) share one target rule: the control's own answer wins; otherwise
+         the target is the INVERSE of what is on screen — the synchronous intent
+         when the user already touched the field, the accepted document
+         otherwise. The parentheses are load-bearing: `cond ? a : b !== false`
+         parses as `cond ? a : (b !== false)`, so the old spelling of the
+         fallback (`: values[field] !== false) !== true`) made a label click a
+         silent no-op — it recomputed the CURRENT value and wrote it back
+         unchanged (v0.19.6 user report, fixed in v0.19.7). Keep the inversion
+         on the whole expression, never on its last operand. */
+      const placementShown = (field) => (Object.prototype.hasOwnProperty.call(intent.current, field)
+        ? intent.current[field] === true
+        : values[field] !== false)
+      const placementTarget = (field, fromControl) => {
+        if (fromControl !== null) return fromControl
+        const current = placementShown(field)
+        return current !== true
+      }
       return wrapCard(E('div', { className: 'dig-settings dig-card-body', 'data-settings-status': status, 'data-settings-readonly': readOnly === true ? 'true' : 'false' },
         E('div', { className: readOnly === true ? 'dig-settings-note' : 'dig-settings-note dig-settings-note-hidden', 'data-settings-readonly-note': '' }, t('settings.rail.readonly')),
         note === '' ? null : E('div', { className: 'dig-settings-error', 'data-settings-error': '' }, note),
@@ -9815,20 +9833,14 @@ window.__ModuleLoader__.load({
         (() => {
           const field = 'conversationTab'
           const inputId = 'dig-placement-' + field
-          const shown = Object.prototype.hasOwnProperty.call(intent.current, field)
-            ? intent.current[field] === true
-            : values[field] !== false
+          const shown = placementShown(field)
           const toggle = (event) => {
             if (readOnly === true) { setNote(t('settings.rail.readonly')); return }
             const fromControl = event !== undefined && event !== null && event.target !== null
               && event.target !== undefined && typeof event.target.checked === 'boolean'
               ? event.target.checked
               : null
-            const wanted = fromControl !== null
-              ? fromControl
-              : (Object.prototype.hasOwnProperty.call(intent.current, field)
-                ? intent.current[field] !== true
-                : values[field] !== false) !== true
+            const wanted = placementTarget(field, fromControl)
             intent.current[field] = wanted
             dirty.current.set(field, wanted)
             setPending((now) => Object.assign({}, now, { [field]: wanted }))
@@ -9859,20 +9871,14 @@ window.__ModuleLoader__.load({
              same config). */
           const field = 'immersive'
           const inputId = 'dig-placement-' + field
-          const shown = Object.prototype.hasOwnProperty.call(intent.current, field)
-            ? intent.current[field] === true
-            : values[field] !== false
+          const shown = placementShown(field)
           const toggle = (event) => {
             if (readOnly === true) { setNote(t('settings.rail.readonly')); return }
             const fromControl = event !== undefined && event !== null && event.target !== null
               && event.target !== undefined && typeof event.target.checked === 'boolean'
               ? event.target.checked
               : null
-            const wanted = fromControl !== null
-              ? fromControl
-              : (Object.prototype.hasOwnProperty.call(intent.current, field)
-                ? intent.current[field] !== true
-                : values[field] !== false) !== true
+            const wanted = placementTarget(field, fromControl)
             intent.current[field] = wanted
             dirty.current.set(field, wanted)
             setPending((now) => Object.assign({}, now, { [field]: wanted }))
@@ -9902,20 +9908,14 @@ window.__ModuleLoader__.load({
              disappears live. Default ON. */
           const field = 'composerStatus'
           const inputId = 'dig-placement-' + field
-          const shown = Object.prototype.hasOwnProperty.call(intent.current, field)
-            ? intent.current[field] === true
-            : values[field] !== false
+          const shown = placementShown(field)
           const toggle = (event) => {
             if (readOnly === true) { setNote(t('settings.rail.readonly')); return }
             const fromControl = event !== undefined && event !== null && event.target !== null
               && event.target !== undefined && typeof event.target.checked === 'boolean'
               ? event.target.checked
               : null
-            const wanted = fromControl !== null
-              ? fromControl
-              : (Object.prototype.hasOwnProperty.call(intent.current, field)
-                ? intent.current[field] !== true
-                : values[field] !== false) !== true
+            const wanted = placementTarget(field, fromControl)
             intent.current[field] = wanted
             dirty.current.set(field, wanted)
             setPending((now) => Object.assign({}, now, { [field]: wanted }))
@@ -14544,10 +14544,15 @@ window.__ModuleLoader__.load({
          vars, which are absent when that feature is off — the seat inherits
          guaranteed-invalid values, and var() fallbacks do NOT rescue IVCT, so the
          whole background chain below resolves to transparent. Re-declaring the two
-         aliases from the official static token (the exact source the light theme's
-         own alias defs point at, theme-correct in dark too) makes the chain valid
-         again regardless of any-bg's injection state. */
+         aliases from the official static token — the exact source the LIGHT
+         theme's own alias defs point at — makes the chain valid again regardless
+         of any-bg's injection state. static never varies by theme, so this only
+         reproduces the LIGHT surface; the dark override right below re-pins the
+         same aliases to the dark theme's own sources (layer-1→bluish-875,
+         layer-2→bluish-850). Without that override every dark theme renders
+         white surfaces under light text here (issue #15, 1.13:1). */
       '.dig-selection-bar{--dsw-alias-bg-layer-1:var(--dsw-static-neutral-bluish-00,#fff);--dsw-alias-bg-layer-2:var(--dsw-static-neutral-bluish-00,#fff);display:flex;align-items:center;gap:10px;flex-wrap:wrap;padding:5px 10px;margin:6px 0;font-size:11px;line-height:16px;border-radius:var(--dsw-radius-sm,8px);background:var(--dsh-any-op-menu-cordis,var(--dsw-alias-bg-layer-2));border:1px solid var(--dsw-alias-border-l2,var(--dsw-alias-border-subtle,transparent));box-shadow:var(--dsw-elevation-prominent,0 4px 14px rgba(0,0,0,.25))}',
+      'body[data-ds-dark-theme] .dig-selection-bar{--dsw-alias-bg-layer-1:var(--dsw-static-neutral-bluish-875,#232324);--dsw-alias-bg-layer-2:var(--dsw-static-neutral-bluish-850,#2c2c2e)}',
       '.dig-selection-bar .dig-link{margin-left:0;padding:2px 0}',
       '.dig-selection-bar .dig-link-danger{color:var(--dsw-alias-state-error-primary)}',
       '.dig-selection-count{color:var(--dsw-alias-label-secondary);white-space:nowrap}',
@@ -14761,8 +14766,12 @@ window.__ModuleLoader__.load({
       // surface sampling misses and that remap would otherwise IVCT to transparent).
       // --dsh-any-op-menu-cordis at the input opacity tier, plus its input blur rule), so fill
       // opacity and frost follow the composer card exactly. Without that plugin the
-      // theme-owned menu material applies.
+      // theme-owned menu material applies. The light re-declaration on the rule below
+      // pins the LIGHT static surface (see the .dig-selection-bar note); dark themes
+      // need the matching override right after it, or the menu renders white under
+      // light text (issue #15).
       '.dig-cs-menu{--dsw-alias-bg-layer-1:var(--dsw-static-neutral-bluish-00,#fff);--dsw-alias-bg-layer-2:var(--dsw-static-neutral-bluish-00,#fff);position:absolute;bottom:calc(100% + 6px);left:0;z-index:60;min-width:220px;max-width:320px;max-height:320px;overflow:auto;padding:6px;border-radius:var(--dsw-radius-lg,12px);background:var(--dsh-any-op-menu-cordis,var(--dsw-alias-bg-layer-2));box-shadow:var(--dsw-elevation-prominent,var(--dsw-elevation-dimmed,0 8px 24px rgba(0,0,0,.2)));color:var(--dsw-alias-label-secondary);font-size:12px;line-height:20px}',
+      'body[data-ds-dark-theme] .dig-cs-menu{--dsw-alias-bg-layer-1:var(--dsw-static-neutral-bluish-875,#232324);--dsw-alias-bg-layer-2:var(--dsw-static-neutral-bluish-850,#2c2c2e)}',
       '.dig-cs-item{display:flex;align-items:center;gap:8px;width:100%;padding:5px 10px;border:none;border-radius:var(--dsw-radius-sm,8px);background:transparent;color:var(--dsw-alias-label-primary);font-family:inherit;font-size:13px;line-height:20px;cursor:pointer;text-align:left}',
       '.dig-cs-item:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}',
       '.dig-cs-item:disabled{opacity:.5;cursor:default}',

package/src/index.js

@@ -77,6 +77,13 @@ function railConfigSchema(schema) {
      does not mark volatile ("Config field … is not volatile"), and the settings
      switch then rolls back silently. */
   shape.immersive = live(schema.boolean().default(true))
+  /* Composer status pill (v0.19.0): the settings card's "输入框 Git 状态" switch
+     and the pill itself read this field. v0.19.0-v0.19.6 shipped the switch and
+     the reader WITHOUT this declaration, so the Host rejected every write with
+     `Config field "composerStatus" is not volatile` — the card rolled the switch
+     back and said "设置没写进去". Any new row-Config field the client writes MUST
+     be declared (and volatile) here, or the write is refused before it lands. */
+  shape.composerStatus = live(schema.boolean().default(true))
   return schema.object(shape)
 }