@ljwei-stak/model-router-galgame 0.4.12 → 0.4.15

package/.dsh-plugin/client.js

@@ -61740,7 +61740,7 @@ var gal_scene_default = { version: 1, settings: { stageW: 1920, stageH: 1080, sh
 var name = "gal-view";
 var PROJECT_URL = "https://github.com/ljwei-stak/deepseek-harness";
 var RELEASES_URL = `${PROJECT_URL}/releases`;
-var PLUGIN_VERSION = "0.4.12";
+var PLUGIN_VERSION = "0.4.14";
 function createUpdateApi() {
   const bridge = globalThis.deepSeekHarnessDesktop;
   const openExternal = (url) => {

package/.dsh-plugin/index.mjs

@@ -15,6 +15,17 @@ import {
   modLensUpstream,
   routeThroughModLens,
 } from './shared/modlens-routing.mjs'
+import {
+  approvalGateStatus,
+  approvalSafetyContext,
+  decorateApprovalReason,
+  isApprovalGateReason,
+} from './shared/approval-gate.mjs'
+import {
+  webCapabilityForPlan,
+  webCapabilityStatus,
+  webInstruction,
+} from './shared/web-routing.mjs'
 
 let settingsRuntimePromise
 let routerSettings = { ...DEFAULT_ROUTER_SETTINGS }
@@ -213,6 +224,17 @@ function stageMessage(plan, step) {
   }
 }
 
+function webMessage(plan) {
+  const text = webInstruction(plan?.web)
+  if (text === '') return null
+  return {
+    id: newMessageId(),
+    role: 'user',
+    content: [{ type: 'text', text }],
+    source: { kind: 'plugin', plugin: name, form: 'web-capability', summary: '联网与可见浏览器策略' },
+  }
+}
+
 /**
  * Persona is a final-answer context only. It is intentionally a separate
  * message so the collaboration stages and their audit records remain free of
@@ -268,6 +290,7 @@ function analysisMessage(plan) {
     `缓存计费比例：读取 ${Math.round(Number(plan.optimization?.cacheReadRatio ?? 0) * 100)}%，写入 ${Math.round(Number(plan.optimization?.cacheWriteRatio ?? 0) * 100)}%（未填写时按普通输入计费）`,
     Number(plan.optimization?.budgetUsd ?? 0) > 0 ? `预算上限：$${Number(plan.optimization.budgetUsd).toFixed(6)}；${plan.optimization.budgetExceeded ? '仍超预算，已在质量下限内尽量压缩' : '满足预算约束'}` : '',
     `LiveBench：${plan.optimization?.liveBench?.fetchedAt ? `快照于 ${new Date(Number(plan.optimization.liveBench.fetchedAt)).toISOString()}${plan.optimization.liveBench.stale ? '（本次刷新失败，沿用上次快照）' : ''}` : '未完成联网核验，使用实验基线'}`,
+    plan.web?.needsWeb ? `联网策略：${plan.web.directBrowser ? 'Ego Browser 可见窗口优先' : 'ModSearch 搜索/抓取，失败时 Ego Browser 窗口兜底'}；反爬处理：人工接管后继续` : '',
     String(plan.reason ?? ''),
   ].filter(Boolean).join('\n')
   return {
@@ -432,6 +455,27 @@ export function apply(ctx) {
     routerSettingsPromise = registerRouterSettings(ctx)
   }
   const scheduleOpenCodeRepair = createOpenCodeRepairScheduler(ctx)
+
+  // dsh-approval-gate owns the actual decision. The router adds auditable
+  // stage/route context before that waterfall so multi-task escalations are
+  // visible to the gate's Flash classifier and human reviewer. The request
+  // object is borrowed by the Host approval service for this dispatch only.
+  ctx.on('approval/request', (request, next) => {
+    if (!isApprovalGateReason(request?.reason)) return next()
+    const state = request?.agent === undefined ? null : stateFor(request.agent)
+    const context = approvalSafetyContext(state, state?.lastStep)
+    const decorated = decorateApprovalReason(request.reason, context)
+    if (decorated !== request.reason) {
+      try {
+        request.reason = decorated
+      } catch {
+        // Some hosts freeze event payloads. In that case the gate still
+        // receives the original reason and remains fully fail-safe.
+      }
+    }
+    return next()
+  }, { prepend: true })
+
   ctx.commands.register({
     name: 'router',
     description: 'switch Model Router mode or inspect the latest routing plan',
@@ -440,7 +484,7 @@ export function apply(ctx) {
     // the whole composer submission; the GAL client sends this command
     // without image bytes so the attachment remains available for the next
     // user turn.
-    input: { hint: 'mode collective|single | plan', images: true },
+    input: { hint: 'mode collective|single | plan | safety', images: true },
     recordInput: true,
     handler: ({ agent, rawInput }) => {
       const state = stateFor(agent)
@@ -458,7 +502,13 @@ export function apply(ctx) {
       if (value === 'plan' || value === '') {
         return { kind: 'success', text: state.plan === null ? '还没有可展示的路由方案。' : JSON.stringify(state.plan) }
       }
-      return { kind: 'error', text: '用法：/router mode collective、/router mode single 或 /router plan' }
+      if (value === 'safety' || value === 'approval') {
+        return { kind: 'success', text: JSON.stringify({ ...approvalGateStatus(ctx), context: approvalSafetyContext(state, state.lastStep) }) }
+      }
+      if (value === 'web' || value === 'network') {
+        return { kind: 'success', text: JSON.stringify({ ...webCapabilityStatus(ctx), context: webCapabilityForPlan(state.taskText, state.plan) }) }
+      }
+      return { kind: 'error', text: '用法：/router mode collective、/router mode single、/router plan、/router safety 或 /router web' }
     },
   })
 
@@ -515,7 +565,7 @@ export function apply(ctx) {
       await routerSettingsPromise
       state.taskText = inputText(messages)
       const liveBench = await liveBenchFor(ctx, state)
-      state.plan = buildPlan({
+      const plan = buildPlan({
         text: state.taskText,
         available,
         mode: state.mode,
@@ -526,6 +576,16 @@ export function apply(ctx) {
         cacheReadRatio: routerSettings.cacheReadRatio,
         cacheWriteRatio: routerSettings.cacheWriteRatio,
       })
+      state.plan = {
+        ...plan,
+        web: webCapabilityForPlan(state.taskText, plan),
+        safety: {
+          ...approvalGateStatus(ctx),
+          ...approvalSafetyContext({ ...state, plan }, Number(step)),
+          hardCategories: ['deletion', 'credential', 'remote', 'system', 'bulk'],
+          failSafe: true,
+        },
+      }
       state.collaboration = shouldCollaborate(state.plan, available)
         ? { lastStep: 0, queuedStep: null }
         : null
@@ -538,11 +598,13 @@ export function apply(ctx) {
     const currentStep = Number.isFinite(Number(step)) ? Number(step) : state.lastStep + 1
     const stageContext = stageMessage(state.plan, currentStep)
     const analysisContext = currentStep === 1 ? analysisMessage(state.plan) : null
+    const webContext = currentStep === 1 ? webMessage(state.plan) : null
     const hasPersona = proposed.messages.some(message => message?.content?.some(block => isPersonaPrompt(block?.text)))
     if (hasPersona) state.personaInjected = true
     const personaContext = state.personaInjected ? null : personaMessage(state, agent, currentStep)
     const additions = []
     if (analysisContext !== null && !hasStageMarker(proposed.messages, currentStep)) additions.push(analysisContext)
+    if (webContext !== null && !proposed.messages.some(message => message?.content?.some(block => block?.text === webContext.content[0].text))) additions.push(webContext)
     if (personaContext !== null) {
       additions.push(personaContext)
       state.personaInjected = true

package/.dsh-plugin/shared/approval-gate.mjs

@@ -0,0 +1,109 @@
+/**
+ * Compatibility bridge for dsh-approval-gate.
+ *
+ * The approval-gate package owns the approval waterfall, Flash judgement,
+ * learning, audit files, snapshots and UI. This module only produces a small,
+ * deterministic safety context for the current Model Router work package.
+ * Keeping the bridge stateless makes it safe when the gate is installed by
+ * another profile layer as well as when it is bundled by this plugin.
+ */
+
+export const APPROVAL_GATE_PACKAGE = '@ljwei-stak/dsh-approval-gate'
+export const APPROVAL_GATE_VERSION = '0.5.2'
+
+const ESCALATION_RE = /escalate\s+sandbox\s+to\s+([^\s:]+):?\s*([\s\S]*)/i
+
+function clean(value, max = 240) {
+  return String(value ?? '').replace(/[\r\n]+/g, ' ').trim().slice(0, max)
+}
+
+function stageFor(state, step) {
+  const plan = state?.plan
+  const tasks = Array.isArray(plan?.subtasks) ? plan.subtasks : []
+  if (tasks.length === 0) return null
+  const index = Math.max(0, Number(step || state?.lastStep || 1) - 1)
+  return tasks[index] ?? tasks[tasks.length - 1] ?? null
+}
+
+/**
+ * Return the router safety facts that are relevant to an approval request.
+ * `bulk` is a candidate supplied as context; dsh-approval-gate still performs
+ * the authoritative category decision and fail-safe human handoff.
+ */
+export function approvalSafetyContext(state, step) {
+  const plan = state?.plan
+  const tasks = Array.isArray(plan?.subtasks) ? plan.subtasks : []
+  const stage = stageFor(state, step)
+  const collective = state?.mode === 'collective'
+  const multiTask = collective && plan?.complexity?.band === 'complex' && tasks.length >= 3
+  return {
+    mode: state?.mode ?? 'collective',
+    complexity: plan?.complexity?.band ?? 'unknown',
+    stage: stage?.id ?? null,
+    stagePurpose: stage?.purpose ?? null,
+    stageType: stage?.type ?? null,
+    stageIndex: tasks.length === 0 ? 0 : Math.max(1, Number(step || state?.lastStep || 1)),
+    stageCount: tasks.length,
+    multiTask,
+    candidateCategory: multiTask ? 'bulk' : 'neutral',
+    selectedRoute: plan?.selected?.provider && plan?.selected?.model
+      ? `${plan.selected.provider}/${plan.selected.model}`
+      : null,
+    activeRoute: state?.lastTarget?.provider && state?.lastTarget?.model
+      ? `${state.lastTarget.provider}/${state.lastTarget.model}`
+      : null,
+  }
+}
+
+/**
+ * Decorate the justification consumed by dsh-approval-gate. The original
+ * escalation prefix remains intact, so the target plugin can parse it. The
+ * marker is deliberately plain text because the target plugin's Flash model
+ * judges only the justification string.
+ */
+export function decorateApprovalReason(reason, context) {
+  const raw = String(reason ?? '')
+  const match = raw.match(ESCALATION_RE)
+  if (!match || context === null || context === undefined) return raw
+  const mode = clean(match[1], 64)
+  const justification = clean(match[2], 500)
+  const stage = context.stage ? `${context.stage} ${context.stageIndex}/${context.stageCount}` : 'unknown'
+  const route = context.activeRoute || context.selectedRoute || 'unassigned'
+  const marker = [
+    '[model-router safety context]',
+    `mode=${context.mode}`,
+    `complexity=${context.complexity}`,
+    `stage=${stage}`,
+    `purpose=${context.stagePurpose || 'unknown'}`,
+    `route=${route}`,
+    `task_count=${context.stageCount || 0}`,
+    `risk_candidate=${context.candidateCategory}`,
+    context.multiTask ? 'multi_task_review=required' : 'multi_task_review=not_applicable',
+  ].join('; ')
+  return `escalate sandbox to ${mode}: ${justification || 'router stage requires sandbox escalation'} ${marker}`.trim()
+}
+
+export function isApprovalGateReason(reason) {
+  return ESCALATION_RE.test(String(reason ?? ''))
+}
+
+export function approvalGateStatus(ctx) {
+  let approval = false
+  let permissionPresets = false
+  try {
+    approval = Boolean(ctx?.get?.('approval'))
+    permissionPresets = Boolean(ctx?.get?.('permissionPresets'))
+  } catch {
+    approval = false
+    permissionPresets = false
+  }
+  return {
+    package: APPROVAL_GATE_PACKAGE,
+    version: APPROVAL_GATE_VERSION,
+    bundled: true,
+    approvalServiceDetected: approval,
+    permissionPresetsDetected: permissionPresets,
+    policy: 'hard-risk-human-review',
+  }
+}
+

package/.dsh-plugin/shared/web-routing.mjs

@@ -0,0 +1,90 @@
+/**
+ * Web capability selection for the bundled ModSearch + Ego Browser pair.
+ *
+ * ModSearch owns search/fetch engines and SSRF protection. Ego Browser owns
+ * the real visible browser, login state, screenshots, and human-check handoff.
+ * This module only classifies intent and creates an auditable instruction for
+ * the model; it never fetches an untrusted URL itself.
+ */
+
+export const MODSEARCH_PACKAGE = '@liustack/modsearch'
+export const MODSEARCH_VERSION = '5.10.1'
+export const EGO_BROWSER_PACKAGE = 'dsh-ego-browser'
+export const EGO_BROWSER_VERSION = '0.8.0'
+
+const WEB_RE = /https?:\/\/|www\.|联网|上网|网页|网站|搜索|查找|资料|文献|新闻|最新|实时|网页内容|页面|来源|引用|网络|x\s*帖子|twitter|推特|github|反爬|验证码|登录|人机验证/i
+const BROWSER_RE = /反爬|验证码|人机验证|cloudflare|turnstile|recaptcha|hcaptcha|登录|需要点击|动态页面|网页窗口|浏览器|可见窗口|手动验证|页面交互/i
+
+function text(value, max = 12000) {
+  return String(value ?? '').slice(-max)
+}
+
+export function classifyWebIntent(input) {
+  const value = text(input)
+  const needsWeb = WEB_RE.test(value)
+  const directBrowser = BROWSER_RE.test(value)
+  return {
+    needsWeb,
+    directBrowser,
+    antiBotFallback: needsWeb,
+    primary: needsWeb ? 'modsearch' : 'native-model',
+    fallback: needsWeb ? 'ego-browser' : null,
+    reason: directBrowser
+      ? '用户明确要求动态网页、登录态或反爬页面，优先使用可见 Ego Browser。'
+      : needsWeb
+        ? '先使用 ModSearch 搜索/抓取；失败、内容不完整或触发人机验证时切换 Ego Browser。'
+        : '',
+  }
+}
+
+export function webCapabilityForPlan(input, plan = null) {
+  const intent = classifyWebIntent(input)
+  const tasks = Array.isArray(plan?.subtasks) ? plan.subtasks : []
+  return {
+    ...intent,
+    taskCount: tasks.length,
+    stageAware: tasks.length > 1,
+    packages: {
+      search: MODSEARCH_PACKAGE,
+      browser: EGO_BROWSER_PACKAGE,
+    },
+    versions: {
+      search: MODSEARCH_VERSION,
+      browser: EGO_BROWSER_VERSION,
+    },
+    humanCheckPolicy: 'pause-and-handoff',
+  }
+}
+
+export function webCapabilityStatus(ctx) {
+  let web = false
+  let tools = false
+  try {
+    web = Boolean(ctx?.get?.('web'))
+    tools = Boolean(ctx?.get?.('tools'))
+  } catch {
+    web = false
+    tools = false
+  }
+  return {
+    modsearch: { package: MODSEARCH_PACKAGE, version: MODSEARCH_VERSION, bundled: true, webServiceDetected: web },
+    egoBrowser: { package: EGO_BROWSER_PACKAGE, version: EGO_BROWSER_VERSION, bundled: true, toolServiceDetected: tools },
+    antiBotWindow: 'ego_space_open -> ego_navigate -> ego_page_info/ego_captcha -> ego_snapshot/ego_screenshot',
+    humanCheck: 'pause-and-handoff',
+  }
+}
+
+export function webInstruction(capability) {
+  if (!capability?.needsWeb) return ''
+  const browserFirst = capability.directBrowser
+  return [
+    '[联网与可见浏览器适配]',
+    browserFirst
+      ? '本任务涉及动态网页、登录态或反爬页面：优先使用 Ego Browser 的真实可见窗口。'
+      : '普通联网先使用 ModSearch 提供的 web_search/read_page；需要 X 内容时使用 x_search。',
+    '如果搜索或抓取返回 unavailable、内容不完整、JS 页面空白或 warnings，切换 Ego Browser：先 ego_space_open，再 ego_navigate；随后调用 ego_page_info 或 ego_captcha 检查 humanCheck。',
+    '页面可读时使用 ego_snapshot、ego_read_element、ego_screenshot 或 ego_http(browser) 提取证据；必须交互时使用 ego_click、ego_fill、ego_wait*。',
+    '检测到验证码、Cloudflare、Turnstile、登录或其他 humanCheck=true 时，暂停当前工作包，提示用户在 Agent 浏览器观察窗完成验证；用户确认后再继续。不要绕过验证码或伪造验证结果。',
+    '联网证据必须保留 URL、页面状态和不确定性说明；批量抓取仍遵守审批门控。',
+  ].join('\n')
+}