@windypro-rourou/dsh-logcat 0.2.2 → 0.2.4

package/README.md

@@ -7,13 +7,22 @@ DSH Web GUI 的安卓实机调试面板（类似 Android Studio 的 Logcat 视
 - **自动连接**：探测本机 adb（`ANDROID_HOME` / `ANDROID_SDK_ROOT` / 默认 `%LOCALAPPDATA%\Android\Sdk` / PATH），
   每 2 秒轮询 `adb devices -l`；检测到处于调试模式的设备**自动附加 logcat 流**（`-v threadtime`），无需打开面板。
 - **实时日志**：WebSocket 推送，每设备保留最近 2000 行环形缓冲；断线自动重连（指数退避）。
-- **Logcat 面板**（侧边栏「Logcat」入口）：
+- **Logcat 面板**（侧边栏「Logcat」入口，右侧抽屉，**宽度可拖拽调整并记忆**）：
   - 设备下拉（显示型号/序列号/状态，记住上次选择）
   - 级别过滤（V/D/I/W/E/F 单选，颜色与 Android Studio 一致）
   - 关键词过滤、暂停/继续（暂停时缓冲，恢复自动回放）、清空、复制、导出 .txt
   - 窗口化渲染 + 自动滚动（滚动手动上翻时自动停用）
   - 未授权设备提示「请在手机上点击允许 USB 调试」
-- **Agent 工具**：`logcat_recent`（读取某设备最近 N 条日志，支持级别/关键词过滤）。
+- **Agent 工具**：
+  - `logcat_devices`：列出已连接设备（serial / model / state），判断能否实机调试。
+  - `adb_exec`：在指定设备执行 `adb shell` 命令（安装 APK、启动 Activity、查进程、截图、dump UI 等），
+    破坏性操作（卸载 / 重启 / 清数据）需先确认。
+  - `logcat_set_package`：设置 / 清除当前测试的 app 包名（安装 / 启动应用后调用）。
+  - `logcat_recent`：读取某设备最近 N 条日志，支持级别 / 关键词过滤；
+    设置了测试包名（或显式传 `package`）时自动按该 app 的 pid 过滤日志。
+- **实机调试工作流**：构建安卓应用时，agent 的通告会动态列出当前已连接设备（serial + 型号）与当前测试包名，
+  可先向用户确认后用 `adb_exec` 安装 / 启动、`logcat_set_package` 锁定目标 app、`logcat_recent` 按包名查看崩溃日志，
+  闭环真机调试。
 - **附加能力**：`POST /api/dsh-logcat/exec` 可对设备执行 `adb shell` 命令（UI 后续版本可扩展）。
 
 ## 安装

package/lib/client.js

@@ -35,6 +35,8 @@ window.__ModuleLoader__.load({
 [data-dsh-logcat-entry] .lc-entry-label { font-size: 13px; line-height: 1.2; opacity: .92; }
 .dsh-logcat-view { position: fixed; top: 0; right: 0; bottom: 0; width: min(620px, 94vw); display: flex; flex-direction: column; background: var(--lc-bg, #ffffff); border-left: 1px solid rgba(128,128,128,.3); box-shadow: -10px 0 28px rgba(0,0,0,.18); z-index: 9999; }
 .dsh-logcat-view[hidden] { display: none !important; }
+.dsh-logcat-resize { position: absolute; left: -5px; top: 0; bottom: 0; width: 10px; cursor: col-resize; z-index: 2; }
+.dsh-logcat-resize:hover, .dsh-logcat-resize[data-drag] { background: rgba(128,128,128,.28); }
 .lc-panel { display: flex; flex-direction: column; height: 100%; min-height: 0; font-family: -apple-system, "Segoe UI", "Microsoft YaHei", sans-serif; }
 .lc-header { display: flex; align-items: center; gap: 8px; padding: 8px 12px; border-bottom: 1px solid rgba(128,128,128,.25); flex: none; }
 .lc-back { border: 0; background: transparent; color: inherit; font: inherit; cursor: pointer; display: flex; align-items: center; gap: 4px; padding: 4px 8px; border-radius: 6px; font-size: 13px; }
@@ -528,16 +530,59 @@ window.__ModuleLoader__.load({
 		function mountPanel(controller) {
 			let root;
 			let container;
+			let handle;
+			let drag = null;
+
+			const MIN_WIDTH = 320;
+			const DEFAULT_WIDTH = 620;
+			const readWidth = () => {
+				try {
+					const w = Number(localStorage.getItem("dsh-logcat-width"));
+					if (Number.isFinite(w) && w >= MIN_WIDTH && w <= window.innerWidth - 40) return w;
+				} catch { /* private mode */ }
+				return Math.min(DEFAULT_WIDTH, Math.max(MIN_WIDTH, window.innerWidth - 80));
+			};
+
+			const onMove = (e) => {
+				if (drag === null || container === undefined) return;
+				const width = Math.max(MIN_WIDTH, Math.min(window.innerWidth - 40, drag.startWidth + (drag.startX - e.clientX)));
+				container.style.width = width + "px";
+			};
+			const onUp = () => {
+				if (drag === null) return;
+				handle?.removeAttribute("data-drag");
+				try {
+					const w = container.style.width.replace("px", "");
+					localStorage.setItem("dsh-logcat-width", w);
+				} catch { /* private mode */ }
+				window.removeEventListener("mousemove", onMove);
+				window.removeEventListener("mouseup", onUp);
+				drag = null;
+			};
+			const onDown = (e) => {
+				e.preventDefault();
+				drag = { startX: e.clientX, startWidth: container.getBoundingClientRect().width };
+				handle?.setAttribute("data-drag", "");
+				window.addEventListener("mousemove", onMove);
+				window.addEventListener("mouseup", onUp);
+			};
 
 			const ensure = () => {
 				if (container !== undefined && container.isConnected) return;
 				root?.unmount();
 				root = undefined;
 				container?.remove();
+				handle = undefined;
 				container = document.createElement("div");
 				container.dataset.dshLogcatView = "";
 				container.className = "dsh-logcat-view";
+				container.style.width = readWidth() + "px";
 				container.hidden = true; // side-drawer: hidden until the sidebar entry is clicked
+				handle = document.createElement("div");
+				handle.className = "dsh-logcat-resize";
+				handle.title = "拖拽调整宽度";
+				handle.addEventListener("mousedown", onDown);
+				container.appendChild(handle);
 				document.body.appendChild(container);
 				root = createRoot(container);
 				root.render(h(LogcatPanel, { controller }));
@@ -553,11 +598,14 @@ window.__ModuleLoader__.load({
 			applyOpen();
 
 			return () => {
+				window.removeEventListener("mousemove", onMove);
+				window.removeEventListener("mouseup", onUp);
 				unsubscribe();
 				root?.unmount();
 				root = undefined;
 				container?.remove();
 				container = undefined;
+				handle = undefined;
 			};
 		}
 		//#endregion

package/lib/index.js

@@ -36,7 +36,22 @@ const SECTION_ORDER = 152
 
 /** Model-facing announcement: plugin presence, capabilities, and limits. */
 export const LOGCAT_GUIDANCE =
-  '本机已安装 dsh-logcat 插件（DSH Web GUI 的安卓实机调试面板）：侧边栏「Logcat」入口；自动探测本机 adb（ANDROID_HOME / 默认 SDK 路径），对处于调试模式的已连接设备自动附加 logcat 流（threadtime 格式，每设备保留最近 2000 行环形缓冲）；Web 面板支持设备切换、级别/关键词过滤、暂停/清空/导出；agent 可用 logcat_recent 工具读取最近日志。限制：需设备开启 USB 调试并授权本机；logcat 输出可能含敏感信息；执行 adb 命令消耗真实设备资源，先确认再操作。用户提到「Logcat / 安卓日志 / 实机调试 / adb 日志」时即指本插件，请据此协作。'
+  '本机已安装 dsh-logcat 插件（DSH Web GUI 的安卓实机调试面板）：侧边栏「Logcat」入口；自动探测本机 adb，对已连接的调试设备自动附加 logcat 流（threadtime，每设备 2000 行环形缓冲）；Web 面板支持设备切换、级别/关键词过滤、暂停/清空/导出；agent 工具：logcat_devices（列出已连接设备）、adb_exec（在设备上执行 adb shell：安装/启动/查看日志/截图等）、logcat_recent（读取最近日志）。构建安卓应用时若检测到已连接设备，可先向用户确认后用 adb_exec / logcat_recent 直接实机调试。限制：需设备开启 USB 调试并授权本机；logcat 输出可能含敏感信息；adb 命令消耗真实设备资源，破坏性操作（卸载/重启/清数据）先确认再执行。用户提到「Logcat / 安卓日志 / 实机调试 / adb 日志」时即指本插件，请据此协作。'
+
+/** Dynamic model-facing announcement: base guidance plus currently attached devices. */
+function logcatGuidance(engine) {
+  return () => {
+    const devices = engine.deviceList()
+    const live = devices.filter((d) => d.state === 'device')
+    const deviceLine = live.length > 0
+      ? `当前已连接安卓设备：${live.map((d) => `${d.serial}${d.model !== '' ? `（${d.model}）` : ''}`).join('、')}（已授权，可实机调试：安装 APK / 启动应用 / logcat / 截图等）。`
+      : '当前无已连接的安卓设备（插上设备并开启 USB 调试后会自动识别）。'
+    const pkgLine = engine.currentPackage !== ''
+      ? `当前测试应用包名：${engine.currentPackage}（logcat_recent 默认按它过滤日志）。`
+      : ''
+    return `${LOGCAT_GUIDANCE}\n${deviceLine}${pkgLine !== '' ? `\n${pkgLine}` : ''}`
+  }
+}
 
 /** ---------------------------------------------------------------- adb */
 
@@ -195,6 +210,7 @@ class AdbEngine {
     this.timer = null
     this.polling = false
     this.BUFFER_CAP = 2000
+    this.currentPackage = ''   // app package currently under test (agent-set)
   }
 
   /** Probe and warm the adb server. Returns true when usable. */
@@ -328,6 +344,14 @@ class AdbEngine {
     return picked.slice(-lines)
   }
 
+  /** Map a package name to its running pids on a device ([] when not running). */
+  async pidsOfPackage(serial, packageName) {
+    if (this.adb === null || packageName === '') return []
+    const output = await runAdb(this.adb, ['-s', serial, 'shell', 'pidof', packageName], 8000)
+    if (output === null) return []
+    return output.split(/\s+/).map((s) => Number.parseInt(s, 10)).filter((n) => Number.isInteger(n) && n > 0)
+  }
+
   /** Broadcast one frame to every open panel socket. */
   broadcast(frame) {
     const payload = JSON.stringify(frame)
@@ -465,6 +489,7 @@ function logcatRecentTool(engine) {
       lines: { type: 'integer', description: 'Max entries to return (default 200, max 2000).' },
       level: { type: 'string', enum: ['V', 'D', 'I', 'W', 'E', 'F'], description: 'Minimum severity filter (V=verbose … F=fatal).' },
       filter: { type: 'string', description: 'Substring to filter the raw line (case-insensitive).' },
+      package: { type: 'string', description: 'App package to filter by (pid of the running app); falls back to the package set via logcat_set_package.' },
     },
     output: {
       schema: {
@@ -487,6 +512,7 @@ function logcatRecentTool(engine) {
               },
             },
           },
+          note: { type: 'string' },
         },
       },
       render: (_args, value) => {
@@ -509,7 +535,135 @@ function logcatRecentTool(engine) {
       const lines = Math.min(Math.max(Number(args.lines ?? 200) || 200, 1), 2000)
       const level = typeof args.level === 'string' ? args.level : ''
       const filter = typeof args.filter === 'string' ? args.filter : ''
-      return { entries: engine.recent(serial, lines, level, filter) }
+      const pkg = (typeof args.package === 'string' ? args.package.trim() : '') || engine.currentPackage
+      const picked = engine.recent(serial, lines, level, filter)
+      if (pkg === '') return { entries: picked }
+      const pids = await engine.pidsOfPackage(serial, pkg)
+      if (pids.length === 0) {
+        return { entries: [], note: `package ${pkg} is not running on ${serial} — start it first (adb_exec: am start -n ...) or pass another package` }
+      }
+      const byPid = picked.filter((e) => e.pid > 0 && pids.includes(e.pid))
+      return byPid.length > 0
+        ? { entries: byPid }
+        : { entries: [], note: `no buffered logcat lines for package ${pkg} (pids ${pids.join(', ')}); the app may not have logged yet` }
+    },
+  })
+}
+
+/** The logcat_set_package agent tool: set/clear the app package currently under test. */
+function logcatSetPackageTool(engine) {
+  return defineTool({
+    name: 'logcat_set_package',
+    description: 'Set (or clear) the Android app package currently under test, so logcat_recent filters by it. ' +
+      'Call after installing/starting the app you are debugging (e.g. via adb_exec). ' +
+      'Pass an empty string to clear the filter. Triggers: focus logs on one app, filter logcat by package.',
+    parameters: {
+      package: { type: 'string', description: 'The app package to track, e.g. "com.example.app"; an empty string clears it.' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          package: { type: 'string', required: true },
+        },
+      },
+      render: (_args, value) => [{ type: 'text', text: value?.package ? `tracking package: ${value.package}` : 'package filter cleared' }],
+    },
+    async execute(args) {
+      const pkg = typeof args.package === 'string' ? args.package.trim() : ''
+      engine.currentPackage = pkg
+      return { package: pkg }
+    },
+  })
+}
+
+/** The logcat_devices agent tool: list attached adb devices for on-device debugging. */
+function logcatDevicesTool(engine) {
+  return defineTool({
+    name: 'logcat_devices',
+    description: 'List currently attached Android devices (serial, model, state) for on-device debugging. ' +
+      'Triggers: check adb devices, see which phones are connected, decide whether to debug a build on a real device.',
+    parameters: {},
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          devices: {
+            type: 'array',
+            required: true,
+            items: {
+              type: 'object',
+              additionalProperties: false,
+              properties: {
+                serial: { type: 'string', required: true },
+                model: { type: 'string', required: true },
+                state: { type: 'string', required: true },
+              },
+            },
+          },
+        },
+      },
+      render: (_args, value) => {
+        const devices = value?.devices ?? []
+        if (devices.length === 0) return [{ type: 'text', text: '(no devices attached)' }]
+        const lines = devices.map((d) => `${d.state.padEnd(11)} ${(d.model || '?').padEnd(22)} ${d.serial}`)
+        return [{ type: 'text', text: lines.join('\n') }]
+      },
+    },
+    async execute() {
+      return { devices: engine.deviceList().map(({ serial, model, state }) => ({ serial, model, state })) }
+    },
+  })
+}
+
+/** The adb_exec agent tool: run one adb shell command on a device. */
+function adbExecTool(engine) {
+  return defineTool({
+    name: 'adb_exec',
+    description: 'Run one adb shell command on an attached Android device — e.g. install an APK (pm install -r <path>), ' +
+      'start an activity (am start -n pkg/.Activity), list processes, take a screenshot (screencap -p /sdcard/x.png), ' +
+      'or dump UI (uiautomator dump). NOTE: executes real commands on the user\'s device and consumes device resources — ' +
+      'confirm intent before destructive actions (uninstall, reboot, clear data, factory reset).',
+    parameters: {
+      serial: { type: 'string', description: 'Device serial from logcat_devices (optional; defaults to the first attached device).' },
+      command: { type: 'string', description: 'The shell command to run without the "adb shell" prefix, e.g. "pm list packages | grep com.example" or "am start -n com.example/.MainActivity".' },
+      timeoutMs: { type: 'integer', description: 'Command timeout in ms (default 15000, max 120000).' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          ok: { type: 'boolean', required: true },
+          code: { type: 'integer' },
+          stdout: { type: 'string', required: true },
+          stderr: { type: 'string', required: true },
+        },
+      },
+      render: (_args, value) => {
+        const out = value?.stdout ?? ''
+        const err = value?.stderr ?? ''
+        const parts = []
+        if (out !== '') parts.push(out.trimEnd())
+        if (err !== '') parts.push('stderr: ' + err.trimEnd())
+        if (parts.length === 0) parts.push(`(exit ${value?.code ?? '?'}, no output)`)
+        return [{ type: 'text', text: parts.join('\n') }]
+      },
+    },
+    async execute(args) {
+      const devices = engine.deviceList()
+      const serial = typeof args.serial === 'string' && args.serial !== ''
+        ? args.serial
+        : devices.find((d) => d.state === 'device')?.serial ?? ''
+      const command = typeof args.command === 'string' ? args.command.trim() : ''
+      if (engine.adb === null) return { ok: false, code: null, stdout: '', stderr: 'adb not found on this host' }
+      if (serial === '') return { ok: false, code: null, stdout: '', stderr: 'no attached device; connect and authorize one first' }
+      if (command === '') return { ok: false, code: null, stdout: '', stderr: 'command is required' }
+      const timeoutMs = Math.min(Math.max(Number(args.timeoutMs ?? 15000) || 15000, 1000), 120000)
+      const result = await runAdbFull(engine.adb, ['-s', serial, 'shell', command], timeoutMs)
+      return { ok: result.ok, code: result.code, stdout: result.stdout, stderr: result.stderr }
     },
   })
 }
@@ -537,6 +691,7 @@ export function apply(ctx, config) {
       devices: engine.deviceList(),
       streaming: [...engine.streams.keys()],
       bufferSizes: Object.fromEntries([...engine.buffers.entries()].map(([s, b]) => [s, b.length])),
+      currentPackage: engine.currentPackage,
     }),
   }
   if (typeof ctx.provide === 'function') ctx.provide('logcat', logcatHandle)
@@ -565,7 +720,7 @@ export function apply(ctx, config) {
       disposeSection = ctx.systemPrompt.section({
         name: 'plugin:dsh-logcat',
         order: SECTION_ORDER,
-        text: LOGCAT_GUIDANCE,
+        text: logcatGuidance(engine),
       })
     }
     disposeRoutes = ctx.effect(() => {
@@ -577,7 +732,12 @@ export function apply(ctx, config) {
       }
     }, 'dsh-logcat: routes')
     disposeTools = ctx.effect(() => {
-      const disposers = [logcatRecentTool(engine)].map((tool) => ctx.tools.register(tool))
+      const disposers = [
+        logcatRecentTool(engine),
+        logcatDevicesTool(engine),
+        adbExecTool(engine),
+        logcatSetPackageTool(engine),
+      ].map((tool) => ctx.tools.register(tool))
       return () => { for (const dispose of disposers) dispose() }
     }, 'dsh-logcat: tools')
     initOnce()

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.2.2",
+  "version": "0.2.4",
   "type": "module",
   "packageManager": "pnpm@11.22.0",
   "engines": {