@restregular/dsh-filekit 0.2.1 → 0.2.3

package/README.md

@@ -30,7 +30,8 @@ dsh plugin --profile web add @restregular/dsh-filekit
 | 新建文件 / 文件夹 | 右键菜单 | 在当前目录或目标目录创建 |
 | 重命名 | 右键菜单 | 只改名字，不改变所在目录 |
 | 移动到… | 右键菜单 | 目录选择器 |
-| 复制一份 | 右键菜单 | 在同目录生成副本 |
+| 复制 / 剪切 | 右键菜单 | 把条目放进 FileKit 剪贴板，不立即改动磁盘 |
+| 粘贴 | 目录 / 空白处右键 | 粘贴到该目录；重名时自动用 `名称 (2).扩展名`，不会覆盖 |
 | 复制路径 | 右键菜单 | 相对路径与绝对路径 |
 | 引用到对话框 | 右键菜单 | 插入 `@相对路径 `；输入框不可用时退回复制 |
 | 删除到回收站 | 右键菜单 | 移动到 `<工作区>/.dsh-trash`，可恢复 |
@@ -39,10 +40,17 @@ dsh plugin --profile web add @restregular/dsh-filekit
 ### FileKit 文件管理页
 
 - 独立侧边栏标签页（`filekit` kind），不是浮层弹窗；
-- 面包屑浏览、新建、复制、移动、删除、回收站；
-- 内置文本编辑器（`Ctrl/Cmd+S` 保存、未保存守卫、保存后刷新）；
-- 右键菜单与拖拽移动；
-- 有未保存修改时，关闭标签页会被阻止并提示先保存或放弃。
+- 面包屑浏览、新建、复制/剪切/粘贴、移动、删除、回收站；
+- 右键菜单与拖拽移动。
+
+### 编辑器标签页
+
+- 每个文件一个独立标签页（`filekit-edit` kind），和预览页可以互相切换：
+  - 预览标题栏的**编辑**按钮把当前预览标签页切换成编辑页；
+  - 编辑页的**保存**按钮保存后切回该文件的预览页；**放弃修改**确认后也切回预览。
+- 与内置预览同一套 Shiki 高亮器、行内滚动同步、`Ctrl/Cmd+S` 保存；
+- 未保存时标签页标题右侧显示橙色圆点；关闭未保存的标签页会被阻止并提示；
+- 工具栏全部为图标按钮，悬停显示提示文本（复制相对路径、引用、预览、放弃修改、保存）。
 
 ### 设置页
 
@@ -113,6 +121,7 @@ action: list | read | write | create | rename | move | copy | delete
 - 回收站恢复要求原父目录仍然存在；父目录被改名或删除时需要先手动恢复目录。
 - Host 路由只监听本机回环地址；如果通过 Pocket/公网隧道在另一台设备上打开页面，界面数据请求会被拒绝（有意的安全边界）。
 - 编辑器按 UTF-8 读写，不做编码转换；超限文件以只读截断方式展示。
+- 文件剪贴板是页面内存状态（不是系统剪贴板），刷新页面或重启 DSH 后清空。
 - 接管文件页后，宿主「在系统中打开目录」按钮不再出现在该页标题栏（宿主把该按钮挂在文件页的子槽位里，接管页不使用该子槽位）。
 
 ## 故障排查

package/client.js

@@ -32,6 +32,11 @@
   const FILEKIT_ID = '@restregular/dsh-filekit';
   const FILES_KIND = 'files';
   const FILEKIT_KIND = 'filekit';
+  const EDITOR_KIND = 'filekit-edit';
+  /** Identity of the per-file editor tab type and its body cell. */
+  const EDITOR_ID = '@restregular/dsh-filekit/editor';
+  /** Resource scheme for editor tabs; the address carries the file, so it survives restarts. */
+  const EDITOR_PREFIX = 'dsh-resource://filekit-edit/session/';
 
   const factories = window.__ModuleLoader__?.factories;
   if (factories !== undefined && typeof factories.has === 'function' && factories.has(MODULE_ID)) return;
@@ -42,6 +47,20 @@
       const React = require('react');
       const h = React.createElement;
 
+      // Harness primitives give the editor the same Shiki highlighter the
+      // built-in document preview uses. Optional: a missing module degrades to
+      // a plain textarea instead of breaking the whole plugin.
+      let primitives = undefined;
+      try {
+        primitives = require('@deepseek-ai/dsh-client-ui-primitives');
+      } catch {
+        primitives = undefined;
+      }
+      const useCodeHighlighter =
+        typeof primitives?.useCodeHighlighter === 'function' ? primitives.useCodeHighlighter : () => () => undefined;
+      const languageForPath =
+        typeof primitives?.languageForPath === 'function' ? primitives.languageForPath : () => undefined;
+
       // ------------------------------------------------------------------
       // Copy
       // ------------------------------------------------------------------
@@ -79,7 +98,10 @@
           openPreview: '打开预览',
           rename: '重命名',
           move: '移动到…',
-          copy: '复制一份',
+          copy: '复制',
+          cut: '剪切',
+          paste: '粘贴',
+          pasteHere: '粘贴到此处',
           copyRel: '复制相对路径',
           copyAbs: '复制绝对路径',
           reference: '引用到对话框',
@@ -109,6 +131,9 @@
           emptyHint: '回收站里的所有条目都会被永久删除，无法恢复。',
           discardTitle: '放弃未保存的修改？',
           discardConfirm: '放弃修改',
+          discardHint: '放弃后该标签页会切换回文件预览。',
+          editorTab: '编辑',
+          editorNoFile: '这个标签页没有要编辑的文件。',
           dirty: '未保存',
           discard: '放弃修改',
           binary: '这是二进制文件，不能用文本编辑器打开。',
@@ -120,6 +145,9 @@
           renamed: '已重命名',
           moved: '已移动',
           copied: '已复制',
+          cutDone: '已剪切',
+          pasted: '已粘贴',
+          pastedTo: '已粘贴到 {path}',
           deleted: '已移入回收站',
           restored: '已恢复',
           purged: '已永久删除',
@@ -216,7 +244,10 @@
           openPreview: 'Open preview',
           rename: 'Rename',
           move: 'Move to…',
-          copy: 'Duplicate',
+          copy: 'Copy',
+          cut: 'Cut',
+          paste: 'Paste',
+          pasteHere: 'Paste here',
           copyRel: 'Copy relative path',
           copyAbs: 'Copy absolute path',
           reference: 'Reference in composer',
@@ -246,6 +277,9 @@
           emptyHint: 'Every entry in the recycle bin is permanently deleted; this cannot be undone.',
           discardTitle: 'Discard unsaved changes?',
           discardConfirm: 'Discard',
+          discardHint: 'Discarding switches this tab back to the file preview.',
+          editorTab: 'Edit',
+          editorNoFile: 'This tab has no file to edit.',
           dirty: 'Unsaved',
           discard: 'Discard',
           binary: 'This is a binary file; the text editor cannot open it.',
@@ -257,6 +291,9 @@
           renamed: 'Renamed',
           moved: 'Moved',
           copied: 'Copied',
+          cutDone: 'Cut',
+          pasted: 'Pasted',
+          pastedTo: 'Pasted into {path}',
           deleted: 'Moved to the recycle bin',
           restored: 'Restored',
           purged: 'Permanently deleted',
@@ -517,6 +554,26 @@
         return 'dsh-resource://file/session/' + id + '/' + rel.split('/').map((part) => encodeURIComponent(part)).join('/');
       }
 
+      /** Address of a FileKit editor tab; unique per session+file, and persisted as its contentId. */
+      function editorAddress(sessionId, rel) {
+        return EDITOR_PREFIX + encodeURIComponent(String(sessionId)) + '/' + rel.split('/').map((part) => encodeURIComponent(part)).join('/');
+      }
+
+      /** Read the file out of an editor tab address; `undefined` for any other resource. */
+      function parseEditorAddress(address) {
+        if (typeof address !== 'string' || !address.startsWith(EDITOR_PREFIX)) return undefined;
+        const rest = address.slice(EDITOR_PREFIX.length);
+        const slash = rest.indexOf('/');
+        if (slash <= 0 || slash === rest.length - 1) return undefined;
+        try {
+          const sessionId = decodeURIComponent(rest.slice(0, slash));
+          const rel = rest.slice(slash + 1).split('/').map((part) => decodeURIComponent(part)).join('/');
+          return { sessionId, rel };
+        } catch {
+          return undefined;
+        }
+      }
+
       function formatBytes(size) {
         if (typeof size !== 'number' || !Number.isFinite(size)) return '';
         if (size < 1024) return `${size} B`;
@@ -599,6 +656,405 @@
         return h('div', { className: 'dsh-fk-toast', 'data-kind': spec.kind, role: 'status' }, spec.text);
       }
 
+      // ------------------------------------------------------------------
+      // File clipboard (copy / cut → paste)
+      // ------------------------------------------------------------------
+
+      /** Shared across both panels: copy in one, paste in the other. */
+      let fileClipboard = null;
+      const clipboardListeners = new Set();
+
+      function setFileClipboard(value) {
+        fileClipboard = value;
+        for (const listener of clipboardListeners) {
+          try {
+            listener();
+          } catch {
+            /* ignore */
+          }
+        }
+      }
+
+      function useFileClipboard() {
+        const [value, setValue] = React.useState(fileClipboard);
+        React.useEffect(() => {
+          const listener = () => setValue(fileClipboard);
+          clipboardListeners.add(listener);
+          return () => clipboardListeners.delete(listener);
+        }, []);
+        return value;
+      }
+
+      /** Put one entry on the FileKit clipboard (no filesystem work yet). */
+      function copyToFileClipboard(root, rel, kind, mode) {
+        setFileClipboard({ mode, root, rel, kind, name: baseOf(rel) });
+        showToast(mode === 'cut' ? t('cutDone') : t('copied'), 'ok');
+      }
+
+      // ------------------------------------------------------------------
+      // Highlighted code editor
+      // ------------------------------------------------------------------
+
+      /** Above this size the editor skips highlighting so typing stays fluid. */
+      const HIGHLIGHT_MAX_CHARS = 200_000;
+
+      function CodeEditor({ value, onChange, rel, fontSize, readOnly = false }) {
+        const inputRef = React.useRef(null);
+        const preRef = React.useRef(null);
+        const [composing, setComposing] = React.useState(false);
+        const deferred = React.useDeferredValue(value);
+        const language = React.useMemo(() => languageForPath(rel), [rel]);
+        const highlight = useCodeHighlighter(language);
+        const plainLines = React.useMemo(() => String(deferred).split('\n'), [deferred]);
+        const lines = React.useMemo(() => {
+          if (typeof highlight !== 'function' || deferred.length > HIGHLIGHT_MAX_CHARS) return undefined;
+          try {
+            const result = highlight(deferred);
+            return Array.isArray(result) ? result : undefined;
+          } catch {
+            return undefined;
+          }
+        }, [deferred, highlight]);
+        const totalLines = String(value).split('\n').length;
+        const rendered = [];
+        const source = lines ?? plainLines;
+        for (let index = 0; index < Math.max(source.length, totalLines); index += 1) {
+          const line = source[index];
+          rendered.push(
+            h(
+              'div',
+              { className: 'dsh-fk-codeeditor-line', key: index },
+              Array.isArray(line)
+                ? line.map((token, tokenIndex) => h('span', { key: tokenIndex, style: token.style }, token.text))
+                : line ?? '',
+            ),
+          );
+        }
+
+        const syncScroll = (event) => {
+          const pre = preRef.current;
+          if (pre === null) return;
+          pre.scrollTop = event.currentTarget.scrollTop;
+          pre.scrollLeft = event.currentTarget.scrollLeft;
+        };
+
+        // After edits (or a highlight pass) the textarea may have scrolled under
+        // the caret; keep the painted layer on the same scroll offset.
+        React.useEffect(() => {
+          const input = inputRef.current;
+          const pre = preRef.current;
+          if (input === null || pre === null) return;
+          pre.scrollTop = input.scrollTop;
+          pre.scrollLeft = input.scrollLeft;
+        }, [value, lines]);
+
+        return h(
+          'div',
+          { className: 'dsh-fk-codeeditor' },
+          h(
+            'pre',
+            {
+              className: 'dsh-fk-codeeditor-pre',
+              ref: preRef,
+              'aria-hidden': true,
+              style: { fontSize: `${fontSize}px`, visibility: composing ? 'hidden' : 'visible' },
+            },
+            rendered,
+          ),
+          h('textarea', {
+            ref: inputRef,
+            className: 'dsh-fk-codeeditor-input',
+            value,
+            spellCheck: false,
+            readOnly,
+            wrap: 'off',
+            autoCapitalize: 'off',
+            autoCorrect: 'off',
+            autoComplete: 'off',
+            style: {
+              fontSize: `${fontSize}px`,
+              // IME composition text would be invisible through the transparent
+              // layer; show it plainly while the candidate window is open.
+              color: composing ? 'var(--dsw-alias-label-primary)' : 'transparent',
+            },
+            onChange: (event) => onChange(event.target.value),
+            onScroll: syncScroll,
+            onCompositionStart: () => setComposing(true),
+            onCompositionEnd: () => setComposing(false),
+            onKeyDown: (event) => {
+              if (readOnly || event.key !== 'Tab') return;
+              event.preventDefault();
+              const area = event.currentTarget;
+              const start = area.selectionStart;
+              const end = area.selectionEnd;
+              onChange(`${value.slice(0, start)}  ${value.slice(end)}`);
+              window.requestAnimationFrame(() => {
+                area.selectionStart = start + 2;
+                area.selectionEnd = start + 2;
+              });
+            },
+          }),
+        );
+      }
+
+      /**
+       * One per-file editor tab. Saving (or discarding) swaps this tab for the
+       * file's preview tab, so the pair behave as one page with two modes.
+       */
+      function FileEditorTab(props) {
+        const { useTabInfo, sessionId, inputActions } = props;
+        const { tab } = useTabInfo();
+        const settingsSnapshot = useSettings();
+        const params = tab.navigation?.params;
+        // Navigation params carry the file on first open; a restored layout only
+        // has the tab's contentId, which is the editor address.
+        const rel =
+          typeof params?.rel === 'string' && params.rel !== '' ? params.rel : parseEditorAddress(tab.contentId)?.rel ?? '';
+        const [root, setRoot] = React.useState('');
+        const [error, setError] = React.useState('');
+        const [editor, setEditor] = React.useState(null);
+        const [draft, setDraft] = React.useState('');
+        const [saving, setSaving] = React.useState(false);
+        const [discardOpen, setDiscardOpen] = React.useState(false);
+        const draftRef = React.useRef('');
+        const savingRef = React.useRef(false);
+        const saveRef = React.useRef(null);
+        draftRef.current = draft;
+        const dirty = editor !== null && draft !== editor.original;
+
+        // The tab chip shows the unsaved marker through this flag.
+        React.useEffect(() => {
+          setTabDirty(tab.id, dirty);
+          return () => setTabDirty(tab.id, false);
+        }, [tab.id, dirty]);
+
+        React.useEffect(() => {
+          if (typeof sessionId !== 'string' || sessionId === '') return undefined;
+          let dead = false;
+          api('workspace', { sessionId })
+            .then((data) => {
+              if (!dead) setRoot(data.root);
+            })
+            .catch((failure) => {
+              if (!dead) setError(errorText(failure));
+            });
+          return () => {
+            dead = true;
+          };
+        }, [sessionId]);
+
+        React.useEffect(() => {
+          if (root === '' || rel === '') return undefined;
+          let dead = false;
+          setEditor(null);
+          setDraft('');
+          setError('');
+          api('read', { root, path: rel, sessionId })
+            .then((data) => {
+              if (dead) return;
+              if (data.binary === true) {
+                setError(t('binary'));
+                return;
+              }
+              setEditor({
+                rel,
+                original: data.text,
+                mtimeMs: data.mtimeMs,
+                size: data.size,
+                truncated: data.truncated === true,
+              });
+              setDraft(data.text);
+            })
+            .catch((failure) => {
+              if (!dead) setError(errorText(failure));
+            });
+          return () => {
+            dead = true;
+          };
+        }, [root, rel, sessionId]);
+
+        const switchToPreview = () => {
+          setTabDirty(tab.id, false);
+          try {
+            tab.actions.openResource(fileAddress(sessionId, rel), { replaceTab: true });
+          } catch (failure) {
+            showToast(errorText(failure), 'error');
+          }
+        };
+
+        const save = async () => {
+          const current = editor;
+          const text = draftRef.current;
+          if (current === null || savingRef.current || current.truncated || text === current.original) return;
+          savingRef.current = true;
+          setSaving(true);
+          try {
+            await api('write', { root, path: rel, content: text, expectedMtimeMs: current.mtimeMs, sessionId });
+            showToast(t('saved'));
+            switchToPreview();
+          } catch (failure) {
+            setError(errorText(failure));
+            showToast(errorText(failure), 'error');
+          } finally {
+            savingRef.current = false;
+            setSaving(false);
+          }
+        };
+        saveRef.current = save;
+
+        const discard = () => {
+          if (!dirty) {
+            switchToPreview();
+            return;
+          }
+          setDiscardOpen(true);
+        };
+
+        React.useEffect(() => {
+          const onKeyDown = (event) => {
+            if (tab.visible !== true) return;
+            if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 's' && editor !== null) {
+              event.preventDefault();
+              saveRef.current?.();
+            }
+          };
+          window.addEventListener('keydown', onKeyDown);
+          return () => window.removeEventListener('keydown', onKeyDown);
+        }, [editor, tab.visible]);
+
+        const copyRelPath = async () => {
+          const ok = await copyText(rel);
+          showToast(ok ? t('copiedPath') : t('error.internal'), ok ? 'ok' : 'error');
+        };
+
+        const referenceRel = async () => {
+          const text = `@${rel} `;
+          if (inputActions !== undefined && typeof inputActions.captureInsertion === 'function' && typeof inputActions.insertText === 'function') {
+            try {
+              const span = inputActions.captureInsertion();
+              if (inputActions.insertText(text, span) === true) {
+                inputActions.persistDraft?.();
+                showToast(t('referenced'));
+                return;
+              }
+            } catch {
+              /* fall back to the clipboard */
+            }
+          }
+          const ok = await copyText(text);
+          showToast(ok ? t('referencedCopied') : t('error.internal'), ok ? 'ok' : 'error');
+        };
+
+        if (params === undefined) {
+          return h('div', { className: 'dsh-fk-tabstatus' }, h('p', { className: 'dsh-fk-hint' }, t('loading')));
+        }
+        if (rel === '') {
+          return h('div', { className: 'dsh-fk-tabstatus' }, h('p', { className: 'dsh-fk-error' }, t('editorNoFile')));
+        }
+        if (error !== '' && editor === null) {
+          return h(
+            'div',
+            { className: 'dsh-fk-tabstatus' },
+            h('p', { className: 'dsh-fk-error' }, error),
+            h('button', { type: 'button', className: 'dsh-fk-btn', onClick: switchToPreview }, t('openPreview')),
+          );
+        }
+        if (editor === null) {
+          return h('div', { className: 'dsh-fk-tabstatus' }, h('p', { className: 'dsh-fk-hint' }, t('loading')));
+        }
+
+        return h(
+          'div',
+          { className: 'dsh-fk-tab' },
+          h(
+            'div',
+            { className: 'dsh-fk-editorhead' },
+            h(
+              'div',
+              { className: 'dsh-fk-editorpath', title: joinAbs(root, rel) },
+              h(Icon, { name: 'file', size: 15 }),
+              h('span', { className: 'dsh-fk-editorpathname' }, baseOf(rel)),
+              h('span', { className: 'dsh-fk-editorpathdir' }, dirOf(rel)),
+            ),
+            h('span', { className: 'dsh-fk-spacer' }),
+            dirty ? h('span', { className: 'dsh-fk-badge' }, t('dirty')) : null,
+            h(
+              'span',
+              { className: 'dsh-fk-iconactions' },
+              h(IconButton, { icon: 'copy', label: t('copyRel'), onClick: copyRelPath }),
+              h(IconButton, { icon: 'link', label: t('reference'), onClick: referenceRel }),
+              h(IconButton, { icon: 'file', label: t('openPreview'), onClick: switchToPreview, disabled: saving }),
+              h(IconButton, {
+                icon: 'close',
+                label: t('discard'),
+                onClick: discard,
+                disabled: saving || !dirty,
+              }),
+              h(IconButton, {
+                icon: 'check',
+                label: saving ? t('saving') : t('save'),
+                onClick: save,
+                disabled: saving || !dirty || editor.truncated,
+              }),
+            ),
+          ),
+          h(
+            'div',
+            { className: 'dsh-fk-editor' },
+            editor.truncated ? h('p', { className: 'dsh-fk-warn' }, h(Icon, { name: 'warning', size: 14 }), t('truncated')) : null,
+            h(CodeEditor, {
+              value: draft,
+              onChange: setDraft,
+              rel,
+              fontSize: settingsSnapshot.editorFontSize,
+              readOnly: editor.truncated,
+            }),
+            h(
+              'div',
+              { className: 'dsh-fk-editor-meta' },
+              h('span', null, `${formatBytes(editor.size)}${dirty ? ` → ${formatBytes(new TextEncoder().encode(draft).length)}` : ''}`),
+              h('span', { className: 'dsh-fk-spacer' }),
+              h('span', null, t('modified')),
+              h('span', null, new Date(editor.mtimeMs).toLocaleString()),
+            ),
+          ),
+          error !== '' ? h('div', { className: 'dsh-fk-status', 'data-kind': 'error' }, error) : null,
+          discardOpen
+            ? h(ConfirmDialog, {
+                key: 'discard',
+                title: t('discardTitle'),
+                text: rel,
+                hint: t('discardHint'),
+                danger: true,
+                confirmText: t('discardConfirm'),
+                onClose: () => setDiscardOpen(false),
+                onConfirm: () => {
+                  setTabDirty(tab.id, false);
+                  switchToPreview();
+                  return true;
+                },
+              })
+            : null,
+        );
+      }
+
+      function EditorTitle({ useTabInfo }) {
+        const { tab } = useTabInfo();
+        const dirty = useTabDirty(tab.id);
+        const rel =
+          typeof tab.navigation?.params?.rel === 'string' && tab.navigation.params.rel !== ''
+            ? tab.navigation.params.rel
+            : parseEditorAddress(tab.contentId)?.rel ?? '';
+        const name = rel === '' ? t('editorTab') : baseOf(rel);
+        return h(
+          'span',
+          { className: 'dsh-fk-tabtitle', title: rel === '' ? name : rel },
+          h(Icon, { name: 'file', size: 15 }),
+          h('span', { className: 'dsh-fk-tabtitle-name' }, name),
+          dirty ? h('span', { className: 'dsh-fk-tabdot', title: t('dirty') }) : null,
+        );
+      }
+
       function createOwnedStyle(css) {
         const el = document.createElement('style');
         el.setAttribute('data-plugin', OWNER);
@@ -608,15 +1064,69 @@
       }
 
       // ------------------------------------------------------------------
-      // Dirty tabs (the FileKit page's close guard)
+      // Dirty tabs (close guard + the tab title's unsaved dot)
       // ------------------------------------------------------------------
 
       const dirtyTabs = new Set();
+      const dirtyListeners = new Set();
 
       function setTabDirty(tabId, dirty) {
         if (typeof tabId !== 'string' || tabId === '') return;
+        const before = dirtyTabs.has(tabId);
         if (dirty) dirtyTabs.add(tabId);
         else dirtyTabs.delete(tabId);
+        if (before === dirtyTabs.has(tabId)) return;
+        for (const listener of dirtyListeners) {
+          try {
+            listener();
+          } catch {
+            /* ignore */
+          }
+        }
+      }
+
+      /** Live dirty flag for one tab, used by its title chip. */
+      function useTabDirty(tabId) {
+        const [dirty, setDirty] = React.useState(() => dirtyTabs.has(tabId));
+        React.useEffect(() => {
+          const listener = () => setDirty(dirtyTabs.has(tabId));
+          dirtyListeners.add(listener);
+          listener();
+          return () => dirtyListeners.delete(listener);
+        }, [tabId]);
+        return dirty;
+      }
+
+      // ------------------------------------------------------------------
+      // Per-file editor tabs
+      // ------------------------------------------------------------------
+
+      /** Find the open tab whose content is one resource address (a preview tab). */
+      function tabIdForContent(sessionId, contentId) {
+        const open = sidebarRightService?.tabsIn?.(sessionId) ?? [];
+        return open.find((item) => item.contentId === contentId)?.id;
+      }
+
+      /**
+       * Open one file's editor tab. The address carries session+file, so the
+       * same file reuses its tab and a restored layout can still resolve it.
+       * An optional `replaceTabId` swaps an existing tab — the preview page's
+       * edit button passes its own tab.
+       */
+      function openEditorTab(sessionId, rel, replaceTabId) {
+        if (typeof rel !== 'string' || rel === '') return;
+        if (sidebarRightService === undefined || typeof sidebarRightService.openResource !== 'function') {
+          showToast(t('error.internal'), 'error');
+          return;
+        }
+        try {
+          sidebarRightService.openResource(editorAddress(sessionId, rel), {
+            params: { rel },
+            ...(typeof replaceTabId === 'string' ? { replaceTab: replaceTabId } : {}),
+          });
+        } catch (failure) {
+          showToast(errorText(failure), 'error');
+        }
       }
 
       // ------------------------------------------------------------------
@@ -676,6 +1186,22 @@
             return h('svg', common, h('path', { d: 'M4 20h4L19 9l-4-4L4 16z' }), h('path', { d: 'M13.5 6.5l4 4' }));
           case 'copy':
             return h('svg', common, h('rect', { x: 9, y: 9, width: 11, height: 11, rx: 2 }), h('path', { d: 'M5 15H4V4h11v1' }));
+          case 'cut':
+            return h(
+              'svg',
+              common,
+              h('circle', { cx: 6.5, cy: 17.5, r: 2.5 }),
+              h('circle', { cx: 17.5, cy: 17.5, r: 2.5 }),
+              h('path', { d: 'M8.2 15.6L16 3M15.8 15.6L8 3' }),
+            );
+          case 'paste':
+            return h(
+              'svg',
+              common,
+              h('path', { d: 'M9 4.5h6v3H9z' }),
+              h('path', { d: 'M9 6H6.5A1.5 1.5 0 0 0 5 7.5v12A1.5 1.5 0 0 0 6.5 21h11a1.5 1.5 0 0 0 1.5-1.5v-12A1.5 1.5 0 0 0 17.5 6H15' }),
+              h('path', { d: 'M9 12h6M9 16h6' }),
+            );
           case 'link':
             return h(
               'svg',
@@ -749,6 +1275,14 @@
               h('rect', { x: 3, y: 4.5, width: 18, height: 15, rx: 2.2 }),
               h('path', { d: 'M14.5 4.5v15' }),
             );
+          case 'filesPanel':
+            return h(
+              'svg',
+              common,
+              h('rect', { x: 3, y: 4.5, width: 18, height: 15, rx: 2.2 }),
+              h('path', { d: 'M14.5 4.5v15' }),
+              h('path', { d: 'M6 9h5M6 12h5M6 15h5' }),
+            );
           case 'spark':
             return h('svg', common, h('path', { d: 'M12 3.5l1.9 5.1 5.1 1.9-5.1 1.9L12 17.5l-1.9-5.1L5 10.5l5.1-1.9z' }));
           default:
@@ -1156,6 +1690,8 @@
         const [dragging, setDragging] = React.useState(null);
         const [dropDir, setDropDir] = React.useState(null);
         const settingsSnapshot = useSettings();
+        const clipboard = useFileClipboard();
+        const canPaste = clipboard !== null && clipboard.root === root;
         const navigation = tab.navigation;
         const editorRef = React.useRef(null);
         const draftRef = React.useRef('');
@@ -1184,30 +1720,12 @@
         }, [notice]);
 
         const loadEditor = React.useCallback(
-          async (rel) => {
-            if (root === '') return;
-            try {
-              const data = await api('read', { root, path: rel, sessionId });
-              if (data.binary === true) {
-                setNotice({ kind: 'error', text: t('binary') });
-                return;
-              }
-              setEditor({
-                rel,
-                original: data.text,
-                mtimeMs: data.mtimeMs,
-                size: data.size,
-                truncated: data.truncated === true,
-              });
-              setDraft(data.text);
-              setMenu(null);
-              setDialog(null);
-              setNotice(null);
-            } catch (failure) {
-              setNotice({ kind: 'error', text: errorText(failure) });
-            }
+          (rel) => {
+            setMenu(null);
+            setDialog(null);
+            openEditorTab(sessionId, rel);
           },
-          [root, sessionId],
+          [sessionId],
         );
 
         const refresh = React.useCallback(() => setReload((value) => value + 1), []);
@@ -1309,8 +1827,8 @@
         const mutate = async (action, successText) => {
           if (root === '') return false;
           try {
-            await action();
-            succeed(typeof successText === 'function' ? successText() : successText);
+            const result = await action();
+            succeed(typeof successText === 'function' ? successText(result) : successText);
             return true;
           } catch (failure) {
             setNotice({ kind: 'error', text: errorText(failure) });
@@ -1318,6 +1836,18 @@
           }
         };
 
+        /** Paste the FileKit clipboard into one directory; a taken name gets " (n)". */
+        const pasteInto = async (toDir) => {
+          const clip = fileClipboard;
+          if (clip === null || clip.root !== root) return false;
+          const ok = await mutate(
+            () => api(clip.mode === 'cut' ? 'move' : 'copy', { root, path: clip.rel, toDir, unique: true, sessionId }),
+            (result) => t('pastedTo', { path: result.path }),
+          );
+          if (ok && clip.mode === 'cut') setFileClipboard(null);
+          return ok;
+        };
+
         const copyRelPath = async (rel) => {
           const ok = await copyText(rel);
           showToast(ok ? t('copiedPath') : t('error.internal'), ok ? 'ok' : 'error');
@@ -1679,13 +2209,12 @@
                   'div',
                   { className: 'dsh-fk-editor' },
                   editor.truncated ? h('p', { className: 'dsh-fk-warn' }, h(Icon, { name: 'warning', size: 14 }), t('truncated')) : null,
-                  h('textarea', {
-                    className: 'dsh-fk-textarea',
+                  h(CodeEditor, {
                     value: draft,
-                    spellCheck: false,
+                    onChange: setDraft,
+                    rel: editor.rel,
+                    fontSize: settingsSnapshot.editorFontSize,
                     readOnly: editor.truncated,
-                    style: { fontSize: `${settingsSnapshot.editorFontSize}px` },
-                    onChange: (event) => setDraft(event.target.value),
                   }),
                   h(
                     'div',
@@ -1710,7 +2239,7 @@
                 key: entry.path,
                 className: 'dsh-fk-row',
                 'data-kind': entry.kind,
-                'data-selected': selected === entry.path,
+                'data-menu': menu !== null && menu.rel === entry.path,
                 'data-drop': dropDir === entry.path,
                 tabIndex: 0,
                 draggable: true,
@@ -1744,7 +2273,6 @@
                       }
                     : undefined,
                 onClick: () => {
-                  setSelected(entry.path);
                   if (entry.kind === 'directory') {
                     setCwd(entry.path);
                     setMenu(null);
@@ -1874,6 +2402,7 @@
         if (menu !== null) {
           if (menu.rel === null) {
             menuItems = [
+              ...(canPaste ? [{ label: t('paste'), icon: 'paste', onSelect: () => pasteInto(cwd) }] : []),
               { label: t('newFile'), onSelect: () => setDialog({ kind: 'create-file' }) },
               { label: t('newDir'), onSelect: () => setDialog({ kind: 'create-dir' }) },
               { separator: true },
@@ -1885,10 +2414,15 @@
               ...(menu.kind === 'file' ? [{ label: t('openPreview'), icon: 'file', onSelect: () => openPreview(menu.rel) }] : []),
               ...(menu.kind === 'directory' ? [{ label: t('newFileHere'), icon: 'filePlus', onSelect: () => setDialog({ kind: 'create-file', dir: menu.rel }) }] : []),
               ...(menu.kind === 'directory' ? [{ label: t('newDirHere'), icon: 'folderPlus', onSelect: () => setDialog({ kind: 'create-dir', dir: menu.rel }) }] : []),
+              ...(menu.kind === 'directory' ? [{ separator: true }] : []),
+              ...(menu.kind === 'directory'
+                ? [{ label: t('pasteHere'), icon: 'paste', disabled: !canPaste, onSelect: () => pasteInto(menu.rel) }]
+                : []),
               { separator: true },
               { label: t('rename'), icon: 'edit', onSelect: () => setDialog({ kind: 'rename', rel: menu.rel }) },
               { label: t('move'), icon: 'folder', onSelect: () => setDialog({ kind: 'move', rel: menu.rel, entryKind: menu.kind }) },
-              { label: t('copy'), icon: 'copy', onSelect: () => mutate(() => api('copy', { root, path: menu.rel, toDir: dirOf(menu.rel), sessionId }), t('copied')) },
+              { label: t('copy'), icon: 'copy', onSelect: () => copyToFileClipboard(root, menu.rel, menu.kind, 'copy') },
+              { label: t('cut'), icon: 'cut', onSelect: () => copyToFileClipboard(root, menu.rel, menu.kind, 'cut') },
               { separator: true },
               { label: t('copyRel'), icon: 'copy', onSelect: () => copyRelPath(menu.rel) },
               { label: t('copyAbs'), icon: 'copy', onSelect: () => copyAbsPath(menu.rel) },
@@ -1924,7 +2458,7 @@
             ),
             h('span', { className: 'dsh-fk-spacer' }),
             h(IconButton, {
-              icon: 'panel',
+              icon: 'filesPanel',
               label: t('openFiles'),
               onClick: () => {
                 try {
@@ -1952,6 +2486,7 @@
         const { useTabInfo, sessionId, inputActions, useSessions } = props;
         const { tab } = useTabInfo();
         const settingsSnapshot = useSettings();
+        const clipboard = useFileClipboard();
         const [root, setRoot] = React.useState('');
         const [rootError, setRootError] = React.useState('');
         const [levels, setLevels] = React.useState({});
@@ -2142,8 +2677,20 @@
           });
         };
 
-        const copyEntry = (rel) =>
-          mutate('copy', { path: rel, toDir: dirOf(rel) }, t('copied'), [dirOf(rel)]);
+        /** Paste the shared clipboard into one directory of this workspace. */
+        const pasteInto = (toDir) => {
+          const clip = fileClipboard;
+          if (clip === null || clip.root !== root) return Promise.resolve(false);
+          return mutate(
+            clip.mode === 'cut' ? 'move' : 'copy',
+            { path: clip.rel, toDir, unique: true },
+            t('pasted'),
+            [dirOf(clip.rel), toDir],
+            clip.mode === 'cut' ? () => setFileClipboard(null) : undefined,
+          );
+        };
+
+        const canPaste = clipboard !== null && clipboard.root === root;
 
         const copyRelPath = async (rel) => {
           const ok = await copyText(rel);
@@ -2219,19 +2766,22 @@
         const openEntryMenu = (event, entry) => {
           event.preventDefault();
           event.stopPropagation();
-          setSelected(entry.path);
+          // The menu target is highlighted through `data-menu`; closing the menu
+          // must not leave a selection behind (the row was never "selected").
           setMenu({ x: event.clientX, y: event.clientY, rel: entry.path, kind: entry.kind, name: entry.name });
         };
 
         const openBlankMenu = (event) => {
           if (typeof event.target.closest === 'function' && event.target.closest('.dsh-fk-row, .dsh-fk-trow') !== null) return;
           event.preventDefault();
+          setSelected(null);
           setMenu({ x: event.clientX, y: event.clientY, rel: null, kind: 'directory' });
         };
 
         const menuItems = [];
         if (menu !== null) {
           if (menu.rel === null) {
+            if (canPaste) menuItems.push({ label: t('paste'), icon: 'paste', onSelect: () => void pasteInto('') });
             menuItems.push(
               { label: t('newFile'), icon: 'filePlus', onSelect: () => setDialog({ kind: 'create-file', dir: '' }) },
               { label: t('newDir'), icon: 'folderPlus', onSelect: () => setDialog({ kind: 'create-dir', dir: '' }) },
@@ -2245,17 +2795,19 @@
             const isDir = menu.kind === 'directory';
             if (isDir) menuItems.push({ label: t('openDirInFileKit'), icon: 'brand', onSelect: () => openFileKit({ dir: menu.rel }) });
             else menuItems.push({ label: t('openPreview'), icon: 'file', onSelect: () => openPreview(menu.rel) });
-            if (!isDir) menuItems.push({ label: t('openEditor'), icon: 'edit', onSelect: () => openFileKit({ rel: menu.rel, action: 'edit' }) });
+            if (!isDir) menuItems.push({ label: t('openEditor'), icon: 'edit', onSelect: () => openEditorTab(sessionId, menu.rel) });
             menuItems.push({ separator: true });
             if (isDir) {
               menuItems.push({ label: t('newFileHere'), icon: 'filePlus', onSelect: () => setDialog({ kind: 'create-file', dir: menu.rel }) });
               menuItems.push({ label: t('newDirHere'), icon: 'folderPlus', onSelect: () => setDialog({ kind: 'create-dir', dir: menu.rel }) });
+              menuItems.push({ label: t('pasteHere'), icon: 'paste', disabled: !canPaste, onSelect: () => void pasteInto(menu.rel) });
               menuItems.push({ separator: true });
             }
             menuItems.push(
               { label: t('rename'), icon: 'edit', onSelect: () => setDialog({ kind: 'rename', rel: menu.rel, entryKind: menu.kind }) },
               { label: t('move'), icon: 'folder', onSelect: () => setDialog({ kind: 'move', rel: menu.rel, entryKind: menu.kind }) },
-              { label: t('copy'), icon: 'copy', onSelect: () => void copyEntry(menu.rel) },
+              { label: t('copy'), icon: 'copy', onSelect: () => copyToFileClipboard(root, menu.rel, menu.kind, 'copy') },
+              { label: t('cut'), icon: 'cut', onSelect: () => copyToFileClipboard(root, menu.rel, menu.kind, 'cut') },
               { separator: true },
               { label: t('copyRel'), icon: 'copy', onSelect: () => void copyRelPath(menu.rel) },
               { label: t('copyAbs'), icon: 'copy', onSelect: () => void copyAbsPath(menu.rel) },
@@ -2350,7 +2902,7 @@
                     key: entry.path,
                     className: 'dsh-fk-trow',
                     'data-kind': entry.kind,
-                    'data-selected': selected === entry.path,
+                    'data-menu': menu !== null && menu.rel === entry.path,
                     'data-drop': dropDir === entry.path,
                     role: 'treeitem',
                     'aria-expanded': isDir ? open : undefined,
@@ -2360,7 +2912,6 @@
                     draggable: true,
                     title: entry.path,
                     onClick: () => {
-                      setSelected(entry.path);
                       if (isDir) toggleDir(entry.path);
                       else openPreview(entry.path);
                     },
@@ -2634,6 +3185,14 @@
         const [menu, setMenu] = React.useState(null);
         if (abs === '') return null;
 
+        /** Swap this preview tab for the file's editor tab. */
+        const startEditing = async (target, session) => {
+          const workspace = await api('workspace', { sessionId: session, file: target });
+          const rel = relFromAbs(target, workspace.root);
+          if (rel === null) throw Object.assign(new Error('outside'), { code: 'outside-workspace' });
+          openEditorTab(session, rel, tabIdForContent(session, fileAddress(session, rel)));
+        };
+
         const run = async (label, fn) => {
           try {
             await fn();
@@ -2648,7 +3207,7 @@
         };
 
         const items = [
-          { label: t('openEditor'), icon: 'edit', onSelect: () => run(t('openEditor'), () => openFileInKit(abs, sessionId, inputActions, 'edit')) },
+          { label: t('openEditor'), icon: 'edit', onSelect: () => run(t('openEditor'), () => startEditing(abs, sessionId)) },
           { label: t('rename'), icon: 'edit', onSelect: () => run(t('rename'), () => openFileInKit(abs, sessionId, inputActions, 'rename')) },
           { label: t('move'), icon: 'folder', onSelect: () => run(t('move'), () => openFileInKit(abs, sessionId, inputActions, 'move')) },
           { label: t('copyAbs'), icon: 'copy', onSelect: () => run(t('copyAbs'), async () => {
@@ -2675,9 +3234,9 @@
             {
               type: 'button',
               className: 'dsh-fk-tool',
-              title: t('edit'),
-              'aria-label': t('edit'),
-              onClick: () => run(t('edit'), () => openFileInKit(abs, sessionId, inputActions, 'edit')),
+              title: t('openEditor'),
+              'aria-label': t('openEditor'),
+              onClick: () => run(t('openEditor'), () => startEditing(abs, sessionId)),
             },
             h(Icon, { name: 'edit', size: 15 }),
           ),
@@ -2853,10 +3412,10 @@
       // ------------------------------------------------------------------
 
       const CSS = `
-:root{--dsh-fk-gold:#f5b83d;--dsh-fk-orange:#f4511e;--dsh-fk-grad:linear-gradient(135deg,#f7c948 0%,#f4932a 52%,#f4511e 100%);--dsh-fk-dir:#c47a12;--dsh-fk-soft:rgb(244 81 30/.12);--dsh-fk-editor-font:12px}
+:root{--dsh-fk-gold:#f5b83d;--dsh-fk-orange:#f4511e;--dsh-fk-grad:linear-gradient(135deg,#f7c948 0%,#f4932a 52%,#f4511e 100%);--dsh-fk-dir:#c47a12;--dsh-fk-soft:rgb(244 81 30/.12);--dsh-fk-hover:var(--dsw-alias-interactive-bg-hover,rgb(0 0 0/.055));--dsh-fk-active:var(--dsw-alias-interactive-bg-active,rgb(0 0 0/.09));--dsh-fk-editor-font:12px}
 body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
 .dsh-fk-tool{display:inline-flex;align-items:center;justify-content:center;width:26px;height:26px;padding:0;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-secondary);cursor:pointer;flex:none}
-.dsh-fk-tool:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsh-fk-orange)}
+.dsh-fk-tool:hover{background:var(--dsh-fk-hover);color:var(--dsh-fk-orange)}
 .dsh-fk-doc-actions{display:inline-flex;align-items:center;gap:1px;flex:none}
 .dsh-fk-tab{position:relative;display:flex;flex-direction:column;width:100%;height:100%;min-height:0;overflow:hidden;color:var(--dsw-alias-label-primary);font-size:13px;line-height:1.5;background:var(--dsw-alias-bg-base)}
 .dsh-fk-tabstatus{display:flex;flex-direction:column;gap:12px;align-items:flex-start;justify-content:center;height:100%;padding:24px}
@@ -2869,26 +3428,27 @@ body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
 .dsh-fk-toolbar{display:flex;align-items:center;gap:8px;padding:7px 10px;border-bottom:1px solid var(--dsw-alias-border-l2);flex:none;flex-wrap:wrap}
 .dsh-fk-crumbs{display:flex;align-items:center;gap:1px;min-width:0;flex:1;overflow:hidden;color:var(--dsw-alias-label-secondary);font-size:12px}
 .dsh-fk-crumb{display:inline-flex;align-items:center;gap:4px;max-width:220px;padding:3px 7px;border:0;border-radius:6px;background:transparent;color:inherit;font:inherit;cursor:pointer;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-.dsh-fk-crumb:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary)}
+.dsh-fk-crumb:hover{background:var(--dsh-fk-hover);color:var(--dsw-alias-label-primary)}
 .dsh-fk-crumb[data-drop=true]{background:var(--dsh-fk-soft);box-shadow:inset 0 0 0 1px var(--dsh-fk-orange);color:var(--dsh-fk-orange)}
 .dsh-fk-crumb-current{color:var(--dsw-alias-label-primary);font-weight:500;cursor:default}
 .dsh-fk-crumb-sep{opacity:.5}
 .dsh-fk-toolbar-actions{display:flex;align-items:center;gap:4px;flex:none}
 .dsh-fk-btn{display:inline-flex;align-items:center;gap:5px;height:28px;padding:0 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;cursor:pointer;white-space:nowrap}
-.dsh-fk-btn:hover{background:var(--dsw-alias-bg-layer-2)}
+.dsh-fk-btn:hover{background:var(--dsh-fk-hover)}
 .dsh-fk-btn:disabled{opacity:.45;cursor:default}
 .dsh-fk-btn-primary{background:var(--dsh-fk-grad);border-color:transparent;color:#fff;box-shadow:0 1px 6px rgb(244 81 30/.25)}
 .dsh-fk-btn-primary:hover{filter:brightness(1.05);background:var(--dsh-fk-grad)}
 .dsh-fk-btn-danger{background:var(--dsw-alias-state-error-primary);border-color:transparent;color:#fff}
 .dsh-fk-btn-danger:hover{filter:brightness(1.06);background:var(--dsw-alias-state-error-primary)}
 .dsh-fk-iconbtn{display:inline-flex;align-items:center;justify-content:center;width:26px;height:26px;padding:0;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-secondary);cursor:pointer;flex:none}
-.dsh-fk-iconbtn:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsh-fk-orange)}
+.dsh-fk-iconbtn:hover{background:var(--dsh-fk-hover);color:var(--dsh-fk-orange)}
 .dsh-fk-iconbtn:disabled{opacity:.4;cursor:default}
 .dsh-fk-iconbtn[data-danger=true]:hover{color:var(--dsw-alias-state-error-primary)}
 .dsh-fk-body{flex:1;min-height:0;overflow:auto;padding:4px 6px 10px}
 .dsh-fk-row{display:flex;align-items:center;gap:8px;min-height:32px;padding:3px 6px;border-radius:7px;cursor:pointer;outline:none}
-.dsh-fk-row:hover,.dsh-fk-row:focus-visible{background:var(--dsw-alias-bg-layer-2)}
-.dsh-fk-row[data-selected=true]{background:var(--dsh-fk-soft)}
+.dsh-fk-row:hover{background:var(--dsh-fk-hover)}
+.dsh-fk-row[data-menu=true]{background:var(--dsh-fk-hover)}
+.dsh-fk-row:focus-visible{outline:1.5px solid var(--dsh-fk-orange);outline-offset:-2px}
 .dsh-fk-row[data-drop=true]{outline:1.5px dashed var(--dsh-fk-orange);outline-offset:-2px;background:var(--dsh-fk-soft)}
 .dsh-fk-row-static{cursor:default}
 .dsh-fk-rowicon{display:flex;color:var(--dsw-alias-label-secondary);flex:none}
@@ -2901,8 +3461,18 @@ body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
 .dsh-fk-row:hover .dsh-fk-rowactions,.dsh-fk-row:focus-within .dsh-fk-rowactions{opacity:1}
 @media (hover:none){.dsh-fk-rowactions{opacity:1}}
 .dsh-fk-editor{flex:1;min-height:0;display:flex;flex-direction:column;gap:8px;padding:10px 12px 12px}
-.dsh-fk-textarea{flex:1;min-height:160px;width:100%;resize:none;box-sizing:border-box;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-base);color:var(--dsw-alias-label-primary);font:var(--dsh-fk-editor-font)/1.62 var(--dsw-font-mono,ui-monospace,SFMono-Regular,Menlo,Consolas,monospace);outline:none;tab-size:2}
-.dsh-fk-textarea:focus{border-color:var(--dsh-fk-orange)}
+.dsh-fk-editorhead{display:flex;align-items:center;gap:8px;padding:6px 8px 6px 12px;border-bottom:1px solid var(--dsw-alias-border-l2);flex:none}
+.dsh-fk-editorpath{display:flex;align-items:center;gap:6px;min-width:0;color:var(--dsw-alias-label-primary);font-size:12.5px}
+.dsh-fk-editorpath svg{color:var(--dsh-fk-dir)}
+.dsh-fk-editorpathname{font-weight:600;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.dsh-fk-editorpathdir{color:var(--dsw-alias-label-tertiary);font-size:11px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.dsh-fk-iconactions{display:flex;align-items:center;gap:2px;flex:none}
+.dsh-fk-codeeditor{position:relative;flex:1;min-height:160px;overflow:hidden;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-base)}
+.dsh-fk-codeeditor:focus-within{border-color:var(--dsh-fk-orange)}
+.dsh-fk-codeeditor-pre{position:absolute;inset:0;margin:0;padding:10px 12px;overflow:hidden;pointer-events:none;font:var(--dsh-fk-editor-font)/1.62 var(--dsw-font-mono,ui-monospace,SFMono-Regular,Menlo,Consolas,monospace);white-space:pre;tab-size:2;color:var(--dsw-alias-label-primary)}
+.dsh-fk-codeeditor-line{min-height:1.62em;white-space:pre}
+.dsh-fk-codeeditor-input{position:absolute;inset:0;box-sizing:border-box;width:100%;height:100%;margin:0;padding:10px 12px;border:0;resize:none;background:transparent;color:transparent;caret-color:var(--dsw-alias-label-primary);font:var(--dsh-fk-editor-font)/1.62 var(--dsw-font-mono,ui-monospace,SFMono-Regular,Menlo,Consolas,monospace);white-space:pre;overflow:auto;tab-size:2;outline:none}
+.dsh-fk-codeeditor-input::selection{background:rgb(244 81 30/.24)}
 .dsh-fk-editor-meta{display:flex;align-items:center;gap:8px;font-size:11px;color:var(--dsw-alias-label-secondary);flex:none}
 .dsh-fk-badge{display:inline-flex;align-items:center;height:18px;padding:0 7px;margin-left:6px;border-radius:9px;background:var(--dsh-fk-grad);color:#fff;font-size:10px;font-weight:600}
 .dsh-fk-warn{display:flex;align-items:center;gap:6px;margin:0;padding:7px 10px;border-radius:7px;background:var(--dsh-fk-soft);color:var(--dsw-alias-state-warn-primary);font-size:12px}
@@ -2926,11 +3496,11 @@ body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
 .dsh-fk-dialog-crumbs{flex:none;border-bottom:1px solid var(--dsw-alias-border-l2);padding-bottom:6px}
 .dsh-fk-picklist{display:flex;flex-direction:column;gap:2px;max-height:260px;overflow:auto;padding:2px}
 .dsh-fk-pickrow{display:flex;align-items:center;gap:8px;min-height:32px;padding:4px 8px;border:0;border-radius:7px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:13px;text-align:left;cursor:pointer}
-.dsh-fk-pickrow:hover{background:var(--dsw-alias-bg-layer-2)}
+.dsh-fk-pickrow:hover{background:var(--dsh-fk-hover)}
 .dsh-fk-scrim{position:fixed;inset:0;z-index:1300}
 .dsh-fk-menu{position:fixed;z-index:1301;display:flex;flex-direction:column;gap:1px;padding:5px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:var(--dsw-alias-bg-overlay);box-shadow:0 14px 40px rgb(0 0 0/.26)}
 .dsh-fk-menu button{display:flex;align-items:center;gap:8px;width:100%;padding:6px 9px;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;text-align:left;cursor:pointer;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-.dsh-fk-menu button:hover{background:var(--dsw-alias-bg-layer-2)}
+.dsh-fk-menu button:hover{background:var(--dsh-fk-hover)}
 .dsh-fk-menu button:disabled{opacity:.45;cursor:default}
 .dsh-fk-menu button[data-danger=true]{color:var(--dsw-alias-state-error-primary)}
 .dsh-fk-menulabel{overflow:hidden;text-overflow:ellipsis}
@@ -2939,17 +3509,20 @@ body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
 .dsh-fk-toast[data-kind=error]{color:var(--dsw-alias-state-error-primary)}
 .dsh-fk-tabtitle{display:inline-flex;align-items:center;gap:5px;min-width:0}
 .dsh-fk-tabtitle svg{color:var(--dsh-fk-dir)}
+.dsh-fk-tabtitle-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dsh-fk-tabdot{width:7px;height:7px;border-radius:50%;background:var(--dsh-fk-orange);flex:none;margin-left:2px;box-shadow:0 0 0 2px rgb(244 81 30/.18)}
 .dsh-fk-filestab{background:transparent}
 .dsh-fk-treehead{display:flex;align-items:center;gap:6px;padding:7px 8px 7px 10px;border-bottom:1px solid var(--dsw-alias-border-l2);flex:none}
 .dsh-fk-rootpath{display:flex;align-items:center;gap:6px;min-width:0;max-width:100%;padding:4px 7px;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;font-size:12px;cursor:pointer}
-.dsh-fk-rootpath:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary)}
+.dsh-fk-rootpath:hover{background:var(--dsh-fk-hover);color:var(--dsw-alias-label-primary)}
 .dsh-fk-rootpath[data-drop=true]{background:var(--dsh-fk-soft);box-shadow:inset 0 0 0 1px var(--dsh-fk-orange);color:var(--dsh-fk-orange)}
 .dsh-fk-rootpathtext{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dsh-fk-treebody{position:relative;flex:1;min-height:0;overflow:auto;padding:4px 5px 22px}
 .dsh-fk-tlevel{display:flex;flex-direction:column;gap:0}
 .dsh-fk-trow{display:flex;align-items:center;gap:5px;min-height:26px;padding:2px 6px 2px 5px;border-radius:6px;cursor:pointer;outline:none;user-select:none}
-.dsh-fk-trow:hover,.dsh-fk-trow:focus-visible{background:var(--dsw-alias-bg-layer-2)}
-.dsh-fk-trow[data-selected=true]{background:var(--dsh-fk-soft)}
+.dsh-fk-trow:hover{background:var(--dsh-fk-hover)}
+.dsh-fk-trow[data-menu=true]{background:var(--dsh-fk-hover)}
+.dsh-fk-trow:focus-visible{outline:1.5px solid var(--dsh-fk-orange);outline-offset:-2px}
 .dsh-fk-trow[data-drop=true]{outline:1.5px dashed var(--dsh-fk-orange);outline-offset:-2px;background:var(--dsh-fk-soft)}
 .dsh-fk-trow[data-kind=directory] .dsh-fk-trowname{font-weight:500}
 .dsh-fk-tchev{display:flex;align-items:center;justify-content:center;width:13px;flex:none;color:var(--dsw-alias-label-tertiary,#8b8b8b)}
@@ -2992,7 +3565,7 @@ body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
 .dsh-fk-switch[data-on=true] .dsh-fk-switchknob{left:19px}
 .dsh-fk-segmented{display:inline-flex;gap:2px;padding:2px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;flex:none}
 .dsh-fk-segment{padding:4px 9px;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;font-size:11.5px;cursor:pointer;white-space:nowrap}
-.dsh-fk-segment:hover{background:var(--dsw-alias-bg-layer-2)}
+.dsh-fk-segment:hover{background:var(--dsh-fk-hover)}
 .dsh-fk-segment[data-on=true]{background:var(--dsh-fk-grad);color:#fff}
 .dsh-fk-fontpicker{display:flex;align-items:center;gap:10px;flex:none}
 .dsh-fk-range{width:130px;accent-color:var(--dsh-fk-orange)}
@@ -3076,24 +3649,49 @@ body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
               }),
             'dsh-filekit: filekit type',
           );
+          ctx.effect(
+            () =>
+              tabs.register({
+                id: EDITOR_ID,
+                kind: EDITOR_KIND,
+                priority: 'extension',
+                keepMounted: true,
+                patterns: ['dsh-resource://filekit-edit/[\\s\\S]+'],
+                title: () => t('editorTab'),
+              }),
+            'dsh-filekit: editor type',
+          );
         } else {
           console.warn('[dsh-filekit] sidebarRightTabs service missing; tabs not registered');
         }
 
         if (sidebarRightService !== undefined && typeof sidebarRightService.registerCloseHandler === 'function') {
           ctx.effect(() => {
-            try {
-              return sidebarRightService.registerCloseHandler(FILEKIT_KIND, (sessionId, tab) => {
-                if (dirtyTabs.has(tab.id)) {
-                  showToast(t('saveBeforeClose'), 'error');
-                  throw new Error('dsh-filekit: unsaved changes');
-                }
-              });
-            } catch (error) {
-              console.warn('[dsh-filekit] close guard not registered:', error?.message ?? error);
-              return undefined;
+            const releases = [];
+            for (const kind of [FILEKIT_KIND, EDITOR_KIND]) {
+              try {
+                releases.push(
+                  sidebarRightService.registerCloseHandler(kind, (sessionId, tab) => {
+                    if (dirtyTabs.has(tab.id)) {
+                      showToast(t('saveBeforeClose'), 'error');
+                      throw new Error('dsh-filekit: unsaved changes');
+                    }
+                  }),
+                );
+              } catch (error) {
+                console.warn(`[dsh-filekit] close guard for ${kind} not registered:`, error?.message ?? error);
+              }
             }
-          }, 'dsh-filekit: close guard');
+            return () => {
+              for (const release of releases) {
+                try {
+                  release?.();
+                } catch {
+                  /* ignore */
+                }
+              }
+            };
+          }, 'dsh-filekit: close guards');
         }
 
         const registerList = (slot, options, Component) => {
@@ -3128,8 +3726,10 @@ body[data-ds-dark-theme]{--dsh-fk-dir:#f3bf4d;--dsh-fk-soft:rgb(247 201 72/.14)}
           FilesBody,
         );
         registerKeyed('sidebar.right.pane.tab', { key: FILEKIT_ID, locale: NS }, FileKitTab);
+        registerKeyed('sidebar.right.pane.tab', { key: EDITOR_ID, locale: NS }, FileEditorTab);
         registerKeyed('sidebar.right.pane.tab.title', { key: FILES_ID }, FilesTitle);
         registerKeyed('sidebar.right.pane.tab.title', { key: FILEKIT_ID }, FileKitTitle);
+        registerKeyed('sidebar.right.pane.tab.title', { key: EDITOR_ID }, EditorTitle);
 
         // The workspace-files guide card gains a FileKit button underneath.
         registerKeyed('sidebar.right.tab.guide.entry', { key: FILES_ID, locale: NS }, FilesGuideCard);

package/index.js

@@ -38,7 +38,7 @@ import {
 const ROUTE = '/dsh-filekit';
 
 /** Plugin version mirrored in package.json. */
-const VERSION = '0.2.1';
+const VERSION = '0.2.3';
 
 /** Request body cap: larger than the editor's text cap, small enough to stay sane. */
 const BODY_LIMIT = 16 * 1024 * 1024;
@@ -272,12 +272,12 @@ async function runOperation(ctx, op, args) {
     }
     case 'move': {
       const root = await resolveRequestRoot(ctx, args);
-      const result = await moveEntry(root, args.path, args.toDir);
+      const result = await moveEntry(root, args.path, args.toDir, { unique: args.unique === true });
       return { ...result, change: { kind: 'move', ...result } };
     }
     case 'copy': {
       const root = await resolveRequestRoot(ctx, args);
-      const result = await copyEntry(root, args.path, args.toDir);
+      const result = await copyEntry(root, args.path, args.toDir, { unique: args.unique === true });
       return { ...result, change: { kind: 'copy', ...result } };
     }
     case 'delete': {

package/lib/filekit.js

@@ -356,8 +356,9 @@ export async function renameEntry(root, rel, name) {
  * @param {string} root - workspace root.
  * @param {string} rel - existing entry path.
  * @param {string} toDirRel - destination directory.
+ * @param {{ unique?: boolean }} [options] - `unique` picks a free "name (n)" when the name is taken.
  */
-export async function moveEntry(root, rel, toDirRel) {
+export async function moveEntry(root, rel, toDirRel, options = {}) {
   const safeRel = normalizeRel(rel);
   const toDir = normalizeRel(toDirRel, { allowRoot: true });
   if (safeRel === '') fail('protected', 'The workspace root cannot be moved.');
@@ -371,7 +372,11 @@ export async function moveEntry(root, rel, toDirRel) {
   await assertExistingInside(root, dirAbs);
   if (path.dirname(abs) === dirAbs) return { root, path: safeRel, from: safeRel, unchanged: true };
   if (within(abs, dirAbs)) fail('bad-move', 'Cannot move a directory into itself.');
-  const target = path.join(dirAbs, path.basename(abs));
+  const name = path.basename(abs);
+  const target =
+    (await lstatOrNull(path.join(dirAbs, name))) === undefined || options.unique !== true
+      ? path.join(dirAbs, name)
+      : path.join(dirAbs, await uniqueTargetName(dirAbs, name));
   if ((await lstatOrNull(target)) !== undefined) fail('exists', 'Destination already has an entry with that name.');
   await fs.rename(abs, target);
   return { root, path: relOf(root, target), from: safeRel };
@@ -382,8 +387,9 @@ export async function moveEntry(root, rel, toDirRel) {
  * @param {string} root - workspace root.
  * @param {string} rel - source entry path.
  * @param {string} toDirRel - destination directory.
+ * @param {{ unique?: boolean }} [options] - `unique` picks a free "name (n)" when the name is taken.
  */
-export async function copyEntry(root, rel, toDirRel) {
+export async function copyEntry(root, rel, toDirRel, options = {}) {
   const safeRel = normalizeRel(rel);
   const toDir = normalizeRel(toDirRel, { allowRoot: true });
   const abs = absOf(root, safeRel);
@@ -397,7 +403,11 @@ export async function copyEntry(root, rel, toDirRel) {
   if (!dirStat.isDirectory()) fail('not-directory', 'Destination is not a directory.');
   await assertExistingInside(root, dirAbs);
   if (within(abs, dirAbs)) fail('bad-copy', 'Cannot copy a directory into itself.');
-  const target = path.join(dirAbs, path.basename(abs));
+  const name = path.basename(abs);
+  const target =
+    (await lstatOrNull(path.join(dirAbs, name))) === undefined || options.unique !== true
+      ? path.join(dirAbs, name)
+      : path.join(dirAbs, await uniqueTargetName(dirAbs, name));
   if ((await lstatOrNull(target)) !== undefined) fail('exists', 'Destination already has an entry with that name.');
   if (source.isDirectory()) {
     await fs.cp(abs, target, { recursive: true, force: false, errorOnExist: true, preserveTimestamps: true });
@@ -407,6 +417,22 @@ export async function copyEntry(root, rel, toDirRel) {
   return { root, path: relOf(root, target), from: safeRel };
 }
 
+/**
+ * First free `stem (n).ext` (or `name (n)` for directories) in one directory.
+ * @param {string} dirAbs - destination directory (absolute).
+ * @param {string} name - original entry name.
+ * @returns {Promise<string>} a name no entry currently uses.
+ */
+async function uniqueTargetName(dirAbs, name) {
+  const ext = path.extname(name);
+  const stem = ext === '' ? name : name.slice(0, -ext.length);
+  for (let index = 2; index < 1000; index += 1) {
+    const candidate = `${stem} (${index})${ext}`;
+    if ((await lstatOrNull(path.join(dirAbs, candidate))) === undefined) return candidate;
+  }
+  fail('exists', 'Could not find a free name for the pasted entry.');
+}
+
 /**
  * Ensure the trash directory exists.
  * @param {string} root - workspace root.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restregular/dsh-filekit",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "FileKit — 在右侧「工作区文件」面板中右键操作、拖拽移动、编辑、复制引用与可恢复删除（.dsh-trash 回收站），变更自动告知 Agent；另含独立 FileKit 文件管理页与设置页。 · Workspace file operations for the DeepSeek Harness right sidebar: context menus, drag-to-move, editor, recoverable trash, Agent change notices, a FileKit page, and settings.",
   "icon": "./icon.svg",
   "type": "module",