@windypro-rourou/dsh-logcat 0.6.0-preview.1 → 0.6.0-preview.2

package/README.md

@@ -23,13 +23,16 @@ DSH Web GUI 的安卓实机调试面板（类似 Android Studio 的 Logcat 视
   - **装APK 按钮**：本地文件选择器选 APK 直接安装到当前设备（流式上传，1GB 上限）
   - **设备快捷按键**：Home / 返回 / 最近任务 / 唤醒 / 电源 / 音量 ± 一键发送
   - **性能曲线**：CPU / 内存 / 电量每 2s 采样，状态栏 sparkline 趋势图
-  - **逆向工作台（日志/逆向双 tab）**：进程列表 → 内存 hex/字符串搜索 → 匹配地址 → 点击转储 256B 查看
+  - **屏幕实时投屏与远程操控**：「屏幕」tab 开启 ~1fps 实时画面（WS 二进制帧推送），**点击=点按、拖动=滑动**、
+    文字输入框直接发到手机、快捷按键（Home/返回/唤醒/音量）、一键下载当前帧 —— 不用拿起手机
+  - **逆向工作台（日志/屏幕/逆向三 tab）**：进程列表 → 内存 hex/字符串搜索 → 匹配地址 → 点击转储 256B 查看
   - 暂停/继续（暂停时缓冲，恢复自动回放）、清空、复制、导出 .txt
   - 窗口化渲染 + 自动滚动（滚动手动上翻时自动停用）
   - 未授权设备提示「请在手机上点击允许 USB 调试」
-- **Agent 工具**（共 29 个，全部对 agent 开放，前置提示中已明示可调用）：
+- **Agent 工具**（共 30 个，全部对 agent 开放，前置提示中已明示可调用）：
   - 设备：`logcat_devices`（列出设备）、`device_info`（型号/版本/SDK/分辨率/内存/电量）、`device_stats`（CPU/内存/电量实时采样）、
     `app_info`（已安装应用版本号/versionCode/APK 路径）
+  - 屏幕/多模态：`screen_capture`（截图存档 + 嵌入对话图片块，多模态模型可直接看图配合 `input_*` 修 bug）
   - 执行：`adb_exec`（shell）、`adb_install`（本地 APK 装真机）、`adb_pull`（拉文件）、
     `app_launch`（启动应用/指定 Activity）、`app_stop`（force-stop，破坏性先确认）
   - 输入：`input_tap` / `input_swipe` / `input_text` / `input_keyevent`（真机 UI 自动化）、`ui_dump`（界面层级 XML）、

package/lib/client.js

@@ -18,7 +18,7 @@ window.__ModuleLoader__.load({
 		var module = { exports: {} };
 		var exports = module.exports;
 
-		const { createElement: h, useEffect, useMemo, useRef, useState } = require("react");
+		const { createElement: h, useEffect, useMemo, useRef, useState, useSyncExternalStore } = require("react");
 		const { createRoot } = require("react-dom/client");
 
 		//#region styles
@@ -133,6 +133,12 @@ window.__ModuleLoader__.load({
 .lc-re-row[data-on] { background: light-dark(rgba(66,133,244,.12), rgba(66,133,244,.2)); }
 .lc-re-dump { flex: 1; overflow: auto; padding: 8px 10px; font-family: Consolas, "Cascadia Mono", monospace; font-size: 11px; line-height: 16px; white-space: pre-wrap; word-break: break-all; }
 .lc-re-err { padding: 8px 10px; color: #ef5350; font-size: 12px; white-space: pre-wrap; }
+.lc-screen { position: absolute; inset: 0; display: flex; flex-direction: column; }
+.lc-screen-bar { display: flex; gap: 6px; padding: 6px 12px; border-bottom: 1px solid light-dark(rgba(0,0,0,.08), rgba(255,255,255,.1)); flex: none; align-items: center; flex-wrap: wrap; font-size: 11px; }
+.lc-screen-bar input { background: light-dark(rgba(0,0,0,.05), rgba(255,255,255,.08)); border: 1px solid light-dark(rgba(0,0,0,.16), rgba(255,255,255,.2)); border-radius: 7px; color: inherit; font: inherit; font-size: 12px; padding: 4px 8px; }
+.lc-screen-img { flex: 1; min-height: 0; overflow: auto; display: flex; align-items: center; justify-content: center; cursor: crosshair; background: light-dark(rgba(0,0,0,.03), rgba(255,255,255,.03)); }
+.lc-screen-img img { max-width: 100%; max-height: 100%; object-fit: contain; user-select: none; }
+.lc-screen-hint { color: light-dark(#6b7078, #9aa0a8); }
 `;
 		//#endregion
 
@@ -206,6 +212,10 @@ window.__ModuleLoader__.load({
 			const [reDumpAddr, setReDumpAddr] = useState("");
 			const [reError, setReError] = useState("");
 			const [spark, setSpark] = useState({ cpu: [], mem: [], bat: [] });
+			const [screenImg, setScreenImg] = useState(null);
+			const [screenText, setScreenText] = useState("");
+			const [screenOn, setScreenOn] = useState(false);
+			const panelOpen = useSyncExternalStore(controller.subscribe, controller.getSnapshot).panelOpen;
 
 			const wsRef = useRef(null);
 			const entriesRef = useRef([]);
@@ -218,6 +228,12 @@ window.__ModuleLoader__.load({
 			const applyFrameRef = useRef(null);
 			const eventsRef = useRef([]);
 			const fileInputRef = useRef(null);
+			const screenWrapRef = useRef(null);
+			const screenImgRef = useRef(null);
+			const screenDragRef = useRef(null);
+			const screenWantRef = useRef(false);
+			const handleBinaryRef = useRef(null);
+			const prevSerialRef = useRef(serial);
 
 			useEffect(() => { serialRef.current = serial; }, [serial]);
 			useEffect(() => { pausedRef.current = paused; }, [paused]);
@@ -335,14 +351,19 @@ window.__ModuleLoader__.load({
 					if (closed) return;
 					const scheme = window.location.protocol === "https:" ? "wss" : "ws";
 					socket = new WebSocket(scheme + "://" + window.location.host + API_BASE + "/stream");
+					socket.binaryType = "arraybuffer";
 					wsRef.current = socket;
 					socket.onopen = () => {
 						retry = 0;
 						setConnected(true);
 						const target = serialRef.current;
 						if (target !== "") socket.send(JSON.stringify({ type: "replay", serial: target }));
+						if (screenWantRef.current && target !== "") {
+							socket.send(JSON.stringify({ type: "screen", serial: target, on: true }));
+						}
 					};
 					socket.onmessage = (event) => {
+						if (event.data instanceof ArrayBuffer) { handleBinaryRef.current?.(event.data); return; }
 						let frame;
 						try { frame = JSON.parse(event.data); } catch { return; }
 						applyFrameRef.current(frame);
@@ -679,6 +700,96 @@ window.__ModuleLoader__.load({
 					.catch(() => { setReDump(""); setReError("转储失败"); });
 			};
 
+			// Live screen stream: on while the 屏幕 tab is open, the panel is open, and a device is selected.
+			useEffect(() => {
+				const prev = prevSerialRef.current;
+				prevSerialRef.current = serial;
+				const want = tab === "screen" && serial !== "" && panelOpen;
+				screenWantRef.current = want;
+				const ws = wsRef.current;
+				if (ws !== null && ws.readyState === WebSocket.OPEN) {
+					if (prev !== "" && prev !== serial) ws.send(JSON.stringify({ type: "screen", serial: prev, on: false }));
+					ws.send(JSON.stringify({ type: "screen", serial, on: want }));
+				}
+				setScreenOn(want);
+				if (!want) setScreenImg(null);
+			}, [tab, serial, panelOpen]);
+
+			// Binary WS frames: 4-byte JSON header length + header + PNG payload.
+			const handleBinary = (buffer) => {
+				try {
+					const view = new DataView(buffer);
+					const hlen = view.getUint32(0);
+					const header = JSON.parse(new TextDecoder().decode(new Uint8Array(buffer, 4, hlen)));
+					if (header.type !== "simage" || header.serial !== serialRef.current) return;
+					const bytes = new Uint8Array(buffer, 4 + hlen);
+					let binary = "";
+					const CHUNK = 0x8000;
+					for (let i = 0; i < bytes.length; i += CHUNK) {
+						binary += String.fromCharCode.apply(null, bytes.subarray(i, i + CHUNK));
+					}
+					setScreenImg("data:image/png;base64," + btoa(binary));
+				} catch { /* malformed frame */ }
+			};
+			handleBinaryRef.current = handleBinary;
+
+			const screenToDevice = (e) => {
+				const img = screenImgRef.current;
+				if (img === null || img.naturalWidth === 0) return null;
+				const imgRect = img.getBoundingClientRect();
+				const x = Math.round(((e.clientX - imgRect.left) / imgRect.width) * img.naturalWidth);
+				const y = Math.round(((e.clientY - imgRect.top) / imgRect.height) * img.naturalHeight);
+				if (x < 0 || y < 0 || x >= img.naturalWidth || y >= img.naturalHeight) return null;
+				return { x, y };
+			};
+
+			const screenMouseDown = (e) => {
+				const pt = screenToDevice(e);
+				if (pt === null) return;
+				screenDragRef.current = { ...pt, clientX: e.clientX, clientY: e.clientY };
+			};
+
+			const screenMouseUp = (e) => {
+				const drag = screenDragRef.current;
+				screenDragRef.current = null;
+				if (drag === null) return;
+				const pt = screenToDevice(e);
+				if (pt === null) return;
+				const dx = pt.x - drag.x;
+				const dy = pt.y - drag.y;
+				const dist = Math.sqrt(dx * dx + dy * dy);
+				const command = dist < 12
+					? `input tap ${drag.x} ${drag.y}`
+					: `input swipe ${drag.x} ${drag.y} ${pt.x} ${pt.y} 120`;
+				fetch(API_BASE + "/exec", {
+					method: "POST",
+					headers: { "content-type": "application/json" },
+					body: JSON.stringify({ serial, command }),
+				}).catch(() => { /* offline */ });
+			};
+
+			const sendScreenText = () => {
+				const text = screenText.trim();
+				if (text === "") return;
+				setScreenText("");
+				const safe = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/ /g, "%s");
+				fetch(API_BASE + "/exec", {
+					method: "POST",
+					headers: { "content-type": "application/json" },
+					body: JSON.stringify({ serial, command: `input text "${safe}"` }),
+				}).catch(() => { /* offline */ });
+			};
+
+			const downloadScreen = () => {
+				if (screenImg === null) return;
+				const a = document.createElement("a");
+				a.href = screenImg;
+				a.download = "screen-" + (serial || "device") + "-" + new Date().toISOString().replace(/[:.]/g, "-") + ".png";
+				document.body.appendChild(a);
+				a.click();
+				a.remove();
+			};
+
 			return h("div", { className: "lc-panel" },
 				h("div", { className: "lc-header" },
 					h("button", { type: "button", className: "lc-back", onClick: () => controller.close() },
@@ -733,6 +844,7 @@ window.__ModuleLoader__.load({
 				),
 				h("div", { className: "lc-tabs" },
 					h("button", { type: "button", className: "lc-tab", "data-on": tab === "log" ? "" : undefined, onClick: () => setTab("log") }, "日志"),
+					h("button", { type: "button", className: "lc-tab", "data-on": tab === "screen" ? "" : undefined, onClick: () => setTab("screen") }, "屏幕"),
 					h("button", { type: "button", className: "lc-tab", "data-on": tab === "re" ? "" : undefined, onClick: () => setTab("re") }, "逆向"),
 				),
 				tab === "log"
@@ -800,7 +912,7 @@ window.__ModuleLoader__.load({
 						}, "自动滚动"),
 					)
 					: null,
-				tab === "log"
+				tab === "log" || tab === "screen"
 					? h("div", { className: "lc-keys" },
 						[["home", "⌂ Home"], ["back", "← 返回"], ["recents", "▦ 最近"], ["wakeup", "☀ 唤醒"], ["power", "⏻ 电源"], ["volume_up", "🔊+"], ["volume_down", "🔉−"]].map(([key, label]) =>
 							h("button", { key, type: "button", className: "lc-key", title: "发送按键 " + key, onClick: () => sendKey(key) }, label)))
@@ -850,7 +962,22 @@ window.__ModuleLoader__.load({
 								),
 							),
 						)
-						: eventsOn
+						: tab === "screen"
+							? h("div", { className: "lc-screen" },
+								h("div", { className: "lc-screen-bar" },
+									h("span", { className: "lc-dot " + (screenOn ? "on" : "off") }),
+									h("span", null, screenOn ? "投屏中 (~1fps)" : "投屏未开启"),
+									h("input", { placeholder: "输入文字后回车发送…", value: screenText, onChange: (e) => setScreenText(e.target.value), onKeyDown: (e) => { if (e.key === "Enter") sendScreenText(); }, style: { flex: 1, minWidth: 140 } }),
+									h("button", { type: "button", className: "lc-btn", onClick: downloadScreen, title: "下载当前帧 PNG" }, "下载"),
+									h("span", { className: "lc-screen-hint" }, "点击=点按 · 拖动=滑动"),
+								),
+								h("div", { className: "lc-screen-img", ref: screenWrapRef, onMouseDown: screenMouseDown, onMouseUp: screenMouseUp, onMouseLeave: screenMouseUp },
+									screenImg !== null
+										? h("img", { ref: screenImgRef, src: screenImg, alt: "设备屏幕", draggable: false })
+										: h("div", { className: "lc-empty" }, "等待画面…（设备连接后自动开始，1fps）"),
+								),
+							)
+							: eventsOn
 							? (filteredEvents.length === 0
 								? h("div", { className: "lc-empty" }, "events 事件缓冲（已开启流，等待事件…）")
 								: h(VirtualLog, { entries: filteredEvents, scrollTop, onScrollTop: setScrollTop, bodyRef }))

package/lib/index.js

@@ -99,9 +99,10 @@ const SECTION_ORDER = 152
 
 /** Model-facing announcement: plugin presence, capabilities, and limits. */
 export const LOGCAT_GUIDANCE =
-  '本机已安装 dsh-logcat 插件（DSH Web GUI 的安卓实机调试/逆向工作台）：自动探测本机 adb 并对已连接的调试设备附加 logcat 流；日志自动落盘（~/.dsh/logcat/logs）支持历史回溯，崩溃/ANR 自动截图快照存档（~/.dsh/logcat/crashes，可用 crash_sessions 查阅）；侧边栏「Logcat」入口打开面板（设备切换、级别/多关键词过滤、按测试包名过滤、截图、崩溃高亮、历史回溯、events 事件视图、内存搜索工作台、WiFi 无线连接、APK 安装、一键安装 adb）。' +
+  '本机已安装 dsh-logcat 插件（DSH Web GUI 的安卓实机调试/逆向工作台）：自动探测本机 adb 并对已连接的调试设备附加 logcat 流；日志自动落盘（~/.dsh/logcat/logs）支持历史回溯，崩溃/ANR 自动截图快照存档（~/.dsh/logcat/crashes，可用 crash_sessions 查阅）；侧边栏「Logcat」入口打开面板（设备切换、级别/多关键词过滤、按测试包名过滤、截图、崩溃高亮、历史回溯、events 事件视图、内存搜索工作台、屏幕实时投屏与远程操控（点击/滑动/输入）、WiFi 无线连接、APK 安装、一键安装 adb）。' +
   '以下 agent 工具均可用（串口为设备 serial，可用 logcat_devices 获取），构建安卓应用/实机调试/逆向分析时请主动调用：' +
   '设备与状态：logcat_devices（列出设备）、device_info（型号/版本/SDK/分辨率/内存/电量）、device_stats（CPU/内存/电量采样）、app_info（已安装应用的版本号/versionCode/APK 路径）；' +
+  '屏幕与多模态：screen_capture（截图存档并嵌入对话图片，配合 input_* 做可视化调试循环，多模态模型可直接看图修 bug）；' +
   '部署与执行：adb_install（本地 APK 装真机）、adb_exec（任意 adb shell 命令）、adb_pull（拉文件）、app_launch（启动应用/指定 Activity）、app_stop（停止应用，破坏性先确认）、input_tap/input_swipe/input_text/input_keyevent（模拟点击/滑动/输入/按键）、ui_dump（界面层级 XML）、activity_current（当前前台 Activity）；' +
   '日志与崩溃：logcat_recent（按级别/关键词/包名读实时日志）、logcat_history（磁盘历史日志回溯）、logcat_crash（崩溃/ANR 捕获+上下文）、logcat_events（events 事件缓冲：应用启动/崩溃/生命周期事件）、crash_sessions（崩溃自动快照历史）、logcat_set_package（锁定当前测试包名）；' +
   '逆向与内存：proc_list（进程列表）、proc_maps（内存映射+so 模块基址）、proc_status（进程状态/内存摘要）、proc_smaps（内存占用明细 Top 区域）、mem_dump（指定地址读内存 hex）、mem_search（内存搜 hex 模式/字符串）、frida_server（frida-server 部署/启停）、frida_script（hook/trace/scan/bypass/dump 常用脚本模板）。' +
@@ -376,6 +377,7 @@ export class AdbEngine {
     this.eventsBuffers = new Map()  // serial -> ring buffer (logcat -b events)
     this.eventsStreams = new Map()  // serial -> DeviceStream (-b events)
     this.lastCrash = new Map()      // serial -> ms timestamp (snapshot throttle)
+    this.screenLoops = new Map()    // serial -> { timer, busy } (1fps screen stream)
   }
 
   /** Serial -> filesystem-safe directory name. */
@@ -428,6 +430,8 @@ export class AdbEngine {
     this.logStreams.clear()
     for (const stream of this.eventsStreams.values()) stream.stop()
     this.eventsStreams.clear()
+    for (const loop of this.screenLoops.values()) clearInterval(loop.timer)
+    this.screenLoops.clear()
     for (const ws of this.clients) {
       try { ws.close(1001, 'plugin disposed') } catch { /* closed */ }
     }
@@ -467,6 +471,11 @@ export class AdbEngine {
           estream.stop()
           this.eventsStreams.delete(serial)
         }
+        const sloop = this.screenLoops.get(serial)
+        if (sloop !== undefined) {
+          clearInterval(sloop.timer)
+          this.screenLoops.delete(serial)
+        }
         changed = true
       }
     }
@@ -493,6 +502,11 @@ export class AdbEngine {
           estream.stop()
           this.eventsStreams.delete(serial)
         }
+        const sloop = this.screenLoops.get(serial)
+        if (sloop !== undefined) {
+          clearInterval(sloop.timer)
+          this.screenLoops.delete(serial)
+        }
         this.broadcast({ type: 'device-state', serial, state: info.state })
       }
     }
@@ -673,6 +687,50 @@ export class AdbEngine {
     return picked.slice(-lines)
   }
 
+  /** Start / stop the ~1fps screen-stream loop for a device (panel live view). */
+  setScreen(serial, on) {
+    const existing = this.screenLoops.get(serial)
+    if (on) {
+      if (existing === undefined && this.adb !== null && this.devices.get(serial)?.state === 'device') {
+        const loop = { timer: null, busy: false }
+        this.screenLoops.set(serial, loop)
+        const tick = () => {
+          if (loop.busy || this.screenLoops.get(serial) !== loop) return
+          loop.busy = true
+          void this.captureScreenFrame(serial).finally(() => { loop.busy = false })
+        }
+        loop.timer = setInterval(tick, 1000)
+        tick()
+      }
+    } else if (existing !== undefined) {
+      clearInterval(existing.timer)
+      this.screenLoops.delete(serial)
+    }
+  }
+
+  /** Capture one frame and broadcast it as a binary WS frame. */
+  async captureScreenFrame(serial) {
+    try {
+      const png = await runAdbBinary(this.adb, ['-s', serial, 'exec-out', 'screencap', '-p'], 8000)
+      if (png.length < 100) return
+      this.broadcastBinary({ type: 'simage', serial, len: png.length, ts: Date.now() }, png)
+    } catch { /* frame dropped */ }
+  }
+
+  /** Broadcast a binary frame: 4-byte header length + JSON header + payload. */
+  broadcastBinary(header, payload) {
+    const headerBuf = Buffer.from(JSON.stringify(header), 'utf8')
+    const frame = Buffer.alloc(4 + headerBuf.length + payload.length)
+    frame.writeUInt32BE(headerBuf.length, 0)
+    headerBuf.copy(frame, 4)
+    payload.copy(frame, 4 + headerBuf.length)
+    for (const ws of this.clients) {
+      if (ws.readyState !== WebSocket.OPEN) continue
+      if (ws.bufferedAmount > 4 * 1024 * 1024) continue
+      try { ws.send(frame) } catch { /* closed */ }
+    }
+  }
+
   /** Snapshot of the device list (for routes and the browser). */
   deviceList() {
     return [...this.devices.values()]
@@ -1247,6 +1305,9 @@ function makeRoutes(engine) {
             if (frame.on === true) {
               ws.send(JSON.stringify({ type: 'ehistory', serial: frame.serial, entries: engine.eventsRecent(frame.serial, 500) }))
             }
+          } else if (frame?.type === 'screen' && typeof frame.serial === 'string') {
+            // Panel toggles the per-device live screen stream (1fps screencap).
+            engine.setScreen(frame.serial, frame.on === true)
           }
         })
         ws.on('close', () => { engine.clients.delete(ws) })
@@ -2840,6 +2901,108 @@ function appStopTool(engine) {
   })
 }
 
+/** The screen_capture agent tool: one-shot screenshot for multimodal flows. */
+function screenCaptureTool(ctx, engine) {
+  return defineTool({
+    name: 'screen_capture',
+    description: 'Capture the device screen as a PNG — saved to a local file, and embedded into the conversation as an image block so a multimodal model can see the screen (deployment permitting). ' +
+      'Pair with input_tap / input_swipe / input_text / input_keyevent for visual debugging loops. Triggers: see the phone screen, screenshot for bug analysis.',
+    parameters: {
+      serial: { type: 'string', description: 'Device serial from logcat_devices (optional; defaults to the first attached device).' },
+      path: { type: 'string', description: 'Optional local file path to save the PNG (default ~/.dsh/logcat/screens/<serial>-<ts>.png).' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          ok: { type: 'boolean', required: true },
+          path: { type: 'string' },
+          size: { type: 'integer' },
+          width: { type: 'integer' },
+          height: { type: 'integer' },
+          embedded: { type: 'boolean' },
+          embeddedRef: {
+            type: 'object',
+            additionalProperties: false,
+            properties: {
+              attachmentId: { type: 'string', required: true },
+              mediaType: { type: 'string', required: true },
+              bytes: { type: 'integer', required: true },
+              width: { type: 'integer', required: true },
+              height: { type: 'integer', required: true },
+            },
+          },
+          error: { type: 'string' },
+        },
+      },
+      render: (_args, value) => {
+        if (value?.error) return [{ type: 'text', text: value.error }]
+        const blocks = []
+        if (value?.embeddedRef !== undefined && value?.embeddedRef !== null) {
+          blocks.push({ type: 'image', attachment: value.embeddedRef })
+        }
+        const parts = [`screen captured: ${value?.path ?? '?'} (${value?.size ?? 0} bytes, ${value?.width ?? '?'}x${value?.height ?? '?'})`]
+        if (value?.embedded === true) parts.push('(image embedded in this result)')
+        blocks.push({ type: 'text', text: parts.join('\n') })
+        return blocks
+      },
+    },
+    async execute(args) {
+      const devices = engine.deviceList()
+      const serial = typeof args.serial === 'string' && args.serial !== ''
+        ? args.serial
+        : devices.find((d) => d.state === 'device')?.serial ?? ''
+      if (engine.adb === null) return { ok: false, error: 'adb not found on this host' }
+      if (serial === '') return { ok: false, error: 'no attached device; connect and authorize one first' }
+      try {
+        const png = await runAdbBinary(engine.adb, ['-s', serial, 'exec-out', 'screencap', '-p'], 15000)
+        const screensRoot = join(engine.logRoot, 'screens')
+        mkdirSync(screensRoot, { recursive: true })
+        const stamp = new Date().toISOString().replace(/[:.]/g, '-')
+        const rel = `${engine.safeName(serial)}-${stamp}.png`
+        const file = typeof args.path === 'string' && args.path.trim() !== ''
+          ? args.path.trim()
+          : join(screensRoot, rel)
+        await fsp.writeFile(file, png)
+        // PNG intrinsic dimensions from the IHDR chunk (bytes 16-23).
+        let width
+        let height
+        if (png.length > 24 && png[0] === 0x89) {
+          width = png.readUInt32BE(16)
+          height = png.readUInt32BE(20)
+        }
+        // Embed into the conversation through the attachment service when available.
+        let embeddedRef = null
+        try {
+          const store = typeof ctx.attachments?.saveImage === 'function' ? ctx.attachments : null
+          if (store !== null) {
+            const ref = await store.saveImage({ data: png, mediaType: 'image/png', name: rel })
+            embeddedRef = {
+              attachmentId: ref.attachmentId,
+              mediaType: ref.mediaType,
+              bytes: ref.bytes,
+              width: ref.width,
+              height: ref.height,
+            }
+          }
+        } catch { /* attachment embed is best-effort */ }
+        return {
+          ok: true,
+          path: file,
+          size: png.length,
+          width,
+          height,
+          embedded: embeddedRef !== null,
+          embeddedRef,
+        }
+      } catch (error) {
+        return { ok: false, error: error instanceof Error ? error.message : String(error) }
+      }
+    },
+  })
+}
+
 /** ------------------------------------------------------------------ */
 
 /** Mount the adb engine, routes, tool, and announcement. */
@@ -2922,6 +3085,7 @@ export function apply(ctx, config) {
         inputKeyeventTool(engine),
         appLaunchTool(engine),
         appStopTool(engine),
+        screenCaptureTool(ctx, engine),
         deviceInfoTool(engine),
         deviceStatsTool(engine),
         inputTapTool(engine),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@windypro-rourou/dsh-logcat",
   "description": "Android Logcat viewer for the dsh web GUI: auto-connects to any adb device in debug mode, live logcat stream with level/keyword filters, pause/clear/export, plus agent tools (logcat_recent). Hot-pluggable — mounted via ~/.dsh/cordis.patch.yml + a profile node_modules copy, no dsh source changes.",
-  "version": "0.6.0-preview.1",
+  "version": "0.6.0-preview.2",
   "type": "module",
   "packageManager": "pnpm@11.22.0",
   "engines": {