@lyhue1991/dsh-soup 0.4.11 → 0.5.0

package/lib/client.js

@@ -45,10 +45,13 @@ window.__ModuleLoader__.load({
     // ------------------------------------------------------------------
     // 样式：一次性注入 <style data-plugin>（与官方插件 css 内联约定一致）
     // ------------------------------------------------------------------
-    var EXPL_CSS = '.expl-panel{position:relative;height:100%;min-width:0;width:100%;display:flex;flex-direction:column;background:var(--dsw-specific-sidebar-fill);color:var(--dsw-alias-label-primary);font-size:13px;font-family:var(--dsw-font-family);overflow:hidden;box-sizing:border-box;}' +
+    var EXPL_CSS = '.expl-panel{position:relative;height:100%;min-width:300px;max-width:520px;width:100%;display:flex;flex-direction:column;background:var(--dsw-specific-sidebar-fill);color:var(--dsw-alias-label-primary);font-size:13px;font-family:var(--dsw-font-family);overflow:hidden;box-sizing:border-box;}' +
       '.expl-resize{position:absolute;left:0;top:0;bottom:0;width:7px;cursor:col-resize;z-index:6;touch-action:none;}' +
       '.expl-resize::after{content:"";position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:3px;height:40px;border-radius:2px;background:var(--dsw-alias-interactive-bg-hover);opacity:0;transition:opacity .15s;}' +
       '.expl-resize:hover::after{opacity:1;}' +
+      /* The official 0.1.5 expand control duplicates dsh-soup's folder
+         button; hide it so the explorer has one unambiguous entry point. */
+      '[data-sidebar-right-expand],[data-sidebar-right-expand-placeholder]{display:none!important;}' +
       '[data-side="details"]{display:none!important;}' +
       '.expl-head{display:flex;align-items:center;justify-content:space-between;gap:8px;padding:12px 14px;border-bottom:1px solid var(--dsw-alias-border-l1);flex:none;}' +
       '.expl-title{font-weight:600;color:var(--dsw-alias-label-primary);white-space:nowrap;font-size:14px;}' +
@@ -90,6 +93,10 @@ window.__ModuleLoader__.load({
       '.expl-size{color:var(--dsw-alias-label-tertiary);font-size:11px;flex:none;margin-left:8px;}' +
       '.expl-muted{color:var(--dsw-alias-label-tertiary);padding:4px 14px;font-size:12px;}' +
       '.expl-menu-mask{position:fixed;inset:0;z-index:1980;}' +
+      '.expl-confirm-mask{position:fixed;inset:0;z-index:2100;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,.28);}' +
+      '.expl-confirm{width:min(360px,calc(100vw - 32px));padding:18px;border-radius:12px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);box-shadow:var(--dsw-shadow-lv3);}' +
+      '.expl-confirm-title{font-size:14px;font-weight:600;margin-bottom:10px;}.expl-confirm-text{font-size:13px;line-height:20px;overflow-wrap:anywhere;}.expl-confirm-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:18px;}' +
+      '.expl-confirm-btn{height:30px;padding:0 14px;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;background:transparent;color:var(--dsw-alias-label-primary);cursor:pointer;font-size:13px;}.expl-confirm-btn:hover{background:var(--dsw-alias-interactive-bg-hover);}.expl-confirm-primary{border-color:var(--dsw-alias-state-business-primary);background:var(--dsw-alias-state-business-primary);color:#fff;}' +
       '.expl-menu{position:fixed;z-index:1990;min-width:172px;background:var(--dsw-specific-menu);border:1px solid var(--dsw-alias-border-inverted);border-radius:12px;padding:4px;box-shadow:var(--dsw-shadow-lv3);pointer-events:auto;}' +
       '.expl-menu-item{display:flex;align-items:center;gap:7px;width:100%;text-align:left;background:transparent;border:none;color:var(--dsw-alias-label-primary);font-size:13px;padding:6px 10px;border-radius:8px;cursor:pointer;line-height:1.4;}' +
       '.expl-menu-ico{flex:none;display:inline-flex;align-items:center;}.expl-menu-ico svg{width:14px;height:14px;display:block;}' +
@@ -260,6 +267,10 @@ window.__ModuleLoader__.load({
         'explorer.uploading': '上传中 ',
         'explorer.downloading': '下载中 ',
         'explorer.uploaded': '已上传 {n} 个文件',
+        'explorer.overwriteConfirm': '文件“{name}”已存在，是否覆盖？',
+        'explorer.overwriteTitle': '确认覆盖',
+        'explorer.overwrite': '覆盖',
+        'explorer.cancel': '取消',
         'explorer.filesCount': '{n} 个文件',
         'explorer.filesCountPartial': '{ok}/{total} 个文件',
         'explorer.downloaded': '已下载 {n} 个文件',
@@ -324,6 +335,10 @@ window.__ModuleLoader__.load({
         'explorer.uploading': 'Uploading ',
         'explorer.downloading': 'Downloading ',
         'explorer.uploaded': 'Uploaded {n} file(s)',
+        'explorer.overwriteConfirm': 'The file "{name}" already exists. Overwrite it?',
+        'explorer.overwriteTitle': 'Confirm overwrite',
+        'explorer.overwrite': 'Overwrite',
+        'explorer.cancel': 'Cancel',
         'explorer.filesCount': '{n} file(s)',
         'explorer.filesCountPartial': '{ok}/{total} file(s)',
         'explorer.downloaded': 'Downloaded {n} file(s)',
@@ -387,6 +402,7 @@ window.__ModuleLoader__.load({
       dropTarget: null, dragPaths: null,
       files: { list: [], active: null, overlay: false, overlayMax: false, overlayReturn: null },
       uploads: [],
+      uploadConflict: null,
     }
     var listeners = new Set()
     // trackSession() is called by both the hero toggle and the details panel
@@ -1140,9 +1156,12 @@ window.__ModuleLoader__.load({
     }
 
     function finishUploads(count, okCount, failedName, down) {
-      var verb = down ? T('explorer.downloaded') : T('explorer.uploaded')
+      // These translations own the `{n}` placeholder; passing no params leaves
+      // the literal token visible in the green completion notice.
+      var verb = down ? T('explorer.downloaded', { n: okCount }) : T('explorer.uploaded', { n: okCount })
+      var suffix = okCount === count ? '' : ' · ' + T('explorer.filesCountPartial', { ok: okCount, total: count })
       setUploadEntry({
-        name: '✓ ' + verb + ' ' + (okCount === count ? T('explorer.filesCount', { n: count }) : T('explorer.filesCountPartial', { ok: okCount, total: count }) + (failedName ? '（' + failedName + '）' : '')),
+        name: '✓ ' + verb + suffix + (failedName ? '（' + failedName + '）' : ''),
         loaded: 0, total: 0, idx: 0, totalFiles: 0, done: true, down: !!down,
       })
       window.setTimeout(function () { setState({ uploads: [] }) }, 1600)
@@ -1157,10 +1176,17 @@ window.__ModuleLoader__.load({
         var start = c * UPLOAD_CHUNK_SIZE
         var blob = f.slice(start, Math.min(f.size, start + UPLOAD_CHUNK_SIZE))
         var b64 = await fileToBase64(blob)
-        var res = await rpc('upload', {
+        var args = {
           dir: dir, name: f.name, data: b64,
           chunk: chunked ? c + 1 : undefined,
-        })
+        }
+        var res = await rpc('upload', args)
+        if (res && res.conflict) {
+          var overwrite = await askOverwrite(f.name)
+          if (!overwrite) throw new Error('已取消上传')
+          args.overwrite = true
+          res = await rpc('upload', args)
+        }
         if (!res || !res.ok) throw new Error((res && res.error) || T('explorer.uploadFail'))
         updateUpload(f.name, Math.min(f.size, start + UPLOAD_CHUNK_SIZE), f.size, idx, totalFiles)
       }
@@ -1492,6 +1518,13 @@ window.__ModuleLoader__.load({
               var last = parseFloat(parts[parts.length - 1])
               if (isNaN(last) || last <= 1) { setState({ open: false }); return }
               setState({ open: true })
+              // Official 0.1.5 rightbar defaults to a viewport ratio. Keep
+              // it within dsh-soup's 300-520px explorer contract.
+              if (last < DETAILS_MIN || last > DETAILS_MAX) {
+                if (Math.round(last) !== DETAILS_DEFAULT) setFrameWidth(DETAILS_DEFAULT)
+                widthRef.current = DETAILS_DEFAULT
+                return
+              }
               if (Math.round(last) !== Math.round(widthRef.current)) {
                 // 宿主是宽度偏好的权威（/native drag/窗口求解都可能改它）。
                 // 插件只同步基准，不能把宿主拖出来的宽度强行拉回旧默认。
@@ -1584,7 +1617,10 @@ window.__ModuleLoader__.load({
             create('button', {
               className: 'expl-btn',
               onClick: function (event) {
-                try { layout.closeDetails() } catch (e) {}
+                try {
+                  if (layout && typeof layout.closeRightbar === 'function') layout.closeRightbar()
+                  else if (layout && typeof layout.closeDetails === 'function') layout.closeDetails()
+                } catch (e) {}
                 setHeroDetailsWidth(event.currentTarget, 0)
               },
               title: T('explorer.close'),
@@ -1615,6 +1651,16 @@ window.__ModuleLoader__.load({
         container,
         s.menu ? create('div', { className: 'expl-menu-mask', onMouseDown: function () { setState({ menu: null }) }, onContextMenu: function (e) { e.preventDefault(); setState({ menu: null }) } }) : null,
         s.menu ? create(Menu, { menu: s.menu }) : null,
+        s.uploadConflict ? create('div', { className: 'expl-confirm-mask', role: 'dialog', 'aria-modal': 'true' },
+          create('div', { className: 'expl-confirm' },
+            create('div', { className: 'expl-confirm-title' }, T('explorer.overwriteTitle')),
+            create('div', { className: 'expl-confirm-text' }, T('explorer.overwriteConfirm', { name: s.uploadConflict.name })),
+            create('div', { className: 'expl-confirm-actions' },
+              create('button', { type: 'button', className: 'expl-confirm-btn', onClick: function () { s.uploadConflict.resolve(false); setState({ uploadConflict: null }) } }, T('explorer.cancel')),
+              create('button', { type: 'button', className: 'expl-confirm-btn expl-confirm-primary', autoFocus: true, onClick: function () { s.uploadConflict.resolve(true); setState({ uploadConflict: null }) } }, T('explorer.overwrite')),
+            ),
+          ),
+        ) : null,
       )
     }
 
@@ -1631,7 +1677,15 @@ window.__ModuleLoader__.load({
       return create('button', {
         type: 'button',
         className: 'expl-toggle expl-tool' + (s.open ? ' expl-active' : ''),
-        onClick: function () { try { if (s.open) layout.closeDetails(); else layout.openDetails() } catch (e) {} },
+        onClick: function () {
+          try {
+            if (layout && typeof layout.closeRightbar === 'function') {
+              if (s.open) layout.closeRightbar()
+              else layout.openRightbar(true, false)
+            } else if (s.open) layout.closeDetails()
+            else layout.openDetails()
+          } catch (e) {}
+        },
         title: T('explorer.label'),
         'aria-label': T('explorer.label'),
       }, '📁')
@@ -1661,10 +1715,16 @@ window.__ModuleLoader__.load({
           className: 'expl-toggle expl-tool' + (s.open ? ' expl-active' : ''),
           onClick: function (event) {
             if (s.open) {
-              try { layout.closeDetails() } catch (e) {}
+              try {
+                if (layout && typeof layout.closeRightbar === 'function') layout.closeRightbar()
+                else if (layout && typeof layout.closeDetails === 'function') layout.closeDetails()
+              } catch (e) {}
               setHeroDetailsWidth(event.currentTarget, 0)
             } else if (!setHeroDetailsWidth(event.currentTarget, DETAILS_DEFAULT)) {
-              try { layout.openDetails() } catch (e) {}
+              try {
+                if (layout && typeof layout.openRightbar === 'function') layout.openRightbar(true, false)
+                else if (layout && typeof layout.openDetails === 'function') layout.openDetails()
+              } catch (e) {}
             }
           },
           title: T('explorer.label'),
@@ -1719,6 +1779,12 @@ window.__ModuleLoader__.load({
       } catch (_) {}
     }
 
+    function askOverwrite(name) {
+      return new Promise(function (resolve) {
+        setState({ uploadConflict: { name: name, resolve: resolve } })
+      })
+    }
+
     function findFileEntry(path) {
       for (var i = 0; i < state.files.list.length; i++) {
         if (state.files.list[i].path === path) return state.files.list[i]
@@ -2972,6 +3038,30 @@ window.__ModuleLoader__.load({
       var sessions = ctx.sessions
       var remoteGoals = ctx.remote.goals
       var disposers = []
+      // 0.1.5's official Sidebar adds a header-corner expand button. Its
+      // default handler opens the official surface, which would diverge from
+      // dsh-soup's resource explorer. Route that button to the same layout
+      // face used by our explorer controls instead.
+      if (typeof document !== 'undefined') {
+        var onOfficialExpand = function (event) {
+          var target = event.target && event.target.closest
+            ? event.target.closest('[data-sidebar-right-expand]') : null
+          if (!target) return
+          event.preventDefault()
+          if (typeof event.stopImmediatePropagation === 'function') event.stopImmediatePropagation()
+          else event.stopPropagation()
+          try {
+            if (state.open) {
+              if (layout && typeof layout.closeRightbar === 'function') layout.closeRightbar()
+              else if (layout && typeof layout.closeDetails === 'function') layout.closeDetails()
+            } else if (layout && typeof layout.openRightbar === 'function') {
+              layout.openRightbar(true, false)
+            } else if (layout && typeof layout.openDetails === 'function') layout.openDetails()
+          } catch (e) {}
+        }
+        document.addEventListener('click', onOfficialExpand, true)
+        disposers.push(function () { document.removeEventListener('click', onOfficialExpand, true) })
+      }
       // i18n：注册双语词典；模块级 T 供组件外回调（菜单/错误横幅）取当前语言文案。
       if (ctx.locale && typeof ctx.locale.register === 'function') {
         ctx.effect(function () { return ctx.locale.register(NS, DICT) }, 'dsh-soup: dictionaries')
@@ -3002,6 +3092,20 @@ window.__ModuleLoader__.load({
           },
         ))
       })
+      // DSH 0.1.5 moved the right column from the legacy `details` seat to
+      // `rightbar`.  Register at a lower priority so dsh-soup remains the
+      // occupant when the official Sidebar plugin is present.
+      slots.inject('rightbar', function () {
+        disposers.push(slots.register(
+          { name: 'rightbar', priority: -1, locale: NS },
+          function (props) {
+            return create(React.Fragment, null,
+              create(Panel, props),
+              create(PreviewOverlay),
+            )
+          },
+        ))
+      })
       // 文件标签页：与 对话/轨迹 同级的原生 view tab（ui-trajectory 同款注册方式）。
       // 槽位 entry 是静态的，多文件由 FilesView 内部子 tab 条管理。
       slots.inject('conversation.view', function () {

package/lib/index.js

@@ -690,14 +690,22 @@ export function apply(ctx) {
         }
         const dirRp = await confine(dir, '目录', sessionIdArg)
         const target = await confine(joinPath(dirRp, fileName), '上传路径', sessionIdArg)
-        // 分块上传（JupyterLab 同款语义）：chunk=1/缺省覆盖写，chunk>=2 追加。
-        // 无需服务端状态——按块序到达即顺序落盘。
+        // 分块上传：首块先做同名冲突检查；客户端确认覆盖后才写入，
+        // 后续块追加到已创建的目标。
         const chunk = Number((args && args.chunk) || 0)
         if (chunk < 0 || !Number.isInteger(chunk)) return { ok: false, error: '无效的 chunk 序号' }
         try {
           const bytes = Buffer.from(data.replace(/\s+/g, ''), 'base64')
-          if (chunk >= 2) await appendFile(target, bytes)
-          else await writeFile(target, bytes)
+          if (chunk >= 2) {
+            await appendFile(target, bytes)
+            return { ok: true, path: target }
+          }
+          if (!(args && args.overwrite)) {
+            try { await stat(target); return { ok: false, conflict: true, error: '目标文件已存在' } } catch (err) {
+              if (!err || err.code !== 'ENOENT') throw err
+            }
+          }
+          await writeFile(target, bytes)
           return { ok: true, path: target }
         } catch (err) {
           return { ok: false, error: `写入失败: ${String((err && err.message) || err)}` }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lyhue1991/dsh-soup",
   "description": "DSH 项目资源管理器：右侧 details 列文件树（并列网格、宽度对齐宿主 details 合同 300-520px），有 Session log 时在其右侧、空白新会话在输入框上方右端提供 📁 切换按钮；支持多选、双击展开/打开、右键菜单（打开/系统打开/重命名/废纸篓/新建/复制路径）、拖拽移动、上传。文件「打开」在会话区新增「文件」标签页（原生 conversation.view，与对话/轨迹同级）：文本可编辑 ⌘S 保存、图片预览、二进制提示。附带模型吞吐徽标：输入框正上方显示「正在等待模型...」与彩色 t/s 徽标（数据来自 llm/stream 真实流）。附带 GoalBar 多行展示：把原生单行截断 GoalBar 放开为多行完整显示，编辑用 textarea，工具与数据仍走原生 goal。",
-  "version": "0.4.11",
+  "version": "0.5.0",
   "type": "module",
   "main": "lib/index.js",
   "exports": {