dsh-vision-router 2.2.7 → 2.2.8

package/lib/settings-client-rc8-lifecycle.js

@@ -1,4 +1,4 @@
-import { htmlHasScriptMarker } from './html-script-marker.js'
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 
 const SETTINGS_RC8_MARK = 'data-vision-router-settings-rc8-lifecycle'
 
@@ -384,19 +384,14 @@ export const SETTINGS_RC8_CLIENT_PRELUDE = String.raw`(function(){
 })();`
 
 export function injectSettingsRc8ClientPrelude(html) {
-  if (typeof html !== 'string' || htmlHasScriptMarker(html, SETTINGS_RC8_MARK)) return html
-  const safe = SETTINGS_RC8_CLIENT_PRELUDE.replace(/<\/script/gi, '<\\/script')
-  const script = `<script ${SETTINGS_RC8_MARK}>${safe}</script>`
-  const closeHead = html.indexOf('</head>')
-  return closeHead === -1 ? `${html}${script}` : `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
+  return injectClientCarrierHtml(html, SETTINGS_RC8_MARK, SETTINGS_RC8_CLIENT_PRELUDE)
 }
 
 export function installSettingsRc8ClientLifecycle(ctx) {
-  if (!ctx || typeof ctx.inject !== 'function') return
-  ctx.inject(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectSettingsRc8ClientPrelude),
-      'vision-router: rc8 settings client lifecycle',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: SETTINGS_RC8_MARK,
+    prelude: SETTINGS_RC8_CLIENT_PRELUDE,
+    label: 'vision-router: rc8 settings client lifecycle',
+    injectHtml: injectSettingsRc8ClientPrelude,
   })
 }

package/lib/settings-factory-lifecycle.js

@@ -8,20 +8,20 @@ import {
 } from './settings-limit-client-prelude.js'
 import {
   SETTINGS_NATIVE_CARD_IA_PRELUDE,
+  SETTINGS_NATIVE_CARD_STYLE,
   injectSettingsNativeCardStyle,
 } from './settings-native-card-layout.js'
+import { appendStructuredClientCarrier, injectClientCarrierHtml } from './client-script-carrier.js'
 
 const CLIENT_MARK = 'data-vision-router-settings-factory-lifecycle'
 const IA_SCRIPT_MARK = 'data-vision-router-settings-ia'
 const LIMIT_SCRIPT_MARK = 'data-vision-router-settings-limit-hardening'
 
-function scriptMarkup(mark, source) {
-  const safe = source.replace(/<\/script/gi, '<\\/script')
-  return `<script ${mark}>${safe}</script>`
+function removeScriptMarker(source, marker) {
+  const pattern = new RegExp(`<script\\b[^>]*\\b${marker}(?:\\s|=|>|/)[^>]*>[\\s\\S]*?<\\/script\\s*>`, 'gi')
+  return source.replace(pattern, '')
 }
 
-const IA_SCRIPT = scriptMarkup(IA_SCRIPT_MARK, SETTINGS_IA_CLIENT_PRELUDE)
-const LIMIT_SCRIPT = scriptMarkup(LIMIT_SCRIPT_MARK, SETTINGS_LIMIT_CLIENT_PRELUDE)
 
 /**
  * One lifecycle owner for every decorator that shapes the Vision Router
@@ -123,19 +123,30 @@ export function injectSettingsFactoryLifecycle(html) {
   let next = injectSettingsLimitClientPrelude(html)
   next = injectSettingsIaClientPrelude(next)
   next = injectSettingsNativeCardStyle(next)
-  next = next.split(LIMIT_SCRIPT).join('')
-  next = next.split(IA_SCRIPT).join('')
-
-  const safe = SETTINGS_FACTORY_LIFECYCLE_PRELUDE.replace(/<\/script/gi, '<\\/script')
-  const script = `<script ${CLIENT_MARK}>${safe}</script>`
-  const closeHead = next.indexOf('</head>')
-  return closeHead === -1
-    ? `${next}${script}`
-    : `${next.slice(0, closeHead)}${script}${next.slice(closeHead)}`
+  next = removeScriptMarker(next, LIMIT_SCRIPT_MARK)
+  next = removeScriptMarker(next, IA_SCRIPT_MARK)
+  return injectClientCarrierHtml(next, CLIENT_MARK, SETTINGS_FACTORY_LIFECYCLE_PRELUDE)
 }
 
 export function installSettingsFactoryLifecycle(ctx) {
   ctx?.inject?.(['webServer'], (webCtx) => {
+    if (typeof webCtx.on === 'function') {
+      webCtx.on('webserver/index-inject', (table) => {
+        if (!Array.isArray(table)) return
+        const historical = [`/* ${IA_SCRIPT_MARK} */`, `/* ${LIMIT_SCRIPT_MARK} */`]
+        for (let index = table.length - 1; index >= 0; index -= 1) {
+          const row = table[index]
+          if (row?.kind === 'script' && typeof row.text === 'string' && historical.some((mark) => row.text.includes(mark))) {
+            table.splice(index, 1)
+          }
+        }
+        appendStructuredClientCarrier(table, CLIENT_MARK, SETTINGS_FACTORY_LIFECYCLE_PRELUDE)
+        const styleMark = 'data-vision-router-settings-native-cards'
+        if (!table.some((row) => row?.kind === 'style' && typeof row.text === 'string' && row.text.includes(styleMark))) {
+          table.push({ kind: 'style', placement: 'head', text: `/* ${styleMark} */\n${SETTINGS_NATIVE_CARD_STYLE}` })
+        }
+      })
+    }
     webCtx.effect(
       () => webCtx.webServer.tapIndex(injectSettingsFactoryLifecycle),
       'vision-router: converged settings client factory lifecycle',

package/lib/settings-ia-client-prelude.js

@@ -1,3 +1,4 @@
+import { injectClientCarrierHtml, injectClientStyleHtml, installClientScriptCarriers } from './client-script-carrier.js'
 const CLIENT_MARK = 'data-vision-router-settings-ia'
 
 export const SETTINGS_IA_CLIENT_PRELUDE = String.raw`(function(){
@@ -180,7 +181,7 @@ export const SETTINGS_IA_CLIENT_PRELUDE = String.raw`(function(){
       function modelOptions(provider,current,allowAll){var group=groupById.get(provider),models=arr(group&&group.models),listed=new Set(models.map(function(model){return model&&model.id;}).filter(Boolean)),nodes=[h('option',{value:'',key:'__empty'},allowAll?tx('全部模型','All models'):(provider?tx('选择模型…','Choose model…'):tx('先选供应商','Choose provider first')))];if(current&&!listed.has(current))nodes.push(h('option',{value:current,key:'__stale-'+current},current+' '+tx('（已保存）','(saved)')));models.forEach(function(model){if(model&&typeof model.id==='string'&&model.id)nodes.push(h('option',{value:model.id,key:model.id},modelName(group,model.id)));});return nodes;}
       function modelRow(row,index,rows,setRows,allowAll){var ready=groups.length>0;function update(next){var copy=rows.map(function(item){return Object.assign({},item);});copy[index]=next;setRows(copy);setSaveState({status:'idle'});}function providerChanged(provider){var next=Object.assign({},row,{provider:provider,model:''});if(!allowAll)next.fallbacks=[];update(next);}function remove(){var copy=rows.filter(function(_,i){return i!==index;});setRows(copy.length?copy:[{provider:'',model:'',fallbacks:[]}]);setSaveState({status:'idle'});}return h('div',{className:'vr-chain-row',key:index},ready?h('select',{className:'vr-input vr-select',value:row.provider||'',disabled:!writable||saving,onChange:function(event){providerChanged(event.target.value);}},providerOptions(row.provider||'')):h('input',{className:'vr-input',placeholder:'provider',value:row.provider||'',disabled:!writable||saving,onChange:function(event){providerChanged(event.target.value);}}),ready?h('select',{className:'vr-input vr-select',value:row.model||'',disabled:!writable||saving||!row.provider,onChange:function(event){update(Object.assign({},row,{model:event.target.value}));}},modelOptions(row.provider||'',row.model||'',allowAll)):h('input',{className:'vr-input',placeholder:allowAll?tx('model（留空=全部）','model (empty = all)'):'model',value:row.model||'',disabled:!writable||saving,onChange:function(event){update(Object.assign({},row,{model:event.target.value}));}}),h('button',{type:'button',className:'vr-reset',disabled:!writable||saving,onClick:remove},tx('移除','Remove')));}
 
-      function generalPage(){var rows=chainRows(),configured=rows.filter(function(row){return row&&row.provider&&row.model;}),localOnly=toggleValue('localOnlyVision',false),fallback=!localOnly&&toggleValue('freeFallback',true),status=localOnly?tx('仅本地视觉策略已启用','Local-only vision policy enabled'):configured.length?tx('识图已就绪','Vision ready'):fallback?tx('已可使用内置免费识图','Built-in free vision is ready'):tx('暂无可用识图模型','No vision model configured'),ordered=configured.map(function(row){return row.model;});if(fallback)ordered.push(tx('内置免费兜底','Built-in free fallback'));var stale=catalog.status==='ready'?configured.filter(function(row){var group=groupById.get(row.provider);return !group||!arr(group.models).some(function(model){return model&&model.id===row.model;});}):[];return h(React.Fragment,null,title(tx('常规','General'),tx('这里只设置“谁负责看图”。聊天模型仍在聊天页选择。','This page only decides who reads images; the chat model is still chosen in chat.')),card([toggle('localOnlyVision',tx('仅本地视觉','Local-only vision'),tx('开启后，Vision Router 只允许回环地址上的本地视觉后端（Ollama、LM Studio 或本机自定义 HTTP）；所有云端/DSH Provider 和 OVH 免费兜底都会在运行时被硬阻止。已保存的云端配置不会删除，关闭后可恢复。主聊天模型是否联网不受此开关控制。此隐私开关只能在运行 DSH 的本机页面修改。','When enabled, Vision Router only allows visual backends on loopback addresses (Ollama, LM Studio, or custom local HTTP). Cloud/DSH providers and the OVH free fallback are blocked at runtime. Saved cloud settings are preserved for later restoration. This does not control whether the main chat model is remote. This privacy control can only be changed from the local DSH settings page.'),!local),h('div',{className:'vr-ia-status',key:'status'},h('strong',null,(localOnly?'🔒 ':configured.length||fallback?'● ':'⚠ ')+status),h('p',{className:'vr-hint'},tx('需要看图时，在聊天框旁点击「👁 识图」。','Use “👁 Vision” beside the chat box when an image needs inspection.')),h('p',{className:localOnly?'vr-hint':'vr-failed',key:'egress'},localOnly?tx('当前仅本地视觉策略正在生效：云端识图行和 OVH 免费兜底会保留配置但不会执行；只有回环地址上的本地视觉端点可接收图片。注意：当前聊天模型仍可能是云端模型。','Local-only vision is active: cloud vision rows and the OVH fallback remain saved but cannot execute; only visual endpoints on loopback addresses may receive images. The current chat model may still be remote.'):tx('数据流向：使用云端识图模型（包括默认 OVHcloud 匿名兜底）时，图片/裁剪、提示词和相关上下文会离开本机；免费或免 Key 不等于离线。若要阻止 Vision Router 将图片发送到远程视觉端点，请开启上方“仅本地视觉”。','Data flow: cloud vision models, including the default anonymous OVHcloud fallback, receive images/crops, prompts and related context; free or keyless does not mean offline. Enable Local-only vision above to prevent Vision Router from sending image data to remote visual endpoints.')),ordered.length?h('p',{className:'vr-ia-chain-summary'},ordered.join(' → ')):null,stale.length?h('p',{className:'vr-failed'},tx('有已保存的识图模型当前不在可调用目录中；请到“诊断”重新检测。','A saved vision model is not currently in the callable catalog; re-detect it in Diagnostics.')):null)]),card([h('div',{className:'vr-field',id:'vr-vision-backend-chain','data-vr-guide-target':'vision-backend',key:'chain'},fieldHead('providers',tx('识图模型','Vision models')),h('p',{className:'vr-hint'},tx('从上到下依次尝试；前一个失败时自动切换到下一个。','Models are tried from top to bottom and fall through automatically on failure.')),rows.map(function(row,index){return modelRow(row,index,rows,setChainDraft,false);}),h('button',{type:'button',className:'vr-btn',disabled:!writable||saving,onClick:function(){setChainDraft(rows.concat([{provider:'',model:'',fallbacks:[]}]))}},tx('+ 添加备用识图模型','+ Add fallback vision model'))),toggle('freeFallback',tx('内置免费兜底','Built-in free fallback'),localOnly?tx('仅本地视觉开启时，OVH 免费兜底由运行时强制禁用；这里保留原设置，关闭仅本地视觉后可恢复。','The OVH fallback is runtime-blocked while Local-only vision is enabled. Its saved value is preserved and becomes active again when Local-only vision is turned off.'):tx('这是远程 OVHcloud 服务；前面的模型都失败后会上传图片并自动尝试，无需 API Key。','This is a remote OVHcloud service. After earlier models fail, it uploads the image and tries automatically; no API key is required.'),localOnly)]));}
+      function generalPage(){var rows=chainRows(),configured=rows.filter(function(row){return row&&row.provider&&row.model;}),localOnly=toggleValue('localOnlyVision',false),fallback=!localOnly&&toggleValue('freeFallback',true),status=localOnly?tx('仅本地视觉策略已启用','Local-only vision policy enabled'):configured.length?tx('识图已就绪','Vision ready'):fallback?tx('已可使用内置免费识图','Built-in free vision is ready'):tx('暂无可用识图模型','No vision model configured'),ordered=configured.map(function(row){return row.model;});if(fallback)ordered.push(tx('内置免费兜底','Built-in free fallback'));var stale=catalog.status==='ready'?configured.filter(function(row){var group=groupById.get(row.provider);return !group||!arr(group.models).some(function(model){return model&&model.id===row.model;});}):[];return h(React.Fragment,null,title(tx('常规','General'),tx('这里只设置“谁负责看图”。聊天模型仍在聊天页选择。','This page only decides who reads images; the chat model is still chosen in chat.')),card([toggle('localOnlyVision',tx('仅本地视觉','Local-only vision'),tx('开启后，Vision Router 只允许回环地址上的本地视觉后端（Ollama、LM Studio 或本机自定义 HTTP）；所有云端/DSH Provider 和 OVH 免费兜底都会在运行时被硬阻止。已保存的云端配置不会删除，关闭后可恢复。Vision Router 不会把图片和裁剪发送到云端视觉服务，但视觉后端返回的描述、OCR、坐标等识图结果文本仍会交给当前聊天模型；若聊天模型在云端，图片语义仍可能离开本机。严格纯本地还需同时选择本地聊天模型。此隐私开关只能在运行 DSH 的本机页面修改。','When enabled, Vision Router only allows visual backends on loopback addresses (Ollama, LM Studio, or custom local HTTP). Cloud/DSH providers and the OVH free fallback are blocked at runtime. Saved cloud settings are preserved for later restoration. Vision Router does not send image bytes or crops to cloud vision services, but derived result text—descriptions, OCR, and coordinates—is still passed to the current chat model; if that model is remote, image semantics may still leave this machine. For a strict end-to-end local workflow, select a local chat model too. This privacy control can only be changed from the local DSH settings page.'),!local),h('div',{className:'vr-ia-status',key:'status'},h('strong',null,(localOnly?'🔒 ':configured.length||fallback?'● ':'⚠ ')+status),h('p',{className:'vr-hint'},tx('需要看图时，在聊天框旁点击「👁 识图」。','Use “👁 Vision” beside the chat box when an image needs inspection.')),h('p',{className:localOnly?'vr-hint':'vr-failed',key:'egress'},localOnly?tx('当前仅本地视觉策略正在生效：云端识图行和 OVH 免费兜底会保留配置但不会执行；Vision Router 只会把图片和裁剪发往回环地址上的本地视觉端点。识图结果文本仍会交给当前聊天模型；若聊天模型在云端，图片语义仍可能离开本机。严格纯本地还需同时选择本地聊天模型。','Local-only vision is active: cloud vision rows and the OVH fallback remain saved but cannot execute; Vision Router sends image bytes and crops only to local visual endpoints on loopback addresses. Derived result text is still passed to the current chat model; if that model is remote, image semantics may still leave this machine. For a strict end-to-end local workflow, select a local chat model too.'):tx('数据流向：使用云端识图模型（包括默认 OVHcloud 匿名兜底）时，图片/裁剪、提示词和相关上下文会离开本机；免费或免 Key 不等于离线。若要阻止 Vision Router 将图片发送到远程视觉端点，请开启上方“仅本地视觉”。','Data flow: cloud vision models, including the default anonymous OVHcloud fallback, receive images/crops, prompts and related context; free or keyless does not mean offline. Enable Local-only vision above to prevent Vision Router from sending image data to remote visual endpoints.')),ordered.length?h('p',{className:'vr-ia-chain-summary'},ordered.join(' → ')):null,stale.length?h('p',{className:'vr-failed'},tx('有已保存的识图模型当前不在可调用目录中；请到“诊断”重新检测。','A saved vision model is not currently in the callable catalog; re-detect it in Diagnostics.')):null)]),card([h('div',{className:'vr-field',id:'vr-vision-backend-chain','data-vr-guide-target':'vision-backend',key:'chain'},fieldHead('providers',tx('识图模型','Vision models')),h('p',{className:'vr-hint'},tx('从上到下依次尝试；前一个失败时自动切换到下一个。','Models are tried from top to bottom and fall through automatically on failure.')),rows.map(function(row,index){return modelRow(row,index,rows,setChainDraft,false);}),h('button',{type:'button',className:'vr-btn',disabled:!writable||saving,onClick:function(){setChainDraft(rows.concat([{provider:'',model:'',fallbacks:[]}]))}},tx('+ 添加备用识图模型','+ Add fallback vision model'))),toggle('freeFallback',tx('内置免费兜底','Built-in free fallback'),localOnly?tx('仅本地视觉开启时，OVH 免费兜底由运行时强制禁用；这里保留原设置，关闭仅本地视觉后可恢复。','The OVH fallback is runtime-blocked while Local-only vision is enabled. Its saved value is preserved and becomes active again when Local-only vision is turned off.'):tx('这是远程 OVHcloud 服务；前面的模型都失败后会上传图片并自动尝试，无需 API Key。','This is a remote OVHcloud service. After earlier models fail, it uploads the image and tries automatically; no API key is required.'),localOnly)]));}
       function strategyPage(){
         var structured=toggleValue('structuredVisionBootstrap',false);
         var rawDepth=String(value('visionDepth','standard')||'standard');
@@ -261,7 +262,7 @@ export const SETTINGS_IA_CLIENT_PRELUDE = String.raw`(function(){
       function advancedPage(){var routing=toggleValue('routing',false),turnBudget=Number(value('visionTurnBudgetMs',0))||0,customBudget=turnBudget>0;return h(React.Fragment,null,title(tx('高级','Advanced'),tx('这些默认值对大多数用户已经合适。','Defaults are suitable for most users.')),card([h('h4',{className:'vr-ia-subtitle',key:'p'},tx('性能与稳定性','Performance & stability')),toggle('downscale',tx('自动缩放','Auto downscale')),numberField('downscaleMaxPixels',tx('图片像素上限','Image pixel limit'),null,1000,100000000),toggle('cache',tx('识图缓存','Vision answer cache')),numberField('cacheTtlSeconds',tx('缓存有效期（秒）','Cache TTL (seconds)'),null,0,31536000),numberField('cacheMaxEntries',tx('最大缓存数量','Maximum cached answers'),null,1,100000),h('h4',{className:'vr-ia-subtitle',key:'t'},tx('超时','Timeouts')),numberField('timeoutMs',tx('单次模型请求','Single model request'),tx('毫秒。','Milliseconds.'),1000,600000),numberField('visionTaskTimeoutMs',tx('单个视觉任务','Single visual task'),tx('包含该任务内部的重试和备用模型；不是每个后端各自一份。','Includes retries and fallbacks inside the task; it is not a fresh budget per backend.'),1000,180000),numberField('ocrTimeoutMs',tx('OCR 任务','OCR task'),null,1000,120000),h('div',{className:'vr-field',key:'ocr-engine'},fieldHead('ocrEngine',tx('OCR 默认引擎','Default OCR engine')),h('select',{className:'vr-input',value:String(value('ocrEngine','auto')||'auto'),disabled:!writable||saving,onChange:function(event){setValue('ocrEngine',event.target.value);}},h('option',{value:'auto'},tx('自动（Tesseract → 视觉模型）','Auto (Tesseract → vision)')),h('option',{value:'tesseract'},tx('仅 Tesseract','Tesseract only')),h('option',{value:'vision'},tx('仅视觉模型','Vision model only'))),h('p',{className:'vr-hint'},tx('vision_ocr 未显式指定 engine 时使用；单次调用的 engine=tesseract/vision 始终优先。','Used when vision_ocr does not explicitly choose an engine; per-call engine=tesseract/vision always wins.'))),h('div',{className:'vr-field',key:'budget'},fieldHead('visionTurnBudgetMs',tx('整轮视觉工具上限','Whole-turn vision-tool limit')),h('select',{className:'vr-input',value:customBudget?'custom':'unlimited',disabled:!writable||saving,onChange:function(event){setValue('visionTurnBudgetMs',event.target.value==='unlimited'?0:(turnBudget>0?turnBudget:180000));}},h('option',{value:'unlimited'},tx('不限制（推荐）','Unlimited (recommended)')),h('option',{value:'custom'},tx('自定义','Custom'))),customBudget?numberField('visionTurnBudgetMs',tx('上限（毫秒）','Limit (ms)'),null,10000,600000):null)]),card([h('h4',{className:'vr-ia-subtitle',key:'cost'},tx('模型顺序与成本','Model order & cost')),toggle('freeCloudFirst',tx('免费云模型优先','Try free cloud models first'))]),card([h('h4',{className:'vr-ia-subtitle',key:'scope'},tx('识图模式范围','Vision mode scope')),toggle('autoWrapProviders',tx('自动允许已启用模型使用识图','Automatically allow enabled models to use Vision mode')),wrappersEditor()]),local?card([h('h4',{className:'vr-ia-subtitle',key:'network'},tx('网络与远程','Network & remote')),h('p',{className:'vr-hint',key:'network-authority'},tx('默认沿用 DSH/Host 的网络出口；只有需要让视觉请求走不同出口时才填写下方覆盖。','By default Vision Router follows the DSH/Host network path. Use the override below only when vision requests need a different egress route.')),toggle('allowRemoteSettings',tx('允许可信 Host 远程修改设置','Allow trusted-host remote settings'),tx('默认关闭；trustedHosts 不是身份认证。','Off by default; trustedHosts is not authentication.')),textField('proxy',tx('视觉专用代理覆盖','Vision-only proxy override'),tx('留空即沿用 DSH/Host；支持 http(s)://、socks5://，并兼容旧 socks5h://。','Leave empty to follow DSH/Host; supports http(s):// and socks5://, with legacy socks5h:// compatibility.')),textareaArray('proxyHosts',tx('视觉代理覆盖域名','Vision proxy override hosts'),tx('仅在上方覆盖非空时生效；每行一个，其余请求继续沿用 DSH/Host。','Used only when the override above is non-empty; one host per line. All other requests keep the DSH/Host path.'))]):null,card([h('h4',{className:'vr-ia-subtitle',key:'compat'},tx('兼容模式','Compatibility')),toggle('rewriteImages',tx('保护纯文本模型','Protect text-only models')),toggle('routing',tx('整轮视觉路由（旧工作流）','Whole-turn vision routing (legacy workflow)')),routing?toggle('reverseRouting',tx('纯文字消息继续使用聊天模型','Keep text-only messages on the chat model')):null,routing?textProviderEditor():null]),card([h('button',{type:'button',className:'vr-btn',key:'dev',onClick:function(){setOpen(Object.assign({},open,{developer:!open.developer}));}},open.developer?tx('隐藏开发者设置','Hide developer settings'):tx('显示开发者设置','Show developer settings')),open.developer?h('div',{className:'vr-ia-dev',key:'body'},toggle('progressiveTools',tx('渐进式工具暴露','Progressive tool exposure')),h('p',{className:'vr-hint',key:'progressive-restart'},tx('保存后需重启 DSH 才生效。','Restart DSH after saving for this change to take effect.')),local?toggle('stealth','Stealth'):null,local?textField('wrapperRoute',tx('包装路由名','Wrapper route name')):null,local?textField('chainRoute',tx('视觉链路由名','Vision chain route name')):null,textareaArray('extraVisionModels',tx('额外视觉能力标记','Extra vision capability labels'),tx('只有诊断发现模型未声明图片能力时才需要。','Needed only when diagnostics show missing image-capability metadata.'))):null]));}
       function diagnosticValue(label,valueText){return h('div',{className:'vr-ia-diag-row',key:label},h('span',null,label),h('strong',null,valueText));}
       function updatePanel(){if(!local)return null;var result=updateState.result,auto=result&&result.autoUpdate,current=result&&result.currentVersion?result.currentVersion:tx('检测中','Checking'),latest=result&&result.latestVersion?result.latestVersion:'—',available=result&&result.ok===true&&result.updateAvailable===true,profile=auto&&auto.profile?auto.profile:'web',manualVersion=result&&result.latestVersion?result.latestVersion:'<version>',spec='dsh-vision-router@'+manualVersion,pnpm='pnpm dsh plugin --profile '+profile+' add '+spec,npx='npx @deepseek-ai/dsh plugin --profile '+profile+' add '+spec;return card([h('h4',{className:'vr-ia-subtitle',key:'title'},tx('版本更新','Updates')),h('p',{className:'vr-hint',key:'status'},updateState.status==='running'?tx('正在检查更新…','Checking for updates…'):result&&result.ok===false?tx('更新检查失败：','Update check failed: ')+String(result.error||'unknown'):available?tx('发现新版本：v','Update available: v')+latest+tx('（当前 v',' (current v')+current+')':result&&result.ok===true?tx('已是最新版本 v','Up to date: v')+current:tx('尚未检查','Not checked yet')),h('div',{className:'vr-ia-actions',key:'actions'},h('button',{type:'button',className:'vr-btn',disabled:updateState.status==='running',onClick:function(){void runUpdateCheck(true);}},tx('检查更新','Check for updates')),available&&auto&&auto.supported===true&&auto.token?h('button',{type:'button',className:'vr-btn vr-btn-save',disabled:selfUpdateState.status==='running',onClick:function(){void runSelfUpdate();}},selfUpdateState.status==='running'?tx('更新中…','Updating…'):tx('一键更新','Update now')):null),selfUpdateState.status==='done'&&selfUpdateState.result?h('p',{className:'vr-hint',key:'updated'},tx('更新完成，请重启 DSH。','Update complete. Restart DSH.')):selfUpdateState.error?h('p',{className:'vr-failed',key:'uerr'},String(selfUpdateState.error)):null,available&&(!auto||auto.supported!==true)?h('div',{className:'vr-ia-manual',key:'manual'},h('p',{className:'vr-hint'},tx('当前安装方式不支持安全的一键更新，请使用与你当前 DSH 安装方式一致的命令：','This install method cannot be safely auto-updated. Use the command matching your DSH installation:')),h('code',{className:'vr-ia-code'},pnpm),h('code',{className:'vr-ia-code'},npx)):null]);}
-      function diagnosticsPage(){var providerCount=groups.length,modelCount=groups.reduce(function(total,group){return total+arr(group&&group.models).length;},0),configured=chainRows().filter(function(row){return row&&row.provider&&row.model;}).length,ollama=obj(value('localOllama',{})),lm=obj(value('localLmStudio',{})),testText=!local?tx('仅本机可见','Local only'):testState.status==='running'?tx('检测中','Checking'):testState.status==='done'&&testState.result&&testState.result.ok===true?tx('连接正常','Connected'):testState.status==='done'?tx('连接失败','Failed'):tx('未检测','Not checked'),capsText=caps.status==='ready'?tx('正常','Ready'):caps.status==='loading'?tx('检测中','Checking'):caps.status==='error'?tx('不可用','Unavailable'):tx('未检测','Not checked');var rows=[[tx('设置协议','Settings contract'),String(value('settingsContractRevision','—'))],[tx('模型目录','Model catalog'),catalog.status==='ready'?tx('正常','Ready'):catalog.status==='loading'?tx('检测中','Checking'):tx('不可用','Unavailable')],[tx('图片能力元数据','Image capability metadata'),capsText],[tx('可选 Provider','Selectable providers'),String(providerCount)],[tx('可选模型','Selectable models'),String(modelCount)],[tx('已配置识图模型','Configured vision models'),String(configured)],[tx('内置免费兜底','Built-in free fallback'),toggleValue('freeFallback',true)?(caps.builtinFallback.length?tx('已启用，','Enabled, ')+caps.builtinFallback.length+tx(' 个模型',' models'):tx('已启用','Enabled')):tx('已关闭','Disabled')],[tx('后端连接','Backend connection'),testText],[tx('Ollama','Ollama'),local?(ollama.enabled===true?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('仅本机可见','Local only')],[tx('LM Studio','LM Studio'),local?(lm.enabled===true?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('仅本机可见','Local only')],[tx('桌面截图','Desktop capture'),local?(toggleValue('desktopScreenshot',false)?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('仅本机可见','Local only')],[tx('网络出口','Network egress'),local?(String(value('proxy','')).trim()?tx('视觉专用覆盖','Vision-only override'):tx('DSH/Host（默认）','DSH/Host (default)')):tx('仅本机可见','Local only')],[tx('远程设置','Remote settings'),local?(toggleValue('allowRemoteSettings',false)?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('当前为远程安全视图','Remote safe view')]];function reportText(){return ['Vision Router diagnostics'].concat(rows.map(function(row){return row[0]+': '+row[1];}),['doctor: dsh-vision-router doctor']).join('\n');}async function copyReport(){try{if(typeof navigator!=='undefined'&&navigator.clipboard&&typeof navigator.clipboard.writeText==='function')await navigator.clipboard.writeText(reportText());setActionState({status:'copied'});}catch(error){setActionState({status:'error',error:error&&error.message?error.message:String(error)});}}return h(React.Fragment,null,title(tx('诊断','Diagnostics'),tx('状态页不会修改你的模型/路由设置；连接测试和更新操作会明确由按钮触发。','The status page does not change model or routing settings; connection tests and updates are explicit actions.')),card(rows.map(function(row){return diagnosticValue(row[0],row[1]);})),card([h('div',{className:'vr-ia-actions',key:'actions'},local?h('button',{type:'button',className:'vr-btn',disabled:testState.status==='running',onClick:function(){void runTestConnection();}},tx('测试连接','Test connection')):null,h('button',{type:'button',className:'vr-btn',onClick:function(){invalidateCatalog();}},tx('重新检测模型','Re-detect models')),local?h('button',{type:'button',className:'vr-btn',onClick:function(){void openLogs();}},tx('打开日志文件夹','Open logs folder')):null,h('button',{type:'button',className:'vr-btn',onClick:function(){void copyReport();}},tx('复制诊断信息','Copy diagnostics'))),h('p',{className:'vr-hint',key:'doctor'},tx('需要完整 DSH 版本、安装、Profile、运行时路由和会话诊断时执行：dsh-vision-router doctor','For the full DSH version, installation, profile, runtime-route, and session report, run: dsh-vision-router doctor')),testState.status==='done'&&testState.result&&testState.result.ok!==true?h('p',{className:'vr-failed',key:'testerr'},String(testState.result.error||tx('连接测试失败','Connection test failed'))):null,actionState.status==='error'?h('p',{className:'vr-failed',key:'aerr'},String(actionState.error||'unknown')):null]),updatePanel());}
+      function diagnosticsPage(){var providerCount=groups.length,modelCount=groups.reduce(function(total,group){return total+arr(group&&group.models).length;},0),configured=chainRows().filter(function(row){return row&&row.provider&&row.model;}).length,ollama=obj(value('localOllama',{})),lm=obj(value('localLmStudio',{})),testText=!local?tx('仅本机可见','Local only'):testState.status==='running'?tx('检测中','Checking'):testState.status==='done'&&testState.result&&testState.result.ok===true?tx('连接正常','Connected'):testState.status==='done'?tx('连接失败','Failed'):tx('未检测','Not checked'),capsText=caps.status==='ready'?tx('正常','Ready'):caps.status==='loading'?tx('检测中','Checking'):caps.status==='error'?tx('不可用','Unavailable'):tx('未检测','Not checked');var rows=[[tx('设置协议','Settings contract'),String(value('settingsContractRevision','—'))],[tx('模型目录','Model catalog'),catalog.status==='ready'?tx('正常','Ready'):catalog.status==='loading'?tx('检测中','Checking'):tx('不可用','Unavailable')],[tx('图片能力元数据','Image capability metadata'),capsText],[tx('可选 Provider','Selectable providers'),String(providerCount)],[tx('可选模型','Selectable models'),String(modelCount)],[tx('已配置识图模型','Configured vision models'),String(configured)],[tx('内置免费兜底','Built-in free fallback'),toggleValue('freeFallback',true)?(caps.builtinFallback.length?tx('已启用，','Enabled, ')+caps.builtinFallback.length+tx(' 个模型',' models'):tx('已启用','Enabled')):tx('已关闭','Disabled')],[tx('后端连接','Backend connection'),testText],[tx('Ollama','Ollama'),local?(ollama.enabled===true?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('仅本机可见','Local only')],[tx('LM Studio','LM Studio'),local?(lm.enabled===true?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('仅本机可见','Local only')],[tx('桌面截图','Desktop capture'),local?(toggleValue('desktopScreenshot',false)?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('仅本机可见','Local only')],[tx('网络出口','Network egress'),local?(String(value('proxy','')).trim()?tx('视觉专用覆盖','Vision-only override'):tx('DSH/Host（默认）','DSH/Host (default)')):tx('仅本机可见','Local only')],[tx('识图结果去向','Vision result destination'),tx('当前聊天模型（可能为云端）','Current chat model (may be remote)')],[tx('远程设置','Remote settings'),local?(toggleValue('allowRemoteSettings',false)?tx('已启用','Enabled'):tx('未启用','Disabled')):tx('当前为远程安全视图','Remote safe view')]];function reportText(){return ['Vision Router diagnostics'].concat(rows.map(function(row){return row[0]+': '+row[1];}),['doctor: dsh-vision-router doctor']).join('\n');}async function copyReport(){try{if(typeof navigator!=='undefined'&&navigator.clipboard&&typeof navigator.clipboard.writeText==='function')await navigator.clipboard.writeText(reportText());setActionState({status:'copied'});}catch(error){setActionState({status:'error',error:error&&error.message?error.message:String(error)});}}return h(React.Fragment,null,title(tx('诊断','Diagnostics'),tx('状态页不会修改你的模型/路由设置；连接测试和更新操作会明确由按钮触发。','The status page does not change model or routing settings; connection tests and updates are explicit actions.')),card(rows.map(function(row){return diagnosticValue(row[0],row[1]);})),card([h('div',{className:'vr-ia-actions',key:'actions'},local?h('button',{type:'button',className:'vr-btn',disabled:testState.status==='running',onClick:function(){void runTestConnection();}},tx('测试连接','Test connection')):null,h('button',{type:'button',className:'vr-btn',onClick:function(){invalidateCatalog();}},tx('重新检测模型','Re-detect models')),local?h('button',{type:'button',className:'vr-btn',onClick:function(){void openLogs();}},tx('打开日志文件夹','Open logs folder')):null,h('button',{type:'button',className:'vr-btn',onClick:function(){void copyReport();}},tx('复制诊断信息','Copy diagnostics'))),h('p',{className:'vr-hint',key:'doctor'},tx('需要完整 DSH 版本、安装、Profile、运行时路由和会话诊断时执行：dsh-vision-router doctor','For the full DSH version, installation, profile, runtime-route, and session report, run: dsh-vision-router doctor')),testState.status==='done'&&testState.result&&testState.result.ok!==true?h('p',{className:'vr-failed',key:'testerr'},String(testState.result.error||tx('连接测试失败','Connection test failed'))):null,actionState.status==='error'?h('p',{className:'vr-failed',key:'aerr'},String(actionState.error||'unknown')):null]),updatePanel());}
 
       var pages=[['general',tx('常规','General')],['strategy',tx('识图策略','Vision strategy')],['local',tx('本地与设备','Local & device')],['advanced',tx('高级','Advanced')],['diagnostics',tx('诊断','Diagnostics')]];
       var content=page==='strategy'?strategyPage():page==='local'?localPageContent():page==='advanced'?advancedPage():page==='diagnostics'?diagnosticsPage():generalPage();
@@ -282,17 +283,16 @@ const SETTINGS_IA_STYLE = String.raw`
 `
 
 export function injectSettingsIaClientPrelude(html) {
-  if (typeof html !== 'string' || html.includes(CLIENT_MARK)) return html
-  const script = `<style ${CLIENT_MARK}>${SETTINGS_IA_STYLE}</style><script ${CLIENT_MARK}>${SETTINGS_IA_CLIENT_PRELUDE.replace(/<\/script/gi, '<\\/script')}</script>`
-  const closeHead = html.indexOf('</head>')
-  return closeHead === -1 ? `${html}${script}` : `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
+  const withStyle = injectClientStyleHtml(html, CLIENT_MARK, SETTINGS_IA_STYLE)
+  return injectClientCarrierHtml(withStyle, CLIENT_MARK, SETTINGS_IA_CLIENT_PRELUDE)
 }
 
 export function installSettingsIaClientPrelude(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectSettingsIaClientPrelude),
-      'vision-router: settings information architecture client prelude',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: CLIENT_MARK,
+    prelude: SETTINGS_IA_CLIENT_PRELUDE,
+    label: 'vision-router: Settings IA client prelude',
+    injectHtml: injectSettingsIaClientPrelude,
+    style: { marker: CLIENT_MARK, text: SETTINGS_IA_STYLE },
   })
 }

package/lib/settings-limit-client-prelude.js

@@ -1,3 +1,4 @@
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 import { SETTINGS_NUMBER_META } from './settings-number-contract.js'
 
 const CLIENT_MARK = 'data-vision-router-settings-limit-hardening'
@@ -94,17 +95,14 @@ export const SETTINGS_LIMIT_CLIENT_PRELUDE = String.raw`(function(){
 })();`
 
 export function injectSettingsLimitClientPrelude(html) {
-  if (typeof html !== 'string' || html.includes(CLIENT_MARK)) return html
-  const script = `<script ${CLIENT_MARK}>${SETTINGS_LIMIT_CLIENT_PRELUDE.replace(/<\/script/gi, '<\\/script')}</script>`
-  const closeHead = html.indexOf('</head>')
-  return closeHead === -1 ? `${html}${script}` : `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
+  return injectClientCarrierHtml(html, CLIENT_MARK, SETTINGS_LIMIT_CLIENT_PRELUDE)
 }
 
 export function installSettingsLimitClientPrelude(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectSettingsLimitClientPrelude),
-      'vision-router: settings numeric contract and limit diagnostics prelude',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: CLIENT_MARK,
+    prelude: SETTINGS_LIMIT_CLIENT_PRELUDE,
+    label: 'vision-router: settings numeric limits',
+    injectHtml: injectSettingsLimitClientPrelude,
   })
 }

package/lib/strict-live-model-client-prelude.js

@@ -1,3 +1,4 @@
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 import { LIVE_MODEL_CLIENT_PRELUDE } from './live-model-client-prelude.js'
 
 const CLIENT_PRELUDE_MARK = 'data-vision-router-live-models'
@@ -120,18 +121,14 @@ function replaceMergeCatalog(source) {
 export const STRICT_LIVE_MODEL_CLIENT_PRELUDE = replaceMergeCatalog(LIVE_MODEL_CLIENT_PRELUDE)
 
 export function injectStrictLiveModelClientPrelude(html) {
-  if (typeof html !== 'string' || html.includes(CLIENT_PRELUDE_MARK)) return html
-  const script = `<script ${CLIENT_PRELUDE_MARK}>${STRICT_LIVE_MODEL_CLIENT_PRELUDE.replace(/<\/script/gi, '<\\/script')}</script>`
-  const closeHead = html.indexOf('</head>')
-  if (closeHead !== -1) return `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
-  return `${html}${script}`
+  return injectClientCarrierHtml(html, CLIENT_PRELUDE_MARK, STRICT_LIVE_MODEL_CLIENT_PRELUDE)
 }
 
 export function installStrictLiveModelClientPrelude(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectStrictLiveModelClientPrelude),
-      'vision-router: strict live model client prelude',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: CLIENT_PRELUDE_MARK,
+    prelude: STRICT_LIVE_MODEL_CLIENT_PRELUDE,
+    label: 'vision-router: strict live model client prelude',
+    injectHtml: injectStrictLiveModelClientPrelude,
   })
 }

package/lib/v2-settings-ia-integration.js

@@ -1,4 +1,4 @@
-import { htmlHasScriptMarker } from './html-script-marker.js'
+import { appendStructuredClientCarrier, injectClientCarrierHtml } from './client-script-carrier.js'
 
 const V2_SETTINGS_IA_MARK = 'data-vision-router-v2-settings-ia'
 
@@ -241,16 +241,31 @@ export const V2_SETTINGS_IA_CLIENT = String.raw`(function(){
 })();`
 
 export function injectV2SettingsIaIntegration(html) {
-  if (typeof html !== 'string' || htmlHasScriptMarker(html, V2_SETTINGS_IA_MARK)) return html
-  const client = V2_SETTINGS_IA_CLIENT.replace(/<\/script/gi, '<\\/script')
-  const nodes = `<style>${V2_SETTINGS_IA_STYLE}</style><script ${V2_SETTINGS_IA_MARK}>${client}</script>`
-  const closeHead = html.indexOf('</head>')
-  return closeHead === -1 ? `${html}${nodes}` : `${html.slice(0, closeHead)}${nodes}${html.slice(closeHead)}`
+  if (typeof html !== 'string') return html
+  const styleMark = 'data-vision-router-v2-settings-ia-style'
+  let next = html
+  if (!next.includes(styleMark)) {
+    const style = `<style ${styleMark}>${V2_SETTINGS_IA_STYLE}</style>`
+    const closeHead = next.indexOf('</head>')
+    next = closeHead === -1 ? `${next}${style}` : `${next.slice(0, closeHead)}${style}${next.slice(closeHead)}`
+  }
+  return injectClientCarrierHtml(next, V2_SETTINGS_IA_MARK, V2_SETTINGS_IA_CLIENT)
 }
 
 export function installV2SettingsIaIntegration(ctx) {
   if (!ctx || typeof ctx.inject !== 'function') return
   ctx.inject(['webServer'], (webCtx) => {
+    if (typeof webCtx.on === 'function') {
+      webCtx.on('webserver/index-inject', (table) => {
+        if (!Array.isArray(table)) return
+        appendStructuredClientCarrier(table, V2_SETTINGS_IA_MARK, V2_SETTINGS_IA_CLIENT)
+        const styleMark = 'data-vision-router-v2-settings-ia-style'
+        if (!table.some((row) => row?.kind === 'style' && typeof row.text === 'string' && row.text.includes(styleMark))) {
+          table.push({ kind: 'style', placement: 'head', text: `/* ${styleMark} */
+${V2_SETTINGS_IA_STYLE}` })
+        }
+      })
+    }
     webCtx.effect(
       () => webCtx.webServer.tapIndex(injectV2SettingsIaIntegration),
       'vision-router: integrate v2 routing controls into settings IA',

package/lib/vision-background-benchmark.js

@@ -8,7 +8,7 @@ import {
 import { withHardDeadline } from './vision-capability-benchmark-hardening.js'
 import { resolveVisionRoutingAuthority } from './vision-routing-authority.js'
 import { redactDiagnosticText } from './diagnostic-redaction.js'
-import { injectVisionExactCheckClient } from './vision-exact-check-client.js'
+import { installVisionExactCheckClient } from './vision-exact-check-client.js'
 import { createImageInputVerdictStore } from './vision-image-input-verdict.js'
 import { createBackgroundBenchmarkStopStore } from './vision-background-stop-store.js'
 import { backgroundFailurePolicy } from './vision-background-failure-policy.js'
@@ -1033,12 +1033,10 @@ export function installBackgroundCapabilityProfiling(ctx, config, core, store, o
     // Cleanup registration is best-effort; the profiler remains process-scoped.
   }
 
+  installVisionExactCheckClient(ctx)
+
   try {
     ctx?.inject?.(['webServer'], (webCtx) => {
-      webCtx.effect(
-        () => webCtx.webServer.tapIndex(injectVisionExactCheckClient),
-        'vision-router: exact image check product control',
-      )
       webCtx.effect(() => webCtx.webServer.register({
         kind: 'exact',
         path: VISION_CAPABILITY_RUNTIME_PATH,

package/lib/vision-capability-benchmark-client.js

@@ -1,4 +1,4 @@
-import { htmlHasScriptMarker } from './html-script-marker.js'
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 
 const CLIENT_MARK = 'data-vision-router-capability-benchmark'
 
@@ -412,17 +412,14 @@ export const CAPABILITY_BENCHMARK_CLIENT = String.raw`(function(){
 })();`
 
 export function injectCapabilityBenchmarkClient(html) {
-  if (typeof html !== 'string' || htmlHasScriptMarker(html, CLIENT_MARK)) return html
-  const script = `<script ${CLIENT_MARK}>${CAPABILITY_BENCHMARK_CLIENT.replace(/<\/script/gi, '<\\/script')}</script>`
-  const head = html.indexOf('<head>')
-  return head === -1 ? `${script}${html}` : `${html.slice(0, head + 6)}${script}${html.slice(head + 6)}`
+  return injectClientCarrierHtml(html, CLIENT_MARK, CAPABILITY_BENCHMARK_CLIENT)
 }
 
 export function installCapabilityBenchmarkClient(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectCapabilityBenchmarkClient),
-      'vision-router: capability benchmark Host presentation client controls',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: CLIENT_MARK,
+    prelude: CAPABILITY_BENCHMARK_CLIENT,
+    label: 'vision-router: capability benchmark client',
+    injectHtml: injectCapabilityBenchmarkClient,
   })
 }

package/lib/vision-exact-check-client.js

@@ -1,4 +1,4 @@
-import { htmlHasScriptMarker } from './html-script-marker.js'
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 
 const CLIENT_MARK = 'data-vision-router-exact-check'
 
@@ -185,9 +185,14 @@ export const VISION_EXACT_CHECK_CLIENT = String.raw`(function(){
 })();`
 
 export function injectVisionExactCheckClient(html) {
-  if (typeof html !== 'string' || htmlHasScriptMarker(html, CLIENT_MARK)) return html
-  const script = `<script ${CLIENT_MARK}>${VISION_EXACT_CHECK_CLIENT.replace(/<\/script/gi, '<\\/script')}</script>`
-  const closeHead = html.indexOf('</head>')
-  if (closeHead !== -1) return `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
-  return `${html}${script}`
+  return injectClientCarrierHtml(html, CLIENT_MARK, VISION_EXACT_CHECK_CLIENT)
+}
+
+export function installVisionExactCheckClient(ctx) {
+  installClientScriptCarriers(ctx, {
+    marker: CLIENT_MARK,
+    prelude: VISION_EXACT_CHECK_CLIENT,
+    label: 'vision-router: exact image check product control',
+    injectHtml: injectVisionExactCheckClient,
+  })
 }

package/lib/vision-model-visibility-boundary-main.js

@@ -1,3 +1,4 @@
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 const VISION_MODE_WRAPPER_SOURCE = 'deepseek-official'
 const DEFAULT_WRAPPER_ROUTE = 'deepseek-vision'
 const MODEL_SELECTION_TARGET = '@deepseek-ai/dsh-client-ui-model-selection'
@@ -454,19 +455,14 @@ export const VISION_MODEL_VISIBILITY_PRELUDE = String.raw`(function(){
 })();`
 
 export function injectVisionModelVisibilityBoundary(html) {
-  if (typeof html !== 'string' || html.includes(VISIBILITY_MARK)) return html
-  const safe = VISION_MODEL_VISIBILITY_PRELUDE.replace(/<\/script/gi, '<\\/script')
-  const script = `<script ${VISIBILITY_MARK}>${safe}</script>`
-  const closeHead = html.indexOf('</head>')
-  if (closeHead !== -1) return `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
-  return `${html}${script}`
+  return injectClientCarrierHtml(html, VISIBILITY_MARK, VISION_MODEL_VISIBILITY_PRELUDE)
 }
 
 export function installVisionModelVisibilityBoundary(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectVisionModelVisibilityBoundary),
-      'vision-router: model visibility boundary',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: VISIBILITY_MARK,
+    prelude: VISION_MODEL_VISIBILITY_PRELUDE,
+    label: 'vision-router: model visibility boundary',
+    injectHtml: injectVisionModelVisibilityBoundary,
   })
 }

package/lib/vision-model-visibility-boundary.js

@@ -1,4 +1,4 @@
-import { htmlHasScriptMarker } from './html-script-marker.js'
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 import { VISION_MODEL_VISIBILITY_PRELUDE } from './vision-model-visibility-boundary-main.js'
 
 const VISIBILITY_MARK = 'data-vision-router-model-visibility-boundary'
@@ -10,19 +10,14 @@ export {
 } from './vision-model-visibility-boundary-main.js'
 
 export function injectVisionModelVisibilityBoundary(html) {
-  if (typeof html !== 'string' || htmlHasScriptMarker(html, VISIBILITY_MARK)) return html
-  const safe = VISION_MODEL_VISIBILITY_PRELUDE.replace(/<\/script/gi, '<\\/script')
-  const script = `<script ${VISIBILITY_MARK}>${safe}</script>`
-  const closeHead = html.indexOf('</head>')
-  if (closeHead !== -1) return `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
-  return `${html}${script}`
+  return injectClientCarrierHtml(html, VISIBILITY_MARK, VISION_MODEL_VISIBILITY_PRELUDE)
 }
 
 export function installVisionModelVisibilityBoundary(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectVisionModelVisibilityBoundary),
-      'vision-router: model visibility boundary',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: VISIBILITY_MARK,
+    prelude: VISION_MODEL_VISIBILITY_PRELUDE,
+    label: 'vision-router: model visibility boundary',
+    injectHtml: injectVisionModelVisibilityBoundary,
   })
 }

package/lib/vision-routing-settings-prelude.js

@@ -1,4 +1,4 @@
-import { htmlHasScriptMarker } from './html-script-marker.js'
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 
 const ROUTING_SETTINGS_PRELUDE_MARK = 'data-vision-router-routing-settings'
 
@@ -536,18 +536,14 @@ export const VISION_ROUTING_SETTINGS_PRELUDE = String.raw`(function(){
 })();`
 
 export function injectVisionRoutingSettingsPrelude(html) {
-  if (typeof html !== 'string' || htmlHasScriptMarker(html, ROUTING_SETTINGS_PRELUDE_MARK)) return html
-  const script = `<script ${ROUTING_SETTINGS_PRELUDE_MARK}>${VISION_ROUTING_SETTINGS_PRELUDE.replace(/<\/script/gi, '<\\/script')}</script>`
-  const closeHead = html.indexOf('</head>')
-  if (closeHead !== -1) return `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
-  return `${html}${script}`
+  return injectClientCarrierHtml(html, ROUTING_SETTINGS_PRELUDE_MARK, VISION_ROUTING_SETTINGS_PRELUDE)
 }
 
 export function installVisionRoutingSettingsPrelude(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectVisionRoutingSettingsPrelude),
-      'vision-router: v2 routing settings product panel',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: ROUTING_SETTINGS_PRELUDE_MARK,
+    prelude: VISION_ROUTING_SETTINGS_PRELUDE,
+    label: 'vision-router: Vision routing Settings prelude',
+    injectHtml: injectVisionRoutingSettingsPrelude,
   })
 }

package/lib/vision-toggle-root-hardening.js

@@ -331,9 +331,9 @@ function replaceAll(source, before, after) {
   return source.includes(before) ? source.split(before).join(after) : source
 }
 
-export function hardenVisionToggleHtml(html) {
-  if (typeof html !== 'string') return html
-  let next = html
+export function hardenVisionClientSource(source) {
+  if (typeof source !== 'string') return source
+  let next = source
 
   next = replaceAll(
     next,
@@ -430,6 +430,13 @@ export function hardenVisionToggleHtml(html) {
     `    var hardening = window.__dshVisionRouterRootHardening;\n    var recovery = hardening ? hardening.recoveryFor(directory) : undefined;\n    var store = wrapStore(directory.store, settings, recovery);`,
   )
 
+  return next
+}
+
+export function hardenVisionToggleHtml(html) {
+  if (typeof html !== 'string') return html
+  let next = hardenVisionClientSource(html)
+
   if (!next.includes(OWNERSHIP_MARK)) {
     const safe = CLIENT_PRELUDE.replace(/<\/script/gi, '<\\/script')
     const script = `<script ${OWNERSHIP_MARK}>${safe}</script>`
@@ -474,6 +481,24 @@ export function createVisionToggleRootHardening(ctx, config = {}) {
           }),
           'vision-router: route ownership',
         )
+        if (typeof webCtx.on === 'function') {
+          webCtx.on('webserver/index-inject', (table) => {
+            if (!Array.isArray(table)) return
+            for (const row of table) {
+              if (row?.kind === 'script' && typeof row.text === 'string') {
+                row.text = hardenVisionClientSource(row.text)
+              }
+            }
+            const signature = `/* ${OWNERSHIP_MARK} */`
+            if (!table.some((row) => row?.kind === 'script' && typeof row.text === 'string' && row.text.includes(signature))) {
+              table.push({
+                kind: 'script',
+                placement: 'head',
+                text: `${signature}\n${CLIENT_PRELUDE}`,
+              })
+            }
+          })
+        }
         webCtx.effect(
           () => webCtx.webServer.tapIndex(hardenVisionToggleHtml),
           'vision-router: vision toggle root hardening',

package/lib/vision-turn-budget-client-prelude.js

@@ -1,3 +1,4 @@
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
 const CLIENT_PRELUDE_MARK = 'data-vision-router-turn-budget'
 
 export const VISION_TURN_BUDGET_CLIENT_PRELUDE = String.raw`(function(){
@@ -259,18 +260,14 @@ export const VISION_TURN_BUDGET_CLIENT_PRELUDE = String.raw`(function(){
 })();`
 
 export function injectVisionTurnBudgetClientPrelude(html) {
-  if (typeof html !== 'string' || html.includes(CLIENT_PRELUDE_MARK)) return html
-  const script = `<script ${CLIENT_PRELUDE_MARK}>${VISION_TURN_BUDGET_CLIENT_PRELUDE.replace(/<\/script/gi, '<\\/script')}</script>`
-  const closeHead = html.indexOf('</head>')
-  if (closeHead !== -1) return `${html.slice(0, closeHead)}${script}${html.slice(closeHead)}`
-  return `${html}${script}`
+  return injectClientCarrierHtml(html, CLIENT_PRELUDE_MARK, VISION_TURN_BUDGET_CLIENT_PRELUDE)
 }
 
 export function installVisionTurnBudgetClientPrelude(ctx) {
-  ctx?.inject?.(['webServer'], (webCtx) => {
-    webCtx.effect(
-      () => webCtx.webServer.tapIndex(injectVisionTurnBudgetClientPrelude),
-      'vision-router: turn budget client prelude',
-    )
+  installClientScriptCarriers(ctx, {
+    marker: CLIENT_PRELUDE_MARK,
+    prelude: VISION_TURN_BUDGET_CLIENT_PRELUDE,
+    label: 'vision-router: turn budget client prelude',
+    injectHtml: injectVisionTurnBudgetClientPrelude,
   })
 }