From 1e1d119a2af2dc337a77f77f8aaa1bdb9f2a67f4 Mon Sep 17 00:00:00 2001
From: harveysang <harveysang@outlook.com>
Date: Mon, 24 Aug 2026 23:06:22 +0800
Subject: [PATCH] feat: sync DeepSeek Harness plugin main

---
 deepseek-harness-plugin/README.md             |   1 +
 deepseek-harness-plugin/README.zh.md          |   1 +
 deepseek-harness-plugin/SOURCE.md             |   2 +-
 .../docs/install-for-beginners.zh.md          |   2 +-
 deepseek-harness-plugin/docs/use-cases.zh.md  |   2 +-
 .../src/client/BrowserInstallPrompt.tsx       |  10 +-
 .../src/client/CoremateClaimBridge.tsx        |  34 +-
 .../src/client/CoremateView.tsx               |  62 +++-
 .../src/client/MirrorButton.tsx               |  10 +-
 .../src/client/PhoneStream.tsx                | 118 ++++---
 .../src/client/coremate-trigger.ts            |  13 +-
 deepseek-harness-plugin/src/client/index.tsx  |   2 +-
 .../src/client/promotion-data.ts              |  53 ++-
 .../src/client/session-bridge.ts              |  43 ++-
 .../src/client/task-status-store.ts           |   4 +
 .../src/client/video-decoder.ts               |  85 +++--
 deepseek-harness-plugin/src/concurrency.ts    |  53 +++
 deepseek-harness-plugin/src/configuration.ts  |  21 +-
 deepseek-harness-plugin/src/device-fleet.ts   |   2 +-
 .../src/forward-registry.ts                   | 280 ++++++++++++++++
 deepseek-harness-plugin/src/index.ts          | 316 +++++++++++++-----
 deepseek-harness-plugin/src/phone-progress.ts |  12 +-
 deepseek-harness-plugin/src/phone-task.ts     | 197 +++++++----
 deepseek-harness-plugin/src/preview.ts        |  86 ++---
 deepseek-harness-plugin/src/scrcpy-stream.ts  |  54 ++-
 deepseek-harness-plugin/src/scrcpy.ts         | 231 +++++++++++--
 deepseek-harness-plugin/src/suggestions.ts    |  14 +-
 deepseek-harness-plugin/tests/adb.spec.ts     |   7 +
 .../tests/browser-install-prompt.spec.ts      |   2 +-
 deepseek-harness-plugin/tests/bundle.spec.ts  |   4 +-
 .../tests/concurrency.spec.ts                 |  38 +++
 .../tests/coremate-claim-bridge.spec.ts       |  19 +-
 .../tests/coremate-trigger.spec.ts            |  11 +-
 .../tests/coremate-view.spec.ts               |   2 +-
 .../tests/device-fleet.spec.ts                |  15 +
 .../tests/forward-registry.spec.ts            | 143 ++++++++
 .../tests/phone-progress.spec.ts              |   6 +-
 .../tests/phone-task.spec.ts                  |  40 ++-
 deepseek-harness-plugin/tests/preview.spec.ts |  34 ++
 .../tests/promotion.spec.ts                   |  37 +-
 deepseek-harness-plugin/tests/scrcpy.spec.ts  | 115 +++++++
 .../tests/session-bridge.spec.ts              |  72 ++++
 .../tests/stream-manager.spec.ts              |  55 ++-
 .../tests/suggestions.spec.ts                 |  24 ++
 .../tests/task-status-store.spec.ts           |   6 +
 .../tests/video-decoder.spec.ts               | 130 +++++++
 46 files changed, 2055 insertions(+), 413 deletions(-)
 create mode 100644 deepseek-harness-plugin/src/concurrency.ts
 create mode 100644 deepseek-harness-plugin/src/forward-registry.ts
 create mode 100644 deepseek-harness-plugin/tests/concurrency.spec.ts
 create mode 100644 deepseek-harness-plugin/tests/forward-registry.spec.ts
 create mode 100644 deepseek-harness-plugin/tests/video-decoder.spec.ts

diff --git a/deepseek-harness-plugin/README.md b/deepseek-harness-plugin/README.md
index dd1d8f4..cac51a3 100644
--- a/deepseek-harness-plugin/README.md
+++ b/deepseek-harness-plugin/README.md
@@ -209,6 +209,7 @@ The plugin checks for its managed Chromium only when a task actually calls `brow
 | `apiKeyEnv` | Harness credential reference; default `COREMATE_MOBILE_API_KEY`. |
 | `commandTimeoutMs` | Base timeout for local ADB processes and browser actions; default 15 seconds. |
 | `maxOperations` | Maximum `phone_control` or `browser_control` calls in one child task; default 100. |
+| `maxParallelDevices` | Maximum selected phones processed concurrently by one OpenGUI task; default 4, range 1–16. |
 | `contextWindow` | Declared model context capacity; default 262,144 tokens. |
 | `maxTokens` | Declared maximum model output; default 32,768 tokens. |
 | `streamIdleTimeoutMs` | Maximum interval without a model stream event; default 300 seconds. |
diff --git a/deepseek-harness-plugin/README.zh.md b/deepseek-harness-plugin/README.zh.md
index a27e40a..c9e72b8 100644
--- a/deepseek-harness-plugin/README.zh.md
+++ b/deepseek-harness-plugin/README.zh.md
@@ -211,6 +211,7 @@ OpenGUI 任务运行时，输入框右侧会出现方形“停止 OpenGUI 操作
 | `apiKeyEnv` | Harness 凭据引用；默认 `COREMATE_MOBILE_API_KEY`。 |
 | `commandTimeoutMs` | 每个本地 ADB 进程及浏览器动作的基础超时；默认 15 秒。 |
 | `maxOperations` | 单次子任务允许的 `phone_control` 或 `browser_control` 调用上限；默认 100 次。 |
+| `maxParallelDevices` | 单个 OpenGUI 任务同时处理的已选手机上限；默认 4，范围 1–16。 |
 | `contextWindow` | 声明的模型上下文容量；默认 262,144 token。 |
 | `maxTokens` | 声明的最大模型输出；默认 32,768 token。 |
 | `streamIdleTimeoutMs` | 模型 stream 无新事件的最长时间；默认 300 秒。 |
diff --git a/deepseek-harness-plugin/SOURCE.md b/deepseek-harness-plugin/SOURCE.md
index 7004117..a37edc3 100644
--- a/deepseek-harness-plugin/SOURCE.md
+++ b/deepseek-harness-plugin/SOURCE.md
@@ -5,7 +5,7 @@ This directory was imported from the standalone
 repository.
 
 - Source branch: `main`
-- Source commit: `2675d3c2e3428595d1d6cdb016dd641dece75ebf`
+- Source commit: `7a77c0ab222121d466c23c92c5df24d680c7c3a1`
 - Import date: 2026-08-24
 
 The source commit is the migration baseline. Local uncommitted changes from the
diff --git a/deepseek-harness-plugin/docs/install-for-beginners.zh.md b/deepseek-harness-plugin/docs/install-for-beginners.zh.md
index 30bda47..e346853 100644
--- a/deepseek-harness-plugin/docs/install-for-beginners.zh.md
+++ b/deepseek-harness-plugin/docs/install-for-beginners.zh.md
@@ -94,7 +94,7 @@ Usage: /opengui <task>
 
 如果终端出现红色错误，请不要继续操作手机，先查看本文末尾的“常见问题”。
 
-打开 DSH、查看手机列表或点击眼睛手动投屏，都不需要先填写 OpenGUI 专用模型。
+打开 DSH、查看 OpenGUI Tab 手机列表或使用“独立窗口”，都不需要先填写 OpenGUI 专用模型。
 
 页面顶部还会出现 `OpenGUI` Tab。进入后，已连接手机的画面默认展开；下方三个场景模板只会把 `@OpenGUI` 任务填入输入框，不会自动发送。
 
diff --git a/deepseek-harness-plugin/docs/use-cases.zh.md b/deepseek-harness-plugin/docs/use-cases.zh.md
index 0c591d2..81ed20e 100644
--- a/deepseek-harness-plugin/docs/use-cases.zh.md
+++ b/deepseek-harness-plugin/docs/use-cases.zh.md
@@ -51,7 +51,7 @@ OpenGUI 通过当前 DSH 会话模型操作已授权的 Android 手机，并按
 - 空 `/opengui` 和裸 `@OpenGUI` 只显示用法，不检查手机或模型。
 - 当前模型明确支持图片时直接使用；不兼容时才进入专用视觉模型回退。
 - 能力错误不会自动重试，避免重复产生手机或浏览器副作用。
-- 原生投屏只读，必须手动点击眼睛打开；任务完成不会自动关闭投屏。
+- OpenGUI Tab 的实时画面只读；需要单独放大查看时可手动打开“独立窗口”，任务完成不会自动关闭该窗口。
 - 点击任务完成卡片中的追问只会生成 `@OpenGUI` 草稿，请检查后再发送。
 
 需要帮助可加入 [OpenGUI Discord](https://discord.gg/pqHHw7XgJ3)。本版本的微信群入口仍是不可扫码占位，请勿扫描来历不明的二维码。
diff --git a/deepseek-harness-plugin/src/client/BrowserInstallPrompt.tsx b/deepseek-harness-plugin/src/client/BrowserInstallPrompt.tsx
index 992a9f9..f2e217b 100644
--- a/deepseek-harness-plugin/src/client/BrowserInstallPrompt.tsx
+++ b/deepseek-harness-plugin/src/client/BrowserInstallPrompt.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import type { CSSProperties } from 'react'
 import {
   BROWSER_INSTALL_APPROVE_PATH,
@@ -69,7 +69,7 @@ export function browserInstallPresentation(status?: BrowserInstallStatus): Brows
       : undefined
     return {
       kind: 'progress',
-      label: percent === undefined ? '正在下载托管浏览器…' : `正在下载托管浏览器：${percent}%`,
+      label: '正在下载托管浏览器…',
       ...(percent === undefined ? {} : { percent }),
     }
   }
@@ -79,6 +79,7 @@ export function browserInstallPresentation(status?: BrowserInstallStatus): Brows
 
 /** Inline first-use consent and progress for the plugin-managed browser. */
 export function BrowserInstallPrompt(): JSX.Element | null {
+  const panel = useRef<HTMLElement>(null)
   const [status, setStatus] = useState<BrowserInstallStatus>()
   const [pending, setPending] = useState(false)
   const [error, setError] = useState<string>()
@@ -120,10 +121,13 @@ export function BrowserInstallPrompt(): JSX.Element | null {
   }, [])
 
   const presentation = browserInstallPresentation(status)
+  useEffect(() => {
+    if (presentation.kind === 'confirmation') panel.current?.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
+  }, [presentation.kind])
   if (presentation.kind === 'hidden') return null
   if (presentation.kind === 'confirmation' && status !== undefined) {
     return (
-      <section style={panelStyle} role="alert" data-coremate-browser-install="awaiting-confirmation">
+      <section ref={panel} style={panelStyle} role="alert" data-coremate-browser-install="awaiting-confirmation">
         <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', flexWrap: 'wrap', gap: 12 }}>
           <div style={{ flex: '1 1 260px', minWidth: 0 }}>
             <strong style={{ display: 'block', marginBottom: 4, fontSize: 14 }}>启用托管浏览器</strong>
diff --git a/deepseek-harness-plugin/src/client/CoremateClaimBridge.tsx b/deepseek-harness-plugin/src/client/CoremateClaimBridge.tsx
index 1920073..a61f38d 100644
--- a/deepseek-harness-plugin/src/client/CoremateClaimBridge.tsx
+++ b/deepseek-harness-plugin/src/client/CoremateClaimBridge.tsx
@@ -1,4 +1,7 @@
 import { useEffect } from 'react'
+import type { ISessions } from '@deepseek-ai/dsh-client-runtime/client'
+import { isUntitledSession, taskTitle } from './coremate-trigger.ts'
+import { coremateTaskStatusStore } from './task-status-store.ts'
 
 export interface CoremateDraftActions {
   /** Upgrade the leading @OpenGUI token through the scoped DSH claim event. */
@@ -20,6 +23,16 @@ interface InputSnapshot {
 interface CoremateClaimBridgeProps {
   readonly useInput: <T>(selector: (state: InputSnapshot) => T) => T
   readonly coremateDraftActions: CoremateDraftActions
+  readonly coremateSessionId: string
+  readonly coremateSessions: ISessions
+}
+
+export function directOpenGuiTask(draft: string): string | undefined {
+  return /^\/(?:opengui|coremate)\s+(.+)$/iu.exec(draft.trim())?.[1]?.trim() || undefined
+}
+
+export function submittedDirectOpenGuiTask(draft: string, phase: InputSnapshot['phase']): string | undefined {
+  return phase === 'submitting' ? directOpenGuiTask(draft) : undefined
 }
 
 /** Include one existing separator so the command claim does not duplicate it. */
@@ -34,7 +47,12 @@ export function coremateClaimSpan(draft: string, draftRev: number): CoremateClai
 }
 
 /** Make menu picks, typed text, pasted text, and template drafts share one native claim. */
-export function CoremateClaimBridge({ useInput, coremateDraftActions }: CoremateClaimBridgeProps): null {
+export function CoremateClaimBridge({
+  useInput,
+  coremateDraftActions,
+  coremateSessionId,
+  coremateSessions,
+}: CoremateClaimBridgeProps): null {
   const draft = useInput(state => state.draft)
   const draftRev = useInput(state => state.draftRev)
   const phase = useInput(state => state.phase)
@@ -44,5 +62,19 @@ export function CoremateClaimBridge({ useInput, coremateDraftActions }: Coremate
     const span = coremateClaimSpan(draft, draftRev)
     if (span) coremateDraftActions.claim(span)
   }, [coremateDraftActions, draft, draftRev, phase])
+
+  useEffect(() => {
+    const task = submittedDirectOpenGuiTask(draft, phase)
+    if (task === undefined) return
+    coremateTaskStatusStore.markConsumedSession(coremateSessionId)
+    coremateTaskStatusStore.beginLaunch(coremateSessionId)
+    const sessions = coremateSessions
+    const id = coremateSessionId as keyof ReturnType<typeof sessions.list.getSnapshot>['byId']
+    const row = sessions.list.getSnapshot().byId[id]
+    const binding = sessions.binding(id)
+    if (isUntitledSession(row?.title) && binding !== undefined) {
+      void binding.session.rename(taskTitle(task)).catch(() => {})
+    }
+  }, [coremateSessionId, coremateSessions, draft, phase])
   return null
 }
diff --git a/deepseek-harness-plugin/src/client/CoremateView.tsx b/deepseek-harness-plugin/src/client/CoremateView.tsx
index 9fcd2dc..4d99756 100644
--- a/deepseek-harness-plugin/src/client/CoremateView.tsx
+++ b/deepseek-harness-plugin/src/client/CoremateView.tsx
@@ -2,13 +2,16 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import type { CSSProperties } from 'react'
 import {
   DEVICE_SELECTION_PATH,
+  DEVICE_STREAM_ENABLE_PATH,
+  DEVICE_STREAM_STATUS_PATH,
   MIRROR_START_PATH,
   MIRROR_STOP_PATH,
 } from '../mirror-contract.ts'
 import type { MirrorDeviceStatus, MirrorStatus } from '../mirror-contract.ts'
+import type { ScrcpyStreamStatus } from '../scrcpy-stream.ts'
 import { BrowserInstallPrompt } from './BrowserInstallPrompt.tsx'
 import { OpenGuiMark } from './OpenGuiMark.tsx'
-import { postMirrorStatus, readMirrorStatus } from './MirrorButton.tsx'
+import { mirrorBusy, mirrorLabel, mirrorProgress, postMirrorStatus, readMirrorStatus } from './MirrorButton.tsx'
 import { TaskStopButton } from './TaskStopButton.tsx'
 import { PhoneStream } from './PhoneStream.tsx'
 
@@ -18,11 +21,8 @@ const OPENGUI_WEBSITE_URL = 'https://opengui.ai/'
 
 const rootStyle: CSSProperties = {
   width: '100%',
-  height: 'calc(100dvh - 74px)',
   margin: 0,
   padding: '16px clamp(16px, 2vw, 32px) 180px',
-  overflowY: 'auto',
-  scrollbarGutter: 'stable both-edges',
   boxSizing: 'border-box',
   containerType: 'inline-size',
   color: 'var(--dsw-alias-label-primary, #27272a)',
@@ -153,6 +153,8 @@ export function CoremateView({ coremateSessionId }: { readonly coremateSessionId
   const seenDevices = useRef(new Set<string>())
   const [pending, setPending] = useState(false)
   const [error, setError] = useState<string>()
+  const [streamStatus, setStreamStatus] = useState<ScrcpyStreamStatus>()
+  const [streamGeneration, setStreamGeneration] = useState(0)
 
   useEffect(() => {
     const controller = new AbortController()
@@ -162,7 +164,9 @@ export function CoremateView({ coremateSessionId }: { readonly coremateSessionId
         const next = await readMirrorStatus(controller.signal)
         setStatus(next)
         setExpanded(current => {
-          const value = new Set(current)
+          const connectedIds = new Set(next.devices.map(device => device.id))
+          const value = new Set([...current].filter(id => connectedIds.has(id)))
+          seenDevices.current = new Set([...seenDevices.current].filter(id => connectedIds.has(id)))
           for (const device of next.devices) {
             if (seenDevices.current.has(device.id)) continue
             seenDevices.current.add(device.id)
@@ -184,6 +188,32 @@ export function CoremateView({ coremateSessionId }: { readonly coremateSessionId
     }
   }, [])
 
+  useEffect(() => {
+    const controller = new AbortController()
+    let timer: ReturnType<typeof setTimeout> | undefined
+    const poll = async (): Promise<void> => {
+      try {
+        const response = await fetch(DEVICE_STREAM_STATUS_PATH, { cache: 'no-store', signal: controller.signal })
+        if (response.ok) setStreamStatus(await response.json() as ScrcpyStreamStatus)
+      } catch { /* stream support is optional; each card retains screenshot fallback */ }
+      finally {
+        if (!controller.signal.aborted) timer = setTimeout(poll, document.hidden ? 5_000 : 1_500)
+      }
+    }
+    void poll()
+    return () => {
+      controller.abort()
+      if (timer !== undefined) clearTimeout(timer)
+    }
+  }, [])
+
+  const enableStream = useCallback(async (): Promise<void> => {
+    const response = await fetch(DEVICE_STREAM_ENABLE_PATH, { method: 'POST', headers: { Accept: 'application/json' } })
+    if (!response.ok) throw new Error(`启用实时画面失败 (${response.status})`)
+    setStreamStatus(await response.json() as ScrcpyStreamStatus)
+    setStreamGeneration(value => value + 1)
+  }, [])
+
   const mutate = useCallback(async (path: string, ids: readonly string[]): Promise<void> => {
     setPending(true)
     try {
@@ -198,7 +228,6 @@ export function CoremateView({ coremateSessionId }: { readonly coremateSessionId
 
   const selected = status?.devices.filter(device => device.selected).map(device => device.id) ?? []
   const wallItems = buildDeviceWallItems(status?.devices ?? [])
-  const anyExpanded = status?.devices.some(device => expanded.has(device.id)) ?? false
   return (
     <main style={rootStyle} lang="zh-CN" data-coremate-view>
       <style>{`
@@ -230,13 +259,13 @@ export function CoremateView({ coremateSessionId }: { readonly coremateSessionId
         </div>
       </header>
 
-      <BrowserInstallPrompt />
+      <div style={{ position: 'sticky', top: 0, zIndex: 10 }}><BrowserInstallPrompt /></div>
 
       <section aria-label="设备照片墙" style={gridStyle} data-coremate-device-wall>
         {wallItems.map(item => {
           if (item.kind === 'connect-more') {
             return (
-              <aside key="connect-more" style={{ ...connectStyle, minHeight: anyExpanded ? 'min(56vh, 620px)' : 360 }} data-coremate-connect-more>
+              <aside key="connect-more" style={connectStyle} data-coremate-connect-more>
                 <div>
                   <span aria-hidden="true" style={{ display: 'inline-grid', placeItems: 'center', width: 48, height: 48, marginBottom: 16, border: '1px solid currentColor', borderRadius: 999, fontSize: 30, fontWeight: 300, lineHeight: 1 }}>+</span>
                   <h2 style={{ margin: '0 0 8px', fontSize: 17, lineHeight: 1.35, fontWeight: 720 }}>连接更多设备</h2>
@@ -252,7 +281,7 @@ export function CoremateView({ coremateSessionId }: { readonly coremateSessionId
           const active = mirrorActive(device)
           const open = expanded.has(device.id)
           return (
-            <article key={device.id} style={{ ...deviceStyle, alignSelf: open ? 'stretch' : 'start' }} data-coremate-device-card>
+            <article key={device.id} style={deviceStyle} data-coremate-device-card>
                 <div style={deviceHeaderStyle}>
                   <label style={{ display: 'flex', flex: '1 1 92px', alignItems: 'center', gap: 7, minWidth: 0, cursor: status?.selectionLocked === true ? 'not-allowed' : 'pointer' }}>
                     <input
@@ -265,16 +294,25 @@ export function CoremateView({ coremateSessionId }: { readonly coremateSessionId
                     <span aria-label={device.connected ? '在线' : '已断开'} title={device.connected ? '在线' : '已断开'} style={{ width: 6, height: 6, flex: '0 0 auto', borderRadius: 999, background: device.connected ? '#16a34a' : '#a1a1aa' }} />
                   </label>
                   <div style={{ display: 'flex', flex: '0 0 auto', gap: 6 }}>
-                    <button data-coremate-press type="button" style={actionStyle} aria-expanded={open} onClick={() => setExpanded(current => {
+                    <button data-coremate-press type="button" style={actionStyle} aria-label={`${open ? '收起' : '展开'} ${device.label} 画面`} aria-expanded={open} onClick={() => setExpanded(current => {
                       const next = new Set(current)
                       if (next.has(device.id)) next.delete(device.id)
                       else next.add(device.id)
                       return next
                     })}>{open ? '收起' : '展开'}</button>
-                    <button data-coremate-press type="button" style={{ ...actionStyle, color: active ? '#b45309' : actionStyle.color }} disabled={pending || !device.connected} onClick={() => void mutate(active ? MIRROR_STOP_PATH : MIRROR_START_PATH, [device.id])}>{active ? '关闭窗口' : '独立窗口'}</button>
+                    <button
+                      data-coremate-press
+                      type="button"
+                      style={{ ...actionStyle, color: active ? '#b45309' : actionStyle.color }}
+                      aria-label={mirrorLabel(device)}
+                      aria-busy={mirrorBusy(device)}
+                      disabled={pending || device.phase === 'unsupported' || (!device.connected && !active)}
+                      onClick={() => void mutate(active ? MIRROR_STOP_PATH : MIRROR_START_PATH, [device.id])}
+                    >{mirrorProgress(device) ?? (active ? '关闭窗口' : '独立窗口')}</button>
                   </div>
                 </div>
-                <PhoneStream device={device} expanded={open} />
+                {device.message === undefined ? null : <div role="status" style={{ padding: '0 12px 8px', color: device.phase === 'error' ? '#b91c1c' : 'var(--dsw-alias-label-secondary, #52525b)', fontSize: 11 }}>{device.message}</div>}
+                <PhoneStream device={device} expanded={open} streamStatus={streamStatus} streamGeneration={streamGeneration} enableStream={enableStream} />
             </article>
           )
         })}
diff --git a/deepseek-harness-plugin/src/client/MirrorButton.tsx b/deepseek-harness-plugin/src/client/MirrorButton.tsx
index 80c6794..bdb9877 100644
--- a/deepseek-harness-plugin/src/client/MirrorButton.tsx
+++ b/deepseek-harness-plugin/src/client/MirrorButton.tsx
@@ -83,7 +83,7 @@ const messageStyle: CSSProperties = {
   overflowWrap: 'anywhere',
 }
 
-function mirrorLabel(device: MirrorDeviceStatus): string {
+export function mirrorLabel(device: MirrorDeviceStatus): string {
   switch (device.phase) {
     case 'downloading': {
       const percent = device.downloadedBytes !== undefined && device.totalBytes
@@ -102,7 +102,7 @@ function mirrorLabel(device: MirrorDeviceStatus): string {
   }
 }
 
-function progressFor(device: MirrorDeviceStatus): string | undefined {
+export function mirrorProgress(device: MirrorDeviceStatus): string | undefined {
   if (device.phase === 'downloading') {
     return device.downloadedBytes !== undefined && device.totalBytes
       ? `${Math.min(100, Math.round((device.downloadedBytes / device.totalBytes) * 100))}%`
@@ -122,7 +122,7 @@ function WindowIcon({ active }: { active: boolean }): JSX.Element {
   )
 }
 
-function isBusy(device: MirrorDeviceStatus): boolean {
+export function mirrorBusy(device: MirrorDeviceStatus): boolean {
   return device.phase === 'downloading' || device.phase === 'extracting' || device.phase === 'launching'
 }
 
@@ -195,10 +195,10 @@ export function MirrorButton(): JSX.Element | null {
         {status.devices.length === 0
           ? <span style={messageStyle}>未检测到已授权的 Android 手机</span>
           : status.devices.map(device => {
-            const busy = isBusy(device)
+            const busy = mirrorBusy(device)
             const mirrorActive = busy || device.phase === 'running'
             const mirrorDisabled = pending || device.phase === 'unsupported' || (!device.connected && !mirrorActive)
-            const progress = progressFor(device)
+            const progress = mirrorProgress(device)
             return (
             <div
               key={device.id}
diff --git a/deepseek-harness-plugin/src/client/PhoneStream.tsx b/deepseek-harness-plugin/src/client/PhoneStream.tsx
index e3b4aae..30792f1 100644
--- a/deepseek-harness-plugin/src/client/PhoneStream.tsx
+++ b/deepseek-harness-plugin/src/client/PhoneStream.tsx
@@ -2,9 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import type { CSSProperties } from 'react'
 import {
   DEVICE_PREVIEW_PATH,
-  DEVICE_STREAM_ENABLE_PATH,
   DEVICE_STREAM_PATH,
-  DEVICE_STREAM_STATUS_PATH,
   type MirrorDeviceStatus,
 } from '../mirror-contract.ts'
 import type { ScrcpyStreamStatus } from '../scrcpy-stream.ts'
@@ -57,16 +55,20 @@ function usePageVisible(): boolean {
   return visible
 }
 
-function ScreenshotFallback({ device }: { readonly device: MirrorDeviceStatus }): JSX.Element {
+function ScreenshotFallback({ device, active }: { readonly device: MirrorDeviceStatus, readonly active: boolean }): JSX.Element {
   const [url, setUrl] = useState<string>()
   const [error, setError] = useState<string>()
+  const [lastUpdated, setLastUpdated] = useState<number>()
   const etag = useRef<string>()
+  const currentUrl = useRef<string>()
+  useEffect(() => () => {
+    if (currentUrl.current !== undefined) URL.revokeObjectURL(currentUrl.current)
+  }, [device.id])
   useEffect(() => {
+    if (!active) return
     const controller = new AbortController()
     let timer: ReturnType<typeof setTimeout> | undefined
-    let currentUrl: string | undefined
     const poll = async (): Promise<void> => {
-      if (document.hidden) { timer = setTimeout(poll, 1_000); return }
       try {
         const response = await fetch(`${DEVICE_PREVIEW_PATH}?id=${encodeURIComponent(device.id)}`, {
           cache: 'no-store',
@@ -74,13 +76,21 @@ function ScreenshotFallback({ device }: { readonly device: MirrorDeviceStatus })
           signal: controller.signal,
         })
         if (response.status !== 304) {
-          if (!response.ok) throw new Error(`截图预览失败 (${response.status})`)
+          if (!response.ok) {
+            if (response.status === 404) {
+              if (currentUrl.current !== undefined) URL.revokeObjectURL(currentUrl.current)
+              currentUrl.current = undefined
+              setUrl(undefined)
+            }
+            throw new Error(`截图预览失败 (${response.status})`)
+          }
           const next = URL.createObjectURL(await response.blob())
-          if (currentUrl !== undefined) URL.revokeObjectURL(currentUrl)
-          currentUrl = next
+          if (currentUrl.current !== undefined) URL.revokeObjectURL(currentUrl.current)
+          currentUrl.current = next
           setUrl(next)
           etag.current = response.headers.get('ETag') ?? undefined
         }
+        setLastUpdated(Date.now())
         setError(undefined)
       } catch (reason) {
         if (!controller.signal.aborted) setError(reason instanceof Error ? reason.message : String(reason))
@@ -92,26 +102,37 @@ function ScreenshotFallback({ device }: { readonly device: MirrorDeviceStatus })
     return () => {
       controller.abort()
       if (timer !== undefined) clearTimeout(timer)
-      if (currentUrl !== undefined) URL.revokeObjectURL(currentUrl)
     }
-  }, [device.id])
+  }, [active, device.id])
   return (
     <div style={viewportStyle} data-coremate-preview="screenshot">
       {url === undefined ? <span role="status" style={{ padding: 24, color: 'oklch(82% 0.01 92)', fontSize: 12 }}>{error ?? '正在获取截图预览…'}</span> : (
         <img src={url} alt={`${device.label} 截图预览`} style={{ display: 'block', width: '100%', height: 'auto', objectFit: 'contain' }} />
       )}
       <span style={{ position: 'absolute', top: 10, left: 10, padding: '3px 7px', borderRadius: 999, color: '#fff', background: 'rgba(0,0,0,.62)', fontSize: 11 }}>截图预览</span>
+      {error === undefined || url === undefined ? null : (
+        <span role="status" style={{ position: 'absolute', right: 10, bottom: 10, maxWidth: '75%', padding: '4px 8px', borderRadius: 7, color: '#fff', background: 'rgba(127,29,29,.86)', fontSize: 11 }}>
+          {error}{lastUpdated === undefined ? '' : ` · 上次更新 ${new Date(lastUpdated).toLocaleTimeString()}`}
+        </span>
+      )}
     </div>
   )
 }
 
-export function PhoneStream({ device, expanded }: { readonly device: MirrorDeviceStatus, readonly expanded: boolean }): JSX.Element | null {
+interface PhoneStreamProps {
+  readonly device: MirrorDeviceStatus
+  readonly expanded: boolean
+  readonly streamStatus: ScrcpyStreamStatus | undefined
+  readonly streamGeneration: number
+  readonly enableStream: () => Promise<void>
+}
+
+export function PhoneStream({ device, expanded, streamStatus, streamGeneration, enableStream }: PhoneStreamProps): JSX.Element {
   const root = useRef<HTMLDivElement>(null)
   const canvas = useRef<HTMLCanvasElement>(null)
   const [inViewport, setInViewport] = useState(true)
   const pageVisible = usePageVisible()
   const [mode, setMode] = useState<StreamMode>('checking')
-  const [status, setStatus] = useState<ScrcpyStreamStatus>()
   const [error, setError] = useState<string>()
   const [retry, setRetry] = useState(0)
 
@@ -135,45 +156,61 @@ export function PhoneStream({ device, expanded }: { readonly device: MirrorDevic
     let websocket: WebSocket | undefined
     let player: ReturnType<typeof createCoremateVideoDecoder> | undefined
     let reconnect: ReturnType<typeof setTimeout> | undefined
+    let terminal = false
+    const fallback = (reason: unknown, retryable = false): void => {
+      if (terminal || controller.signal.aborted) return
+      terminal = !retryable
+      const message = reason instanceof Error ? reason.message : String(reason)
+      setError(message)
+      setMode('fallback')
+      player?.close()
+      player = undefined
+      if (websocket?.readyState === WebSocket.OPEN || websocket?.readyState === WebSocket.CONNECTING) {
+        websocket.close(1011, 'embedded preview fallback')
+      }
+    }
     const start = async (): Promise<void> => {
       try {
         setMode('checking')
-        const response = await fetch(DEVICE_STREAM_STATUS_PATH, { cache: 'no-store', signal: controller.signal })
-        if (!response.ok) throw new Error(`实时画面状态失败 (${response.status})`)
-        const next = await response.json() as ScrcpyStreamStatus
-        setStatus(next)
+        const next = streamStatus
+        if (next === undefined) return
         if (!next.supported) throw new Error('当前电脑不支持内嵌实时画面')
         if (!next.approved) { setMode('consent'); return }
         setMode('connecting')
-        player = createCoremateVideoDecoder(canvas.current!, () => setMode('video'))
+        player = createCoremateVideoDecoder(
+          canvas.current!,
+          () => { setError(undefined); setMode('video') },
+          error => fallback(new Error(`实时画面解码失败，已切换为截图预览：${error.message}`)),
+        )
         websocket = new WebSocket(streamUrl(device.id))
         websocket.binaryType = 'arraybuffer'
         websocket.onmessage = event => {
-          if (typeof event.data === 'string') {
-            const value = JSON.parse(event.data) as { type?: string; width?: number; height?: number; message?: string }
-            if (value.type === 'session' && value.width !== undefined && value.height !== undefined) player?.session(value.width, value.height)
-            if (value.type === 'waiting') { setError(value.message ?? '实时画面正在等待空位'); setMode('fallback') }
-            if (value.type === 'error') { setError(value.message ?? '实时画面启动失败'); setMode('fallback') }
-            return
+          try {
+            if (typeof event.data === 'string') {
+              const value = JSON.parse(event.data) as { type?: string; width?: number; height?: number; message?: string }
+              if (value.type === 'session' && value.width !== undefined && value.height !== undefined) player?.session(value.width, value.height)
+              if (value.type === 'waiting') fallback(value.message ?? '实时画面正在等待空位', true)
+              if (value.type === 'error') fallback(value.message ?? '实时画面启动失败', true)
+              return
+            }
+            const bytes = new Uint8Array(event.data as ArrayBuffer)
+            if (bytes.byteLength < 9) throw new Error('实时画面数据包不完整')
+            const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength)
+            player?.packet(bytes[0]!, view.getBigUint64(1), bytes.subarray(9))
+          } catch (reason) {
+            fallback(reason)
           }
-          const bytes = new Uint8Array(event.data as ArrayBuffer)
-          if (bytes.byteLength < 9) return
-          const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength)
-          player?.packet(bytes[0]!, view.getBigUint64(1), bytes.subarray(9))
         }
-        websocket.onerror = () => { setError('实时画面连接失败，已切换为截图预览。') }
+        websocket.onerror = () => fallback('实时画面连接失败，已切换为截图预览。', true)
         websocket.onclose = event => {
           player?.close()
           player = undefined
           if (controller.signal.aborted) return
           setMode('fallback')
-          if (event.code !== 1000) reconnect = setTimeout(() => setRetry(value => value + 1), Math.min(5_000, 1_000 + retry * 500))
+          if (!terminal && event.code !== 1000) reconnect = setTimeout(() => setRetry(value => value + 1), Math.min(5_000, 1_000 + retry * 500))
         }
       } catch (reason) {
-        if (!controller.signal.aborted) {
-          setError(reason instanceof Error ? reason.message : String(reason))
-          setMode('fallback')
-        }
+        fallback(reason)
       }
     }
     void start()
@@ -183,30 +220,29 @@ export function PhoneStream({ device, expanded }: { readonly device: MirrorDevic
       websocket?.close(1000, 'preview hidden')
       player?.close()
     }
-  }, [device.connected, device.id, retry, shouldStream])
+  }, [device.connected, device.id, retry, shouldStream, streamGeneration, streamStatus?.approved, streamStatus?.supported])
 
   const enable = useCallback(async (): Promise<void> => {
     try {
       setMode('connecting')
-      const response = await fetch(DEVICE_STREAM_ENABLE_PATH, { method: 'POST', headers: { Accept: 'application/json' } })
-      if (!response.ok) throw new Error(`启用实时画面失败 (${response.status})`)
-      setRetry(value => value + 1)
+      await enableStream()
     } catch (reason) {
       setError(reason instanceof Error ? reason.message : String(reason))
       setMode('fallback')
     }
-  }, [])
+  }, [enableStream])
 
-  if (!expanded) return null
+  if (!expanded) return <div ref={root} style={viewportStyle} data-coremate-preview="collapsed"><span style={{ color: 'oklch(76% 0.01 92)', fontSize: 12 }}>画面已收起</span></div>
+  if (!device.connected) return <div ref={root} style={viewportStyle} data-coremate-preview="disconnected"><div style={overlayStyle}>设备已断开</div></div>
   return (
     <div ref={root} style={viewportStyle} data-coremate-preview={mode}>
-      {mode === 'fallback' ? <ScreenshotFallback device={device} /> : <canvas ref={canvas} aria-label={`${device.label} 实时画面`} style={{ display: 'block', width: 'auto', height: 'auto', maxWidth: '100%', maxHeight: 'min(72vh, 820px)', objectFit: 'contain' }} />}
+      {mode === 'fallback' ? <ScreenshotFallback device={device} active={shouldStream} /> : <canvas ref={canvas} aria-label={`${device.label} 实时画面`} style={{ display: 'block', width: 'auto', height: 'auto', maxWidth: '100%', maxHeight: 'min(72vh, 820px)', objectFit: 'contain' }} />}
       {!shouldStream && mode !== 'fallback' ? <div style={overlayStyle}>画面已暂停，回到此处后自动继续</div> : null}
       {mode === 'checking' || mode === 'connecting' ? <div role="status" style={overlayStyle}>{mode === 'checking' ? '正在检查实时画面…' : '正在连接手机实时画面…'}</div> : null}
       {mode === 'consent' ? (
         <div style={overlayStyle}>
           <div>
-            <p style={{ margin: '0 0 12px' }}>首次启用实时画面需要下载并校验 scrcpy {status?.version}（{megabytes(status?.totalBytes)}）。</p>
+            <p style={{ margin: '0 0 12px' }}>首次启用实时画面需要下载并校验 scrcpy {streamStatus?.version}（{megabytes(streamStatus?.totalBytes)}）。</p>
             <button type="button" data-coremate-press onClick={() => { void enable() }} style={{ minHeight: 40, padding: '0 14px', border: 0, borderRadius: 8, color: '#171717', background: '#f1bf1f', font: 'inherit', fontWeight: 700, cursor: 'pointer' }}>启用实时画面</button>
           </div>
         </div>
diff --git a/deepseek-harness-plugin/src/client/coremate-trigger.ts b/deepseek-harness-plugin/src/client/coremate-trigger.ts
index 13876c8..ffc5375 100644
--- a/deepseek-harness-plugin/src/client/coremate-trigger.ts
+++ b/deepseek-harness-plugin/src/client/coremate-trigger.ts
@@ -16,10 +16,15 @@ export interface CoremateLaunchTracker {
   finishLaunch(error?: string): void
 }
 
-function taskTitle(task: string): string {
+export function taskTitle(task: string): string {
   return `OpenGUI · ${Array.from(task).slice(0, 24).join('')}`
 }
 
+export function isUntitledSession(title: string | undefined): boolean {
+  const value = title?.trim()
+  return value === undefined || value.length === 0 || /^(?:new session|新会话)$/iu.test(value)
+}
+
 function launchFailure(reason: unknown): string {
   return reason instanceof Error ? reason.message : String(reason)
 }
@@ -31,8 +36,8 @@ export const COREMATE_SCENES = [
   },
   {
     name: 'QA 助手',
-    description: '走查当前 APP，先产出测试用例，再逐项执行并汇总问题',
-    prompt: '作为测试，帮我走查当前 APP，先产出测试用例，再按用例逐项执行并汇总问题。',
+    description: '走查当前已连接 Android 手机上的 APP，再逐项执行并汇总问题',
+    prompt: '作为测试，帮我走查当前已连接 Android 手机上的 APP，先产出测试用例，再按用例逐项执行并汇总问题。',
   },
   {
     name: '运营助手',
@@ -72,7 +77,7 @@ export function coremateCommandClaim(
         return { kind: 'error', text: '已有 OpenGUI 任务正在启动或执行，请等待完成后再试。' }
       }
       const row = sessions.list.getSnapshot().byId[session.sessionId]
-      if (row?.title === undefined || row.title.trim().length === 0) {
+      if (isUntitledSession(row?.title)) {
         void binding.session.rename(taskTitle(task)).catch(() => {})
       }
       try {
diff --git a/deepseek-harness-plugin/src/client/index.tsx b/deepseek-harness-plugin/src/client/index.tsx
index 3ff5ec4..bf5de48 100644
--- a/deepseek-harness-plugin/src/client/index.tsx
+++ b/deepseek-harness-plugin/src/client/index.tsx
@@ -74,7 +74,7 @@ export function apply(ctx: ClientContext): void {
     resolve(binding) {
       const coremateDraftActions: CoremateDraftActions = {
         claim(span) {
-          const claimed = binding.ctx.bail('slash/input-begin-command', {
+          const claimed = binding.ctx.bail(binding.ctx, 'slash/input-begin-command', {
             claim: coremateCommandClaim(ctx, { sessionId: binding.sessionId }),
             span,
           }) === true
diff --git a/deepseek-harness-plugin/src/client/promotion-data.ts b/deepseek-harness-plugin/src/client/promotion-data.ts
index a2469ce..bdaf991 100644
--- a/deepseek-harness-plugin/src/client/promotion-data.ts
+++ b/deepseek-harness-plugin/src/client/promotion-data.ts
@@ -1,9 +1,8 @@
 import type {
-  ConversationMatch,
   ConversationNodeDefinition,
   ConversationTurnDataMap,
 } from '@deepseek-ai/dsh-client-runtime/client'
-import { parseCoremateSuggestions, type CoremateSuggestion } from '../suggestions.ts'
+import { cleanCoremateSuggestionBlocks, type CoremateSuggestion } from '../suggestions.ts'
 
 interface TurnTailOwnerProps {
   readonly turn: {
@@ -19,6 +18,7 @@ interface CommandContextState {
   readonly name: string
   readonly runSeq: number
   readonly doneSeq?: number
+  readonly doneKind?: 'success' | 'error'
 }
 
 /** Immutable evidence consumed by the turn-tail selector. */
@@ -44,7 +44,7 @@ declare module '@deepseek-ai/dsh-client-runtime/client' {
 interface PromotionTurnState {
   readonly turn: number
   readonly attributed: boolean
-  readonly completed: boolean
+  readonly success: boolean
 }
 
 interface SuggestionTurnState {
@@ -52,23 +52,12 @@ interface SuggestionTurnState {
   readonly items: readonly CoremateSuggestion[]
 }
 
-function assistantText(match: ConversationMatch): string {
-  if (match.event.type !== 'assistant/message') return ''
-  return match.event.data.message.content
-    .map(block => block.type === 'text' ? block.text : '')
-    .join('')
-}
-
 /** Attach validated hidden follow-ups to their owning Turn. */
 export const coremateSuggestionDefinition: ConversationNodeDefinition<SuggestionTurnState> = {
   kind: 'coremate-suggestions',
   match(event) {
     if (event.type !== 'assistant/message') return null
-    const text = event.data.message.content
-      .filter(block => block.type === 'text')
-      .map(block => block.type === 'text' ? block.text : '')
-      .join('')
-    return parseCoremateSuggestions(text).suggestions.length > 0
+    return cleanCoremateSuggestionBlocks(event.data.message.content).suggestions.length > 0
       ? { id: String(event.seq), role: 'start' }
       : null
   },
@@ -76,7 +65,7 @@ export const coremateSuggestionDefinition: ConversationNodeDefinition<Suggestion
     if (match.event.type !== 'assistant/message') throw new Error('OpenGUI suggestions require assistant/message')
     return {
       turn: match.event.data.turn,
-      items: parseCoremateSuggestions(assistantText(match)).suggestions,
+      items: cleanCoremateSuggestionBlocks(match.event.data.message.content).suggestions,
     }
   },
   update(context) {
@@ -93,10 +82,6 @@ export const coremateSuggestionDefinition: ConversationNodeDefinition<Suggestion
   },
 }
 
-function completed(match: ConversationMatch): boolean {
-  return match.event.type === 'turn/end' && match.event.data.reason.kind === 'completed'
-}
-
 /** Track whether the nearest direct command is still running. */
 export const coremateCommandContextDefinition: ConversationNodeDefinition<CommandContextState> = {
   kind: COMMAND_CONTEXT_KIND,
@@ -111,37 +96,41 @@ export const coremateCommandContextDefinition: ConversationNodeDefinition<Comman
   },
   update(context, match) {
     if (match.event.type !== 'command/done') return context.state
-    return { ...context.state, doneSeq: match.event.seq }
+    return { ...context.state, doneSeq: match.event.seq, doneKind: match.event.data.kind }
   },
   publication: () => 'none',
 }
 
-/** Attribute completed parent-chat turns to a live direct /opengui command. */
+/** Publish only the final assistant message named by a successful direct command. */
 export const corematePromotionDefinition: ConversationNodeDefinition<PromotionTurnState> = {
   kind: 'coremate-promotion',
   match(event) {
-    if (event.type === 'turn/start') return { id: String(event.data.turn), role: 'start' }
-    if (event.type === 'turn/end') return { id: String(event.data.turn), role: 'update' }
+    if (event.type === 'assistant/message') return { id: String(event.seq), role: 'start' }
+    if (event.type === 'command/done' && event.data.sourceEventSeq !== undefined) {
+      return { id: String(event.data.sourceEventSeq), role: 'update' }
+    }
     return null
   },
   start(_context, match, reader) {
-    if (match.event.type !== 'turn/start') throw new Error('OpenGUI promotion requires turn/start')
+    if (match.event.type !== 'assistant/message') throw new Error('OpenGUI promotion requires assistant/message')
     const command = reader.previous<CommandContextState>(COMMAND_CONTEXT_KIND)
-    const turnSeq = match.event.seq
+    const messageSeq = match.event.seq
     return {
       turn: match.event.data.turn,
       attributed: command !== undefined && ['opengui', 'coremate'].includes(command.state.name)
-        && command.state.runSeq < turnSeq
-        && (command.state.doneSeq === undefined || turnSeq < command.state.doneSeq),
-      completed: false,
+        && command.state.runSeq < messageSeq
+        && (command.state.doneSeq === undefined || messageSeq < command.state.doneSeq),
+      success: false,
     }
   },
   update(context, match) {
-    return completed(match) ? { ...context.state, completed: true } : context.state
+    return match.event.type === 'command/done'
+      ? { ...context.state, success: match.event.data.kind === 'success' }
+      : context.state
   },
-  publication: match => match.event.type === 'turn/end' ? 'immediate' : 'none',
+  publication: match => match.event.type === 'command/done' ? 'immediate' : 'none',
   buildLocationData(context, scope) {
-    if (scope !== 'turn' || context.state?.attributed !== true || context.state.completed !== true) return null
+    if (scope !== 'turn' || context.state?.attributed !== true || context.state.success !== true) return null
     return {
       kind: 'turn',
       turn: context.state.turn,
diff --git a/deepseek-harness-plugin/src/client/session-bridge.ts b/deepseek-harness-plugin/src/client/session-bridge.ts
index 89e1aea..c6c3455 100644
--- a/deepseek-harness-plugin/src/client/session-bridge.ts
+++ b/deepseek-harness-plugin/src/client/session-bridge.ts
@@ -25,9 +25,30 @@ export function installActiveTaskSessionBridge(ctx: ClientContext, store: Corema
   const workspaces = ctx.workspaces as unknown as IWorkspaces
   const original = workspaces.startSession
   const callOriginal = (workspaceId?: WorkspaceId): void => original.call(workspaces, workspaceId)
-  let pending: Promise<void> | undefined
+  let pending: { target: WorkspaceId, origin: SessionId, operation: Promise<void> } | undefined
+  let queued: { target: WorkspaceId, origin: SessionId, generation: number } | undefined
+  let generation = 0
   let disposed = false
 
+  const createAndMaybeOpen = (target: WorkspaceId, origin: SessionId, requestGeneration: number): void => {
+    store.setBridgeError(undefined)
+    const operation = (async (): Promise<void> => {
+      // SessionRuntime.create projects the new row and binding before resolving.
+      // The raw Host RPC does not, which leaves this browser unable to open it.
+      const id = await sessions.create({ workspaceId: target })
+      const current = sessions.list.getSnapshot().current
+      if (!disposed && generation === requestGeneration && current === origin) sessions.open(id)
+    })().catch(error => {
+      if (!disposed) store.setBridgeError(error instanceof Error ? error.message : String(error))
+    }).finally(() => {
+      if (pending?.operation === operation) pending = undefined
+      const next = queued
+      queued = undefined
+      if (!disposed && next !== undefined) createAndMaybeOpen(next.target, next.origin, next.generation)
+    })
+    pending = { target, origin, operation }
+  }
+
   workspaces.startSession = (workspaceId?: WorkspaceId): void => {
     const list = sessions.list.getSnapshot()
     const current = list.current
@@ -40,19 +61,13 @@ export function installActiveTaskSessionBridge(ctx: ClientContext, store: Corema
     }
     const target = workspaceId ?? ownerWorkspace(workspaces, current)
     if (target === undefined) { callOriginal(workspaceId); return }
-    if (pending !== undefined) return
-    store.setBridgeError(undefined)
-    const operation = (async (): Promise<void> => {
-      // SessionRuntime.create projects the new row and binding before resolving.
-      // The raw Host RPC does not, which leaves this browser unable to open it.
-      const id = await sessions.create({ workspaceId: target })
-      if (!disposed) sessions.open(id)
-    })().catch(error => {
-      if (!disposed) store.setBridgeError(error instanceof Error ? error.message : String(error))
-    }).finally(() => {
-      if (pending === operation) pending = undefined
-    })
-    pending = operation
+    if (pending?.target === target && pending.origin === current) return
+    const requestGeneration = ++generation
+    if (pending !== undefined) {
+      queued = { target, origin: current, generation: requestGeneration }
+      return
+    }
+    createAndMaybeOpen(target, current, requestGeneration)
   }
 
   return () => {
diff --git a/deepseek-harness-plugin/src/client/task-status-store.ts b/deepseek-harness-plugin/src/client/task-status-store.ts
index 64acc7e..4007110 100644
--- a/deepseek-harness-plugin/src/client/task-status-store.ts
+++ b/deepseek-harness-plugin/src/client/task-status-store.ts
@@ -84,6 +84,10 @@ export class CoremateTaskStatusStore {
     return this.consumedSessionIds.has(sessionId)
   }
 
+  markConsumedSession(sessionId: string): void {
+    this.consumedSessionIds.add(sessionId)
+  }
+
   /** Finish command admission; task execution, once observed, remains Host-owned. */
   finishLaunch(error?: string): void {
     this.clearLaunchTimer()
diff --git a/deepseek-harness-plugin/src/client/video-decoder.ts b/deepseek-harness-plugin/src/client/video-decoder.ts
index 58b034a..f788e23 100644
--- a/deepseek-harness-plugin/src/client/video-decoder.ts
+++ b/deepseek-harness-plugin/src/client/video-decoder.ts
@@ -27,15 +27,30 @@ export interface CoremateVideoDecoder {
 }
 
 /** Low-latency Annex-B H.264 decoder that paints the newest frame onto one canvas. */
-export function createCoremateVideoDecoder(canvas: HTMLCanvasElement, onFrame: () => void): CoremateVideoDecoder {
+export function createCoremateVideoDecoder(
+  canvas: HTMLCanvasElement,
+  onFrame: () => void,
+  onFatal: (error: Error) => void,
+): CoremateVideoDecoder {
   let width = 0
   let height = 0
   let configPackets: Uint8Array[] = []
   let waitingForKey = true
   let configured = false
+  let closed = false
+  let generation = 0
+  let chain = Promise.resolve()
+  let decoder: VideoDecoder
   const context = canvas.getContext('2d', { alpha: false, desynchronized: true })
   if (context === null) throw new Error('Canvas 2D 不可用')
-  const decoder = new VideoDecoder({
+  const fatal = (reason: unknown): void => {
+    if (closed) return
+    closed = true
+    const error = reason instanceof Error ? reason : new Error(String(reason))
+    try { if (decoder.state !== 'closed') decoder.close() } catch { /* already failed */ }
+    onFatal(error)
+  }
+  decoder = new VideoDecoder({
     output(frame) {
       try {
         if (canvas.width !== frame.displayWidth || canvas.height !== frame.displayHeight) {
@@ -44,18 +59,29 @@ export function createCoremateVideoDecoder(canvas: HTMLCanvasElement, onFrame: (
         }
         context.drawImage(frame, 0, 0, canvas.width, canvas.height)
         onFrame()
+      } catch (error) {
+        fatal(error)
       } finally {
         frame.close()
       }
     },
-    error(error) { console.warn('coremate-mobile: embedded video decoder failed', error) },
+    error: fatal,
   })
-  const configure = (data: Uint8Array): void => {
-    decoder.configure({ codec: avcCodecFromAnnexB(data), optimizeForLatency: true, hardwareAcceleration: 'prefer-hardware' })
+  const configure = async (data: Uint8Array, packetGeneration: number): Promise<void> => {
+    const config: VideoDecoderConfig = {
+      codec: avcCodecFromAnnexB(data),
+      optimizeForLatency: true,
+      hardwareAcceleration: 'prefer-hardware',
+    }
+    const support = await VideoDecoder.isConfigSupported(config)
+    if (!support.supported) throw new Error(`当前浏览器不支持视频编码 ${config.codec}`)
+    if (closed || packetGeneration !== generation) return
+    decoder.configure(config)
     configured = true
   }
   return {
     session(nextWidth, nextHeight) {
+      if (closed) return
       width = nextWidth
       height = nextHeight
       canvas.width = width
@@ -65,28 +91,41 @@ export function createCoremateVideoDecoder(canvas: HTMLCanvasElement, onFrame: (
       configured = false
       waitingForKey = true
       configPackets = []
+      generation += 1
     },
     packet(flags, pts, data) {
-      const config = (flags & 1) !== 0
-      const key = (flags & 2) !== 0
-      if (config) { configPackets.push(Uint8Array.from(data)); return }
-      if (waitingForKey && !key) return
-      if (!key && decoder.decodeQueueSize > 3) return
-      let payload = data
-      if (key) {
-        payload = concatVideoData(configPackets, data)
-        if (!configured) configure(payload)
-        waitingForKey = false
-        configPackets = []
-      }
-      if (!configured) configure(payload)
-      decoder.decode(new EncodedVideoChunk({
-        type: key ? 'key' : 'delta',
-        timestamp: Number(pts > BigInt(Number.MAX_SAFE_INTEGER) ? BigInt(Number.MAX_SAFE_INTEGER) : pts),
-        data: payload,
-      }))
+      if (closed) return
+      const packetGeneration = generation
+      const packetData = Uint8Array.from(data)
+      chain = chain.then(async () => {
+        if (closed || packetGeneration !== generation) return
+        const config = (flags & 1) !== 0
+        const key = (flags & 2) !== 0
+        if (config) { configPackets.push(packetData); return }
+        if (waitingForKey && !key) return
+        if (!key && decoder.decodeQueueSize > 3) return
+        let payload: Uint8Array<ArrayBufferLike> = packetData
+        if (key) {
+          payload = concatVideoData(configPackets, packetData)
+          if (!configured) await configure(payload, packetGeneration)
+          if (closed || packetGeneration !== generation) return
+          waitingForKey = false
+          configPackets = []
+        }
+        if (!configured) await configure(payload, packetGeneration)
+        if (closed || packetGeneration !== generation) return
+        decoder.decode(new EncodedVideoChunk({
+          type: key ? 'key' : 'delta',
+          timestamp: Number(pts > BigInt(Number.MAX_SAFE_INTEGER) ? BigInt(Number.MAX_SAFE_INTEGER) : pts),
+          data: payload,
+        }))
+      }).catch(error => {
+        if (!closed && packetGeneration === generation) fatal(error)
+      })
     },
     close() {
+      if (closed) return
+      closed = true
       if (decoder.state !== 'closed') decoder.close()
     },
   }
diff --git a/deepseek-harness-plugin/src/concurrency.ts b/deepseek-harness-plugin/src/concurrency.ts
new file mode 100644
index 0000000..5d3ef8c
--- /dev/null
+++ b/deepseek-harness-plugin/src/concurrency.ts
@@ -0,0 +1,53 @@
+/** Fair abort-aware permit pool used to bound expensive host/device media work. */
+export class AsyncSemaphore {
+  private active = 0
+  private readonly queued: Array<{
+    readonly signal: AbortSignal
+    readonly resolve: (release: () => void) => void
+    readonly reject: (reason: unknown) => void
+  }> = []
+
+  constructor(readonly limit: number) {
+    if (!Number.isSafeInteger(limit) || limit < 1) throw new Error('semaphore limit must be a positive integer')
+  }
+
+  async acquire(signal: AbortSignal): Promise<() => void> {
+    signal.throwIfAborted()
+    if (this.active < this.limit) return this.grant()
+    return await new Promise<() => void>((resolvePermit, rejectPermit) => {
+      const request = { signal, resolve: resolvePermit, reject: rejectPermit }
+      const onAbort = (): void => {
+        const index = this.queued.indexOf(request)
+        if (index >= 0) this.queued.splice(index, 1)
+        rejectPermit(signal.reason)
+      }
+      signal.addEventListener('abort', onAbort, { once: true })
+      this.queued.push({
+        ...request,
+        resolve: release => {
+          signal.removeEventListener('abort', onAbort)
+          resolvePermit(release)
+        },
+      })
+    })
+  }
+
+  private grant(): () => void {
+    this.active += 1
+    let released = false
+    return () => {
+      if (released) return
+      released = true
+      this.active -= 1
+      while (this.queued.length > 0) {
+        const next = this.queued.shift()!
+        if (next.signal.aborted) {
+          next.reject(next.signal.reason)
+          continue
+        }
+        next.resolve(this.grant())
+        break
+      }
+    }
+  }
+}
diff --git a/deepseek-harness-plugin/src/configuration.ts b/deepseek-harness-plugin/src/configuration.ts
index e7f2164..d4a69fb 100644
--- a/deepseek-harness-plugin/src/configuration.ts
+++ b/deepseek-harness-plugin/src/configuration.ts
@@ -1,6 +1,6 @@
 /** Interactive, conversation-local setup for the OpenGUI control model. */
 
-import type { CommandInvocation } from '@deepseek-ai/dsh-commands'
+import type { Agent } from '@deepseek-ai/dsh-agent'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { assertUsableApiKey } from '@deepseek-ai/dsh-llm'
 import type {
@@ -39,6 +39,11 @@ export interface PhoneConfigurationServices {
   readonly updateSettings: (patch: PhoneModelConfigurationPatch) => Promise<void>
 }
 
+export interface PhoneConfigurationInteraction {
+  readonly agent: Agent
+  readonly signal: AbortSignal
+}
+
 function answerText(answer: AskUserQuestionAnswer, id: string): string {
   const item = answer.answers.find(candidate => candidate.id === id)
   return (item?.custom ?? item?.selected[0] ?? '').trim()
@@ -46,7 +51,7 @@ function answerText(answer: AskUserQuestionAnswer, id: string): string {
 
 async function askOne(
   services: PhoneConfigurationServices,
-  invocation: CommandInvocation,
+  invocation: PhoneConfigurationInteraction,
   question: AskUserQuestionItem,
 ): Promise<string> {
   const answer = await services.ask({
@@ -63,7 +68,7 @@ async function askOne(
 
 async function askBaseURL(
   services: PhoneConfigurationServices,
-  invocation: CommandInvocation,
+  invocation: PhoneConfigurationInteraction,
 ): Promise<string> {
   let question = '请输入兼容 OpenAI 协议的 Base URL，例如 https://gateway.example/v1。'
   while (true) {
@@ -85,7 +90,7 @@ async function askBaseURL(
 
 async function askIntroduction(
   services: PhoneConfigurationServices,
-  invocation: CommandInvocation,
+  invocation: PhoneConfigurationInteraction,
 ): Promise<void> {
   while (true) {
     const value = await askOne(services, invocation, {
@@ -105,7 +110,7 @@ async function askIntroduction(
 
 async function askApi(
   services: PhoneConfigurationServices,
-  invocation: CommandInvocation,
+  invocation: PhoneConfigurationInteraction,
 ): Promise<MobileApi> {
   while (true) {
     const value = await askOne(services, invocation, {
@@ -125,7 +130,7 @@ async function askApi(
 
 async function askModel(
   services: PhoneConfigurationServices,
-  invocation: CommandInvocation,
+  invocation: PhoneConfigurationInteraction,
 ): Promise<string> {
   return askOne(services, invocation, {
     id: 'model',
@@ -137,7 +142,7 @@ async function askModel(
 
 async function askApiKey(
   services: PhoneConfigurationServices,
-  invocation: CommandInvocation,
+  invocation: PhoneConfigurationInteraction,
   ref: ReturnType<typeof credentialRef>,
 ): Promise<string> {
   let detail = `请输入 ${ref}。答案不会写入聊天记录或模型上下文；提交后会保存到 Harness 凭据存储。输入时文字仍可见。`
@@ -164,7 +169,7 @@ async function askApiKey(
 export async function configurePhoneModel(
   config: PhoneModelConfiguration,
   services: PhoneConfigurationServices,
-  invocation: CommandInvocation,
+  invocation: PhoneConfigurationInteraction,
 ): Promise<boolean> {
   const baseURL = config.baseURL?.trim()
   const model = config.model?.trim()
diff --git a/deepseek-harness-plugin/src/device-fleet.ts b/deepseek-harness-plugin/src/device-fleet.ts
index c5f7c6b..dd608b1 100644
--- a/deepseek-harness-plugin/src/device-fleet.ts
+++ b/deepseek-harness-plugin/src/device-fleet.ts
@@ -120,7 +120,7 @@ export class DeviceFleet {
       throw new Error('coremate-mobile: no authorized Android device is connected; connect a phone and accept its USB debugging prompt')
     }
     if (snapshot.selectedDeviceIds.length === 0) {
-      throw new Error('coremate-mobile: multiple phones are connected; select at least one below the chat input before running /opengui')
+      throw new Error('coremate-mobile: multiple phones are connected; select at least one in the OpenGUI Tab before running /opengui')
     }
     return this.materialize(snapshot, snapshot.selectedDeviceIds)
   }
diff --git a/deepseek-harness-plugin/src/forward-registry.ts b/deepseek-harness-plugin/src/forward-registry.ts
new file mode 100644
index 0000000..27f6d56
--- /dev/null
+++ b/deepseek-harness-plugin/src/forward-registry.ts
@@ -0,0 +1,280 @@
+import { randomUUID } from 'node:crypto'
+import { mkdir, open, readFile, rename, rm, stat, writeFile } from 'node:fs/promises'
+import { closeSync, openSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
+import { spawnSync } from 'node:child_process'
+import { homedir } from 'node:os'
+import { dirname, join, resolve } from 'node:path'
+
+export type OwnedForwardKind = 'text-input' | 'video-stream'
+
+export interface OwnedForward {
+  readonly serial: string
+  readonly port: number
+  readonly scid: string
+  readonly kind: OwnedForwardKind
+}
+
+interface StoredForward extends OwnedForward {
+  readonly ownerId?: string
+  readonly ownerPid?: number
+}
+
+export type ForwardAdbRunner = (args: readonly string[], signal: AbortSignal) => Promise<unknown>
+
+interface ListedForward {
+  readonly serial: string
+  readonly local: string
+  readonly remote: string
+}
+
+export function parseAdbForwardList(output: string): ListedForward[] {
+  const forwards: ListedForward[] = []
+  for (const line of output.split(/\r?\n/u)) {
+    const [serial, local, remote, ...extra] = line.trim().split(/\s+/u)
+    if (!serial || !local || !remote || extra.length > 0) continue
+    forwards.push({ serial, local, remote })
+  }
+  return forwards
+}
+
+export function defaultForwardRegistryPath(): string {
+  const configured = process.env.DSH_HOME?.trim()
+  const dshHome = configured ? resolve(configured) : join(homedir(), '.dsh')
+  return join(dshHome, 'cache', 'coremate-mobile', 'owned-forwards.json')
+}
+
+/** Durable inventory of ADB forwards created by this plugin, never inferred from global ADB state. */
+export class OwnedForwardRegistry {
+  private mutation = Promise.resolve()
+  private readonly ownerId = randomUUID()
+
+  constructor(private readonly path = defaultForwardRegistryPath()) {}
+
+  async track(record: OwnedForward): Promise<void> {
+    await this.mutate(records => {
+      records.set(this.key(record), { ...record, ownerId: this.ownerId, ownerPid: process.pid })
+    })
+  }
+
+  async release(record: OwnedForward, runAdb: ForwardAdbRunner): Promise<boolean> {
+    let forwards: ListedForward[]
+    try {
+      const listed = await runAdb(
+        ['-s', record.serial, 'forward', '--list'],
+        AbortSignal.timeout(5_000),
+      )
+      forwards = parseAdbForwardList(String(listed ?? ''))
+    } catch {
+      return false
+    }
+    const local = `tcp:${record.port}`
+    const owned = forwards.find(candidate => candidate.serial === record.serial && candidate.local === local)
+    if (owned === undefined || owned.remote !== this.remote(record)) {
+      try {
+        await this.deleteMatching(record)
+        return true
+      } catch {
+        return false
+      }
+    }
+    try {
+      await runAdb(
+        ['-s', record.serial, 'forward', '--remove', local],
+        AbortSignal.timeout(5_000),
+      )
+    } catch {
+      return false
+    }
+    try {
+      await this.deleteMatching(record)
+      return true
+    } catch {
+      return false
+    }
+  }
+
+  async recover(runAdb: ForwardAdbRunner): Promise<{ removed: number; retained: number }> {
+    const records = await this.read()
+    let removed = 0
+    let retained = 0
+    for (const record of records.values()) {
+      if (record.ownerId !== undefined && record.ownerId !== this.ownerId
+        && record.ownerPid !== undefined && this.processAlive(record.ownerPid)) {
+        retained += 1
+        continue
+      }
+      if (await this.release(record, runAdb)) removed += 1
+      else retained += 1
+    }
+    return { removed, retained }
+  }
+
+  async list(): Promise<OwnedForward[]> {
+    return [...(await this.read()).values()].map(record => this.publicRecord(record))
+  }
+
+  /** Best-effort synchronous signal-path cleanup when the Host cannot await plugin disposal. */
+  releaseAllSync(adbPath: string): { removed: number; retained: number } {
+    const lock = `${this.path}.lock`
+    let lockFd: number
+    try {
+      lockFd = openSync(lock, 'wx', 0o600)
+    } catch {
+      return { removed: 0, retained: this.readSync().filter(record => record.ownerId === this.ownerId).length }
+    }
+    let records: StoredForward[]
+    try {
+      const value = JSON.parse(readFileSync(this.path, 'utf8')) as unknown
+      records = Array.isArray(value) ? value.filter(candidate => this.valid(candidate)) : []
+    } catch {
+      closeSync(lockFd)
+      rmSync(lock, { force: true })
+      return { removed: 0, retained: 0 }
+    }
+    const ownedRecords = records.filter(record => record.ownerId === this.ownerId)
+    const retainedOwned: StoredForward[] = []
+    for (const record of ownedRecords) {
+      const listed = spawnSync(adbPath, ['-s', record.serial, 'forward', '--list'], {
+        timeout: 1_500,
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+      })
+      if (listed.status !== 0 || listed.error !== undefined) {
+        retainedOwned.push(record)
+        continue
+      }
+      const local = `tcp:${record.port}`
+      const owned = parseAdbForwardList(listed.stdout ?? '')
+        .find(candidate => candidate.serial === record.serial && candidate.local === local)
+      if (owned === undefined || owned.remote !== this.remote(record)) continue
+      const removed = spawnSync(adbPath, ['-s', record.serial, 'forward', '--remove', local], {
+        timeout: 1_500,
+        stdio: 'ignore',
+      })
+      if (removed.status !== 0 || removed.error !== undefined) retainedOwned.push(record)
+    }
+    const retainedKeys = new Set(retainedOwned.map(record => `${this.key(record)}\u0000${record.scid}`))
+    const retained = records.filter(record => record.ownerId !== this.ownerId
+      || retainedKeys.has(`${this.key(record)}\u0000${record.scid}`))
+    try {
+      if (retained.length === 0) rmSync(this.path, { force: true })
+      else {
+        const temporary = `${this.path}.${process.pid}.${this.ownerId}.signal.tmp`
+        writeFileSync(temporary, JSON.stringify(retained), { encoding: 'utf8', mode: 0o600 })
+        renameSync(temporary, this.path)
+      }
+    } catch { /* startup recovery retains the durable fallback */ }
+    finally {
+      closeSync(lockFd)
+      rmSync(lock, { force: true })
+    }
+    return { removed: ownedRecords.length - retainedOwned.length, retained: retainedOwned.length }
+  }
+
+  private key(record: OwnedForward): string {
+    return `${record.serial}\u0000${record.port}`
+  }
+
+  private remote(record: OwnedForward): string {
+    return `localabstract:scrcpy_${record.scid}`
+  }
+
+  private valid(value: unknown): value is StoredForward {
+    if (typeof value !== 'object' || value === null) return false
+    const candidate = value as Partial<OwnedForward>
+    return typeof candidate.serial === 'string' && Number.isSafeInteger(candidate.port)
+      && typeof candidate.scid === 'string'
+      && (candidate.kind === 'text-input' || candidate.kind === 'video-stream')
+  }
+
+  private async mutate(change: (records: Map<string, StoredForward>) => void | boolean): Promise<void> {
+    const operation = this.mutation.then(async () => {
+      await mkdir(dirname(this.path), { recursive: true })
+      const releaseLock = await this.acquireLock()
+      try {
+        const records = await this.read()
+        change(records)
+        if (records.size === 0) {
+          await rm(this.path, { force: true })
+          return
+        }
+        const temporary = `${this.path}.${process.pid}.${this.ownerId}.${randomUUID()}.tmp`
+        await writeFile(temporary, JSON.stringify([...records.values()]), { encoding: 'utf8', mode: 0o600 })
+        await rename(temporary, this.path)
+      } finally {
+        await releaseLock()
+      }
+    })
+    this.mutation = operation.catch(() => undefined)
+    await operation
+  }
+
+  private async read(): Promise<Map<string, StoredForward>> {
+    try {
+      const parsed = JSON.parse(await readFile(this.path, 'utf8')) as unknown
+      if (!Array.isArray(parsed)) return new Map()
+      const records = new Map<string, StoredForward>()
+      for (const value of parsed) {
+        if (!this.valid(value)) continue
+        const record = value
+        records.set(this.key(record), record)
+      }
+      return records
+    } catch {
+      return new Map()
+    }
+  }
+
+  private async deleteMatching(record: OwnedForward): Promise<void> {
+    await this.mutate(records => {
+      const stored = records.get(this.key(record))
+      if (stored?.scid === record.scid) records.delete(this.key(record))
+    })
+  }
+
+  private publicRecord(record: StoredForward): OwnedForward {
+    return { serial: record.serial, port: record.port, scid: record.scid, kind: record.kind }
+  }
+
+  private processAlive(pid: number): boolean {
+    try {
+      process.kill(pid, 0)
+      return true
+    } catch {
+      return false
+    }
+  }
+
+  private readSync(): StoredForward[] {
+    try {
+      const parsed = JSON.parse(readFileSync(this.path, 'utf8')) as unknown
+      return Array.isArray(parsed) ? parsed.filter(candidate => this.valid(candidate)) : []
+    } catch {
+      return []
+    }
+  }
+
+  private async acquireLock(): Promise<() => Promise<void>> {
+    const lock = `${this.path}.lock`
+    const deadline = Date.now() + 5_000
+    while (true) {
+      try {
+        const handle = await open(lock, 'wx', 0o600)
+        return async () => {
+          await handle.close()
+          await rm(lock, { force: true })
+        }
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== 'EEXIST') throw error
+        try {
+          if (Date.now() - (await stat(lock)).mtimeMs > 10_000) {
+            await rm(lock, { force: true })
+            continue
+          }
+        } catch { /* another writer released the lock */ }
+        if (Date.now() >= deadline) throw new Error('coremate-mobile: timed out waiting for forward registry lock')
+        await new Promise(resolve => setTimeout(resolve, 10))
+      }
+    }
+  }
+}
diff --git a/deepseek-harness-plugin/src/index.ts b/deepseek-harness-plugin/src/index.ts
index 8591a13..c7909fa 100644
--- a/deepseek-harness-plugin/src/index.ts
+++ b/deepseek-harness-plugin/src/index.ts
@@ -7,7 +7,7 @@
 import { createHash } from 'node:crypto'
 import type { Context } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
-import type { CommandInvocation } from '@deepseek-ai/dsh-commands'
+import type { CommandDefinition, CommandInvocation, CommandResult } from '@deepseek-ai/dsh-commands'
 import type { AgentOptions } from '@deepseek-ai/dsh-agent'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import type { AskUserQuestionAnswer } from '@deepseek-ai/dsh-user-questions'
@@ -37,10 +37,11 @@ import { encodePhoneScreenshot } from './image.ts'
 import { configurePhoneModel } from './configuration.ts'
 import { DeviceFleet } from './device-fleet.ts'
 import type { FleetDevice } from './device-fleet.ts'
+import { OwnedForwardRegistry } from './forward-registry.ts'
 import { installMirrorHttp } from './mirror-http.ts'
 import { relayNestedTaskProgress, relayPhoneTaskProgress } from './phone-progress.ts'
-import { CoremateTaskCoordinator } from './phone-task.ts'
-import type { CoremateTaskPresentation, CoremateTaskResult, CoremateTaskState } from './phone-task.ts'
+import { OpenGuiTaskManager, OPENGUI_USAGE } from './phone-task.ts'
+import type { CoremateTaskPresentation, CoremateTaskResult, OpenGuiTaskLease } from './phone-task.ts'
 import { resolveMobileProfile, type MobileApi } from './provider.ts'
 import { latestPhoneScreenshotMessages, PhoneExecutionState, PhoneOperationQueue, waitForPhoneUi } from './runtime.ts'
 import { PhonePreview } from './preview.ts'
@@ -61,7 +62,8 @@ import {
   inheritedCapabilityFailure,
   type CoremateModelStrategy,
 } from './model-routing.ts'
-import { COREMATE_SUGGESTION_INSTRUCTION } from './suggestions.ts'
+import { cleanCoremateSuggestionBlocks, COREMATE_SUGGESTION_INSTRUCTION } from './suggestions.ts'
+import { AsyncSemaphore } from './concurrency.ts'
 
 export { actionCommand, canUseAdbInputText, managedAdbPath, normalizePhoneAction, ObservationId, parseDevices, parseScreenSize, selectAuthorizedSerial, textInputCommands } from './adb.ts'
 export type { AdbDevice, PhoneAction, PhoneCoordinateSpace, ScreenSize, TargetBoundingBox } from './adb.ts'
@@ -101,6 +103,8 @@ export interface Config {
   commandTimeoutMs?: number
   /** Maximum phone-control operations in one child task. */
   maxOperations?: number
+  /** Maximum selected phones controlled concurrently by one task. */
+  maxParallelDevices?: number
   /** Declared model context capacity. */
   contextWindow?: number
   /** Declared maximum model output. */
@@ -118,11 +122,12 @@ const DEFAULT_CONFIG = {
   trustUnknownCurrentModels: false,
   commandTimeoutMs: 15_000,
   maxOperations: 100,
+  maxParallelDevices: 4,
   contextWindow: 262_144,
   maxTokens: 32_768,
   streamIdleTimeoutMs: 300_000,
 } as const satisfies Required<Pick<Config,
-  'api' | 'apiKeyEnv' | 'modelStrategy' | 'trustUnknownCurrentModels' | 'commandTimeoutMs' | 'maxOperations' | 'contextWindow' | 'maxTokens' | 'streamIdleTimeoutMs'>>
+  'api' | 'apiKeyEnv' | 'modelStrategy' | 'trustUnknownCurrentModels' | 'commandTimeoutMs' | 'maxOperations' | 'maxParallelDevices' | 'contextWindow' | 'maxTokens' | 'streamIdleTimeoutMs'>>
 
 export const Config: z<Config> = z.object({
   baseURL: z.string(),
@@ -133,6 +138,7 @@ export const Config: z<Config> = z.object({
   trustUnknownCurrentModels: z.boolean().default(DEFAULT_CONFIG.trustUnknownCurrentModels),
   commandTimeoutMs: z.number().step(1).min(1_000).max(120_000).default(DEFAULT_CONFIG.commandTimeoutMs),
   maxOperations: z.number().step(1).min(1).max(10_000).default(DEFAULT_CONFIG.maxOperations),
+  maxParallelDevices: z.number().step(1).min(1).max(16).default(DEFAULT_CONFIG.maxParallelDevices),
   contextWindow: z.number().step(1).min(1).default(DEFAULT_CONFIG.contextWindow),
   maxTokens: z.number().step(1).min(1).default(DEFAULT_CONFIG.maxTokens),
   streamIdleTimeoutMs: z.number().step(1).min(1_000).max(2_147_483_647).default(DEFAULT_CONFIG.streamIdleTimeoutMs),
@@ -146,6 +152,7 @@ type ResolvedConfig = Config & {
   trustUnknownCurrentModels: boolean
   commandTimeoutMs: number
   maxOperations: number
+  maxParallelDevices: number
   contextWindow: number
   maxTokens: number
   streamIdleTimeoutMs: number
@@ -159,6 +166,7 @@ function resolvedConfig(config: Config): ResolvedConfig {
     trustUnknownCurrentModels: config.trustUnknownCurrentModels ?? DEFAULT_CONFIG.trustUnknownCurrentModels,
     commandTimeoutMs: config.commandTimeoutMs ?? DEFAULT_CONFIG.commandTimeoutMs,
     maxOperations: config.maxOperations ?? DEFAULT_CONFIG.maxOperations,
+    maxParallelDevices: config.maxParallelDevices ?? DEFAULT_CONFIG.maxParallelDevices,
     contextWindow: config.contextWindow ?? DEFAULT_CONFIG.contextWindow,
     maxTokens: config.maxTokens ?? DEFAULT_CONFIG.maxTokens,
     streamIdleTimeoutMs: config.streamIdleTimeoutMs ?? DEFAULT_CONFIG.streamIdleTimeoutMs,
@@ -191,11 +199,44 @@ function configuredProfile(config: Config): ResolvedPiAiProviderProfile | undefi
   })
 }
 
-function textFrom(result: SubagentResult): string {
-  return result.output.filter((block): block is Extract<ContentBlock, { type: 'text' }> => block.type === 'text')
+function textFromBlocks(output: readonly ContentBlock[]): string {
+  return output.filter((block): block is Extract<ContentBlock, { type: 'text' }> => block.type === 'text')
     .map(block => block.text).join('')
 }
 
+function textFrom(result: SubagentResult): string {
+  return textFromBlocks(result.output)
+}
+
+export async function mapWithConcurrency<Input, Output>(
+  values: readonly Input[],
+  limit: number,
+  signal: AbortSignal,
+  worker: (value: Input, index: number, signal: AbortSignal) => Promise<Output>,
+): Promise<Output[]> {
+  const output = new Array<Output>(values.length)
+  const batch = new AbortController()
+  const combined = AbortSignal.any([signal, batch.signal])
+  let next = 0
+  const runWorker = async (): Promise<void> => {
+    while (true) {
+      if (combined.aborted) throw combined.reason
+      const index = next++
+      if (index >= values.length) return
+      try {
+        output[index] = await worker(values[index]!, index, combined)
+      } catch (error) {
+        if (!batch.signal.aborted) batch.abort(error)
+        throw error
+      }
+    }
+  }
+  const settled = await Promise.allSettled(Array.from({ length: Math.min(limit, values.length) }, runWorker))
+  const failure = settled.find((value): value is PromiseRejectedResult => value.status === 'rejected')
+  if (failure !== undefined) throw failure.reason
+  return output
+}
+
 interface ForegroundProgress {
   readonly parent: CommandInvocation['agent']
   readonly nestedUnderCallId?: CallId
@@ -213,6 +254,7 @@ function progressFor(
 async function settleForeground(run: SubagentRun, progress?: ForegroundProgress): Promise<CoremateTaskResult> {
   let failure: unknown
   let stopProgress: (() => void) | undefined
+  let sourceEventSeq: (() => number | undefined) | undefined
   try {
     if (progress !== undefined) {
       const child = run.localAgent
@@ -226,20 +268,29 @@ async function settleForeground(run: SubagentRun, progress?: ForegroundProgress)
         }),
         parent: progress.parent.session,
       }
-      stopProgress = progress.nestedUnderCallId === undefined
-        ? relayPhoneTaskProgress(source)
-        : relayNestedTaskProgress({
+      if (progress.nestedUnderCallId === undefined) {
+        const relay = relayPhoneTaskProgress(source)
+        stopProgress = () => relay.dispose()
+        sourceEventSeq = () => relay.latestAssistantMessageSeq()
+      } else {
+        stopProgress = relayNestedTaskProgress({
           ...source,
           rootCallId: progress.nestedUnderCallId,
           sourceId: String(child.session.id),
         })
+      }
     }
     const result = await run.result
     if (result.stopReason !== 'completed') {
       const partial = textFrom(result)
       throw new Error(`coremate-mobile task ended with ${result.stopReason}${partial ? `\nPartial output:\n${partial}` : ''}`)
     }
-    return { runId: run.id, output: result.output }
+    const source = sourceEventSeq?.()
+    return {
+      runId: run.id,
+      output: result.output,
+      ...(source === undefined ? {} : { sourceEventSeq: source }),
+    }
   } catch (error) {
     failure = error
     throw error
@@ -359,21 +410,34 @@ export function apply(ctx: Context, baseConfig: Config): void {
     const output = String(await run(['devices', '-l'], signal))
     return parseDevices(output)
   })
-  const phoneTasks = new CoremateTaskCoordinator(async (task, parent, signal, presentation, requestedOptions) => {
+  interface OpenGuiExecutionContext {
+    readonly targets: readonly FleetDevice[]
+    readonly route: AgentOptions
+  }
+  const tasks = new OpenGuiTaskManager<OpenGuiExecutionContext>()
+
+  const executePhoneTask = async (
+    task: string,
+    parent: CommandInvocation['agent'],
+    lease: OpenGuiTaskLease<OpenGuiExecutionContext>,
+    presentation: CoremateTaskPresentation,
+  ): Promise<CoremateTaskResult> => {
     const foregroundProgress = progressFor(parent, presentation)
     const showMirror = presentation === 'parent-chat'
-    const targets = await fleet.selectedDevices(signal)
-    const route = requestedOptions ?? inheritedAgentOptions(parent.options)
+    const context = lease.context
+    if (context === undefined) throw new Error('coremate-mobile: OpenGUI task context is missing')
+    const targets = await fleet.resolveConnected(context.targets.map(target => target.id), lease.signal)
+    if (targets.length !== context.targets.length || targets.some((target, index) => target.serial !== context.targets[index]?.serial)) {
+      throw new Error('coremate-mobile: a phone locked to this task disconnected; reconnect it and submit the task again')
+    }
     const startRun = async (executionSignal: AbortSignal): Promise<CoremateTaskResult> => {
-      const batch = new AbortController()
-      const childSignal = AbortSignal.any([executionSignal, batch.signal])
-      const operations = targets.map(async (target): Promise<{ target: FleetDevice, result: CoremateTaskResult }> => {
+      const operation = async (target: FleetDevice, _index: number, childSignal: AbortSignal): Promise<{ target: FleetDevice, result: CoremateTaskResult }> => {
         const child = await ctx.subagents.start('spawn', {
           label: `Control ${target.label}`,
           prompt: [{ type: 'text', text: `Target phone: ${target.label}\n\nTask: ${task}` }],
           parent,
           signal: childSignal,
-          agentOptions: route,
+          agentOptions: context.route,
           maxDepth: 2,
           toolFilter: { allow: ['phone_control'] },
           persona: `You control exactly one fixed Android phone, labeled ${target.label}. Never try to discover, switch, or act on another phone. Observe before the first change. For every mutation, echo the exact current observationId. Tap with a tight targetBBox and swipe with coordinates in current screenshot pixels. Perform exactly one action per phone_control call and inspect the returned observation. Use wait only when the UI is visibly loading; ordinary actions already auto-observe. Never reuse coordinates from an old observation. Stop and report any authorization, device, model, repeated-no-progress, operation-limit, or unsupported-action error.`,
@@ -384,13 +448,19 @@ export function apply(ctx: Context, baseConfig: Config): void {
         }
         executionState.assignTarget(child.localAgent, target.serial)
         return { target, result: await settleForeground(child, foregroundProgress) }
-      })
+      }
       let results: { target: FleetDevice, result: CoremateTaskResult }[]
       try {
-        results = await Promise.all(operations)
+        results = await mapWithConcurrency(
+          targets,
+          resolvedConfig(current()).maxParallelDevices,
+          executionSignal,
+          operation,
+        )
       } catch (error) {
-        batch.abort(error)
-        await Promise.allSettled(operations)
+        if (error instanceof Error && context.route.provider === INHERITED_PROVIDER && inheritedCapabilityFailure(error)) {
+          lease.recordCapabilityFailure(error)
+        }
         throw error
       }
       if (results.length === 1) return results[0]!.result
@@ -404,14 +474,21 @@ export function apply(ctx: Context, baseConfig: Config): void {
       }
     }
     if (showMirror) {
-      return parent.runMaintenance(maintenanceSignal => startRun(AbortSignal.any([signal, maintenanceSignal])))
+      return parent.runMaintenance(maintenanceSignal => startRun(AbortSignal.any([lease.signal, maintenanceSignal])))
     }
-    return startRun(signal)
-  })
-  const browserTasks = new CoremateTaskCoordinator(async (task, parent, signal, presentation, requestedOptions) => {
+    return startRun(lease.signal)
+  }
+
+  const executeBrowserTask = async (
+    task: string,
+    parent: CommandInvocation['agent'],
+    lease: OpenGuiTaskLease<OpenGuiExecutionContext>,
+    presentation: CoremateTaskPresentation,
+  ): Promise<CoremateTaskResult> => {
     const foregroundProgress = progressFor(parent, presentation)
     const showProgress = presentation === 'parent-chat'
-    const route = requestedOptions ?? inheritedAgentOptions(parent.options)
+    const context = lease.context
+    if (context === undefined) throw new Error('coremate-mobile: OpenGUI task context is missing')
     const startRun = async (executionSignal: AbortSignal): Promise<CoremateTaskResult> => {
       const page = await managedBrowser.open(executionSignal)
       page.setDefaultTimeout(resolvedConfig(current()).commandTimeoutMs)
@@ -424,7 +501,7 @@ export function apply(ctx: Context, baseConfig: Config): void {
           prompt: [{ type: 'text', text: `Task: ${task}` }],
           parent,
           signal: executionSignal,
-          agentOptions: route,
+          agentOptions: context.route,
           maxDepth: 2,
           toolFilter: { allow: ['browser_control'] },
           persona: 'You control exactly one visible local browser managed by the OpenGUI plugin. Use browser_control only. Navigate only when the task requires it, observe before coordinate-based actions, and echo the exact current observationId for every later mutation. Tap with a tight targetBBox in current screenshot pixels. Perform one action per call and inspect the returned observation. Use wait only for visible loading. Never claim success without observing the result. Do not submit purchases, publish content, upload files, or delete data unless the user explicitly requested that exact side effect.',
@@ -435,6 +512,11 @@ export function apply(ctx: Context, baseConfig: Config): void {
         browserController.bind(child.localAgent, page)
         settlementStarted = true
         return await settleForeground(child, foregroundProgress)
+      } catch (error) {
+        if (error instanceof Error && context.route.provider === INHERITED_PROVIDER && inheritedCapabilityFailure(error)) {
+          lease.recordCapabilityFailure(error)
+        }
+        throw error
       } finally {
         if (child?.localAgent !== undefined) browserController.release(child.localAgent)
         if (!settlementStarted && child !== undefined) await child.dispose().catch(() => {})
@@ -442,38 +524,46 @@ export function apply(ctx: Context, baseConfig: Config): void {
       }
     }
     if (showProgress) {
-      return parent.runMaintenance(maintenanceSignal => startRun(AbortSignal.any([signal, maintenanceSignal])))
+      return parent.runMaintenance(maintenanceSignal => startRun(AbortSignal.any([lease.signal, maintenanceSignal])))
     }
-    return startRun(signal)
-  })
+    return startRun(lease.signal)
+  }
 
-  const commandTasks = new CoremateTaskCoordinator(async (task, parent, signal, presentation, requestedOptions) => {
-    const route = requestedOptions ?? inheritedAgentOptions(parent.options)
+  const executeRouterTask = async (
+    task: string,
+    parent: CommandInvocation['agent'],
+    lease: OpenGuiTaskLease<OpenGuiExecutionContext>,
+    presentation: CoremateTaskPresentation,
+  ): Promise<CoremateTaskResult> => {
+    const context = lease.context
+    if (context === undefined) throw new Error('coremate-mobile: OpenGUI task context is missing')
     const startRun = async (executionSignal: AbortSignal): Promise<CoremateTaskResult> => {
       const child = await ctx.subagents.start('spawn', {
         label: 'Run OpenGUI task',
         prompt: [{ type: 'text', text: `Task: ${task}` }],
         parent,
         signal: executionSignal,
-        agentOptions: route,
+        agentOptions: context.route,
         maxDepth: 1,
         toolFilter: { allow: ['phone_agent', 'browser_agent'] },
-          persona: `Route and complete the user task with the smallest necessary delegation. Use phone_agent for Android phone work and browser_agent for website work; call both sequentially only when the task genuinely spans both. Do not pretend to operate either target yourself. Return a concise completion summary grounded in the delegated results.\n\n${COREMATE_SUGGESTION_INSTRUCTION}`,
+          persona: `Route and complete the user task with the smallest necessary delegation. Treat APP, app, application, Android, phone, mobile game, daily reward, 手机, 应用, 游戏, 福利 and similar device work as phone_agent tasks. Use browser_agent only when the user explicitly names a website, webpage, URL, web app, or browser target. Never infer the DSH page itself as the task target. Call both sequentially only when the task genuinely spans both. Do not pretend to operate either target yourself. Return a concise completion summary grounded in the delegated results.\n\n${COREMATE_SUGGESTION_INSTRUCTION}`,
       })
-      return settleForeground(child, progressFor(parent, presentation))
+      if (child.localAgent !== undefined) lease.bindAgent(child.localAgent)
+      const result = await settleForeground(child, progressFor(parent, presentation))
+      const capabilityError = lease.capabilityFailure()
+      if (capabilityError !== undefined) throw capabilityError
+      return result
     }
     if (presentation === 'parent-chat') {
-      return parent.runMaintenance(maintenanceSignal => startRun(AbortSignal.any([signal, maintenanceSignal])))
+      return parent.runMaintenance(maintenanceSignal => startRun(AbortSignal.any([lease.signal, maintenanceSignal])))
     }
-    return startRun(signal)
-  })
+    return startRun(lease.signal)
+  }
 
   ctx.effect(function* () {
     yield async () => {
-      commandTasks.cancel()
-      phoneTasks.cancel()
-      browserTasks.cancel()
-      await Promise.allSettled([commandTasks.dispose(), phoneTasks.dispose(), browserTasks.dispose(), managedBrowser.close()])
+      tasks.cancel()
+      await Promise.allSettled([tasks.dispose(), managedBrowser.close()])
     }
   }, 'coremate-mobile task lifecycle')
   ctx.llm.registerConfigurableProviders([{
@@ -505,7 +595,9 @@ export function apply(ctx: Context, baseConfig: Config): void {
     onChange: refreshRoute,
   })
 
-  const dedicatedAgentOptions = async (invocation: CommandInvocation): Promise<AgentOptions> => {
+  type TaskInteraction = Pick<CommandInvocation, 'agent' | 'signal'>
+
+  const dedicatedAgentOptions = async (invocation: TaskInteraction): Promise<AgentOptions> => {
     const questions = ctx.get('userQuestions')
     const credentials = ctx.get('credentials')
     const initial = resolvedConfig(current())
@@ -563,24 +655,26 @@ export function apply(ctx: Context, baseConfig: Config): void {
     return (item?.selected[0] ?? item?.custom ?? '').trim()
   }
 
-  const waitForSelectedPhone = async (invocation: CommandInvocation, signal: AbortSignal): Promise<void> => {
+  const waitForSelectedPhone = async (invocation: TaskInteraction): Promise<readonly FleetDevice[]> => {
+    const signal = invocation.signal
     while (true) {
       let failure: Error
       try {
-        await fleet.selectedDevices(signal)
-        return
+        return await fleet.selectedDevices(signal)
       } catch (error) {
         if (signal.aborted) throw signal.reason
         failure = error instanceof Error ? error : new Error(String(error))
       }
       const questions = ctx.get('userQuestions')
-      if (questions === undefined) throw failure
+      if (questions === undefined) {
+        throw new Error(`${failure.message}; 请前往 OpenGUI Tab 连接并选择设备后重试`)
+      }
       const answer = await questions.ask({
         questions: [{
           id: 'deviceConnection',
           header: '连接 Android 手机',
           question: 'OpenGUI 需要先检测到一台已授权并选中的手机。',
-          detail: `${failure.message}\n\n请连接 USB，开启 USB 调试并在手机上允许这台电脑。连接多台手机时，请在输入框下方选择至少一台。`,
+          detail: `${failure.message}\n\n请连接 USB，开启 USB 调试并在手机上允许这台电脑。连接多台手机时，请前往 OpenGUI Tab 选择至少一台。`,
           options: [
             { label: '重新检测', description: '保持任务暂停，重新检查手机连接与选择。' },
             { label: '取消任务', description: '结束本次 OpenGUI 任务，不调用模型。' },
@@ -596,7 +690,7 @@ export function apply(ctx: Context, baseConfig: Config): void {
   }
 
   let configuring = false
-  const prepareDirectCommand = async (invocation: CommandInvocation): Promise<AgentOptions> => {
+  const prepareTask = async (invocation: TaskInteraction): Promise<AgentOptions> => {
     if (configuring) throw new Error('coremate-mobile: OpenGUI 模型配置正在另一条命令中进行')
     configuring = true
     try {
@@ -635,9 +729,9 @@ export function apply(ctx: Context, baseConfig: Config): void {
     }
   }
 
-  const recoverDirectCommand = async (
+  const recoverTask = async (
     error: Error,
-    invocation: CommandInvocation,
+    invocation: TaskInteraction,
     options: AgentOptions,
   ): Promise<string | undefined> => {
     if (options.provider !== INHERITED_PROVIDER || !inheritedCapabilityFailure(error)) return undefined
@@ -666,15 +760,65 @@ export function apply(ctx: Context, baseConfig: Config): void {
     await dedicatedAgentOptions(invocation)
     return '当前 DSH 模型不兼容；专用视觉模型已配置。为避免重复操作，原任务未自动重试，请重新提交。'
   }
-  ctx.commands.register(commandTasks.command(waitForSelectedPhone, prepareDirectCommand, recoverDirectCommand))
-  ctx.commands.register(commandTasks.command(waitForSelectedPhone, prepareDirectCommand, recoverDirectCommand, 'coremate'))
+  const runRootTask = async (
+    interaction: TaskInteraction,
+    operation: (lease: OpenGuiTaskLease<OpenGuiExecutionContext>) => Promise<CoremateTaskResult>,
+  ): Promise<CoremateTaskResult> => tasks.runRoot<CoremateTaskResult>(interaction.agent, interaction.signal, 'waiting-for-device', async lease => {
+    const targets = await waitForSelectedPhone(interaction)
+    lease.setPhase('routing')
+    const route = await prepareTask(interaction)
+    lease.context = { targets, route }
+    lease.setPhase('running')
+    try {
+      return await operation(lease)
+    } catch (error) {
+      if (error instanceof Error) {
+        const recovered = await recoverTask(error, interaction, route)
+        if (recovered !== undefined) throw new Error(recovered)
+      }
+      throw error
+    }
+  })
+
+  const directCommand = (commandName: 'opengui' | 'coremate'): CommandDefinition => ({
+    name: commandName,
+    description: commandName === 'opengui'
+      ? 'Run a phone or local-browser task with OpenGUI'
+      : 'Legacy alias for /opengui',
+    input: { hint: '<task>' },
+    handler: async (invocation): Promise<CommandResult> => {
+      const task = invocation.rawInput.trim()
+      if (task.length === 0) return { kind: 'success', text: OPENGUI_USAGE }
+      try {
+        const result = await runRootTask(invocation, lease => executeRouterTask(task, invocation.agent, lease, 'parent-chat'))
+        const cleaned = cleanCoremateSuggestionBlocks(result.output)
+        const text = textFromBlocks(cleaned.output).trim()
+        return {
+          kind: 'success',
+          text: text.length > 0 ? text : `OpenGUI task completed (run ${result.runId}).`,
+          ...(result.sourceEventSeq === undefined ? {} : { sourceEventSeq: result.sourceEventSeq }),
+        }
+      } catch (error) {
+        return { kind: 'error', text: error instanceof Error ? error.message : String(error) }
+      }
+    },
+  })
+  ctx.commands.register(directCommand('opengui'))
+  ctx.commands.register(directCommand('coremate'))
 
   const scrcpyInstaller = new ScrcpyInstaller()
   const scrcpyAsset = resolveScrcpyAsset()
+  const forwardRegistry = new OwnedForwardRegistry()
+  const forwardRecovery = forwardRegistry.recover((args, signal) => run(args, signal)).then(result => {
+    if (result.removed > 0 || result.retained > 0) {
+      ctx.logger.info(`coremate-mobile: recovered ${result.removed} owned ADB forwards; ${result.retained} retained for retry`)
+    }
+  }).catch(error => ctx.logger.warn(error instanceof Error ? error : new Error(String(error))))
   const textInput = new ScrcpyTextInput({
     adbPath,
     runAdb: (args, signal) => run(args, signal),
     installer: scrcpyInstaller,
+    forwardRegistry,
     ...(scrcpyAsset === undefined ? {} : { asset: scrcpyAsset }),
   })
   const mirror = new ScrcpyMirror({
@@ -683,33 +827,40 @@ export function apply(ctx: Context, baseConfig: Config): void {
     ...(scrcpyAsset === undefined ? {} : { asset: scrcpyAsset }),
     onError: error => ctx.logger.warn(error instanceof Error ? error : new Error(String(error))),
   })
+  const cleanupForTermination = (): void => {
+    mirror.stopAllSync()
+    forwardRegistry.releaseAllSync(adbPath())
+    process.off('SIGTERM', cleanupForTermination)
+    if (process.listenerCount('SIGTERM') === 0) process.kill(process.pid, 'SIGTERM')
+  }
+  process.prependListener('SIGTERM', cleanupForTermination)
+  const mediaPermits = new AsyncSemaphore(2)
   const preview = new PhonePreview(async (serial, signal) => {
     const value = await run(['-s', serial, 'exec-out', 'screencap', '-p'], signal, true)
     return Buffer.isBuffer(value) ? value : Buffer.from(value)
-  })
+  }, 2, Date.now, mediaPermits)
   const streams = new ScrcpyVideoStreams({
     adbPath,
     runAdb: (args, signal) => run(args, signal),
     installer: scrcpyInstaller,
+    forwardRegistry,
     ...(scrcpyAsset === undefined ? {} : { asset: scrcpyAsset }),
     onError: error => ctx.logger.warn(error instanceof Error ? error : new Error(String(error))),
   })
   const taskControl = {
-    isActive: (): boolean => commandTasks.isActive() || phoneTasks.isActive() || browserTasks.isActive(),
-    state: (): CoremateTaskState => {
-      const states = [commandTasks.state(), phoneTasks.state(), browserTasks.state()]
-      return states.find(state => state.active) ?? commandTasks.state()
-    },
-    cancel: (): boolean => {
-      const command = commandTasks.cancel()
-      const phone = phoneTasks.cancel()
-      const browser = browserTasks.cancel()
-      return command || phone || browser
-    },
+    isActive: (): boolean => tasks.isActive(),
+    state: () => tasks.state(),
+    cancel: (): boolean => tasks.cancel(),
   }
   installMirrorHttp(ctx, mirror, fleet, taskControl, managedBrowser, preview, streams)
   ctx.effect(function* () {
-    yield async () => { await Promise.all([mirror.dispose(), textInput.dispose(), streams.dispose()]) }
+    yield async () => {
+      process.off('SIGTERM', cleanupForTermination)
+      await forwardRecovery
+      await Promise.all([mirror.dispose(), textInput.dispose(), streams.dispose()])
+      const cleanup = await forwardRegistry.recover((args, signal) => run(args, signal))
+      if (cleanup.retained > 0) ctx.logger.warn(new Error(`coremate-mobile: ${cleanup.retained} owned ADB forwards remain for next-start recovery`))
+    }
   }, 'coremate-mobile native scrcpy mirror lifecycle')
   const targetFor = async (agent: object, signal: AbortSignal): Promise<string> => {
     return executionState.resolveTarget(agent, async () => {
@@ -721,11 +872,13 @@ export function apply(ctx: Context, baseConfig: Config): void {
     })
   }
   const observe = async (agent: object, serial: string, signal: AbortSignal): Promise<PhoneObservation> => {
-    const [sizeRaw, focusRaw, pngRaw] = await Promise.all([
-      run(['-s', serial, 'shell', 'wm', 'size'], signal),
-      run(['-s', serial, 'shell', 'dumpsys', 'window', 'windows'], signal),
-      run(['-s', serial, 'exec-out', 'screencap', '-p'], signal, true),
-    ])
+    const releaseMedia = await mediaPermits.acquire(signal)
+    try {
+      const [sizeRaw, focusRaw, pngRaw] = await Promise.all([
+        run(['-s', serial, 'shell', 'wm', 'size'], signal),
+        run(['-s', serial, 'shell', 'dumpsys', 'window', 'windows'], signal),
+        run(['-s', serial, 'exec-out', 'screencap', '-p'], signal, true),
+      ])
     const screen = parseScreenSize(String(sizeRaw))
     const png = Buffer.isBuffer(pngRaw) ? pngRaw : Buffer.from(pngRaw)
     const jpeg = await encodePhoneScreenshot(png)
@@ -756,9 +909,12 @@ export function apply(ctx: Context, baseConfig: Config): void {
       foregroundPackage: currentPackage(String(focusRaw)),
       image,
     }
-    observations.set(agent, { value, fingerprint })
-    executionState.recordObservation(agent, { observationId, screenshotFingerprint: fingerprint })
-    return value
+      observations.set(agent, { value, fingerprint })
+      executionState.recordObservation(agent, { observationId, screenshotFingerprint: fingerprint })
+      return value
+    } finally {
+      releaseMedia()
+    }
   }
 
   ctx.tools.register(defineTool({
@@ -954,7 +1110,10 @@ export function apply(ctx: Context, baseConfig: Config): void {
     isConcurrencySafe: () => false,
     async execute(args, exec) {
       if (exec.agent === undefined) throw new Error('coremate-mobile: phone_agent requires a calling agent')
-      const result = await phoneTasks.run(args.task, exec.agent, exec.signal, { nestedUnderCallId: exec.callId })
+      const nested = tasks.nestedLease(exec.agent, exec.signal)
+      const result = nested === undefined
+        ? await runRootTask({ agent: exec.agent, signal: exec.signal }, lease => executePhoneTask(args.task, exec.agent!, lease, { nestedUnderCallId: exec.callId }))
+        : await executePhoneTask(args.task, exec.agent, nested, { nestedUnderCallId: exec.callId })
       return { runId: result.runId, output: result.output as unknown as JsonValue[] }
     },
   }))
@@ -976,7 +1135,10 @@ export function apply(ctx: Context, baseConfig: Config): void {
     isConcurrencySafe: () => false,
     async execute(args, exec) {
       if (exec.agent === undefined) throw new Error('coremate-mobile: browser_agent requires a calling agent')
-      const result = await browserTasks.run(args.task, exec.agent, exec.signal, { nestedUnderCallId: exec.callId })
+      const nested = tasks.nestedLease(exec.agent, exec.signal)
+      const result = nested === undefined
+        ? await runRootTask({ agent: exec.agent, signal: exec.signal }, lease => executeBrowserTask(args.task, exec.agent!, lease, { nestedUnderCallId: exec.callId }))
+        : await executeBrowserTask(args.task, exec.agent, nested, { nestedUnderCallId: exec.callId })
       return { runId: result.runId, output: result.output as unknown as JsonValue[] }
     },
   }))
diff --git a/deepseek-harness-plugin/src/phone-progress.ts b/deepseek-harness-plugin/src/phone-progress.ts
index 09bc9d1..cdd12d7 100644
--- a/deepseek-harness-plugin/src/phone-progress.ts
+++ b/deepseek-harness-plugin/src/phone-progress.ts
@@ -54,7 +54,12 @@ function mappedSources(event: RelayedSurfaceEvent, seqs: ReadonlyMap<number, num
  * The returned disposer also repairs a partially mirrored turn when the child
  * is cancelled before it can publish its own closing boundaries.
  */
-export function relayPhoneTaskProgress(source: PhoneTaskProgressSource): () => void {
+export interface PhoneTaskProgressRelay {
+  dispose(): void
+  latestAssistantMessageSeq(): number | undefined
+}
+
+export function relayPhoneTaskProgress(source: PhoneTaskProgressSource): PhoneTaskProgressRelay {
   const seen = new Set<number>()
   const turns = new Map<number, number>()
   const seqs = new Map<number, number>()
@@ -62,6 +67,7 @@ export function relayPhoneTaskProgress(source: PhoneTaskProgressSource): () => v
   let openTurn: { child: number, parent: number } | undefined
   let openStep: { child: number, parent: number, step: number } | undefined
   let stopped = false
+  let lastAssistantMessageSeq: number | undefined
 
   const parentTurn = (childTurn: number): number => {
     const existing = turns.get(childTurn)
@@ -117,6 +123,7 @@ export function relayPhoneTaskProgress(source: PhoneTaskProgressSource): () => v
           surfaceOp: 'append',
           ...(sourceEventSeqs === undefined ? {} : { sourceEventSeqs }),
         })
+        lastAssistantMessageSeq = mirrored.seq
         break
       }
       case 'tool/call':
@@ -156,7 +163,7 @@ export function relayPhoneTaskProgress(source: PhoneTaskProgressSource): () => v
     throw error
   }
 
-  return () => {
+  const dispose = (): void => {
     if (stopped) return
     stopped = true
     unsubscribe()
@@ -172,6 +179,7 @@ export function relayPhoneTaskProgress(source: PhoneTaskProgressSource): () => v
       openTurn = undefined
     }
   }
+  return { dispose, latestAssistantMessageSeq: () => lastAssistantMessageSeq }
 }
 
 export interface NestedTaskProgressSource {
diff --git a/deepseek-harness-plugin/src/phone-task.ts b/deepseek-harness-plugin/src/phone-task.ts
index 566d381..204edfa 100644
--- a/deepseek-harness-plugin/src/phone-task.ts
+++ b/deepseek-harness-plugin/src/phone-task.ts
@@ -8,12 +8,12 @@ import type { AgentOptions } from '@deepseek-ai/dsh-agent'
 import type { CallId, ContentBlock } from '@deepseek-ai/dsh-llm'
 import { cleanCoremateSuggestionBlocks } from './suggestions.ts'
 
-const OPENGUI_USAGE = `Usage: /opengui <task>
+export const OPENGUI_USAGE = `Usage: /opengui <task>
 
 也可以输入 @OpenGUI 后描述任务。
 
 常用示例：
-- QA 助手：走查当前 APP，先产出测试用例，再逐项执行并汇总问题。
+- QA 助手：走查当前已连接 Android 手机上的 APP，先产出测试用例，再逐项执行并汇总问题。
 - 运营助手：运营目标平台并完成基础互动；发布、私信或账号修改前先确认。
 - 手游助手：领取多款游戏的每日福利；付费、抽卡或资源消耗前先确认。`
 
@@ -32,6 +32,8 @@ export interface CoremateTaskResult {
   readonly runId: string
   /** Final child content; the tool preserves every block while commands render text only. */
   readonly output: ContentBlock[]
+  /** Parent-session assistant message that authoritatively owns this command result. */
+  readonly sourceEventSeq?: number
 }
 
 /** How a caller wants the child run presented. */
@@ -81,13 +83,7 @@ function textFrom(output: readonly ContentBlock[]): string {
  * A second task fails before target access.
  */
 export class CoremateTaskCoordinator {
-  private active: {
-    controller: AbortController
-    phase: Exclude<CoremateTaskPhase, 'idle'>
-    result: Promise<CoremateTaskResult>
-    ownerSessionId?: string
-  } | undefined
-  private readonly lifetime = new AbortController()
+  private readonly tasks = new OpenGuiTaskManager<void>()
 
   /** @param start Establishes and settles the child run. */
   constructor(private readonly start: CoremateTaskStart) {}
@@ -108,65 +104,23 @@ export class CoremateTaskCoordinator {
   ): Promise<CoremateTaskResult> {
     const normalized = task.trim()
     if (normalized.length === 0) throw new Error('coremate-mobile: task must not be empty')
-    if (this.lifetime.signal.aborted) throw new Error('coremate-mobile: task runner is disposed')
-    if (this.active !== undefined) throw new Error('coremate-mobile: another OpenGUI task is already running')
-
-    const ownerSessionId = parent.id === undefined ? undefined : String(parent.id)
-    return this.execute(signal, 'running', combinedSignal => agentOptions === undefined
-      ? this.start(normalized, parent, combinedSignal, presentation)
-      : this.start(normalized, parent, combinedSignal, presentation, agentOptions), ownerSessionId)
-  }
-
-  private async execute(
-    signal: AbortSignal,
-    phase: Exclude<CoremateTaskPhase, 'idle'>,
-    operation: (signal: AbortSignal, setPhase: (phase: Exclude<CoremateTaskPhase, 'idle'>) => void) => Promise<CoremateTaskResult>,
-    ownerSessionId?: string,
-  ): Promise<CoremateTaskResult> {
-    if (this.lifetime.signal.aborted) throw new Error('coremate-mobile: task runner is disposed')
-    if (this.active !== undefined) throw new Error('coremate-mobile: another OpenGUI task is already running')
-    const controller = new AbortController()
-    const active = {
-      controller,
-      phase,
-      result: undefined as unknown as Promise<CoremateTaskResult>,
-      ...(ownerSessionId === undefined ? {} : { ownerSessionId }),
-    }
-    this.active = active
-    const combinedSignal = AbortSignal.any([signal, this.lifetime.signal, controller.signal])
-    const setPhase = (next: Exclude<CoremateTaskPhase, 'idle'>): void => {
-      if (this.active === active) active.phase = next
-    }
-    active.result = operation(combinedSignal, setPhase)
-    try {
-      return await active.result
-    } finally {
-      if (this.active === active) this.active = undefined
-    }
+    return this.tasks.runRoot(parent, signal, 'running', lease => agentOptions === undefined
+      ? this.start(normalized, parent, lease.signal, presentation)
+      : this.start(normalized, parent, lease.signal, presentation, agentOptions))
   }
 
   /** Whether a command or tool currently owns this coordinator. */
   isActive(): boolean {
-    return this.active !== undefined
+    return this.tasks.isActive()
   }
 
   state(): CoremateTaskState {
-    const phase = this.active?.phase ?? 'idle'
-    return {
-      active: phase !== 'idle',
-      phase,
-      selectionLocked: phase === 'routing' || phase === 'running' || phase === 'stopping',
-      ...(this.active?.ownerSessionId === undefined ? {} : { ownerSessionId: this.active.ownerSessionId }),
-    }
+    return this.tasks.state()
   }
 
   /** Request cancellation of the active task without waiting for settlement. */
   cancel(): boolean {
-    const active = this.active
-    if (active === undefined || active.controller.signal.aborted) return false
-    active.phase = 'stopping'
-    active.controller.abort(new Error('coremate-mobile: OpenGUI task stopped by user'))
-    return true
+    return this.tasks.cancel()
   }
 
   /**
@@ -190,21 +144,21 @@ export class CoremateTaskCoordinator {
         const task = invocation.rawInput.trim()
         if (task.length === 0) return { kind: 'success', text: OPENGUI_USAGE }
         try {
-          const result = await this.execute(invocation.signal, 'waiting-for-device', async (signal, setPhase) => {
-            await preflight?.(invocation, signal)
-            setPhase('routing')
-            const agentOptions = await prepare?.({ ...invocation, signal })
-            setPhase('running')
+          const result = await this.tasks.runRoot(invocation.agent, invocation.signal, 'waiting-for-device', async lease => {
+            await preflight?.(invocation, lease.signal)
+            lease.setPhase('routing')
+            const agentOptions = await prepare?.({ ...invocation, signal: lease.signal })
+            lease.setPhase('running')
             try {
-              return await this.start(task, invocation.agent, signal, 'parent-chat', agentOptions)
+              return await this.start(task, invocation.agent, lease.signal, 'parent-chat', agentOptions)
             } catch (error) {
               if (error instanceof Error && agentOptions !== undefined && recover !== undefined) {
-                const recovered = await recover(error, { ...invocation, signal }, agentOptions)
+                const recovered = await recover(error, { ...invocation, signal: lease.signal }, agentOptions)
                 if (recovered !== undefined) throw new CoremateRecoveredError(recovered)
               }
               throw error
             }
-          }, String(invocation.agent.id))
+          })
           const cleaned = cleanCoremateSuggestionBlocks(result.output)
           const text = textFrom(cleaned.output)
           return {
@@ -221,6 +175,104 @@ export class CoremateTaskCoordinator {
   }
 
   /** Abort the active task and await its settlement before plugin teardown completes. */
+  async dispose(): Promise<void> {
+    await this.tasks.dispose()
+  }
+}
+
+class CoremateRecoveredError extends Error {}
+
+/** Mutable data owned by one root OpenGUI task and shared with its nested delegates. */
+export interface OpenGuiTaskLease<Context = unknown> {
+  readonly signal: AbortSignal
+  readonly ownerSessionId: string | undefined
+  context: Context | undefined
+  setPhase(phase: Exclude<CoremateTaskPhase, 'idle'>): void
+  bindAgent(agent: object): void
+  recordCapabilityFailure(error: Error): void
+  capabilityFailure(): Error | undefined
+}
+
+interface ActiveOpenGuiTask<Context> {
+  readonly controller: AbortController
+  readonly agents: WeakSet<object>
+  readonly ownerSessionId?: string
+  phase: Exclude<CoremateTaskPhase, 'idle'>
+  result: Promise<unknown>
+  capabilityError?: Error
+  context: Context | undefined
+}
+
+/**
+ * Plugin-wide admission gate. A root command/tool owns the task while router
+ * delegates explicitly bound to its lease may re-enter without opening a
+ * second task. Unbound callers always compete for the single root slot.
+ */
+export class OpenGuiTaskManager<Context = unknown> {
+  private active: ActiveOpenGuiTask<Context> | undefined
+  private readonly lifetime = new AbortController()
+
+  async runRoot<Result>(
+    parent: CommandInvocation['agent'],
+    signal: AbortSignal,
+    phase: Exclude<CoremateTaskPhase, 'idle'>,
+    operation: (lease: OpenGuiTaskLease<Context>) => Promise<Result>,
+  ): Promise<Result> {
+    if (this.lifetime.signal.aborted) throw new Error('coremate-mobile: task runner is disposed')
+    if (this.active !== undefined) throw new Error('coremate-mobile: another OpenGUI task is already running')
+    const controller = new AbortController()
+    const sessionIdentity = parent.session?.id ?? parent.id
+    const ownerSessionId = sessionIdentity === undefined ? undefined : String(sessionIdentity)
+    const active: ActiveOpenGuiTask<Context> = {
+      controller,
+      agents: new WeakSet(),
+      phase,
+      result: undefined as unknown as Promise<unknown>,
+      context: undefined,
+      ...(ownerSessionId === undefined ? {} : { ownerSessionId }),
+    }
+    this.active = active
+    const combinedSignal = AbortSignal.any([signal, this.lifetime.signal, controller.signal])
+    const lease = this.lease(active, combinedSignal)
+    active.result = operation(lease)
+    try {
+      return await active.result as Result
+    } finally {
+      if (this.active === active) this.active = undefined
+    }
+  }
+
+  /** Return the active lease only for a router agent explicitly bound by its root task. */
+  nestedLease(agent: object, signal?: AbortSignal): OpenGuiTaskLease<Context> | undefined {
+    const active = this.active
+    if (active === undefined || !active.agents.has(agent)) return undefined
+    return this.lease(active, AbortSignal.any([
+      this.lifetime.signal,
+      active.controller.signal,
+      ...(signal === undefined ? [] : [signal]),
+    ]))
+  }
+
+  isActive(): boolean { return this.active !== undefined }
+
+  state(): CoremateTaskState {
+    const phase = this.active?.phase ?? 'idle'
+    return {
+      active: phase !== 'idle',
+      phase,
+      selectionLocked: phase === 'routing' || phase === 'running' || phase === 'stopping',
+      ...(this.active?.ownerSessionId === undefined ? {} : { ownerSessionId: this.active.ownerSessionId }),
+    }
+  }
+
+  cancel(): boolean {
+    const active = this.active
+    if (active === undefined || active.controller.signal.aborted) return false
+    active.phase = 'stopping'
+    active.controller.abort(new Error('coremate-mobile: OpenGUI task stopped by user'))
+    return true
+  }
+
   async dispose(): Promise<void> {
     if (!this.lifetime.signal.aborted) {
       this.lifetime.abort(new Error('coremate-mobile: plugin disposed during OpenGUI task'))
@@ -228,6 +280,17 @@ export class CoremateTaskCoordinator {
     const active = this.active
     if (active !== undefined) await Promise.allSettled([active.result])
   }
-}
 
-class CoremateRecoveredError extends Error {}
+  private lease(active: ActiveOpenGuiTask<Context>, signal: AbortSignal): OpenGuiTaskLease<Context> {
+    return {
+      signal,
+      get ownerSessionId() { return active.ownerSessionId },
+      get context() { return active.context },
+      set context(value: Context | undefined) { active.context = value },
+      setPhase: phase => { if (this.active === active) active.phase = phase },
+      bindAgent: agent => { active.agents.add(agent) },
+      recordCapabilityFailure: error => { active.capabilityError ??= error },
+      capabilityFailure: () => active.capabilityError,
+    }
+  }
+}
diff --git a/deepseek-harness-plugin/src/preview.ts b/deepseek-harness-plugin/src/preview.ts
index d9a78bb..5c297bf 100644
--- a/deepseek-harness-plugin/src/preview.ts
+++ b/deepseek-harness-plugin/src/preview.ts
@@ -1,10 +1,12 @@
 import { createHash } from 'node:crypto'
 import sharp from 'sharp'
 import type { FleetDevice } from './device-fleet.ts'
+import { AsyncSemaphore } from './concurrency.ts'
 
 const PREVIEW_CACHE_MS = 1_500
 const PREVIEW_WIDTH = 720
 const PREVIEW_QUALITY = 60
+const PREVIEW_CACHE_LIMIT = 16
 
 export interface PhonePreviewImage {
   readonly data: Buffer
@@ -13,41 +15,74 @@ export interface PhonePreviewImage {
 
 export type CapturePhonePreview = (serial: string, signal: AbortSignal) => Promise<Buffer>
 
+interface PreviewOperation {
+  readonly controller: AbortController
+  readonly promise: Promise<PhonePreviewImage>
+  readonly waiters: Set<symbol>
+}
+
 /** Bounded, single-flight ADB preview encoder shared by every browser tab. */
 export class PhonePreview {
   private readonly cache = new Map<string, { at: number, image: PhonePreviewImage }>()
-  private readonly pending = new Map<string, Promise<PhonePreviewImage>>()
-  private readonly waiters: Array<() => void> = []
-  private active = 0
+  private readonly pending = new Map<string, PreviewOperation>()
+  private readonly permits: AsyncSemaphore
 
   constructor(
     private readonly capture: CapturePhonePreview,
-    private readonly concurrency = 2,
+    concurrency = 2,
     private readonly now: () => number = Date.now,
+    permits?: AsyncSemaphore,
   ) {
     if (!Number.isSafeInteger(concurrency) || concurrency < 1) {
       throw new Error('coremate-mobile: preview concurrency must be a positive integer')
     }
+    this.permits = permits ?? new AsyncSemaphore(concurrency)
   }
 
   async read(device: FleetDevice, signal: AbortSignal): Promise<PhonePreviewImage> {
     const cached = this.cache.get(device.id)
-    if (cached !== undefined && this.now() - cached.at < PREVIEW_CACHE_MS) return cached.image
-    const pending = this.pending.get(device.id)
-    if (pending !== undefined) return pending
-    const operation = this.captureAndEncode(device, signal)
-    this.pending.set(device.id, operation)
+    if (cached !== undefined && this.now() - cached.at < PREVIEW_CACHE_MS) {
+      this.cache.delete(device.id)
+      this.cache.set(device.id, cached)
+      return cached.image
+    }
+    let operation = this.pending.get(device.id)
+    if (operation === undefined) {
+      const controller = new AbortController()
+      const promise = this.captureAndEncode(device, controller.signal)
+      operation = { controller, promise, waiters: new Set() }
+      this.pending.set(device.id, operation)
+      void promise.finally(() => {
+        if (this.pending.get(device.id) === operation) this.pending.delete(device.id)
+      }).catch(() => {})
+    }
+    const waiter = Symbol('preview-waiter')
+    operation.waiters.add(waiter)
     try {
-      const image = await operation
+      const image = await this.waitFor(operation, signal)
+      this.cache.delete(device.id)
       this.cache.set(device.id, { at: this.now(), image })
+      while (this.cache.size > PREVIEW_CACHE_LIMIT) this.cache.delete(this.cache.keys().next().value!)
       return image
     } finally {
-      if (this.pending.get(device.id) === operation) this.pending.delete(device.id)
+      operation.waiters.delete(waiter)
+      if (operation.waiters.size === 0 && !operation.controller.signal.aborted) {
+        operation.controller.abort(new Error('coremate-mobile: phone preview has no remaining waiters'))
+      }
     }
   }
 
+  private async waitFor(operation: PreviewOperation, signal: AbortSignal): Promise<PhonePreviewImage> {
+    signal.throwIfAborted()
+    return await new Promise<PhonePreviewImage>((resolveImage, rejectImage) => {
+      const onAbort = (): void => rejectImage(signal.reason)
+      signal.addEventListener('abort', onAbort, { once: true })
+      void operation.promise.then(resolveImage, rejectImage).finally(() => signal.removeEventListener('abort', onAbort))
+    })
+  }
+
   private async captureAndEncode(device: FleetDevice, signal: AbortSignal): Promise<PhonePreviewImage> {
-    const release = await this.acquire(signal)
+    const release = await this.permits.acquire(signal)
     try {
       const source = await this.capture(device.serial, signal)
       const data = await sharp(source, { failOn: 'error', limitInputPixels: false })
@@ -63,31 +98,4 @@ export class PhonePreview {
     }
   }
 
-  private async acquire(signal: AbortSignal): Promise<() => void> {
-    if (signal.aborted) throw signal.reason
-    if (this.active < this.concurrency) {
-      this.active += 1
-      return () => this.release()
-    }
-    await new Promise<void>((resolve, reject) => {
-      const ready = (): void => {
-        signal.removeEventListener('abort', aborted)
-        this.active += 1
-        resolve()
-      }
-      const aborted = (): void => {
-        const index = this.waiters.indexOf(ready)
-        if (index >= 0) this.waiters.splice(index, 1)
-        reject(signal.reason)
-      }
-      this.waiters.push(ready)
-      signal.addEventListener('abort', aborted, { once: true })
-    })
-    return () => this.release()
-  }
-
-  private release(): void {
-    this.active -= 1
-    this.waiters.shift()?.()
-  }
 }
diff --git a/deepseek-harness-plugin/src/scrcpy-stream.ts b/deepseek-harness-plugin/src/scrcpy-stream.ts
index b04b1f2..ea6c52b 100644
--- a/deepseek-harness-plugin/src/scrcpy-stream.ts
+++ b/deepseek-harness-plugin/src/scrcpy-stream.ts
@@ -4,6 +4,8 @@ import type { ChildProcess } from 'node:child_process'
 import { connect, createServer } from 'node:net'
 import type { Socket } from 'node:net'
 import type { FleetDevice } from './device-fleet.ts'
+import { OwnedForwardRegistry } from './forward-registry.ts'
+import type { OwnedForward } from './forward-registry.ts'
 import {
   SCRCPY_VERSION,
   type ScrcpyAsset,
@@ -132,6 +134,7 @@ interface StreamEntry {
   socket?: Socket
   process?: ChildProcess
   port?: number
+  forward?: OwnedForward
   idleTimer: ReturnType<typeof setTimeout> | undefined
   lastCodec?: string
   lastSession?: string
@@ -140,6 +143,7 @@ interface StreamEntry {
   closeCode: number
   closeReason: string
   closed: boolean
+  closing?: Promise<void>
 }
 
 export interface ScrcpyVideoStreamsOptions {
@@ -153,6 +157,7 @@ export interface ScrcpyVideoStreamsOptions {
   idleGraceMs?: number
   maxSources?: number
   onError?: (error: unknown) => void
+  forwardRegistry?: OwnedForwardRegistry
 }
 
 /** Shares one scrcpy encoder per device across same-origin browser subscribers. */
@@ -165,6 +170,7 @@ export class ScrcpyVideoStreams {
   private readonly idleGraceMs: number
   private readonly maxSources: number
   private readonly onError: (error: unknown) => void
+  private readonly forwardRegistry: OwnedForwardRegistry
   private readonly entries = new Map<string, StreamEntry>()
   private readonly lifetime = new AbortController()
   private approved = false
@@ -181,6 +187,7 @@ export class ScrcpyVideoStreams {
     this.idleGraceMs = options.idleGraceMs ?? 5_000
     this.maxSources = options.maxSources ?? 4
     this.onError = options.onError ?? (() => {})
+    this.forwardRegistry = options.forwardRegistry ?? new OwnedForwardRegistry()
   }
 
   approve(): boolean {
@@ -214,6 +221,10 @@ export class ScrcpyVideoStreams {
     if (!installed && !this.approved) throw new Error('stream_download_not_approved')
 
     let entry = this.entries.get(device.id)
+    if (entry?.closed === true) {
+      if (this.entries.get(device.id) === entry) this.entries.delete(device.id)
+      entry = undefined
+    }
     if (entry === undefined) {
       if (this.entries.size >= this.maxSources) throw new Error('stream_capacity_wait')
       const controller = new AbortController()
@@ -284,9 +295,18 @@ export class ScrcpyVideoStreams {
     const port = await this.freePort()
     entry.port = port
     const scid = (randomBytes(4).readUInt32BE(0) & 0x7fffffff).toString(16).padStart(8, '0')
+    const forward: OwnedForward = { serial: entry.device.serial, port, scid, kind: 'video-stream' }
     await this.options.runAdb(['-s', entry.device.serial, 'push', installed.server, SCRCPY_REMOTE_SERVER], signal)
-    await this.options.runAdb(['-s', entry.device.serial, 'forward', '--remove', `tcp:${port}`], signal).catch(() => undefined)
-    await this.options.runAdb(['-s', entry.device.serial, 'forward', `tcp:${port}`, `localabstract:scrcpy_${scid}`], signal)
+    try {
+      await this.forwardRegistry.track(forward)
+      entry.forward = forward
+      await this.options.runAdb([
+        '-s', entry.device.serial, 'forward', '--no-rebind', `tcp:${port}`, `localabstract:scrcpy_${scid}`,
+      ], signal)
+    } catch (error) {
+      await this.forwardRegistry.release(forward, this.options.runAdb).catch(() => false)
+      throw error
+    }
 
     const child = this.spawnImpl(this.options.adbPath(), [
       '-s', entry.device.serial, 'shell', ...buildScrcpyVideoServerArgs(scid),
@@ -375,21 +395,23 @@ export class ScrcpyVideoStreams {
     for (const sink of entry.subscribers) sink.sendText(text)
   }
 
-  private async closeEntry(entry: StreamEntry): Promise<void> {
-    if (entry.closed) return
+  private closeEntry(entry: StreamEntry): Promise<void> {
+    if (entry.closing !== undefined) return entry.closing
+    if (entry.closed) return Promise.resolve()
     entry.closed = true
-    if (entry.idleTimer !== undefined) clearTimeout(entry.idleTimer)
-    entry.controller.abort(new Error('coremate-mobile: embedded stream stopped'))
-    entry.socket?.destroy()
-    const child = entry.process
-    if (child !== undefined && child.exitCode === null) await terminateChild(child)
-    if (entry.port !== undefined) {
-      const cleanupSignal = AbortSignal.timeout(5_000)
-      await this.options.runAdb(['-s', entry.device.serial, 'forward', '--remove', `tcp:${entry.port}`], cleanupSignal).catch(() => undefined)
-    }
-    if (this.entries.get(entry.device.id) === entry) this.entries.delete(entry.device.id)
-    for (const sink of entry.subscribers) sink.close(entry.closeCode, entry.closeReason)
-    entry.subscribers.clear()
+    const closing = (async (): Promise<void> => {
+      if (entry.idleTimer !== undefined) clearTimeout(entry.idleTimer)
+      entry.controller.abort(new Error('coremate-mobile: embedded stream stopped'))
+      entry.socket?.destroy()
+      const child = entry.process
+      if (child !== undefined && child.exitCode === null) await terminateChild(child)
+      if (entry.forward !== undefined) await this.forwardRegistry.release(entry.forward, this.options.runAdb)
+      if (this.entries.get(entry.device.id) === entry) this.entries.delete(entry.device.id)
+      for (const sink of entry.subscribers) sink.close(entry.closeCode, entry.closeReason)
+      entry.subscribers.clear()
+    })()
+    entry.closing = closing
+    return closing
   }
 
   private publicError(error: unknown): string {
diff --git a/deepseek-harness-plugin/src/scrcpy.ts b/deepseek-harness-plugin/src/scrcpy.ts
index 975a7a0..b32837d 100644
--- a/deepseek-harness-plugin/src/scrcpy.ts
+++ b/deepseek-harness-plugin/src/scrcpy.ts
@@ -1,7 +1,7 @@
 import { createHash, randomBytes, randomUUID } from 'node:crypto'
 import { spawn } from 'node:child_process'
 import type { ChildProcess } from 'node:child_process'
-import { chmod, lstat, mkdir, mkdtemp, open, readFile, realpath, rename, rm, writeFile } from 'node:fs/promises'
+import { chmod, lstat, mkdir, mkdtemp, open, readFile, realpath, rename, rm, stat, writeFile } from 'node:fs/promises'
 import { constants } from 'node:fs'
 import { homedir } from 'node:os'
 import { connect, createServer } from 'node:net'
@@ -10,6 +10,8 @@ import { basename, join, resolve, sep } from 'node:path'
 import { x as extractTar } from 'tar'
 import type { FleetDevice, FleetDeviceView } from './device-fleet.ts'
 import type { MirrorDeviceStatus, MirrorPhase, MirrorStatus } from './mirror-contract.ts'
+import { OwnedForwardRegistry } from './forward-registry.ts'
+import type { OwnedForward } from './forward-registry.ts'
 import { extractSafeZip } from './secure-zip.ts'
 
 export const SCRCPY_VERSION = '4.1'
@@ -76,6 +78,13 @@ interface InstallProgress {
   totalBytes?: number
 }
 
+interface ScrcpyInstallJob {
+  readonly controller: AbortController
+  promise: Promise<InstalledScrcpy>
+  readonly waiters: Map<symbol, (progress: InstallProgress) => void>
+  latest: InstallProgress | undefined
+}
+
 export interface ScrcpyInstallerOptions {
   cacheDir?: string
   fetch?: typeof globalThis.fetch
@@ -85,7 +94,7 @@ export interface ScrcpyInstallerOptions {
 export class ScrcpyInstaller {
   private readonly cacheDir: string
   private readonly fetchImpl: typeof globalThis.fetch
-  private active: Promise<InstalledScrcpy> | undefined
+  private readonly active = new Map<string, ScrcpyInstallJob>()
 
   constructor(options: ScrcpyInstallerOptions = {}) {
     this.cacheDir = options.cacheDir ?? defaultScrcpyCacheDir()
@@ -121,13 +130,50 @@ export class ScrcpyInstaller {
     signal: AbortSignal,
     progress: (progress: InstallProgress) => void,
   ): Promise<InstalledScrcpy> {
-    if (this.active !== undefined) return this.active
-    const operation = this.install(asset, signal, progress)
-    this.active = operation
-    void operation.finally(() => {
-      if (this.active === operation) this.active = undefined
-    }).catch(() => {})
-    return operation
+    signal.throwIfAborted()
+    let job = this.active.get(asset.key)
+    if (job === undefined) {
+      const controller = new AbortController()
+      const waiters = new Map<symbol, (value: InstallProgress) => void>()
+      const created: ScrcpyInstallJob = {
+        controller,
+        waiters,
+        latest: undefined,
+        promise: Promise.resolve(undefined as never),
+      }
+      created.promise = this.install(asset, controller.signal, value => {
+        created.latest = value
+        for (const notify of created.waiters.values()) notify(value)
+      })
+      this.active.set(asset.key, created)
+      void created.promise.finally(() => {
+        if (this.active.get(asset.key) === created) this.active.delete(asset.key)
+      }).catch(() => {})
+      job = created
+    }
+    return this.waitFor(job, signal, progress)
+  }
+
+  private async waitFor(
+    job: ScrcpyInstallJob,
+    signal: AbortSignal,
+    progress: (progress: InstallProgress) => void,
+  ): Promise<InstalledScrcpy> {
+    const id = Symbol('scrcpy-installer-waiter')
+    job.waiters.set(id, progress)
+    if (job.latest !== undefined) progress(job.latest)
+    try {
+      return await new Promise<InstalledScrcpy>((resolveJob, rejectJob) => {
+        const onAbort = (): void => rejectJob(signal.reason)
+        signal.addEventListener('abort', onAbort, { once: true })
+        void job.promise.then(resolveJob, rejectJob).finally(() => signal.removeEventListener('abort', onAbort))
+      })
+    } finally {
+      job.waiters.delete(id)
+      if (job.waiters.size === 0 && !job.controller.signal.aborted) {
+        job.controller.abort(new Error('coremate-mobile: scrcpy installation has no remaining waiters'))
+      }
+    }
   }
 
   private async install(
@@ -143,7 +189,12 @@ export class ScrcpyInstaller {
     const suffix = asset.archive === 'zip' ? '.zip' : '.tar.gz'
     const archivePath = join(assetDir, `.download-${randomUUID()}${suffix}`)
     const staging = await mkdtemp(join(assetDir, '.extract-'))
+    const releaseLock = await this.acquireInstallLock(join(assetDir, '.install.lock'), signal).catch(async error => {
+      await rm(staging, { recursive: true, force: true }).catch(() => undefined)
+      throw error
+    })
     try {
+      if (await this.isInstalled(asset)) return this.paths(asset)
       await this.download(asset, archivePath, signal, progress)
       signal.throwIfAborted()
       progress({ phase: 'extracting' })
@@ -173,9 +224,23 @@ export class ScrcpyInstaller {
       }), { encoding: 'utf8', mode: 0o600 })
 
       const destination = this.paths(asset).root
+      const quarantine = join(assetDir, `.quarantine-${randomUUID()}`)
+      let quarantined = false
       try {
+        try {
+          await lstat(destination)
+          await rename(destination, quarantine)
+          quarantined = true
+        } catch (error) {
+          if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error
+        }
         await rename(extractedRoot, destination)
+        if (quarantined) await rm(quarantine, { recursive: true, force: true })
       } catch (error) {
+        if (quarantined) {
+          await rm(destination, { recursive: true, force: true }).catch(() => undefined)
+          await rename(quarantine, destination).catch(() => undefined)
+        }
         if (!(await this.isInstalled(asset))) throw error
       }
       return this.paths(asset)
@@ -184,6 +249,37 @@ export class ScrcpyInstaller {
         rm(archivePath, { force: true }),
         rm(staging, { recursive: true, force: true }),
       ])
+      await releaseLock()
+    }
+  }
+
+  private async acquireInstallLock(path: string, signal: AbortSignal): Promise<() => Promise<void>> {
+    while (true) {
+      signal.throwIfAborted()
+      try {
+        const handle = await open(path, constants.O_CREAT | constants.O_EXCL | constants.O_WRONLY, 0o600)
+        await handle.writeFile(`${process.pid}\n${Date.now()}\n`)
+        return async () => {
+          await handle.close().catch(() => undefined)
+          await rm(path, { force: true }).catch(() => undefined)
+        }
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== 'EEXIST') throw error
+        const age = await stat(path).then(value => Date.now() - value.mtimeMs).catch(() => 0)
+        if (age > 120_000) {
+          await rm(path, { force: true }).catch(() => undefined)
+          continue
+        }
+        await new Promise<void>((resolveWait, rejectWait) => {
+          const timer = setTimeout(() => { cleanup(); resolveWait() }, 50)
+          const onAbort = (): void => { cleanup(); rejectWait(signal.reason) }
+          const cleanup = (): void => {
+            clearTimeout(timer)
+            signal.removeEventListener('abort', onAbort)
+          }
+          signal.addEventListener('abort', onAbort, { once: true })
+        })
+      }
     }
   }
 
@@ -325,6 +421,8 @@ interface ScrcpyTextConnection {
   sequence: bigint
   readBuffer: Buffer
   closed: boolean
+  closing: Promise<void> | undefined
+  readonly forward: OwnedForward
   readonly waiters: Map<string, {
     resolve: () => void
     reject: (error: Error) => void
@@ -340,6 +438,7 @@ export interface ScrcpyTextInputOptions {
   spawn?: typeof spawn
   connect?: typeof connect
   freePort?: () => Promise<number>
+  forwardRegistry?: OwnedForwardRegistry
 }
 
 /** Persistent, vendor-neutral UTF-8 text input over scrcpy's acknowledged control protocol. */
@@ -349,6 +448,7 @@ export class ScrcpyTextInput {
   private readonly spawnImpl: typeof spawn
   private readonly connectImpl: typeof connect
   private readonly freePort: () => Promise<number>
+  private readonly forwardRegistry: OwnedForwardRegistry
   private readonly active = new Map<string, ScrcpyTextConnection>()
   private readonly starting = new Map<string, Promise<ScrcpyTextConnection>>()
   private readonly lifetime = new AbortController()
@@ -359,6 +459,7 @@ export class ScrcpyTextInput {
     this.spawnImpl = options.spawn ?? spawn
     this.connectImpl = options.connect ?? connect
     this.freePort = options.freePort ?? availableTcpPort
+    this.forwardRegistry = options.forwardRegistry ?? new OwnedForwardRegistry()
   }
 
   async paste(serial: string, text: string, signal: AbortSignal): Promise<void> {
@@ -404,7 +505,7 @@ export class ScrcpyTextInput {
         })
       })
     } catch (error) {
-      this.close(connection, error instanceof Error ? error : new Error(String(error)))
+      await this.close(connection, error instanceof Error ? error : new Error(String(error)))
       throw error
     }
   }
@@ -412,7 +513,9 @@ export class ScrcpyTextInput {
   async dispose(): Promise<void> {
     if (!this.lifetime.signal.aborted) this.lifetime.abort(new Error('coremate-mobile: scrcpy text input disposed'))
     await Promise.allSettled(this.starting.values())
-    for (const connection of [...this.active.values()]) this.close(connection, new Error('coremate-mobile: scrcpy text input disposed'))
+    await Promise.allSettled([...this.active.values()].map(connection => (
+      this.close(connection, new Error('coremate-mobile: scrcpy text input disposed'))
+    )))
   }
 
   private async connection(serial: string, signal: AbortSignal): Promise<ScrcpyTextConnection> {
@@ -438,9 +541,17 @@ export class ScrcpyTextInput {
     signal.throwIfAborted()
     const port = await this.freePort()
     const scid = (randomBytes(4).readUInt32BE(0) & 0x7fffffff).toString(16).padStart(8, '0')
+    const forward: OwnedForward = { serial, port, scid, kind: 'text-input' }
     await this.options.runAdb(['-s', serial, 'push', installed.server, SCRCPY_REMOTE_SERVER], signal)
-    await this.options.runAdb(['-s', serial, 'forward', '--remove', `tcp:${port}`], signal).catch(() => undefined)
-    await this.options.runAdb(['-s', serial, 'forward', `tcp:${port}`, `localabstract:scrcpy_${scid}`], signal)
+    try {
+      await this.forwardRegistry.track(forward)
+      await this.options.runAdb([
+        '-s', serial, 'forward', '--no-rebind', `tcp:${port}`, `localabstract:scrcpy_${scid}`,
+      ], signal)
+    } catch (error) {
+      await this.forwardRegistry.release(forward, this.options.runAdb).catch(() => false)
+      throw error
+    }
 
     const child = this.spawnImpl(this.options.adbPath(), [
       '-s', serial, 'shell', ...buildScrcpyControlServerArgs(scid),
@@ -462,19 +573,21 @@ export class ScrcpyTextInput {
         sequence: BigInt(Date.now()),
         readBuffer: Buffer.alloc(0),
         closed: false,
+        closing: undefined,
+        forward,
         waiters: new Map(),
       }
       socket.on('data', chunk => this.onData(connection, Buffer.from(chunk)))
       const serverDetail = (): string => stderr.trim() ? `: ${stderr.trim()}` : ''
-      socket.once('error', error => this.close(connection, new Error(`${error.message}${serverDetail()}`, { cause: error })))
-      socket.once('close', () => this.close(connection, new Error(`coremate-mobile: scrcpy control socket closed${serverDetail()}`)))
-      child.once('exit', (code, exitSignal) => this.close(connection, new Error(
+      socket.once('error', error => { void this.close(connection, new Error(`${error.message}${serverDetail()}`, { cause: error })) })
+      socket.once('close', () => { void this.close(connection, new Error(`coremate-mobile: scrcpy control socket closed${serverDetail()}`)) })
+      child.once('exit', (code, exitSignal) => { void this.close(connection, new Error(
         `coremate-mobile: scrcpy control server exited (code=${String(code)}, signal=${String(exitSignal)})${serverDetail()}`,
-      )))
+      )) })
       return connection
     } catch (error) {
-      child.kill('SIGTERM')
-      await this.removeForward(serial, port)
+      await terminateChildProcess(child)
+      await this.forwardRegistry.release(forward, this.options.runAdb)
       const detail = stderr.trim()
       throw new Error(`coremate-mobile: failed to start acknowledged scrcpy text input${detail ? `: ${detail}` : ''}`, { cause: error })
     }
@@ -493,12 +606,13 @@ export class ScrcpyTextInput {
         waiter.resolve()
       }
     } catch (error) {
-      this.close(connection, error instanceof Error ? error : new Error(String(error)))
+      void this.close(connection, error instanceof Error ? error : new Error(String(error)))
     }
   }
 
-  private close(connection: ScrcpyTextConnection, error: Error): void {
-    if (connection.closed) return
+  private close(connection: ScrcpyTextConnection, error: Error): Promise<void> {
+    if (connection.closing !== undefined) return connection.closing
+    if (connection.closed) return Promise.resolve()
     connection.closed = true
     if (this.active.get(connection.serial) === connection) this.active.delete(connection.serial)
     for (const waiter of connection.waiters.values()) {
@@ -507,13 +621,11 @@ export class ScrcpyTextInput {
     }
     connection.waiters.clear()
     connection.socket.destroy()
-    if (connection.process.exitCode === null && !connection.process.killed) connection.process.kill('SIGTERM')
-    void this.removeForward(connection.serial, connection.port)
-  }
-
-  private async removeForward(serial: string, port: number): Promise<void> {
-    const cleanupSignal = new AbortController().signal
-    await this.options.runAdb(['-s', serial, 'forward', '--remove', `tcp:${port}`], cleanupSignal).catch(() => undefined)
+    connection.closing = (async () => {
+      await terminateChildProcess(connection.process)
+      await this.forwardRegistry.release(connection.forward, this.options.runAdb)
+    })()
+    return connection.closing
   }
 }
 
@@ -545,6 +657,20 @@ async function waitForChildSpawn(child: ChildProcess, signal: AbortSignal): Prom
   })
 }
 
+async function terminateChildProcess(child: ChildProcess): Promise<void> {
+  if (child.exitCode !== null) return
+  const exited = new Promise<void>(resolveExit => child.once('exit', () => resolveExit()))
+  if (!child.killed) child.kill('SIGTERM')
+  const graceful = await Promise.race([
+    exited.then(() => true),
+    new Promise<false>(resolveGrace => setTimeout(() => resolveGrace(false), 2_000)),
+  ])
+  if (!graceful && child.exitCode === null) {
+    child.kill('SIGKILL')
+    await Promise.race([exited, new Promise(resolveKill => setTimeout(resolveKill, 500))])
+  }
+}
+
 async function connectScrcpyControl(
   connectImpl: typeof connect,
   port: number,
@@ -621,6 +747,8 @@ interface MirrorEntry {
   operation: Promise<void> | undefined
   controller: AbortController | undefined
   stderr: string
+  updatedAt: number
+  generation: number
 }
 
 /** Independent native scrcpy processes for connected phones, sharing one verified installation. */
@@ -648,6 +776,11 @@ export class ScrcpyMirror {
 
   status(connectedDevices: readonly FleetDeviceView[] = [], taskActive = false): MirrorStatus {
     const connected = new Map(connectedDevices.map(device => [device.id, device]))
+    const now = Date.now()
+    for (const [id, entry] of this.entries) {
+      if (connected.has(id) || entry.process !== undefined || entry.operation !== undefined) continue
+      if (entry.phase === 'idle' || now - entry.updatedAt > 5 * 60_000) this.entries.delete(id)
+    }
     const visible = new Map(connected)
     for (const entry of this.entries.values()) {
       if (entry.phase === 'idle' || visible.has(entry.device.id)) continue
@@ -682,9 +815,16 @@ export class ScrcpyMirror {
   requestStart(device: FleetDevice): void {
     if (this.disposed || this.asset === undefined) return
     const entry = this.entry(device)
+    if (entry === undefined) return
+    const generation = ++entry.generation
+    this.startRequested(entry, generation)
+  }
+
+  private startRequested(entry: MirrorEntry, generation: number): void {
+    if (this.disposed || this.asset === undefined || entry.generation !== generation) return
     if (entry.operation !== undefined) {
       if (entry.controller?.signal.aborted === true) {
-        void entry.operation.finally(() => { this.requestStart(device) }).catch(() => {})
+        void entry.operation.finally(() => { this.startRequested(entry, generation) }).catch(() => {})
       }
       return
     }
@@ -708,6 +848,7 @@ export class ScrcpyMirror {
       : [...this.entries.values()].filter(entry => entry.device.id === deviceId)
     const operations: Promise<void>[] = []
     for (const entry of entries) {
+      entry.generation += 1
       entry.controller?.abort(new Error('coremate-mobile: scrcpy launch cancelled'))
       const child = entry.process
       if (child !== undefined) await this.terminate(child)
@@ -734,9 +875,30 @@ export class ScrcpyMirror {
     await this.stop()
   }
 
-  private entry(device: FleetDevice): MirrorEntry {
+  /** Signal-path fallback used when the Host cannot await the normal async disposer. */
+  stopAllSync(): void {
+    for (const entry of this.entries.values()) {
+      entry.controller?.abort(new Error('coremate-mobile: Host is terminating'))
+      const child = entry.process
+      if (child !== undefined && child.exitCode === null && !child.killed) child.kill('SIGTERM')
+      entry.process = undefined
+      this.setStatus(entry, 'idle')
+    }
+  }
+
+  private entry(device: FleetDevice): MirrorEntry | undefined {
     const existing = this.entries.get(device.id)
     if (existing !== undefined) return existing
+    while (this.entries.size >= 32) {
+      const disposable = [...this.entries.entries()]
+        .filter(([, candidate]) => candidate.process === undefined && candidate.operation === undefined)
+        .sort((left, right) => left[1].updatedAt - right[1].updatedAt)[0]
+      if (disposable === undefined) {
+        this.onError(new Error('coremate-mobile: native mirror state capacity reached (32 devices)'))
+        return undefined
+      }
+      this.entries.delete(disposable[0])
+    }
     const created: MirrorEntry = {
       device,
       phase: 'idle',
@@ -747,6 +909,8 @@ export class ScrcpyMirror {
       operation: undefined,
       controller: undefined,
       stderr: '',
+      updatedAt: Date.now(),
+      generation: 0,
     }
     this.entries.set(device.id, created)
     return created
@@ -756,13 +920,15 @@ export class ScrcpyMirror {
     this.setStatus(entry, 'downloading')
     entry.totalBytes = asset.bytes
     if (this.installController.signal.aborted && !this.disposed) this.installController = new AbortController()
-    const installed = await this.installer.ensure(asset, this.installController.signal, (progress) => {
+    const installSignal = AbortSignal.any([signal, this.installController.signal])
+    const installed = await this.installer.ensure(asset, installSignal, (progress) => {
       for (const candidate of this.entries.values()) {
         if (candidate.operation === undefined || candidate.process !== undefined) continue
         candidate.phase = progress.phase
         candidate.downloadedBytes = progress.downloadedBytes
         candidate.totalBytes = progress.totalBytes
         candidate.message = undefined
+        candidate.updatedAt = Date.now()
       }
     })
     signal.throwIfAborted()
@@ -821,6 +987,7 @@ export class ScrcpyMirror {
     entry.downloadedBytes = undefined
     entry.totalBytes = undefined
     entry.message = message
+    entry.updatedAt = Date.now()
   }
 
   private async terminate(child: ScrcpyProcess): Promise<void> {
diff --git a/deepseek-harness-plugin/src/suggestions.ts b/deepseek-harness-plugin/src/suggestions.ts
index 402b637..a956b0f 100644
--- a/deepseek-harness-plugin/src/suggestions.ts
+++ b/deepseek-harness-plugin/src/suggestions.ts
@@ -60,14 +60,14 @@ export function cleanCoremateSuggestionBlocks(output: readonly ContentBlock[]):
   readonly output: ContentBlock[]
   readonly suggestions: readonly CoremateSuggestion[]
 } {
-  const lastText = output.findLastIndex(block => block.type === 'text')
-  if (lastText < 0) return { output: [...output], suggestions: [] }
-  const block = output[lastText] as Extract<ContentBlock, { type: 'text' }>
-  const parsed = parseCoremateSuggestions(block.text)
+  let start = output.length
+  while (start > 0 && output[start - 1]?.type === 'text') start -= 1
+  if (start === output.length) return { output: [...output], suggestions: [] }
+  const tail = output.slice(start) as Extract<ContentBlock, { type: 'text' }>[]
+  const parsed = parseCoremateSuggestions(tail.map(block => block.text).join(''))
   if (parsed.suggestions.length === 0) return { output: [...output], suggestions: [] }
-  const next = [...output]
-  if (parsed.text.length === 0) next.splice(lastText, 1)
-  else next[lastText] = { ...block, text: parsed.text }
+  const next = output.slice(0, start)
+  if (parsed.text.length > 0) next.push({ ...tail[0]!, text: parsed.text })
   return { output: next, suggestions: parsed.suggestions }
 }
 
diff --git a/deepseek-harness-plugin/tests/adb.spec.ts b/deepseek-harness-plugin/tests/adb.spec.ts
index 7565e7d..59d2b92 100644
--- a/deepseek-harness-plugin/tests/adb.spec.ts
+++ b/deepseek-harness-plugin/tests/adb.spec.ts
@@ -57,6 +57,13 @@ describe('coremate-mobile ADB policy', () => {
     expect(Config({})).not.toHaveProperty('settleDelayMs')
   })
 
+  it('defaults multi-device tasks to four workers and bounds explicit values', () => {
+    expect(Config({}).maxParallelDevices).toBe(4)
+    expect(() => Config({ maxParallelDevices: 0 })).toThrow()
+    expect(() => Config({ maxParallelDevices: 17 })).toThrow()
+    expect(Config({ maxParallelDevices: 16 }).maxParallelDevices).toBe(16)
+  })
+
   it('keeps safe ASCII on adb input text and rejects unacknowledged Unicode injection', () => {
     expect(textInputCommands('hello world')).toEqual([
       ['shell', 'input', 'text', 'hello%sworld'],
diff --git a/deepseek-harness-plugin/tests/browser-install-prompt.spec.ts b/deepseek-harness-plugin/tests/browser-install-prompt.spec.ts
index b03335e..9c2c6bc 100644
--- a/deepseek-harness-plugin/tests/browser-install-prompt.spec.ts
+++ b/deepseek-harness-plugin/tests/browser-install-prompt.spec.ts
@@ -27,7 +27,7 @@ describe('OpenGUI workbench browser installation status', () => {
     expect(browserInstallPresentation(status('downloading', {
       downloadedBytes: 24,
       totalBytes: 100,
-    }))).toEqual({ kind: 'progress', label: '正在下载托管浏览器：24%', percent: 24 })
+    }))).toEqual({ kind: 'progress', label: '正在下载托管浏览器…', percent: 24 })
     expect(browserInstallPresentation(status('downloading'))).toEqual({
       kind: 'progress',
       label: '正在下载托管浏览器…',
diff --git a/deepseek-harness-plugin/tests/bundle.spec.ts b/deepseek-harness-plugin/tests/bundle.spec.ts
index 16471d3..0f11d13 100644
--- a/deepseek-harness-plugin/tests/bundle.spec.ts
+++ b/deepseek-harness-plugin/tests/bundle.spec.ts
@@ -71,7 +71,9 @@ describe('standalone DeepSeek Harness bundle', () => {
       readFile(new URL('src/client/coremate-trigger.ts', root), 'utf8'),
     ])
 
-    expect(view).toContain('<PhoneStream device={device} expanded={open} />')
+    expect(view).toContain('<PhoneStream device={device} expanded={open} streamStatus={streamStatus} streamGeneration={streamGeneration} enableStream={enableStream} />')
+    expect(stream).toContain("value.type === 'waiting') fallback(value.message ?? '实时画面正在等待空位', true)")
+    expect(stream).toContain("websocket.onerror = () => fallback('实时画面连接失败，已切换为截图预览。', true)")
     expect(view).not.toContain('height: 360')
     expect(view).not.toContain('从常用场景开始')
     expect(view).toContain("'收起' : '展开'")
diff --git a/deepseek-harness-plugin/tests/concurrency.spec.ts b/deepseek-harness-plugin/tests/concurrency.spec.ts
new file mode 100644
index 0000000..7084714
--- /dev/null
+++ b/deepseek-harness-plugin/tests/concurrency.spec.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it, vi } from 'vitest'
+import { AsyncSemaphore } from '../src/concurrency.ts'
+import { mapWithConcurrency } from '../src/index.ts'
+
+describe('bounded OpenGUI concurrency', () => {
+  it('cancels queued device work on the first failure and waits for active workers to exit', async () => {
+    const started: number[] = []
+    const exited: number[] = []
+    const running = mapWithConcurrency([0, 1, 2, 3], 2, new AbortController().signal, async (value, _index, signal) => {
+      started.push(value)
+      if (value === 0) throw new Error('phone failed')
+      await new Promise<void>((_resolve, reject) => {
+        signal.addEventListener('abort', () => reject(signal.reason), { once: true })
+      }).finally(() => { exited.push(value) })
+      return value
+    })
+
+    await expect(running).rejects.toThrow('phone failed')
+    expect(started).toEqual([0, 1])
+    expect(exited).toEqual([1])
+  })
+
+  it('shares two media permits across callers and never starts an aborted queued request', async () => {
+    const permits = new AsyncSemaphore(2)
+    const first = await permits.acquire(new AbortController().signal)
+    const second = await permits.acquire(new AbortController().signal)
+    const queued = new AbortController()
+    const waiting = permits.acquire(queued.signal)
+    queued.abort(new Error('stopped'))
+    await expect(waiting).rejects.toThrow('stopped')
+    first()
+    second()
+    const next = await permits.acquire(new AbortController().signal)
+    expect(next).toEqual(expect.any(Function))
+    next()
+    await vi.waitFor(() => expect(true).toBe(true))
+  })
+})
diff --git a/deepseek-harness-plugin/tests/coremate-claim-bridge.spec.ts b/deepseek-harness-plugin/tests/coremate-claim-bridge.spec.ts
index cd82c4d..c75c9af 100644
--- a/deepseek-harness-plugin/tests/coremate-claim-bridge.spec.ts
+++ b/deepseek-harness-plugin/tests/coremate-claim-bridge.spec.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from 'vitest'
-import { coremateClaimSpan } from '../src/client/CoremateClaimBridge.tsx'
+import {
+  coremateClaimSpan,
+  directOpenGuiTask,
+  submittedDirectOpenGuiTask,
+} from '../src/client/CoremateClaimBridge.tsx'
 
 describe('OpenGUI command claim bridge', () => {
   it('keeps a bare mention plain so the native scene menu can remain open', () => {
@@ -14,4 +18,17 @@ describe('OpenGUI command claim bridge', () => {
     expect(coremateClaimSpan('@OpenGUIX run the task', 7)).toBeUndefined()
     expect(coremateClaimSpan('hello @OpenGUI', 8)).toBeUndefined()
   })
+
+  it('recognizes non-empty direct slash commands before Host status polling', () => {
+    expect(directOpenGuiTask('/opengui inspect phone')).toBe('inspect phone')
+    expect(directOpenGuiTask('/coremate legacy task')).toBe('legacy task')
+    expect(directOpenGuiTask('/opengui')).toBeUndefined()
+    expect(directOpenGuiTask('/help opengui')).toBeUndefined()
+  })
+
+  it('does not consume a session until the direct slash command is submitted', () => {
+    expect(submittedDirectOpenGuiTask('/opengui inspect phone', 'plain')).toBeUndefined()
+    expect(submittedDirectOpenGuiTask('/opengui inspect phone', 'adjudicating')).toBeUndefined()
+    expect(submittedDirectOpenGuiTask('/opengui inspect phone', 'submitting')).toBe('inspect phone')
+  })
 })
diff --git a/deepseek-harness-plugin/tests/coremate-trigger.spec.ts b/deepseek-harness-plugin/tests/coremate-trigger.spec.ts
index 8bd2a38..609bc0d 100644
--- a/deepseek-harness-plugin/tests/coremate-trigger.spec.ts
+++ b/deepseek-harness-plugin/tests/coremate-trigger.spec.ts
@@ -1,6 +1,6 @@
 import type { ClientContext, ISessions } from '@deepseek-ai/dsh-client-runtime/client'
 import { describe, expect, it, vi } from 'vitest'
-import { coremateTriggerSource } from '../src/client/coremate-trigger.ts'
+import { coremateTriggerSource, isUntitledSession } from '../src/client/coremate-trigger.ts'
 
 function setup(result: { ok: true, value: { matched: boolean } } | { ok: false, error: { message: string } } = { ok: true, value: { matched: true } }) {
   const command = vi.fn(async () => result)
@@ -19,6 +19,13 @@ function setup(result: { ok: true, value: { matched: boolean } } | { ok: false,
 }
 
 describe('native @OpenGUI trigger', () => {
+  it('recognizes DSH default session titles as untitled', () => {
+    expect(isUntitledSession(undefined)).toBe(true)
+    expect(isUntitledSession('')).toBe(true)
+    expect(isUntitledSession('New Session')).toBe(true)
+    expect(isUntitledSession('新会话')).toBe(true)
+    expect(isUntitledSession('Existing task')).toBe(false)
+  })
   it('offers one leading, case-insensitive menu candidate', async () => {
     const { source, session } = setup()
     await expect(source.candidates(session, { query: 'open', position: 'leading', signal: new AbortController().signal }))
@@ -71,7 +78,7 @@ describe('native @OpenGUI trigger', () => {
       query: 'OpenGUI', position: 'leading', signal: new AbortController().signal,
     })
     const qa = source.onPick({ candidate: scenes[1]!, session, position: 'leading', via: 'menu', span: { start: 0, end: 9, draftRev: 2 } })
-    expect(qa).toEqual({ text: '@OpenGUI 作为测试，帮我走查当前 APP，先产出测试用例，再按用例逐项执行并汇总问题。' })
+    expect(qa).toEqual({ text: '@OpenGUI 作为测试，帮我走查当前已连接 Android 手机上的 APP，先产出测试用例，再按用例逐项执行并汇总问题。' })
 
     const spaced = source.matchSpace?.(session, '@oPeNgUi')
     expect(spaced).toEqual({ claim: expect.objectContaining({ token: '@oPeNgUi ' }) })
diff --git a/deepseek-harness-plugin/tests/coremate-view.spec.ts b/deepseek-harness-plugin/tests/coremate-view.spec.ts
index 0294c39..39ee5a8 100644
--- a/deepseek-harness-plugin/tests/coremate-view.spec.ts
+++ b/deepseek-harness-plugin/tests/coremate-view.spec.ts
@@ -17,7 +17,7 @@ describe('OpenGUI device photo wall', () => {
     expect(buildDeviceWallItems([])).toEqual([{ kind: 'connect-more' }])
   })
 
-  it.each([1, 3, 4, 5])('appends one connection guide after %i devices', count => {
+  it.each([1, 3, 4, 5, 10])('appends one connection guide after %i devices', count => {
     const devices = Array.from({ length: count }, (_, index) => device(`phone-${index + 1}`))
     const items = buildDeviceWallItems(devices)
 
diff --git a/deepseek-harness-plugin/tests/device-fleet.spec.ts b/deepseek-harness-plugin/tests/device-fleet.spec.ts
index 99b3ba0..9df73d7 100644
--- a/deepseek-harness-plugin/tests/device-fleet.spec.ts
+++ b/deepseek-harness-plugin/tests/device-fleet.spec.ts
@@ -63,4 +63,19 @@ describe('multi-phone device fleet', () => {
     })
     await expect(fleet.select(['id-a'], signal)).rejects.toThrow('disconnected or unknown')
   })
+
+  it('never resolves a frozen opaque id to a replacement phone', async () => {
+    let devices: AdbDevice[] = [{ serial: 'original', state: 'device', model: 'Pixel' }]
+    const ids = ['locked-original', 'new-arrival']
+    const fleet = new DeviceFleet(async () => devices, () => ids.shift()!)
+    const signal = new AbortController().signal
+    const locked = await fleet.selectedDevices(signal)
+    expect(locked[0]).toMatchObject({ id: 'locked-original', serial: 'original' })
+
+    devices = [{ serial: 'replacement', state: 'device', model: 'Pixel' }]
+    await expect(fleet.resolveConnected(['locked-original'], signal)).rejects.toThrow('disconnected or unknown')
+    expect((await fleet.snapshot(signal)).devices).toEqual([
+      { id: 'new-arrival', label: 'Pixel', model: 'Pixel', selected: true },
+    ])
+  })
 })
diff --git a/deepseek-harness-plugin/tests/forward-registry.spec.ts b/deepseek-harness-plugin/tests/forward-registry.spec.ts
new file mode 100644
index 0000000..ac731e5
--- /dev/null
+++ b/deepseek-harness-plugin/tests/forward-registry.spec.ts
@@ -0,0 +1,143 @@
+import { mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { OwnedForwardRegistry, parseAdbForwardList } from '../src/forward-registry.ts'
+
+const temporary: string[] = []
+
+afterEach(async () => {
+  await Promise.all(temporary.splice(0).map(path => rm(path, { recursive: true, force: true })))
+})
+
+describe('plugin-owned ADB forward registry', () => {
+  it('parses only complete ADB forward rows', () => {
+    expect(parseAdbForwardList('phone-A tcp:1001 localabstract:scrcpy_a\ninvalid\n')).toEqual([
+      { serial: 'phone-A', local: 'tcp:1001', remote: 'localabstract:scrcpy_a' },
+    ])
+  })
+
+  it('persists exact ownership and removes the record only after cleanup succeeds', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'opengui-forward-registry-'))
+    temporary.push(root)
+    const path = join(root, 'owned.json')
+    const registry = new OwnedForwardRegistry(path)
+    const record = { serial: 'phone-A', port: 27183, scid: '00abc123', kind: 'video-stream' as const }
+    await registry.track(record)
+    const failed = vi.fn(async () => { throw new Error('device offline') })
+    await expect(registry.release(record, failed)).resolves.toBe(false)
+    await expect(new OwnedForwardRegistry(path).list()).resolves.toEqual([record])
+
+    const succeeded = vi.fn(async (args: readonly string[]) => args.includes('--list')
+      ? 'phone-A tcp:27183 localabstract:scrcpy_00abc123\n'
+      : undefined)
+    await expect(registry.release(record, succeeded)).resolves.toBe(true)
+    expect(succeeded).toHaveBeenNthCalledWith(2,
+      ['-s', 'phone-A', 'forward', '--remove', 'tcp:27183'],
+      expect.any(AbortSignal),
+    )
+    await expect(registry.list()).resolves.toEqual([])
+  })
+
+  it('serializes concurrent writers from separate registry instances', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'opengui-forward-concurrent-'))
+    temporary.push(root)
+    const path = join(root, 'owned.json')
+    const first = new OwnedForwardRegistry(path)
+    const second = new OwnedForwardRegistry(path)
+    const records = Array.from({ length: 20 }, (_, index) => ({
+      serial: `phone-${index}`,
+      port: 20_000 + index,
+      scid: `scid-${index}`,
+      kind: 'video-stream' as const,
+    }))
+
+    await Promise.all(records.map((record, index) => (index % 2 === 0 ? first : second).track(record)))
+
+    await expect(new OwnedForwardRegistry(path).list()).resolves.toEqual(
+      expect.arrayContaining(records),
+    )
+    await expect(new OwnedForwardRegistry(path).list()).resolves.toHaveLength(records.length)
+  })
+
+  it('does not recover forwards owned by another live plugin instance', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'opengui-forward-live-owner-'))
+    temporary.push(root)
+    const path = join(root, 'owned.json')
+    const owner = new OwnedForwardRegistry(path)
+    const recovering = new OwnedForwardRegistry(path)
+    const record = { serial: 'phone-A', port: 27183, scid: 'live', kind: 'video-stream' as const }
+    await owner.track(record)
+    const run = vi.fn(async () => 'phone-A tcp:27183 localabstract:scrcpy_live\n')
+
+    await expect(recovering.recover(run)).resolves.toEqual({ removed: 0, retained: 1 })
+    expect(run).not.toHaveBeenCalled()
+    await expect(recovering.list()).resolves.toEqual([record])
+  })
+
+  it('recovers only forwards recorded by this plugin and retains failures for the next start', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'opengui-forward-recovery-'))
+    temporary.push(root)
+    const registry = new OwnedForwardRegistry(join(root, 'owned.json'))
+    await registry.track({ serial: 'phone-A', port: 1001, scid: 'a', kind: 'text-input' })
+    await registry.track({ serial: 'phone-B', port: 1002, scid: 'b', kind: 'video-stream' })
+    const run = vi.fn(async (args: readonly string[]) => {
+      const serial = args[1]
+      if (args.includes('--list')) {
+        const port = serial === 'phone-A' ? 1001 : 1002
+        const scid = serial === 'phone-A' ? 'a' : 'b'
+        return `${serial} tcp:${port} localabstract:scrcpy_${scid}\n`
+      }
+      if (serial === 'phone-B') throw new Error('offline')
+    })
+
+    await expect(registry.recover(run)).resolves.toEqual({ removed: 1, retained: 1 })
+    await expect(registry.list()).resolves.toEqual([
+      { serial: 'phone-B', port: 1002, scid: 'b', kind: 'video-stream' },
+    ])
+    expect(run).toHaveBeenCalledTimes(4)
+  })
+
+  it('does not remove a port that has been remapped to another owner', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'opengui-forward-remap-'))
+    temporary.push(root)
+    const registry = new OwnedForwardRegistry(join(root, 'owned.json'))
+    const record = { serial: 'phone-A', port: 1001, scid: 'ours', kind: 'video-stream' as const }
+    await registry.track(record)
+    const run = vi.fn(async () => 'phone-A tcp:1001 localabstract:another_tool\n')
+
+    await expect(registry.release(record, run)).resolves.toBe(true)
+    expect(run).toHaveBeenCalledOnce()
+    expect(run).toHaveBeenCalledWith(
+      ['-s', 'phone-A', 'forward', '--list'],
+      expect.any(AbortSignal),
+    )
+    await expect(registry.list()).resolves.toEqual([])
+  })
+
+  it('reports retained ownership when registry persistence fails after ADB cleanup', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'opengui-forward-persist-'))
+    temporary.push(root)
+    const path = join(root, 'owned.json')
+    const registry = new OwnedForwardRegistry(path)
+    const record = { serial: 'phone-A', port: 1001, scid: 'ours', kind: 'video-stream' as const }
+    await registry.track(record)
+    await rm(root, { recursive: true, force: true })
+    await writeFile(root, 'not-a-directory')
+    const run = vi.fn(async (args: readonly string[]) => args.includes('--list')
+      ? 'phone-A tcp:1001 localabstract:scrcpy_ours\n'
+      : undefined)
+
+    await expect(registry.release(record, run)).resolves.toBe(false)
+    expect(run).toHaveBeenCalledTimes(2)
+  })
+
+  it('has a synchronous exact cleanup path for Host termination', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'opengui-forward-signal-'))
+    temporary.push(root)
+    const registry = new OwnedForwardRegistry(join(root, 'owned.json'))
+    await registry.track({ serial: 'phone-A', port: 1234, scid: 'signal', kind: 'video-stream' })
+    expect(registry.releaseAllSync('/usr/bin/true')).toEqual({ removed: 1, retained: 0 })
+    await expect(registry.list()).resolves.toEqual([])
+  })
+})
diff --git a/deepseek-harness-plugin/tests/phone-progress.spec.ts b/deepseek-harness-plugin/tests/phone-progress.spec.ts
index 8a05d40..349d6dd 100644
--- a/deepseek-harness-plugin/tests/phone-progress.spec.ts
+++ b/deepseek-harness-plugin/tests/phone-progress.spec.ts
@@ -40,7 +40,7 @@ describe('phone task chat progress', () => {
     })
     expect(subscribe).toHaveBeenCalledOnce()
 
-    stop()
+    stop.dispose()
     expect(listeners).toHaveLength(0)
     expect(parent.events.slice(-2).map(event => event.type)).toEqual(['step/end', 'turn/end'])
   })
@@ -96,7 +96,7 @@ describe('phone task chat progress', () => {
       data: { message: { content: [{ type: 'text', text: '已打开小红书。' }] } },
     })
     const lengthBeforeStop = parent.events.length
-    stop()
+    stop.dispose()
     expect(parent.events).toHaveLength(lengthBeforeStop)
   })
 
@@ -252,6 +252,6 @@ describe('phone task chat progress', () => {
       { type: 'tool/code-dispatch-start', data: nestedData },
       { type: 'tool/code-dispatch', data: { ...nestedData, isError: false } },
     ])
-    stop()
+    stop.dispose()
   })
 })
diff --git a/deepseek-harness-plugin/tests/phone-task.spec.ts b/deepseek-harness-plugin/tests/phone-task.spec.ts
index d58eb05..20d3aa1 100644
--- a/deepseek-harness-plugin/tests/phone-task.spec.ts
+++ b/deepseek-harness-plugin/tests/phone-task.spec.ts
@@ -1,7 +1,7 @@
 import type { CommandInvocation } from '@deepseek-ai/dsh-commands'
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
 import { describe, expect, it, vi } from 'vitest'
-import { CoremateTaskCoordinator } from '../src/phone-task.ts'
+import { CoremateTaskCoordinator, OpenGuiTaskManager } from '../src/phone-task.ts'
 
 const invocation = (rawInput: string, signal = new AbortController().signal): CommandInvocation => ({
   commandId: 'command-test' as CommandInvocation['commandId'],
@@ -13,6 +13,44 @@ const invocation = (rawInput: string, signal = new AbortController().signal): Co
 const result = (runId: string, output: ContentBlock[] = [{ type: 'text', text: 'done' }]) => ({ runId, output })
 
 describe('OpenGUI task entry points', () => {
+  it('admits one root task while allowing only explicitly bound nested agents', async () => {
+    const manager = new OpenGuiTaskManager<{ targets: string[] }>()
+    let release!: () => void
+    const gate = new Promise<void>(resolve => { release = resolve })
+    const router = {}
+    const stranger = {}
+    const running = manager.runRoot(invocation('').agent, new AbortController().signal, 'routing', async lease => {
+      lease.bindAgent(router)
+      lease.context = { targets: ['phone-a'] }
+      await gate
+      return 'done'
+    })
+
+    await vi.waitFor(() => expect(manager.state().phase).toBe('routing'))
+    expect(manager.nestedLease(router)?.context).toEqual({ targets: ['phone-a'] })
+    expect(manager.nestedLease(stranger)).toBeUndefined()
+    await expect(manager.runRoot(invocation('').agent, new AbortController().signal, 'running', async () => 'second'))
+      .rejects.toThrow('another OpenGUI task is already running')
+    release()
+    await expect(running).resolves.toBe('done')
+    expect(manager.state()).toEqual({ active: false, phase: 'idle', selectionLocked: false })
+  })
+
+  it('attributes the root task to the actual session rather than the resident agent id', async () => {
+    const manager = new OpenGuiTaskManager()
+    let release!: () => void
+    const gate = new Promise<void>(resolve => { release = resolve })
+    const parent = { id: 'resident-agent', session: { id: 'actual-session' } } as CommandInvocation['agent']
+    const running = manager.runRoot(parent, new AbortController().signal, 'running', async () => {
+      await gate
+      return 'done'
+    })
+    await vi.waitFor(() => expect(manager.state().active).toBe(true))
+    expect(manager.state().ownerSessionId).toBe('actual-session')
+    release()
+    await running
+  })
+
   it('publishes /opengui metadata and forwards trimmed input to the shared runner', async () => {
     const start = vi.fn(async () => result('run-1', [
       { type: 'text', text: 'opened ' },
diff --git a/deepseek-harness-plugin/tests/preview.spec.ts b/deepseek-harness-plugin/tests/preview.spec.ts
index 12f9231..5842135 100644
--- a/deepseek-harness-plugin/tests/preview.spec.ts
+++ b/deepseek-harness-plugin/tests/preview.spec.ts
@@ -51,4 +51,38 @@ describe('bounded phone previews', () => {
     expect(peak).toBe(2)
     expect(capture).toHaveBeenCalledTimes(2)
   })
+
+  it('lets one HTTP waiter cancel without aborting a shared device capture', async () => {
+    let release!: () => void
+    const gate = new Promise<void>(resolve => { release = resolve })
+    const source = await png('#224466')
+    const capture = vi.fn(async (_serial: string, signal: AbortSignal) => {
+      await gate
+      signal.throwIfAborted()
+      return source
+    })
+    const preview = new PhonePreview(capture)
+    const cancelled = new AbortController()
+    const kept = new AbortController()
+    const first = preview.read(device, cancelled.signal)
+    const second = preview.read(device, kept.signal)
+
+    cancelled.abort(new Error('tab hidden'))
+    await expect(first).rejects.toThrow('tab hidden')
+    release()
+    await expect(second).resolves.toMatchObject({ etag: expect.any(String) })
+    expect(capture).toHaveBeenCalledTimes(1)
+  })
+
+  it('bounds the encoded preview cache to the 16 most recently used devices', async () => {
+    const source = await png('#667788')
+    const capture = vi.fn(async () => source)
+    const preview = new PhonePreview(capture)
+    const signal = new AbortController().signal
+    for (let index = 0; index < 17; index += 1) {
+      await preview.read({ ...device, id: `device-${index}`, serial: `serial-${index}` }, signal)
+    }
+    await preview.read({ ...device, id: 'device-0', serial: 'serial-0' }, signal)
+    expect(capture).toHaveBeenCalledTimes(18)
+  })
 })
diff --git a/deepseek-harness-plugin/tests/promotion.spec.ts b/deepseek-harness-plugin/tests/promotion.spec.ts
index e796a05..681c7d5 100644
--- a/deepseek-harness-plugin/tests/promotion.spec.ts
+++ b/deepseek-harness-plugin/tests/promotion.spec.ts
@@ -42,12 +42,21 @@ function commandState(name = 'opengui', doneSeq?: number): ConversationContextRe
 }
 
 describe('OpenGUI completion promotion', () => {
-  it('publishes one success marker for a completed Turn owned by a live /opengui command', () => {
+  const assistant = (seq: number, turn = 4) => match(event('assistant/message', {
+    turn,
+    step: 1,
+    message: createAssistantMessage({ content: [{ type: 'text', text: '完成。' }], source: { provider: 'test', model: 'vision' } }),
+  }, seq), 'start')
+
+  it('publishes one success marker only after command/done names the final assistant message', () => {
     expect(corematePromotionDefinition.kind).toBe('coremate-promotion')
-    const start = match(event('turn/start', { turn: 4 }, 2), 'start')
+    const start = assistant(2)
     const initial = corematePromotionDefinition.start(context(), start, commandState())
-    const end = match(event('turn/end', { turn: 4, reason: { kind: 'completed' } }, 3), 'update')
-    const completed = corematePromotionDefinition.update(context(initial) as never, end)
+    expect(corematePromotionDefinition.buildLocationData?.(context(initial), 'turn')).toBeNull()
+    const done = match(event('command/done', {
+      commandId: 'command-1' as never, kind: 'success', sourceEventSeq: 2,
+    }, 3), 'update')
+    const completed = corematePromotionDefinition.update(context(initial) as never, done)
 
     expect(corematePromotionDefinition.buildLocationData?.(context(completed), 'turn')).toEqual({
       kind: 'turn', turn: 4, key: 'coremate-promotion',
@@ -56,20 +65,22 @@ describe('OpenGUI completion promotion', () => {
   })
 
   it('still attributes turns launched through the legacy /coremate alias', () => {
-    const start = match(event('turn/start', { turn: 5 }, 2), 'start')
+    const start = assistant(2, 5)
     const initial = corematePromotionDefinition.start(context(), start, commandState('coremate'))
     expect(initial.attributed).toBe(true)
   })
 
   it.each([
-    ['cancelled Turn', 'opengui', undefined, { kind: 'interrupted' }],
-    ['another command', 'help', undefined, { kind: 'completed' }],
-    ['finished configuration command', 'opengui', 1, { kind: 'completed' }],
-  ] as const)('does not publish for %s', (_label, name, doneSeq, reason) => {
-    const start = match(event('turn/start', { turn: 2 }, 2), 'start')
+    ['failed command', 'opengui', undefined, 'error'],
+    ['another command', 'help', undefined, 'success'],
+    ['finished configuration command', 'opengui', 1, 'success'],
+  ] as const)('does not publish for %s', (_label, name, doneSeq, kind) => {
+    const start = assistant(2, 2)
     const initial = corematePromotionDefinition.start(context(), start, commandState(name, doneSeq))
-    const end = match(event('turn/end', { turn: 2, reason }, 3), 'update')
-    const finished = corematePromotionDefinition.update(context(initial) as never, end)
+    const done = match(event('command/done', {
+      commandId: 'command-1' as never, kind, sourceEventSeq: 2,
+    }, 3), 'update')
+    const finished = corematePromotionDefinition.update(context(initial) as never, done)
 
     expect(corematePromotionDefinition.buildLocationData?.(context(finished), 'turn')).toBeNull()
   })
@@ -84,7 +95,7 @@ describe('OpenGUI completion promotion', () => {
     }, 2), 'update')
     const finished = coremateCommandContextDefinition.update(context(initial) as never, done)
 
-    expect(finished).toEqual({ name: 'opengui', runSeq: 1, doneSeq: 2 })
+    expect(finished).toEqual({ name: 'opengui', runSeq: 1, doneSeq: 2, doneKind: 'success' })
     expect(selectCorematePromotion({
       turn: { data: { get: () => undefined } },
     } as never)).toBeNull()
diff --git a/deepseek-harness-plugin/tests/scrcpy.spec.ts b/deepseek-harness-plugin/tests/scrcpy.spec.ts
index b2045e1..c4f2c44 100644
--- a/deepseek-harness-plugin/tests/scrcpy.spec.ts
+++ b/deepseek-harness-plugin/tests/scrcpy.spec.ts
@@ -119,6 +119,79 @@ describe('verified scrcpy installation', () => {
       .rejects.toThrow('scrcpy download checksum mismatch')
     expect(await installer.isInstalled(asset)).toBe(false)
   })
+
+  it('keeps a shared download alive when only one installer waiter cancels', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'coremate-scrcpy-shared-'))
+    temporary.push(root)
+    const source = join(root, 'source')
+    const archiveRoot = 'scrcpy-shared-v4.1'
+    await mkdir(join(source, archiveRoot), { recursive: true })
+    await Promise.all([
+      writeFile(join(source, archiveRoot, 'scrcpy'), 'native-client'),
+      writeFile(join(source, archiveRoot, 'scrcpy-server'), 'android-server'),
+    ])
+    const archive = join(root, 'fixture.tar.gz')
+    await createTar({ cwd: source, file: archive, gzip: true }, [archiveRoot])
+    const bytes = await readFile(archive)
+    let release!: () => void
+    const gate = new Promise<void>(resolve => { release = resolve })
+    const asset: ScrcpyAsset = {
+      key: 'shared-test', archive: 'tar.gz', archiveRoot, executable: 'scrcpy',
+      url: 'https://example.invalid/shared.tar.gz', bytes: bytes.byteLength,
+      sha256: createHash('sha256').update(bytes).digest('hex'),
+    }
+    const fetchMock = vi.fn(async () => {
+      await gate
+      return new Response(bytes)
+    })
+    const installer = new ScrcpyInstaller({ cacheDir: join(root, 'cache'), fetch: fetchMock as typeof fetch })
+    const cancelled = new AbortController()
+    const kept = new AbortController()
+    const first = installer.ensure(asset, cancelled.signal, () => {})
+    const second = installer.ensure(asset, kept.signal, () => {})
+
+    cancelled.abort(new Error('first device closed'))
+    await expect(first).rejects.toThrow('first device closed')
+    release()
+    await expect(second).resolves.toMatchObject({ executable: expect.stringContaining('scrcpy') })
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it('serializes two installer instances and replaces a corrupt partial cache atomically', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'coremate-scrcpy-lock-'))
+    temporary.push(root)
+    const source = join(root, 'source')
+    const archiveRoot = 'scrcpy-locked-v4.1'
+    await mkdir(join(source, archiveRoot), { recursive: true })
+    await Promise.all([
+      writeFile(join(source, archiveRoot, 'scrcpy'), 'valid-client'),
+      writeFile(join(source, archiveRoot, 'scrcpy-server'), 'valid-server'),
+    ])
+    const archive = join(root, 'fixture.tar.gz')
+    await createTar({ cwd: source, file: archive, gzip: true }, [archiveRoot])
+    const bytes = await readFile(archive)
+    const asset: ScrcpyAsset = {
+      key: 'locked-test', archive: 'tar.gz', archiveRoot, executable: 'scrcpy',
+      url: 'https://example.invalid/locked.tar.gz', bytes: bytes.byteLength,
+      sha256: createHash('sha256').update(bytes).digest('hex'),
+    }
+    const cacheDir = join(root, 'cache')
+    const corrupt = join(cacheDir, `v${SCRCPY_VERSION}`, asset.key, archiveRoot)
+    await mkdir(corrupt, { recursive: true })
+    await writeFile(join(corrupt, 'scrcpy'), 'partial')
+    const fetchMock = vi.fn(async () => new Response(bytes))
+    const first = new ScrcpyInstaller({ cacheDir, fetch: fetchMock as typeof fetch })
+    const second = new ScrcpyInstaller({ cacheDir, fetch: fetchMock as typeof fetch })
+
+    const [one, two] = await Promise.all([
+      first.ensure(asset, new AbortController().signal, () => {}),
+      second.ensure(asset, new AbortController().signal, () => {}),
+    ])
+    expect(one).toEqual(two)
+    await expect(readFile(one.executable, 'utf8')).resolves.toBe('valid-client')
+    await expect(readFile(one.server, 'utf8')).resolves.toBe('valid-server')
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
 })
 
 class FakeInstaller extends ScrcpyInstaller {
@@ -240,6 +313,25 @@ describe('always-available native mirror', () => {
     await mirror.dispose()
   })
 
+  it('terminates native windows synchronously when the Host receives SIGTERM', async () => {
+    const child = new FakeProcess()
+    const mirror = new ScrcpyMirror({
+      asset: SCRCPY_ASSETS['darwin-arm64']!,
+      installer: new FakeInstaller({ root: '/cache', executable: '/cache/scrcpy', server: '/cache/server' }),
+      adbPath: () => '/adb',
+      spawn: () => {
+        queueMicrotask(() => { child.emit('spawn') })
+        return child
+      },
+    })
+    mirror.requestStart({ id: 'phone', serial: 'serial', label: 'Pixel' })
+    await vi.waitFor(() => expect(mirror.status([{ id: 'phone', label: 'Pixel', selected: true }]).devices[0]?.phase).toBe('running'))
+    mirror.stopAllSync()
+    expect(child.killed).toBe(true)
+    expect(mirror.status([{ id: 'phone', label: 'Pixel', selected: true }]).devices[0]?.phase).toBe('idle')
+    await mirror.dispose()
+  })
+
   it('waits for process exit and escalates a mirror that ignores SIGTERM', async () => {
     const child = new StubbornProcess()
     const mirror = new ScrcpyMirror({
@@ -284,6 +376,29 @@ describe('always-available native mirror', () => {
     await mirror.dispose()
   })
 
+  it('does not revive a queued mirror start after a later stop', async () => {
+    const installer = new WaitingInstaller()
+    const ensure = vi.spyOn(installer, 'ensure')
+    const mirror = new ScrcpyMirror({
+      asset: SCRCPY_ASSETS['linux-x64']!,
+      installer,
+      adbPath: () => '/adb',
+    })
+    const device = { id: 'phone', serial: 'serial', label: 'Pixel' }
+
+    mirror.requestStart(device)
+    await vi.waitFor(() => { expect(installer.signal).toBeDefined() })
+    const firstStop = mirror.stop(device.id)
+    mirror.requestStart(device)
+    const finalStop = mirror.stop(device.id)
+    await Promise.all([firstStop, finalStop])
+    await new Promise(resolve => setTimeout(resolve, 0))
+
+    expect(ensure).toHaveBeenCalledTimes(1)
+    expect(mirror.status([{ id: device.id, label: device.label, selected: true }]).devices[0]?.phase).toBe('idle')
+    await mirror.dispose()
+  })
+
   it('launches a connected phone without requiring an active OpenGUI task', async () => {
     const child = new FakeProcess()
     const spawnMock = vi.fn(() => {
diff --git a/deepseek-harness-plugin/tests/session-bridge.spec.ts b/deepseek-harness-plugin/tests/session-bridge.spec.ts
index b9ff95b..c2e4d9e 100644
--- a/deepseek-harness-plugin/tests/session-bridge.spec.ts
+++ b/deepseek-harness-plugin/tests/session-bridge.spec.ts
@@ -81,6 +81,78 @@ describe('OpenGUI active-task new-session bridge', () => {
     expect(original).not.toHaveBeenCalled()
   })
 
+  it('does not let a delayed create steal focus after the user navigates elsewhere', async () => {
+    const listState = {
+      current: 'session-owner',
+      byId: {
+        'session-owner': { blank: true },
+        'session-other': { blank: false },
+      } as Record<string, { blank: boolean }>,
+    }
+    let release!: () => void
+    const gate = new Promise<void>(resolve => { release = resolve })
+    const open = vi.fn()
+    const workspace = {
+      list: { getSnapshot: () => ({ items: [{ workspaceId: 'workspace-1', sessionIds: ['session-owner', 'session-other'] }] }) },
+      startSession: vi.fn(),
+    }
+    installActiveTaskSessionBridge({
+      sessions: {
+        list: { getSnapshot: () => listState },
+        create: async () => { await gate; return 'session-fresh' },
+        open,
+      },
+      workspaces: workspace,
+    } as never, {
+      getSnapshot: () => ({ task: { active: true, ownerSessionId: 'session-owner' } }),
+      isConsumedSession: () => false,
+      setBridgeError: vi.fn(),
+    } as never)
+
+    workspace.startSession()
+    listState.current = 'session-other'
+    release()
+    await new Promise(resolve => setTimeout(resolve, 0))
+    expect(open).not.toHaveBeenCalled()
+  })
+
+  it('queues a new-session request from a different origin in the same workspace', async () => {
+    const listState = {
+      current: 'session-owner',
+      byId: {
+        'session-owner': { blank: true },
+        'session-other': { blank: true },
+      } as Record<string, { blank: boolean }>,
+    }
+    let releaseFirst!: () => void
+    const firstGate = new Promise<void>(resolve => { releaseFirst = resolve })
+    const create = vi.fn()
+      .mockImplementationOnce(async () => { await firstGate; return 'session-first' })
+      .mockResolvedValueOnce('session-second')
+    const open = vi.fn()
+    const workspace = {
+      list: { getSnapshot: () => ({ items: [{ workspaceId: 'workspace-1', sessionIds: ['session-owner', 'session-other'] }] }) },
+      startSession: vi.fn(),
+    }
+    installActiveTaskSessionBridge({
+      sessions: { list: { getSnapshot: () => listState }, create, open },
+      workspaces: workspace,
+    } as never, {
+      getSnapshot: () => ({ task: { active: true, ownerSessionId: listState.current } }),
+      isConsumedSession: () => false,
+      setBridgeError: vi.fn(),
+    } as never)
+
+    workspace.startSession()
+    listState.current = 'session-other'
+    workspace.startSession()
+    releaseFirst()
+
+    await vi.waitFor(() => expect(create).toHaveBeenCalledTimes(2))
+    await vi.waitFor(() => expect(open).toHaveBeenCalledWith('session-second'))
+    expect(open).not.toHaveBeenCalledWith('session-first')
+  })
+
   it('preserves the native New Session path outside the active blank owner', () => {
     const original = vi.fn()
     const workspace = {
diff --git a/deepseek-harness-plugin/tests/stream-manager.spec.ts b/deepseek-harness-plugin/tests/stream-manager.spec.ts
index 0556305..6089faa 100644
--- a/deepseek-harness-plugin/tests/stream-manager.spec.ts
+++ b/deepseek-harness-plugin/tests/stream-manager.spec.ts
@@ -41,7 +41,10 @@ function sink() {
   } satisfies ScrcpyStreamSink & { disconnect(): void }
 }
 
-function setup(maxSources = 4) {
+function setup(maxSources = 4, forwardRegistry = {
+  track: vi.fn(async () => undefined),
+  release: vi.fn(async () => true),
+}) {
   const children: FakeProcess[] = []
   const sockets: PassThrough[] = []
   const runAdb = vi.fn(async () => '')
@@ -53,6 +56,7 @@ function setup(maxSources = 4) {
     freePort: async () => 40123 + sockets.length,
     maxSources,
     idleGraceMs: 5,
+    forwardRegistry: forwardRegistry as never,
     spawn: vi.fn(() => {
       const child = new FakeProcess()
       children.push(child)
@@ -112,7 +116,8 @@ describe('shared embedded scrcpy sources', () => {
     unsubscribeLate()
     await new Promise(resolve => setTimeout(resolve, 10))
     await vi.waitFor(() => expect(runAdb).toHaveBeenCalledWith(
-      ['-s', 'private-one', 'forward', '--remove', 'tcp:40123'], expect.any(AbortSignal),
+      ['-s', 'private-one', 'forward', '--no-rebind', 'tcp:40123', expect.stringMatching(/^localabstract:scrcpy_/u)],
+      expect.any(AbortSignal),
     ))
     await streams.dispose()
   })
@@ -147,4 +152,50 @@ describe('shared embedded scrcpy sources', () => {
     await expect(streams.status()).resolves.toMatchObject({ activeSources: 1, maxSources: 1 })
     await streams.dispose()
   })
+
+  it('starts a fresh source when a subscriber arrives while the old entry is still closing', async () => {
+    let releaseCleanup!: () => void
+    const cleanupGate = new Promise<void>(resolve => { releaseCleanup = resolve })
+    const forwardRegistry = {
+      track: vi.fn(async () => undefined),
+      release: vi.fn()
+        .mockImplementationOnce(async () => cleanupGate)
+        .mockResolvedValue(true),
+    }
+    const { streams, sockets } = setup(4, forwardRegistry)
+    const device = { id: 'opaque', serial: 'private', label: 'Pixel' }
+    const unsubscribe = await streams.subscribe(device, sink())
+    await vi.waitFor(() => expect(sockets).toHaveLength(1))
+
+    unsubscribe()
+    await vi.waitFor(() => expect(forwardRegistry.release).toHaveBeenCalledTimes(1))
+    await streams.subscribe(device, sink())
+    await vi.waitFor(() => expect(sockets).toHaveLength(2))
+
+    releaseCleanup()
+    await streams.dispose()
+  })
+
+  it('waits for an already-running entry cleanup during disposal', async () => {
+    let releaseCleanup!: () => void
+    const cleanupGate = new Promise<void>(resolve => { releaseCleanup = resolve })
+    const forwardRegistry = {
+      track: vi.fn(async () => undefined),
+      release: vi.fn(async () => cleanupGate),
+    }
+    const { streams, sockets } = setup(4, forwardRegistry)
+    const unsubscribe = await streams.subscribe({ id: 'opaque', serial: 'private', label: 'Pixel' }, sink())
+    await vi.waitFor(() => expect(sockets).toHaveLength(1))
+
+    unsubscribe()
+    await vi.waitFor(() => expect(forwardRegistry.release).toHaveBeenCalledTimes(1))
+    let disposed = false
+    const disposal = streams.dispose().then(() => { disposed = true })
+    await new Promise(resolve => setTimeout(resolve, 0))
+    expect(disposed).toBe(false)
+
+    releaseCleanup()
+    await disposal
+    expect(disposed).toBe(true)
+  })
 })
diff --git a/deepseek-harness-plugin/tests/suggestions.spec.ts b/deepseek-harness-plugin/tests/suggestions.spec.ts
index 493c308..4e284c1 100644
--- a/deepseek-harness-plugin/tests/suggestions.spec.ts
+++ b/deepseek-harness-plugin/tests/suggestions.spec.ts
@@ -23,6 +23,30 @@ describe('OpenGUI follow-up suggestions', () => {
     })
   })
 
+  it('parses and removes a valid trailer split across trailing text blocks', () => {
+    const blocks: ContentBlock[] = [
+      { type: 'text', text: '任务完成。\n<!--coremate-' },
+      { type: 'text', text: 'suggestions\n{"items":[{"label":"继续检查","prompt":"继续检查剩余页面"},' },
+      { type: 'text', text: '{"label":"整理报告","prompt":"整理完整报告"}]}\n-->' },
+    ]
+    expect(cleanCoremateSuggestionBlocks(blocks)).toEqual({
+      output: [{ type: 'text', text: '任务完成。' }],
+      suggestions: [
+        { label: '继续检查', prompt: '继续检查剩余页面' },
+        { label: '整理报告', prompt: '整理完整报告' },
+      ],
+    })
+  })
+
+  it('does not join a trailer across a non-text block', () => {
+    const blocks: ContentBlock[] = [
+      { type: 'text', text: '任务完成。\n<!--coremate-suggestions\n' },
+      { type: 'image', image: 'attachment:test' } as never,
+      { type: 'text', text: '{"items":[]}\n-->' },
+    ]
+    expect(cleanCoremateSuggestionBlocks(blocks)).toEqual({ output: blocks, suggestions: [] })
+  })
+
   it.each([
     ['missing marker', '任务完成。'],
     ['not final', `${valid}\n尾部文字`],
diff --git a/deepseek-harness-plugin/tests/task-status-store.spec.ts b/deepseek-harness-plugin/tests/task-status-store.spec.ts
index 8c1a40a..9b6e55e 100644
--- a/deepseek-harness-plugin/tests/task-status-store.spec.ts
+++ b/deepseek-harness-plugin/tests/task-status-store.spec.ts
@@ -41,4 +41,10 @@ describe('OpenGUI client task status store', () => {
     expect(store.getSnapshot().launching).toBe(false)
     expect(store.beginLaunch()).toBe(false)
   })
+
+  it('marks a direct slash session consumed before the first Host poll', () => {
+    const store = new CoremateTaskStatusStore()
+    store.markConsumedSession('slash-owner')
+    expect(store.isConsumedSession('slash-owner')).toBe(true)
+  })
 })
diff --git a/deepseek-harness-plugin/tests/video-decoder.spec.ts b/deepseek-harness-plugin/tests/video-decoder.spec.ts
new file mode 100644
index 0000000..b8043e9
--- /dev/null
+++ b/deepseek-harness-plugin/tests/video-decoder.spec.ts
@@ -0,0 +1,130 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createCoremateVideoDecoder } from '../src/client/video-decoder.ts'
+
+afterEach(() => vi.unstubAllGlobals())
+
+function canvas(): HTMLCanvasElement {
+  return {
+    width: 0,
+    height: 0,
+    style: {},
+    getContext: () => ({ drawImage: vi.fn() }),
+  } as unknown as HTMLCanvasElement
+}
+
+describe('embedded video decoder failure handling', () => {
+  it('reports an unsupported H.264 configuration once instead of freezing', async () => {
+    class Decoder {
+      static isConfigSupported = vi.fn(async () => ({ supported: false }))
+      state = 'unconfigured'
+      decodeQueueSize = 0
+      constructor(_init: VideoDecoderInit) {}
+      configure(): void { throw new Error('configure must not run') }
+      decode(): void {}
+      reset(): void {}
+      close(): void { this.state = 'closed' }
+    }
+    vi.stubGlobal('VideoDecoder', Decoder)
+    vi.stubGlobal('EncodedVideoChunk', class { constructor(_init: EncodedVideoChunkInit) {} })
+    const fatal = vi.fn()
+    const decoder = createCoremateVideoDecoder(canvas(), vi.fn(), fatal)
+    decoder.session(1080, 2400)
+    decoder.packet(1, 0n, Uint8Array.from([0, 0, 0, 1, 0x67, 0x64, 0, 0x28]))
+    decoder.packet(2, 1n, Uint8Array.from([0, 0, 0, 1, 0x65, 1]))
+
+    await vi.waitFor(() => expect(fatal).toHaveBeenCalledOnce())
+    expect(fatal.mock.calls[0]?.[0]).toBeInstanceOf(Error)
+  })
+
+  it('forwards the decoder asynchronous error once', () => {
+    let init!: VideoDecoderInit
+    class Decoder {
+      static isConfigSupported = vi.fn(async (config: VideoDecoderConfig) => ({ supported: true, config }))
+      state = 'unconfigured'
+      decodeQueueSize = 0
+      constructor(value: VideoDecoderInit) { init = value }
+      configure(): void { this.state = 'configured' }
+      decode(): void {}
+      reset(): void {}
+      close(): void { this.state = 'closed' }
+    }
+    vi.stubGlobal('VideoDecoder', Decoder)
+    vi.stubGlobal('EncodedVideoChunk', class { constructor(_init: EncodedVideoChunkInit) {} })
+    const fatal = vi.fn()
+    createCoremateVideoDecoder(canvas(), vi.fn(), fatal)
+    init.error(new DOMException('codec crashed'))
+    init.error(new DOMException('duplicate'))
+    expect(fatal).toHaveBeenCalledOnce()
+  })
+
+  it('does not let a delayed codec check configure a newer stream session', async () => {
+    let resolveFirst!: (value: VideoDecoderSupport) => void
+    const firstSupport = new Promise<VideoDecoderSupport>(resolve => { resolveFirst = resolve })
+    class Decoder {
+      static isConfigSupported = vi.fn()
+        .mockImplementationOnce(async () => firstSupport)
+        .mockImplementation(async (config: VideoDecoderConfig) => ({ supported: true, config }))
+      state = 'unconfigured'
+      decodeQueueSize = 0
+      configure = vi.fn(() => { this.state = 'configured' })
+      decode = vi.fn()
+      reset(): void { this.state = 'unconfigured' }
+      close(): void { this.state = 'closed' }
+      constructor(_init: VideoDecoderInit) {}
+    }
+    vi.stubGlobal('VideoDecoder', Decoder)
+    vi.stubGlobal('EncodedVideoChunk', class { constructor(_init: EncodedVideoChunkInit) {} })
+    const fatal = vi.fn()
+    const decoder = createCoremateVideoDecoder(canvas(), vi.fn(), fatal)
+
+    decoder.session(1080, 2400)
+    decoder.packet(1, 0n, Uint8Array.from([0, 0, 0, 1, 0x67, 0x42, 0xe0, 0x1e]))
+    decoder.packet(2, 1n, Uint8Array.from([0, 0, 0, 1, 0x65, 1]))
+    await vi.waitFor(() => expect(Decoder.isConfigSupported).toHaveBeenCalledTimes(1))
+
+    decoder.session(720, 1280)
+    resolveFirst({ supported: true, config: { codec: 'avc1.42e01e' } })
+    await Promise.resolve()
+    decoder.packet(1, 2n, Uint8Array.from([0, 0, 0, 1, 0x67, 0x64, 0, 0x28]))
+    decoder.packet(2, 3n, Uint8Array.from([0, 0, 0, 1, 0x65, 2]))
+
+    await vi.waitFor(() => expect(Decoder.isConfigSupported).toHaveBeenCalledTimes(2))
+    expect(Decoder.isConfigSupported.mock.calls[1]?.[0]).toMatchObject({ codec: 'avc1.640028' })
+    expect(fatal).not.toHaveBeenCalled()
+  })
+
+  it('ignores a delayed codec-check failure from an older stream session', async () => {
+    let rejectFirst!: (reason: Error) => void
+    const firstSupport = new Promise<VideoDecoderSupport>((_resolve, reject) => { rejectFirst = reject })
+    class Decoder {
+      static isConfigSupported = vi.fn()
+        .mockImplementationOnce(async () => firstSupport)
+        .mockImplementation(async (config: VideoDecoderConfig) => ({ supported: true, config }))
+      state = 'unconfigured'
+      decodeQueueSize = 0
+      configure(): void { this.state = 'configured' }
+      decode = vi.fn()
+      reset(): void { this.state = 'unconfigured' }
+      close(): void { this.state = 'closed' }
+      constructor(_init: VideoDecoderInit) {}
+    }
+    vi.stubGlobal('VideoDecoder', Decoder)
+    vi.stubGlobal('EncodedVideoChunk', class { constructor(_init: EncodedVideoChunkInit) {} })
+    const fatal = vi.fn()
+    const decoder = createCoremateVideoDecoder(canvas(), vi.fn(), fatal)
+
+    decoder.session(1080, 2400)
+    decoder.packet(1, 0n, Uint8Array.from([0, 0, 0, 1, 0x67, 0x42, 0xe0, 0x1e]))
+    decoder.packet(2, 1n, Uint8Array.from([0, 0, 0, 1, 0x65, 1]))
+    await vi.waitFor(() => expect(Decoder.isConfigSupported).toHaveBeenCalledTimes(1))
+
+    decoder.session(720, 1280)
+    rejectFirst(new Error('old codec probe failed'))
+    await Promise.resolve()
+    decoder.packet(1, 2n, Uint8Array.from([0, 0, 0, 1, 0x67, 0x64, 0, 0x28]))
+    decoder.packet(2, 3n, Uint8Array.from([0, 0, 0, 1, 0x65, 2]))
+
+    await vi.waitFor(() => expect(Decoder.isConfigSupported).toHaveBeenCalledTimes(2))
+    expect(fatal).not.toHaveBeenCalled()
+  })
+})