dsh-db-mcp 0.6.4 → 0.6.5

package/README.md

@@ -223,10 +223,12 @@ open reads the live catalog.
 
 Every source carries an optional **group** label (`group` in the registry,
 editable under *More settings*). Groups are user-owned: type a name in the
-**新建分组** box to create one, rename or delete it from the group header, and drag
-a source row onto a group to move it there (drag it onto **未分组** to clear the
-label). The list renders one section per group, sorted by name with the ungrouped
-sources last; while no group exists the list keeps its flat look.
+**新建分组** box to create one, **double-click a group name to rename it** (or the
+trash button to delete the group), and drag a source row onto a group to move it
+there (drag it onto **未分组** to clear the label). Double-clicking a source name
+renames just that source — its id never changes. The list renders one section per
+group, sorted by name with the ungrouped sources last; while no group exists the
+list keeps its flat look.
 
 Each group header carries a select-all box, so sources inside a group take part in
 bulk work exactly like loose ones. Tick any row (or click its text) to open the

package/client.js

@@ -182,7 +182,7 @@ window.__ModuleLoader__.load({
         'group.new': 'New group',
         'group.newPlaceholder': 'Group name',
         'group.add': 'Add group',
-        'group.rename': 'Rename',
+        'group.renameHint': 'Double-click to rename',
         'group.save': 'Save',
         'group.cancel': 'Cancel',
         'group.delete': 'Delete',
@@ -354,7 +354,7 @@ window.__ModuleLoader__.load({
         'group.new': '新建分组',
         'group.newPlaceholder': '分组名称',
         'group.add': '新建',
-        'group.rename': '重命名',
+        'group.renameHint': '双击重命名',
         'group.save': '保存',
         'group.cancel': '取消',
         'group.delete': '删除',
@@ -852,7 +852,7 @@ window.__ModuleLoader__.load({
       }
       .dbmcp-group-head {
         display: flex;
-        align-items: baseline;
+        align-items: center;
         gap: 8px;
         padding: 0 2px;
         border-bottom: 1px solid var(--dsw-alias-border-l1);
@@ -883,7 +883,16 @@ window.__ModuleLoader__.load({
         display: flex;
         align-items: center;
         gap: 6px;
-        flex: 0 1 320px;
+        flex: 0 1 auto;
+      }
+      .dbmcp-group-edit .dbmcp-input {
+        width: 170px;
+      }
+      .dbmcp-group-edit .dbmcp-btn,
+      .dbmcp-item-rename .dbmcp-btn {
+        flex: 0 0 auto;
+        white-space: nowrap;
+        padding: 3px 10px;
       }
       .dbmcp-group.is-over {
         outline: 1px dashed var(--dsw-alias-brand-primary);
@@ -960,6 +969,19 @@ window.__ModuleLoader__.load({
         word-break: break-all;
         margin-top: 2px;
       }
+      .dbmcp-item-name > .is-renamable,
+      .dbmcp-group-name.is-renamable {
+        cursor: text;
+      }
+      .dbmcp-item-rename {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+      }
+      .dbmcp-item-rename .dbmcp-input {
+        flex: 0 0 200px;
+        width: 200px;
+      }
       .dbmcp-item-actions {
         display: flex;
         align-items: center;
@@ -1226,6 +1248,7 @@ window.__ModuleLoader__.load({
         disabled: props.disabled === true,
         title: props.title || undefined,
         onChange: (event) => props.onChange(event.target.value),
+        onKeyDown: props.onKeyDown || undefined,
       })
     }
 
@@ -2128,6 +2151,7 @@ window.__ModuleLoader__.load({
       const [pendingGroupDelete, setPendingGroupDelete] = React.useState(null)
       const [draggingId, setDraggingId] = React.useState(null)
       const [dragOverGroup, setDragOverGroup] = React.useState(null)
+      const [renamingSource, setRenamingSource] = React.useState(null)
 
       /** Switching a tab only swaps the card below; the chrome never moves. */
       const selectTab = (id) => {
@@ -2339,6 +2363,34 @@ window.__ModuleLoader__.load({
         }
       }
 
+      /** A source keeps its id; double-clicking the name only changes the label. */
+      const renameSource = async () => {
+        if (!renamingSource) return
+        const name = String(renamingSource.name || '').trim()
+        const source = sources.find((item) => item.id === renamingSource.id)
+        if (!source || !name) {
+          setRenamingSource(null)
+          return
+        }
+        try {
+          await apiPost('/datasources/save', {
+            id: source.id,
+            name,
+            kind: source.kind,
+            readOnly: source.readOnly,
+            isDefault: source.isDefault,
+            tags: source.tags,
+            group: source.group,
+            config: source.config,
+          })
+          setRenamingSource(null)
+          setNotice({ message: t('notice.saved').replace('{name}', name), isError: false })
+          load()
+        } catch (error) {
+          reportError(error)
+        }
+      }
+
       const removeGroup = async (name) => {
         if (pendingGroupDelete !== name) {
           setPendingGroupDelete(name)
@@ -2405,15 +2457,52 @@ window.__ModuleLoader__.load({
           ),
           h(
             'div',
-            { className: 'dbmcp-item-main', onClick: () => toggleSelected(source.id) },
-            h(
-              'div',
-              { className: 'dbmcp-item-name' },
-              h('span', null, source.name || source.id),
-              h('span', { className: 'dbmcp-pill' }, source.kind),
-              source.isDefault ? h('span', { className: 'dbmcp-pill' }, t('sources.default')) : null,
-              h('span', { className: 'dbmcp-pill' }, source.readOnly ? t('sources.readonly') : t('sources.readwrite')),
-            ),
+            { className: 'dbmcp-item-main' },
+            renamingSource && renamingSource.id === source.id
+              ? h(
+                  'form',
+                  {
+                    className: 'dbmcp-item-rename',
+                    onClick: (event) => event.stopPropagation(),
+                    onSubmit: (event) => {
+                      event.preventDefault()
+                      void renameSource()
+                    },
+                  },
+                  h(TextInput, {
+                    value: renamingSource.name,
+                    onChange: (value) => setRenamingSource({ id: source.id, name: value }),
+                    autoFocus: true,
+                    onKeyDown: (event) => {
+                      if (event.key === 'Escape') setRenamingSource(null)
+                    },
+                  }),
+                  h('button', { type: 'submit', className: 'dbmcp-btn is-small is-primary' }, t('group.save')),
+                  h(
+                    'button',
+                    { type: 'button', className: 'dbmcp-btn is-small', onClick: () => setRenamingSource(null) },
+                    t('group.cancel'),
+                  ),
+                )
+              : h(
+                  'div',
+                  { className: 'dbmcp-item-name' },
+                  h(
+                    'span',
+                    {
+                      className: 'is-renamable',
+                      title: t('group.renameHint'),
+                      onDoubleClick: (event) => {
+                        event.stopPropagation()
+                        setRenamingSource({ id: source.id, name: source.name || source.id })
+                      },
+                    },
+                    source.name || source.id,
+                  ),
+                  h('span', { className: 'dbmcp-pill' }, source.kind),
+                  source.isDefault ? h('span', { className: 'dbmcp-pill' }, t('sources.default')) : null,
+                  h('span', { className: 'dbmcp-pill' }, source.readOnly ? t('sources.readonly') : t('sources.readwrite')),
+                ),
             h('div', { className: 'dbmcp-item-target' }, [source.target, source.id].filter(Boolean).join(' · ')),
             h(
               'div',
@@ -2503,22 +2592,30 @@ window.__ModuleLoader__.load({
                     value: editingGroup.name,
                     onChange: (value) => setEditingGroup({ from: name, name: value }),
                     autoFocus: true,
+                    onKeyDown: (event) => {
+                      if (event.key === 'Escape') setEditingGroup(null)
+                    },
                   }),
                   h('button', { type: 'submit', className: 'dbmcp-btn is-small is-primary' }, t('group.save')),
                   h('button', { type: 'button', className: 'dbmcp-btn is-small', onClick: () => setEditingGroup(null) }, t('group.cancel')),
                 )
-              : h('span', { className: 'dbmcp-group-name' }, name || t('group.unassigned')),
+              : h(
+                  'span',
+                  {
+                    className: 'dbmcp-group-name' + (name ? ' is-renamable' : ''),
+                    title: name ? t('group.renameHint') : undefined,
+                    onDoubleClick: () => {
+                      if (name) setEditingGroup({ from: name, name })
+                    },
+                  },
+                  name || t('group.unassigned'),
+                ),
             h('span', { className: 'dbmcp-hint' }, t('group.count').replace('{n}', String(items.length))),
             name === '' || renaming
               ? null
               : h(
                   'span',
                   { className: 'dbmcp-group-actions' },
-                  h(
-                    'button',
-                    { type: 'button', className: 'dbmcp-btn is-small', onClick: () => setEditingGroup({ from: name, name }) },
-                    t('group.rename'),
-                  ),
                   h(
                     'button',
                     {

package/docs/requirements.md

@@ -958,3 +958,26 @@ PostgreSQL/MySQL/Oracle 只做 TCP 端口探测，无法证明口令与服务的
 - `dev/selftest.mjs` 新增 5 项断言，共 **46/46**：扫描标记重复、重复导入被跳过、删掉重复项后可再次导入、第二次导入被跳过、`sourceIdentity` 对大小写与端口字符串不敏感。
 - 其余：render 37/37、parse 24/24、i18n 12/12、p5 15/15、mcp 19/19、shims ok。
 - 线上：`GET /dbeaver/scan` 两条连接均为 `alreadyImported: true`（sqlite → `dbeaver-sample-database-sqlite-1`，mysql → `mysql`）。
+
+## 27. 0.6.5：双击重命名（分组与数据源）
+
+### 27.0 0.6.5 修订
+- 首次实现保留了「点正文即选中」，结果是双击组名/数据源名会先切换选中、再进入编辑，观感是「双击只选中了，没重命名」。现已移除行正文的 `onClick`，选中统一由复选框负责。
+
+
+### 27.1 交互
+- 分组头不再有「重命名」按钮，只保留「删除」。双击组名进入内联编辑，回车保存、Esc 取消。
+- 数据源名称同理：双击名称进入内联编辑，只改显示名称，id 不变；提交走 `POST /datasources/save`，其余字段原样带回（口令仍由 secrets.json 持有，不参与往返）。
+- 「未分组」是投放目标，不是真实分组，因此不可重命名。
+- 行正文不再承担「点一下就选中」的职责：选中只走复选框（含组头全选），否则双击必然先触发两次 `click`，与重命名抢事件。
+
+### 27.2 实现
+- `TextInput` 增加 `onKeyDown` 透传，用于 Escape 取消。
+- `renderGroup` 的组名改为 `span.dbmcp-group-name.is-renamable` + `onDoubleClick`，标题提示用 `group.renameHint`。
+- `renderItem` 在 `renamingSource.id === source.id` 时渲染 `form.dbmcp-item-rename`（输入框 + 保存），否则渲染可双击的名称。
+- 新增状态 `renamingSource`；新增 `renameSource()`；CSS 增加 `.is-renamable { cursor: text }` 与 `.dbmcp-item-rename` 布局。
+- 字典：删除 `group.rename`（按钮文案），新增 `group.renameHint`（`Double-click to rename` / `双击重命名`），避免死键。
+
+### 27.3 验证
+- `node --check client.js` 通过；i18n 12/12（无死键）、render 37/37、selftest 46/46、parse 24/24、p5 15/15、shims ok。
+- 版本 0.6.5。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-db-mcp",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "DSH database plugin: a data-source management panel plus a Python MCP server that exposes those sources to the agent.",
   "keywords": [
     "dsh",

package/src/host.js

@@ -33,7 +33,7 @@ const { createBridge } = await import(new URL(`./tools.js?v=${GENERATION}`, impo
 
 const API_PREFIX = '/plugins/db-mcp/api'
 const PLUGIN_NAME = 'dsh-db-mcp'
-const PLUGIN_VERSION = '0.6.4'
+const PLUGIN_VERSION = '0.6.5'
 const SCHEMA_VERSION = 1
 const REGISTRY_FILE = 'datasources.json'
 const SECRETS_FILE = 'secrets.json'