dsh-adb 0.2.0 → 1.0.0

package/README.md

@@ -14,9 +14,13 @@ dsh plugin --profile web add dsh-adb
 
 Or install directly from GitHub: `dsh plugin --profile web add github:SamXiaBing/dsh-adb`
 
+## Web device panel (v1.0.0)
+
+A "设备" tab in the conversation view ring (next to chat / trajectory / automation): device list with status, package-scoped performance snapshot (memory / frame stats / battery), and filtered logcat tail. Data flows over the package RPC channel; requires the plugin installed in a web profile and a GUI restart.
+
 ## Ecosystem
 
-- ✅ [npm](https://www.npmjs.com/package/dsh-adb) — `dsh-adb` published (latest: 0.1.5)
+- ✅ [npm](https://www.npmjs.com/package/dsh-adb) — `dsh-adb` published (latest: 1.0.0)
 - ✅ [awesome-deepseek-harness#87](https://github.com/0xsline/awesome-deepseek-harness/pull/87) — **merged**
 - ✅ [awesome-dsh-plugin#85](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/85) — **merged**
 - ✅ [awesome-DSH-plugin#29](https://github.com/Alex-Yanggg/awesome-DSH-plugin/pull/29) — **merged**

package/README.zh-CN.md

@@ -14,9 +14,13 @@ dsh plugin --profile web add dsh-adb
 
 或从 GitHub 直装：`dsh plugin --profile web add github:SamXiaBing/dsh-adb`
 
+## Web 设备面板（v1.0.0）
+
+会话视图页签「设备」（与 chat/轨迹/任务管理并列）：设备列表/状态、按包名的性能快照（内存/帧率/电量）、过滤 logcat 尾部。数据走 Package RPC；需装入 web profile 并重启 GUI 生效。
+
 ## 生态收录
 
-- ✅ [npm](https://www.npmjs.com/package/dsh-adb) — `dsh-adb` 已发布（latest: 0.1.5）
+- ✅ [npm](https://www.npmjs.com/package/dsh-adb) — `dsh-adb` 已发布（latest: 1.0.0）
 - ✅ [awesome-deepseek-harness#87](https://github.com/0xsline/awesome-deepseek-harness/pull/87) — **已合并**
 - ✅ [awesome-dsh-plugin#85](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/85) — **已合并**
 - ✅ [awesome-DSH-plugin#29](https://github.com/Alex-Yanggg/awesome-DSH-plugin/pull/29) — **已合并**

package/client.js

@@ -0,0 +1,156 @@
+/* dsh-adb Web device panel (client half) — plain JS, no build step.
+ * Registers a "设备" tab in conversation.view (beside chat/trajectory/automation)
+ * and talks to the Host half over the package RPC channel /dsh-adb.
+ * Uses only client builtins: React, ctx, styles, console.
+ */
+window.__ModuleLoader__.load({
+  id: 'dsh-adb',
+  factory: (require) => {
+    'use strict'
+    const module = { exports: {} }
+
+    const React = require('react')
+    const CHANNEL = '/dsh-adb'
+
+    function unwrap(value) {
+      if (typeof value !== 'object' || value === null || !('ok' in value)) {
+        throw new Error('dsh-adb host returned an invalid response.')
+      }
+      if (value.ok === true && 'value' in value) return value.value
+      if (value.ok === false && value.error) {
+        throw new Error(value.error.message ?? 'dsh-adb request failed.')
+      }
+      throw new Error('dsh-adb host returned an invalid response.')
+    }
+
+    function createRuntime(rpc) {
+      return {
+        listDevices: () => rpc.call(CHANNEL, 'listDevices', {}).then(unwrap),
+        perfSnapshot: (payload) => rpc.call(CHANNEL, 'perfSnapshot', payload).then(unwrap),
+        logcatTail: (payload) => rpc.call(CHANNEL, 'logcatTail', payload).then(unwrap),
+      }
+    }
+
+    const h = React.createElement
+    const ROW = { display: 'flex', alignItems: 'center', gap: 8, padding: '4px 0' }
+    const BTN = { padding: '3px 10px', cursor: 'pointer' }
+    const INPUT = { padding: '3px 6px' }
+
+    function MetricRows({ rows }) {
+      if (!rows || rows.length === 0) return h('div', null, '（无数据）')
+      return h('table', { style: { borderCollapse: 'collapse' } },
+        rows.map((row) => h('tr', { key: row[0] },
+          h('td', { style: { padding: '2px 12px 2px 0', color: 'var(--dsh-text-secondary, #888)' } }, row[0]),
+          h('td', { style: { padding: '2px 0' } }, String(row[1])),
+        )),
+      )
+    }
+
+    function DeviceView(props) {
+      const runtime = props.runtime
+      const [devices, setDevices] = React.useState([])
+      const [selected, setSelected] = React.useState(null)
+      const [pkg, setPkg] = React.useState('com.android.systemui')
+      const [snapshot, setSnapshot] = React.useState(null)
+      const [logEntries, setLogEntries] = React.useState([])
+      const [logTotal, setLogTotal] = React.useState(0)
+      const [level, setLevel] = React.useState('E')
+      const [tail, setTail] = React.useState('30')
+      const [error, setError] = React.useState(null)
+      const [busy, setBusy] = React.useState(false)
+
+      const refresh = () => {
+        setBusy(true); setError(null)
+        runtime.listDevices()
+          .then((value) => setDevices(value.devices ?? []))
+          .catch((e) => setError(String(e.message ?? e)))
+          .finally(() => setBusy(false))
+      }
+      React.useEffect(refresh, [])
+
+      const runSnapshot = () => {
+        if (!selected) return
+        setBusy(true); setError(null)
+        runtime.perfSnapshot({ serial: selected.serial, package: pkg })
+          .then(setSnapshot)
+          .catch((e) => setError(String(e.message ?? e)))
+          .finally(() => setBusy(false))
+      }
+
+      const runLogcat = () => {
+        if (!selected) return
+        setBusy(true); setError(null)
+        const n = parseInt(tail, 10)
+        runtime.logcatTail({ serial: selected.serial, level, tail: Number.isFinite(n) && n > 0 ? n : 30 })
+          .then((value) => { setLogEntries(value.entries ?? []); setLogTotal(value.total ?? 0) })
+          .catch((e) => setError(String(e.message ?? e)))
+          .finally(() => setBusy(false))
+      }
+
+      const snapshotRows = []
+      if (snapshot) {
+        const m = snapshot.meminfo; const g = snapshot.gfxinfo; const b = snapshot.battery
+        if (m) snapshotRows.push(['内存 PSS (KB)', m.totalPssKb], ['内存 RSS (KB)', m.totalRssKb], ['Java Heap (KB)', m.javaHeapKb], ['Native Heap (KB)', m.nativeHeapKb])
+        if (g) snapshotRows.push(['总帧数', g.totalFrames], ['卡顿帧 / %', `${g.jankyFrames} / ${g.jankyPercent}%`], ['P50/P90 (ms)', `${g.percentile50Ms} / ${g.percentile90Ms}`], ['P95/P99 (ms)', `${g.percentile95Ms} / ${g.percentile99Ms}`], ['Missed Vsync', g.missedVsync])
+        if (b) snapshotRows.push(['电量', `${b.levelPercent}%`], ['温度 (°C)', b.temperatureC])
+      }
+
+      return h('div', { style: { padding: 12, fontFamily: 'inherit', fontSize: 13 } },
+        h('div', { style: { ...ROW, justifyContent: 'space-between' } },
+          h('strong', null, 'ADB 设备'),
+          h('button', { style: BTN, onClick: refresh, disabled: busy }, busy ? '…' : '刷新'),
+        ),
+        error !== null && h('div', { style: { color: '#e5484d', margin: '6px 0' } }, String(error)),
+        devices.length === 0
+          ? h('div', { style: { color: 'var(--dsh-text-secondary, #888)', margin: '8px 0' } }, '未连接设备')
+          : h('div', null, devices.map((d) =>
+              h('button', {
+                key: d.serial,
+                onClick: () => setSelected(d),
+                style: { ...BTN, display: 'block', width: '100%', textAlign: 'left', margin: '2px 0',
+                  background: selected && selected.serial === d.serial ? 'var(--dsh-accent-soft, rgba(66,133,244,.15))' : 'transparent' },
+              }, `${d.serial} · ${d.state}${d.model ? ' · ' + d.model : ''}`),
+            )),
+
+        selected !== null && h('div', { style: { marginTop: 14, borderTop: '1px solid var(--dsh-border, #333)', paddingTop: 10 } },
+          h('div', { style: ROW },
+            h('label', null, '包名'),
+            h('input', { style: INPUT, value: pkg, onChange: (e) => setPkg(e.target.value), onKeyDown: (e) => { if (e.key === 'Enter') runSnapshot() } }),
+            h('button', { style: BTN, onClick: runSnapshot, disabled: busy }, '性能快照'),
+          ),
+          snapshot && h('div', { style: { marginTop: 8 } }, h(MetricRows, { rows: snapshotRows })),
+
+          h('div', { style: { ...ROW, marginTop: 12 } },
+            h('label', null, '级别'),
+            h('select', { style: INPUT, value: level, onChange: (e) => setLevel(e.target.value) },
+              ['V', 'D', 'I', 'W', 'E', 'F'].map((lv) => h('option', { key: lv, value: lv }, lv))),
+            h('label', null, '条数'),
+            h('input', { style: { ...INPUT, width: 56 }, value: tail, onChange: (e) => setTail(e.target.value) }),
+            h('button', { style: BTN, onClick: runLogcat, disabled: busy }, '获取日志'),
+          ),
+          h('div', { style: { color: 'var(--dsh-text-secondary, #888)', margin: '4px 0' } }, `logcat 共 ${logTotal} 条（显示 ${logEntries.length}）`),
+          h('div', { style: { maxHeight: 260, overflowY: 'auto', fontFamily: 'monospace', fontSize: 12, whiteSpace: 'pre-wrap' } },
+            logEntries.length === 0
+              ? h('div', null, '（暂无）')
+              : logEntries.map((e) => h('div', { key: `${e.time}-${e.pid}-${e.tid}-${e.message}` },
+                  `${e.time} ${e.pid} ${e.tid} ${e.level} ${e.tag}: ${e.message}`)),
+          ),
+        ),
+      )
+    }
+
+    function apply(ctx) {
+      const slots = ctx.get('slots')
+      const connection = ctx.get('connection')
+      if (slots === undefined || connection === undefined || connection.rpc === undefined) return
+      const runtime = createRuntime(connection.rpc)
+      slots.inject('conversation.view', () => slots.register(
+        { name: 'conversation.view', id: 'devices', order: 30, label: '设备' },
+        (props) => h(DeviceView, { ...props, runtime }),
+      ))
+    }
+
+    module.exports = { apply }
+    return module.exports
+  },
+})

package/lib/index.js

@@ -7,6 +7,7 @@ import { registerInstallTool } from './tools/install.js';
 import { registerLogcatTool } from './tools/logcat.js';
 import { registerPerfTool } from './tools/perf.js';
 import { registerPerfBaselineTool } from './tools/perf-baseline.js';
+import { registerRpc } from './rpc.js';
 export const name = 'dsh-adb';
 /** The tool registry is a hard dependency: every tool registers through it. */
 export const inject = ['tools'];
@@ -25,5 +26,9 @@ export function apply(ctx, config) {
     registerPerfTool(ctx, cfg);
     registerPerfBaselineTool(ctx, cfg, config.baselineDir ?? DEFAULT_BASELINE_DIR);
     registerCrashReportTool(ctx, cfg);
-    ctx.logger.info('[dsh-adb] loaded: adb_devices / adb_connect / adb_disconnect / adb_logcat / adb_install / adb_file / adb_perf_snapshot / adb_perf_baseline / adb_crash_report');
+    // The RPC channel needs the client connection, which mounts after this
+    // plugin starts in web compositions; register lazily so headless profiles
+    // (no connection) stay unaffected.
+    ctx.inject(['connection'], (readyCtx) => registerRpc(readyCtx, cfg));
+    ctx.logger.info('[dsh-adb] loaded: 9 tools + web device panel rpc');
 }

package/lib/rpc.d.ts

@@ -0,0 +1,23 @@
+import type { Context } from '@deepseek-ai/cordis';
+import type { AdbConfig } from './adb.js';
+export type RpcEndpointResult = {
+    ok: true;
+    value: unknown;
+} | {
+    ok: false;
+    error: {
+        message: string;
+    };
+};
+/**
+ * Package-private Client↔Host RPC endpoint dispatch for the Web device panel.
+ * Extracted from the connection handler so the endpoints are unit-testable
+ * against a fake adb backend.
+ */
+export declare function handleRpcEndpoint(ctx: Context, cfg: AdbConfig, endpoint: string, raw: unknown, signal: AbortSignal): Promise<RpcEndpointResult>;
+/**
+ * Register the Package-private Client↔Host RPC for the Web device panel
+ * (conversation.view tab "设备"). Called lazily once the client connection
+ * mounts; headless compositions (no connection) stay unaffected.
+ */
+export declare function registerRpc(ctx: Context, cfg: AdbConfig): void;

package/lib/rpc.js

@@ -0,0 +1,66 @@
+import { classifyFailure, runAdb } from './adb.js';
+import { parseDevices } from './parsers/devices.js';
+import { matchesLevel, parseLogcat } from './parsers/logcat.js';
+import { capturePerfSnapshot } from './tools/perf.js';
+/**
+ * Package-private Client↔Host RPC endpoint dispatch for the Web device panel.
+ * Extracted from the connection handler so the endpoints are unit-testable
+ * against a fake adb backend.
+ */
+export async function handleRpcEndpoint(ctx, cfg, endpoint, raw, signal) {
+    try {
+        const payload = (raw ?? {});
+        switch (endpoint) {
+            case 'listDevices': {
+                const result = await runAdb(ctx, cfg, ['devices', '-l'], { signal });
+                if (result.exitCode !== 0)
+                    throw classifyFailure(result);
+                return { ok: true, value: { server: 'ok', devices: parseDevices(result.stdout) } };
+            }
+            case 'perfSnapshot': {
+                const pkg = typeof payload.package === 'string' ? payload.package : undefined;
+                if (pkg === undefined)
+                    throw new Error('perfSnapshot requires a string "package"');
+                const serial = typeof payload.serial === 'string' ? payload.serial : undefined;
+                const snapshot = await capturePerfSnapshot(ctx, cfg, signal, { package: pkg, serial });
+                return { ok: true, value: snapshot };
+            }
+            case 'logcatTail': {
+                const serial = typeof payload.serial === 'string' ? payload.serial : undefined;
+                const level = typeof payload.level === 'string' ? payload.level : undefined;
+                const tail = typeof payload.tail === 'number' && payload.tail > 0 ? Math.floor(payload.tail) : 30;
+                const output = await runAdb(ctx, cfg, ['logcat', '-v', 'threadtime', '-d'], {
+                    signal,
+                    serial,
+                    maxBytes: 8 * 1024 * 1024,
+                });
+                if (output.exitCode !== 0)
+                    throw classifyFailure(output);
+                let entries = parseLogcat(output.stdout);
+                if (level !== undefined)
+                    entries = entries.filter((entry) => matchesLevel(entry, level));
+                const capped = entries.slice(-tail);
+                return { ok: true, value: { total: entries.length, truncated: entries.length > tail, entries: capped } };
+            }
+            default:
+                return { ok: false, error: { message: `unknown endpoint: ${endpoint}` } };
+        }
+    }
+    catch (error) {
+        return { ok: false, error: { message: error instanceof Error ? error.message : String(error) } };
+    }
+}
+/**
+ * Register the Package-private Client↔Host RPC for the Web device panel
+ * (conversation.view tab "设备"). Called lazily once the client connection
+ * mounts; headless compositions (no connection) stay unaffected.
+ */
+export function registerRpc(ctx, cfg) {
+    const connection = ctx.get('connection');
+    const rpc = connection?.rpc;
+    if (rpc === undefined)
+        return;
+    ctx.effect(() => rpc.handle('/dsh-adb', (endpoint, raw, signal) => handleRpcEndpoint(ctx, cfg, endpoint, raw, signal), 
+    // Browser-only channel: accept requests from the loopback web GUI.
+    { authority: 'loopback' }));
+}

package/lib/tools/crash-report.js

@@ -96,7 +96,7 @@ export function registerCrashReportTool(ctx, cfg) {
                 if (args.package === undefined) {
                     throw new AdbError('ARGS_INVALID', 'meminfo section requires a package');
                 }
-                const snapshot = await capturePerfSnapshot(ctx, cfg, exec, {
+                const snapshot = await capturePerfSnapshot(ctx, cfg, exec.signal, {
                     package: args.package,
                     serial: args.serial,
                     metrics: ['meminfo'],

package/lib/tools/perf-baseline.js

@@ -62,7 +62,7 @@ export function registerPerfBaselineTool(ctx, cfg, baselineDir) {
                 throw new AdbError('ARGS_INVALID', `${args.command} requires a package`);
             }
             if (args.command === 'save') {
-                const snapshot = await capturePerfSnapshot(ctx, cfg, exec, {
+                const snapshot = await capturePerfSnapshot(ctx, cfg, exec.signal, {
                     package: args.package,
                     serial: args.serial,
                     metrics: args.metrics,
@@ -83,7 +83,7 @@ export function registerPerfBaselineTool(ctx, cfg, baselineDir) {
             if (baseline === undefined) {
                 throw new AdbError('BASELINE_NOT_FOUND', `no baseline for device ${device} package ${args.package}${args.id !== undefined ? ` (id ${args.id})` : ''}; save one with command=save first`);
             }
-            const current = await capturePerfSnapshot(ctx, cfg, exec, {
+            const current = await capturePerfSnapshot(ctx, cfg, exec.signal, {
                 package: args.package,
                 serial: args.serial,
                 metrics: args.metrics,

package/lib/tools/perf.d.ts

@@ -1,5 +1,4 @@
 import type { Context } from '@deepseek-ai/cordis';
-import type { ToolExecution } from '@deepseek-ai/dsh-tools';
 import { type AdbConfig } from '../adb.js';
 import { parseBattery, parseGfxinfo, parseMeminfo } from '../parsers/perf.js';
 export type PerfMetric = 'meminfo' | 'gfxinfo' | 'battery';
@@ -11,7 +10,7 @@ export interface PerfSnapshot {
     battery?: ReturnType<typeof parseBattery>;
 }
 /** Shared capture: dumpsys meminfo / gfxinfo / battery for one app. */
-export declare function capturePerfSnapshot(ctx: Context, cfg: AdbConfig, exec: ToolExecution, args: {
+export declare function capturePerfSnapshot(ctx: Context, cfg: AdbConfig, signal: AbortSignal, args: {
     package: string;
     serial?: string;
     metrics?: PerfMetric[];

package/lib/tools/perf.js

@@ -1,7 +1,7 @@
 import { classifyFailure, jsonOutput, runAdb } from '../adb.js';
 import { parseBattery, parseGfxinfo, parseMeminfo } from '../parsers/perf.js';
 /** Shared capture: dumpsys meminfo / gfxinfo / battery for one app. */
-export async function capturePerfSnapshot(ctx, cfg, exec, args) {
+export async function capturePerfSnapshot(ctx, cfg, signal, args) {
     const metrics = args.metrics ?? ['meminfo', 'gfxinfo', 'battery'];
     const result = { package: args.package, metrics: [...metrics] };
     for (const metric of metrics) {
@@ -10,7 +10,7 @@ export async function capturePerfSnapshot(ctx, cfg, exec, args) {
             ? ['shell', 'dumpsys', 'battery']
             : ['shell', 'dumpsys', metric, args.package];
         const output = await runAdb(ctx, cfg, argv, {
-            signal: exec.signal,
+            signal,
             serial: args.serial,
             maxBytes: 4 * 1024 * 1024,
         });
@@ -46,7 +46,7 @@ export function registerPerfTool(ctx, cfg) {
         },
         output: jsonOutput(),
         async execute(args, exec) {
-            return capturePerfSnapshot(ctx, cfg, exec, args);
+            return capturePerfSnapshot(ctx, cfg, exec.signal, args);
         },
     });
 }

package/package.json

@@ -1,11 +1,17 @@
 {
   "name": "dsh-adb",
-  "version": "0.2.0",
-  "description": "ADB device & bench operations for DeepSeek Harness: device discovery, structured logcat, apk install, file pull/push, performance snapshots, perf baselines, crash reports",
+  "version": "1.0.0",
+  "description": "ADB device & bench operations for DeepSeek Harness: device discovery, structured logcat, apk install, file pull/push, performance snapshots, perf baselines, crash reports, web device panel",
   "type": "module",
   "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./client.js",
+    "./package.json": "./package.json"
+  },
   "files": [
     "lib",
+    "client.js",
     "cordis.patch.yml"
   ],
   "keywords": [
@@ -21,6 +27,9 @@
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web"
     }
   },
   "scripts": {