@wszhoho/dsh-file-attachment 0.5.7 → 0.5.9

package/lib/client.js

@@ -118,6 +118,38 @@ window.__ModuleLoader__.load({
 			hijackedInputs.add(el)
 			el.addEventListener('change', onNativeFileChange)
 		}
+		// ---- 移动端双📎兼容：dsh-web-mobile 向 conversation.input.left 注入 file-upload 回形针，
+		// 其设计前提是 host（0.1.6-alpha.2+）已删除 composer 原生📎；在 0.1.5-rc.x 上该前提不成立——
+		// 该代 host 仍渲染原生📎（即 hidden fileInput 的前邻 button），移动端窄屏下两枚并排出现
+		//（PC 宽屏被 dsh-web-mobile 的 pointer:fine 隐藏规则覆盖，故仅移动端可见）。
+		// 此处按 host 原生📎是否存在对调：原生📎在 → 内联 display:none!important 隐藏 mobile 注入的
+		//（压过其 display:grid!important）；原生📎不在（0.1.6+）→ 移除内联声明交还 CSS，保留为唯一入口。
+		// 两枚按钮点击后都触发 host 的 hidden fileInput，change 已被本插件劫持走 runBatch，功能不受影响。
+		function cardHasNativeClip(card) {
+			let inputs
+			try { inputs = card.querySelectorAll('input[type="file"], input[type=file]') } catch (err) { return false }
+			for (let i = 0; i < inputs.length; i++) {
+				const inp = inputs[i]
+				if (typeof inp.hidden !== 'undefined' && !inp.hidden) continue // 只认 host 的 hidden fileInput
+				let prev = inp.previousElementSibling
+				while (prev !== null && prev.tagName !== 'BUTTON') prev = prev.previousElementSibling
+				if (prev !== null) return true
+			}
+			return false
+		}
+		function reconcileMobileFileUpload() {
+			let cards
+			try { cards = Array.from(document.querySelectorAll('[data-composer-card]')) } catch (err) { cards = [] }
+			for (let i = 0; i < cards.length; i++) {
+				const hideMobile = cardHasNativeClip(cards[i])
+				let btns
+				try { btns = cards[i].querySelectorAll('[data-mobile-nav="file-upload"]') } catch (err) { btns = [] }
+				for (let j = 0; j < btns.length; j++) {
+					const curHidden = btns[j].style.display === 'none'
+					if (hideMobile !== curHidden) btns[j].style.setProperty('display', hideMobile ? 'none' : '', 'important')
+				}
+			}
+		}
 		function installNativeAttachHijack() {
 			if (typeof document === 'undefined' || document.body === null || document.body === undefined) return
 			let body
@@ -127,6 +159,7 @@ window.__ModuleLoader__.load({
 				let all = []
 				try { all = Array.from(body.querySelectorAll(nativeFileInputSelector)) } catch (err) { all = [] }
 				for (let i = 0; i < all.length; i++) hijackFileInput(all[i])
+				reconcileMobileFileUpload() // 双📎对调：host 原生📎在则隐藏 dsh-web-mobile 注入的
 			}
 			scan()
 			const mo = new MutationObserver(() => scan())
@@ -772,7 +805,6 @@ window.__ModuleLoader__.load({
 				bridge.input = input
 				bridge.sessionId = sessionId
 				bridge.mounted = true
-				if (typeof console !== 'undefined' && console.log) console.log('[dsh-file-attachment] FaBridge mounted', { sessionId, shell: shell === null ? 'null' : 'ok', addImages: typeof addImages })
 				return () => {
 					bridge.shell = null
 					bridge.addImages = null
@@ -1091,6 +1123,7 @@ window.__ModuleLoader__.load({
 
 		// 设置页扩展名分组：标题 + 可删 tag + 输入框 + 添加按钮
 		function FaExtGroup(props) {
+			const [hover, setHover] = react.useState(false)
 			const list = props.list
 			const setList = props.setList
 			const input = props.input
@@ -1110,7 +1143,7 @@ window.__ModuleLoader__.load({
 					style: { cursor: 'pointer', marginLeft: '4px', opacity: 0.55 },
 				}, '×')
 			))
-			return react.createElement('div', { style: { marginBottom: '18px' } },
+			return react.createElement('div', { onMouseEnter: () => setHover(true), onMouseLeave: () => setHover(false), style: { marginBottom: '18px', padding: '14px 16px', borderRadius: '12px', background: hover ? 'var(--dsw-alias-bg-layer-2, rgba(128,128,128,0.06))' : 'var(--dsw-alias-bg-layer-1, rgba(128,128,128,0.04))', border: `1px solid ${hover ? 'var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2, rgba(128,128,128,0.3)))' : 'var(--dsw-alias-border-l1, rgba(128,128,128,0.14))'}`, boxShadow: hover ? '0 2px 8px rgba(0,0,0,0.05)' : 'none', transition: 'border-color 0.16s, background 0.16s, box-shadow 0.16s' } },
 				react.createElement('div', { style: { fontWeight: 600, marginBottom: '8px', fontSize: '13px' } }, props.title),
 				react.createElement('div', { style: { marginBottom: '8px', minHeight: '22px' } }, tags),
 				react.createElement('div', { style: { display: 'flex', gap: '8px' } },
@@ -1149,6 +1182,7 @@ window.__ModuleLoader__.load({
 			const [cfgIn, setCfgIn] = react.useState('')
 			const [saved, setSaved] = react.useState(false)
 			const [saving, setSaving] = react.useState(false)
+			const [vlmHover, setVlmHover] = react.useState(false)
 			react.useEffect(() => {
 				// 挂载时载入持久化配置到编辑副本（幂等，复用 loadConfig Promise）
 				let live = true
@@ -1193,11 +1227,11 @@ window.__ModuleLoader__.load({
 				} finally { setSaving(false) }
 			}
 			return react.createElement('div', { style: { padding: '16px', maxWidth: '680px' } },
-				react.createElement('div', { style: { marginBottom: '16px', fontSize: '13px', color: 'rgba(128,128,128,0.9)' } }, t('settings.hint')),
+				react.createElement('div', { style: { marginBottom: '16px', fontSize: '13px', lineHeight: '1.5', color: 'var(--dsw-alias-label-secondary, rgba(128,128,128,0.95))' } }, t('settings.hint')),
 				react.createElement(FaExtGroup, { title: t('doc.title'), list: doc, setList: setDoc, input: docIn, setInput: setDocIn }),
 				react.createElement(FaExtGroup, { title: t('code.title'), list: code, setList: setCode, input: codeIn, setInput: setCodeIn }),
 				react.createElement(FaExtGroup, { title: t('config.title'), list: config, setList: setConfig, input: cfgIn, setInput: setCfgIn }),
-				react.createElement('div', { style: { margin: '16px 0', padding: '12px', borderRadius: '8px', background: 'var(--dsw-alias-bg-layer-2, rgba(128,128,128,0.08))', border: '1px solid var(--dsw-alias-border-l2, rgba(128,128,128,0.15))' } },
+				react.createElement('div', { onMouseEnter: () => setVlmHover(true), onMouseLeave: () => setVlmHover(false), style: { margin: '16px 0', padding: '14px 16px', borderRadius: '12px', background: vlmHover ? 'var(--dsw-alias-bg-layer-2, rgba(128,128,128,0.06))' : 'var(--dsw-alias-bg-layer-1, rgba(128,128,128,0.04))', border: `1px solid ${vlmHover ? 'var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2, rgba(128,128,128,0.3)))' : 'var(--dsw-alias-border-l1, rgba(128,128,128,0.14))'}`, boxShadow: vlmHover ? '0 2px 8px rgba(0,0,0,0.05)' : 'none', transition: 'border-color 0.16s, background 0.16s, box-shadow 0.16s' } },
 					react.createElement('div', { style: { marginBottom: '8px', fontSize: '13px', fontWeight: '600', color: 'var(--dsw-alias-label-primary, inherit)' } }, t('vlm.title')),
 					react.createElement('div', { style: { marginBottom: '10px', fontSize: '12px', color: 'var(--dsw-alias-label-tertiary, rgba(128,128,128,0.9))' } }, t('vlm.hint')),
 					react.createElement('div', { style: { display: 'grid', gridTemplateColumns: '110px 1fr', gap: '8px 10px', alignItems: 'center' } },
@@ -1237,11 +1271,12 @@ window.__ModuleLoader__.load({
 			const [open, setOpen] = react.useState(false)
 			const [hover, setHover] = react.useState(false)
 			const [version, setVersion] = react.useState(null)
-			react.useEffect(() => {
-				fetch('/dsh-file-attachment/version').then(r => r.json()).then(d => {
-					if (d.ok && d.version) setVersion(d.version)
-				}).catch(() => { /* ignore */ })
-			}, [])
+			// 【已屏蔽 /version 拉取，保留代码以备后用】
+			// react.useEffect(() => {
+			// 	fetch('/dsh-file-attachment/version').then(r => r.json()).then(d => {
+			// 		if (d.ok && d.version) setVersion(d.version)
+			// 	}).catch(() => { /* ignore */ })
+			// }, [])
 			function t(key) {
 				if (ctxRef !== null && ctxRef.locale !== void 0 && typeof ctxRef.locale.bind === 'function') {
 					try { return ctxRef.locale.bind('dsh-file-attachment')(key) } catch (err) { /* 回退 key */ }

package/lib/index.js

@@ -370,18 +370,19 @@ function registerRoutes(ctx) {
           return
         }
       }
-      if (req.method === 'GET' && pathname === '/dsh-file-attachment/version') {
-        try {
-          const pkgPath = fileURLToPath(new URL('../package.json', import.meta.url))
-          const raw = await readFile(pkgPath, 'utf8')
-          const pkg = JSON.parse(raw)
-          json(res, { ok: true, version: pkg.version || '0.0.0' })
-          return
-        } catch {
-          json(res, { ok: false, version: 'unknown' }, 500)
-          return
-        }
-      }
+      // 【已屏蔽 /version 路由，保留代码以备后用】
+      // if (req.method === 'GET' && pathname === '/dsh-file-attachment/version') {
+      //   try {
+      //     const pkgPath = fileURLToPath(new URL('../package.json', import.meta.url))
+      //     const raw = await readFile(pkgPath, 'utf8')
+      //     const pkg = JSON.parse(raw)
+      //     json(res, { ok: true, version: pkg.version || '0.0.0' })
+      //     return
+      //   } catch {
+      //     json(res, { ok: false, version: 'unknown' }, 500)
+      //     return
+      //   }
+      // }
       if (req.method === 'GET' && pathname === '/dsh-file-attachment/config') {
         json(res, { ok: true, value: await readConfig() })
         return
@@ -488,9 +489,8 @@ function registerTools(ctx) {
         },
       },
       render: (_args, value) => {
-        const thinkingText = (value && value.thinkingType === 'enabled') ? '开启' : '关闭'
         if (value && value.ok === true && typeof value.description === 'string' && value.description !== '') {
-          return [{ type: 'text', text: '图片识别结果：' + value.description + '（思考模式：' + thinkingText + '）' }]
+          return [{ type: 'text', text: '图片识别结果：' + value.description }]
         }
         return [{ type: 'text', text: (value && value.ok === true) ? '（图片已识别）' : '（图片识别失败）' }]
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wszhoho/dsh-file-attachment",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "文件附件：拖拽/粘贴/上传文件（支持多文件）；图片与文档统一落盘到 .dsh-file-attachment 并以 @绝对路径 引用发送（文本模型可正常使用）；输入框内联显示图片缩略图预览与文件条目，聊天区图片同样渲染为可点击放大的缩略图、文件保持芯片样式；非多模态模型下图片自动调用可配置 VLM 识别生成中文描述回填草稿；文档/代码/配置文件可上传类型可在设置页配置；支持 PC 与移动端浏览器",
   "keywords": [
     "dsh",