dsh-mobile-web 0.1.2 → 0.1.4

package/mobile-src/UPSTREAM.md

@@ -1,50 +1,58 @@
-# Vendored mobile UI source (dsh-palm fork)
-
-## Baseline
-
-- Upstream project: **dsh-palm** — <https://github.com/Eternalloveone/dsh-palm>
-- Baseline release: **v1.6.0** (published 2026-10-14)
-- Source obtained from the release tarball:
-  `https://codeload.github.com/Eternalloveone/dsh-palm/tar.gz/refs/tags/v1.6.0`
-  → `packages/dsh-palm/src/**` (Apache-2.0, see `LICENSE-APACHE`)
-- This directory is a **fork**, not a submodule or a pinned dependency. Once vendored,
-  we do **not** follow upstream feature work. Upstream is kept only as reference
-  material for bug fixes we want to cherry-pick by hand.
-
-## What we build
-
-`../assets/mobile.bundle.js` — the single ES module served to the phone at `/m/mobile.js`.
-`build.mjs` uses esbuild with the same entry/options as upstream's `tsdown.config.ts`
-(`format=esm`, `platform=browser`, `target=es2022`, `jsx=automatic`, minify, no externals).
-
-```sh
-cd mobile-src
-npm ci           # only needed once / after package-lock.json changes
-npm run build    # writes ../assets/mobile.bundle.js (+ .map)
-```
-
-Build output is deterministic for a given `src/` + lockfile; rebuilds should produce
-byte-identical files (`sha256sum ../assets/mobile.bundle.js`).
-
-## Local changes carried in this fork (vs v1.6.0)
-
-1. **Send-mode row in Settings** (`src/mobile/views/SettingsView.tsx`, 外观 group):
-   the row reads/writes `window.__dmSendMode` (owned by the host plugin's injected
-   `SEND_MODE_HTML`), so the phone stores its send mode on the host instead of a
-   page-local default. Styled by `assets/theme.css` (`.dm-sendmode-select`).
-2. **Balance label** (`SettingsView.tsx`, usage card): `账户余额` → `充值余额`
-   to match the wording used on the desktop side.
-
-Everything else is upstream v1.6.0 as published. Host-side behaviours that used to be
-patched into the shipped bundle by hand now live where they belong:
-
-- “关于 / 反馈” copy and the GitHub link are rewritten at runtime by the host plugin's
-  DOM patch (`index.js`, `SETTINGS_SCOPE_HTML` block) — no source change needed.
-- The web-search artwork in the builtin-plugin rows is host-side (`index.js`,
-  `HOST_PAGES_HTML` → `CONFIG_ART['web-search']`) — not part of this bundle.
-
-## Updating
-
-Do not `git pull` upstream into this tree. If a specific upstream fix is wanted, read
-the upstream commit, re-implement it here, run `npm run build`, and commit both the
-source change and the rebuilt `assets/mobile.bundle.js` in the same commit.
+# Vendored mobile UI source (dsh-palm fork)
+
+## Baseline
+
+- Upstream project: **dsh-palm** — <https://github.com/Eternalloveone/dsh-palm>
+- Baseline release: **v1.6.0** (published 2026-10-14)
+- Source obtained from the release tarball:
+  `https://codeload.github.com/Eternalloveone/dsh-palm/tar.gz/refs/tags/v1.6.0`
+  → `packages/dsh-palm/src/**` (Apache-2.0, see `LICENSE-APACHE`)
+- This directory is a **fork**, not a submodule or a pinned dependency. Once vendored,
+  we do **not** follow upstream feature work. Upstream is kept only as reference
+  material for bug fixes we want to cherry-pick by hand.
+
+## What we build
+
+`../assets/mobile.bundle.js` — the single ES module served to the phone at `/m/mobile.js`.
+`build.mjs` uses esbuild with the same entry/options as upstream's `tsdown.config.ts`
+(`format=esm`, `platform=browser`, `target=es2022`, `jsx=automatic`, minify, no externals).
+
+```sh
+cd mobile-src
+npm ci           # only needed once / after package-lock.json changes
+npm run build    # writes ../assets/mobile.bundle.js (+ .map)
+```
+
+Build output is deterministic for a given `src/` + lockfile; rebuilds should produce
+byte-identical files (`sha256sum ../assets/mobile.bundle.js`).
+
+## Local changes carried in this fork (vs v1.6.0)
+
+1. **Send-mode row in Settings** (`src/mobile/views/SettingsView.tsx`, 外观 group):
+   the row reads/writes `window.__dmSendMode` (owned by the host plugin's injected
+   `SEND_MODE_HTML`), so the phone stores its send mode on the host instead of a
+   page-local default. Styled by `assets/theme.css` (`.dm-sendmode-select`).
+2. **Balance label** (`SettingsView.tsx`, usage card): `账户余额` → `充值余额`
+   to match the wording used on the desktop side.
+3. **Question record in chat history** (`messages.ts`, `message-row.tsx`,
+   `process-rows.ts`, `mobile-styles.ts`): `ask_user_question` calls are folded into a
+   `QuestionRecord` (question text + chosen options) from the `tool/call` and
+   `tool/result` events and rendered inline as a compact 「提问 · N/M 已回答」 card
+   (expandable). The raw tool row is suppressed for that tool, and a turn whose only
+   process content was the question no longer shows an empty process card. Desktop parity:
+   the desktop renders the same record from its own projection; this deployment's
+   `userQuestions` projection stays empty, so the phone folds the events instead.
+
+Everything else is upstream v1.6.0 as published. Host-side behaviours that used to be
+patched into the shipped bundle by hand now live where they belong:
+
+- “关于 / 反馈” copy and the GitHub link are rewritten at runtime by the host plugin's
+  DOM patch (`index.js`, `SETTINGS_SCOPE_HTML` block) — no source change needed.
+- The web-search artwork in the builtin-plugin rows is host-side (`index.js`,
+  `HOST_PAGES_HTML` → `CONFIG_ART['web-search']`) — not part of this bundle.
+
+## Updating
+
+Do not `git pull` upstream into this tree. If a specific upstream fix is wanted, read
+the upstream commit, re-implement it here, run `npm run build`, and commit both the
+source change and the rebuilt `assets/mobile.bundle.js` in the same commit.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mobile-web",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "掌上 dsh —— DSH 的手机端完整聊天界面：6 位码配对、设备信任、工作区/会话/聊天、SSE 实时流，可经局域网或公网反代访问。",
   "type": "module",
   "main": "index.js",
@@ -76,5 +76,6 @@
   },
   "scripts": {
     "smoke": "node test/smoke.mjs"
-  }
+  },
+  "icon": "./assets/icon.svg"
 }

package/src/host/assets.js

@@ -1,12 +1,12 @@
-/**
- * 静态资源：assets/ 下 bundle/图标/主题，带 mtime 校验的进程内缓存。
- * 本文件位于 src/host/，仓库根的 assets/ 用两个 ../ 定位。
- */
-import { readFileSync, existsSync, mkdirSync, statSync } from 'node:fs'
-import { join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { SHOT_DIR } from './config.js'
-
+/**
+ * 静态资源：assets/ 下 bundle/图标/主题，带 mtime 校验的进程内缓存。
+ * 本文件位于 src/host/，仓库根的 assets/ 用两个 ../ 定位。
+ */
+import { readFileSync, existsSync, mkdirSync, statSync } from 'node:fs'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { SHOT_DIR } from './config.js'
+
 export const assetCache = new Map()
 /**
  * 读取 assets 下的静态资源，**按文件 mtime/size 失效**。

package/src/host/cleanup.js

@@ -0,0 +1,380 @@
+/**
+ * 手机端「删除」的宿主实现：会话目录、会话文件、工作区目录的**永久删除**。
+ *
+ * 设计原则（用户明确要求）：删除就是删除，不做回收站。
+ *   · 会话删除 = 归档墓碑（让所有设备立刻从列表消失）+ rm -rf 会话目录；
+ *   · 文件删除 = 从「会话日志 write/edit 白名单」里校验后 rm；
+ *   · 工作区目录删除 = 输入完整路径确认后 rm -rf，但保留硬护栏
+ *     （主目录 / ~/.dsh / 插件自身目录 / 盘符根一律拒绝）。
+ *
+ * dsh 的会话存储后端没有删除接口（文档：「不删除会话文件，直到外部移除」），
+ * 所以外部移除会话目录就是唯一正确的实现；投影缓存在这里一并清掉。
+ */
+import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, rmSync, statSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:path'
+import { zstdDecompressSync } from 'node:zlib'
+
+const DSH_HOME = join(homedir(), '.dsh')
+
+/** 会话日志根（可用 DSH_SESSIONS_DIR 覆盖，与宿主保持一致）。 */
+export const SESSIONS_ROOT = process.env.DSH_SESSIONS_DIR || join(DSH_HOME, 'sessions')
+const PROJ_CACHE_ROOT = process.env.DSH_PROJ_CACHE_DIR || join(DSH_HOME, 'storages', 'session_projcache', 'sessions')
+/** 单个会话最多列出的文件数（防止异常日志把手机撑爆）。 */
+const MAX_FILES = 2000
+const EDIT_TOOLS = new Set(['write', 'edit', 'multi_edit', 'apply_patch', 'write_file', 'create_file', 'str_replace', 'write_text_file'])
+
+/** 会话 id 只允许安全字符；去掉可能存在的 session- 前缀。 */
+export function normalizeSessionId(raw) {
+  const value = String(raw === undefined || raw === null ? '' : raw).trim()
+  if (!/^(?:session-)?[A-Za-z0-9][A-Za-z0-9._-]{0,119}$/.test(value)) return ''
+  return value.startsWith('session-') ? value.slice('session-'.length) : value
+}
+
+/** 会话 id 在日志/接口里的两种写法（有的地方带 session- 前缀）。 */
+export function sessionIdVariants(raw) {
+  const id = normalizeSessionId(raw)
+  if (id === '') return []
+  return [`session-${id}`, id]
+}
+
+/**
+ * 定位会话目录：~/.dsh/sessions/<--cwd-->/<session-id>/。
+ * 目录名有 `session-<id>` 与 `<id>` 两种历史写法，都认。
+ */
+export function findSessionDir(sessionId) {
+  const variants = sessionIdVariants(sessionId)
+  if (variants.length === 0) return undefined
+  let entries = []
+  try {
+    entries = readdirSync(SESSIONS_ROOT)
+  } catch {
+    return undefined
+  }
+  for (const name of entries) {
+    const workspaceDir = join(SESSIONS_ROOT, name)
+    let isDir = false
+    try {
+      isDir = statSync(workspaceDir).isDirectory()
+    } catch {
+      isDir = false
+    }
+    if (!isDir) continue
+    for (const variant of variants) {
+      const candidate = join(workspaceDir, variant)
+      try {
+        if (statSync(candidate).isDirectory()) return candidate
+      } catch {}
+    }
+  }
+  return undefined
+}
+
+/** 会话目录里的日志文件（session*.jsonl[.zstd]），优先最新版本。 */
+function sessionLogFiles(dir) {
+  let names = []
+  try {
+    names = readdirSync(dir).filter((name) => /^session(?:\.[vV][0-9]+)?\.jsonl(?:\.zstd)?$/.test(name))
+  } catch {
+    return []
+  }
+  if (names.length === 0) return []
+  const versionOf = (name) => {
+    const match = /^session\.[vV]([0-9]+)\.jsonl/.exec(name)
+    return match === null ? 0 : Number(match[1])
+  }
+  const best = names.reduce((top, name) => (versionOf(name) > versionOf(top) ? name : top), names[0])
+  const compressed = `${best}.zstd`
+  return [names.includes(compressed) ? compressed : best]
+}
+
+/**
+ * 解压会话日志。会话日志是**追加写的多个 zstd frame**，Node 的
+ * zstdDecompressSync 只解第一帧（实测 13MB → 200 字节），所以按 magic
+ * 切帧逐个解压再拼接（zstd magic 落在压缩数据内部概率极低；失败则退回整块解）。
+ */
+function decompressSessionLog(buffer) {
+  const MAGIC = Buffer.from([0x28, 0xb5, 0x2f, 0xfd])
+  const offsets = []
+  let at = 0
+  while ((at = buffer.indexOf(MAGIC, at)) !== -1) {
+    offsets.push(at)
+    at += MAGIC.length
+  }
+  if (offsets.length <= 1) {
+    try {
+      return zstdDecompressSync(buffer)
+    } catch {
+      return buffer
+    }
+  }
+  offsets.push(buffer.length)
+  const parts = []
+  for (let index = 0; index < offsets.length - 1; index += 1) {
+    try {
+      parts.push(zstdDecompressSync(buffer.subarray(offsets[index], offsets[index + 1])))
+    } catch {}
+  }
+  return parts.length === 0 ? buffer : Buffer.concat(parts)
+}
+
+/** 会话目录里所有文件的体积信息（用于删除确认页）。 */
+export function sessionDirInfo(sessionId) {
+  const dir = findSessionDir(sessionId)
+  if (dir === undefined) return { found: false }
+  const files = []
+  let bytes = 0
+  let newest = 0
+  try {
+    for (const name of readdirSync(dir)) {
+      const path = join(dir, name)
+      try {
+        const stat = statSync(path)
+        if (!stat.isFile()) continue
+        files.push({ name, bytes: stat.size, mtime: stat.mtimeMs })
+        bytes += stat.size
+        newest = Math.max(newest, stat.mtimeMs)
+      } catch {}
+    }
+  } catch {}
+  return { found: true, dir, files, bytes, newest }
+}
+
+/** 从会话日志里收集 write/edit 类工具调用写过的文件（去重、附带次数）。 */
+export function sessionWrittenFiles(sessionId) {
+  const dir = findSessionDir(sessionId)
+  if (dir === undefined) return new Map()
+  const out = new Map()
+  for (const name of sessionLogFiles(dir)) {
+    let raw
+    try {
+      raw = readFileSync(join(dir, name))
+    } catch {
+      continue
+    }
+    let text
+    try {
+      text = (name.endsWith('.zstd') ? decompressSessionLog(raw) : raw).toString('utf8')
+    } catch {
+      continue
+    }
+    let start = 0
+    while (start < text.length) {
+      const end = text.indexOf('\n', start)
+      const line = text.slice(start, end === -1 ? text.length : end)
+      start = end === -1 ? text.length : end + 1
+      if (line === '' || !line.includes('"tool-call"')) continue
+      let event
+      try {
+        event = JSON.parse(line)
+      } catch {
+        continue
+      }
+      const content = event && event.data && event.data.message && event.data.message.content
+      if (!Array.isArray(content)) continue
+      for (const part of content) {
+        if (!part || part.type !== 'tool-call' || !EDIT_TOOLS.has(part.name)) continue
+        let args
+        try {
+          args = JSON.parse(part.arguments)
+        } catch {
+          continue
+        }
+        if (!args || typeof args !== 'object') continue
+        const paths = []
+        if (typeof args.file_path === 'string' && args.file_path !== '') paths.push(args.file_path)
+        if (typeof args.path === 'string' && args.path !== '') paths.push(args.path)
+        if (Array.isArray(args.paths)) {
+          for (const item of args.paths) if (typeof item === 'string' && item !== '') paths.push(item)
+        }
+        for (const path of paths) {
+          const existing = out.get(path)
+          out.set(path, { path, count: (existing === undefined ? 0 : existing.count) + 1, tool: part.name })
+        }
+        if (out.size >= MAX_FILES) return out
+      }
+    }
+  }
+  return out
+}
+
+/** realpath（文件不存在时返回 undefined）；用于路径边界校验。 */
+function realpathOrUndefined(path) {
+  try {
+    return realpathSync(path)
+  } catch {
+    return undefined
+  }
+}
+
+export function isInside(parent, child) {
+  const rel = relative(parent, child)
+  return rel !== '' && !rel.startsWith('..') && !isAbsolute(rel)
+}
+
+/**
+ * 会话可删除文件清单（给手机端确认页）：
+ *   logs      会话目录里的日志文件（删掉=会话记录本身）
+ *   generated 会话日志里 write/edit 写过的、现在仍然存在的普通文件
+ * 每项都带 absolute path、bytes、insideWorkspace，外部的默认不勾选。
+ */
+export function listSessionFiles(sessionId, cwd) {
+  const dir = findSessionDir(sessionId)
+  const base = dir === undefined ? undefined : resolve(dir)
+  const workspace = typeof cwd === 'string' && cwd !== '' ? resolve(cwd) : undefined
+  const workspaceReal = workspace === undefined ? undefined : (realpathOrUndefined(workspace) || workspace)
+  const logs = []
+  if (base !== undefined) {
+    try {
+      for (const name of readdirSync(base)) {
+        const path = join(base, name)
+        try {
+          const stat = statSync(path)
+          if (!stat.isFile()) continue
+          logs.push({ group: 'logs', path, name, bytes: stat.size, mtime: stat.mtimeMs, insideWorkspace: false })
+        } catch {}
+      }
+    } catch {}
+  }
+  const generated = []
+  for (const record of sessionWrittenFiles(sessionId).values()) {
+    // 日志里的路径可能是绝对路径，也可能是相对当时 cwd 的路径；两种基准都试。
+    const candidates = []
+    if (isAbsolute(record.path)) candidates.push(resolve(record.path))
+    else {
+      if (workspace !== undefined) candidates.push(resolve(workspace, record.path))
+      candidates.push(resolve(record.path))
+    }
+    let path
+    let stat
+    for (const candidate of candidates) {
+      try {
+        const probe = statSync(candidate)
+        if (probe.isFile()) { path = candidate; stat = probe; break }
+      } catch {}
+    }
+    if (path === undefined) continue
+    const real = realpathOrUndefined(path)
+    if (real === undefined) continue
+    // 符号链接不提供删除（避免把链接目标删掉/穿越到别处）。
+    try {
+      if (lstatSync(path).isSymbolicLink()) continue
+    } catch {}
+    const inside = workspaceReal !== undefined && workspace !== undefined
+      ? isInside(workspace, path) || isInside(workspaceReal, real)
+      : false
+    generated.push({
+      group: 'generated',
+      path,
+      name: basename(path),
+      bytes: stat.size,
+      mtime: stat.mtimeMs,
+      insideWorkspace: inside,
+      tool: record.tool,
+      count: record.count,
+    })
+  }
+  generated.sort((a, b) => b.mtime - a.mtime)
+  return {
+    found: dir !== undefined,
+    dir,
+    cwd: workspace,
+    groups: [
+      { kind: 'logs', title: '会话日志', files: logs },
+      { kind: 'generated', title: '本会话写过的文件', files: generated.slice(0, MAX_FILES) },
+    ],
+    bytes: [...logs, ...generated].reduce((sum, file) => sum + file.bytes, 0),
+  }
+}
+
+/** 删除会话目录里的投影缓存（否则列表重建时可能残留标题）。 */
+export function removeProjectionCache(sessionId) {
+  for (const variant of sessionIdVariants(sessionId)) {
+    try {
+      const path = join(PROJ_CACHE_ROOT, `${variant}.json`)
+      if (existsSync(path)) rmSync(path, { force: true })
+    } catch {}
+  }
+}
+
+/** 永久删除会话目录（rm -rf）；返回被删目录与体积。 */
+export function purgeSessionDir(sessionId) {
+  const info = sessionDirInfo(sessionId)
+  if (!info.found) return { ok: false, error: { code: 'not-found', message: '找不到会话目录（可能已经被删除）' } }
+  try {
+    rmSync(info.dir, { recursive: true, force: true })
+  } catch (err) {
+    return { ok: false, error: { code: 'delete-failed', message: err && err.message ? err.message : String(err) } }
+  }
+  removeProjectionCache(sessionId)
+  return { ok: true, dir: info.dir, bytes: info.bytes }
+}
+
+/**
+ * 永久删除清单里的文件；路径必须出现在 listSessionFiles 的白名单里。
+ * 任何不在白名单里的路径都不会被碰。
+ */
+export function purgeSessionFiles(sessionId, paths, cwd) {
+  if (!Array.isArray(paths) || paths.length === 0) return { ok: false, error: { code: 'bad-request', message: '没有选中文件' } }
+  const allowed = new Map()
+  for (const group of listSessionFiles(sessionId, cwd).groups) {
+    for (const file of group.files) allowed.set(resolve(file.path), file)
+  }
+  const removed = []
+  const skipped = []
+  for (const raw of paths) {
+    if (typeof raw !== 'string' || raw === '') continue
+    const path = resolve(raw)
+    if (!allowed.has(path)) {
+      skipped.push(path)
+      continue
+    }
+    try {
+      rmSync(path, { force: true })
+      removed.push({ path })
+    } catch {
+      skipped.push(path)
+    }
+  }
+  if (removed.length === 0) {
+    return { ok: false, error: { code: 'not-found', message: skipped.length === 0 ? '没有可删除的文件' : `文件不可删除：${skipped.join('、')}` } }
+  }
+  return { ok: true, removed, skipped }
+}
+
+/* ── 工作区目录 ─────────────────────────────────────────────────────────── */
+
+/**
+ * 永久删除整个工作区目录。调用方必须已经让用户输入过路径确认；
+ * 这里再做一层硬护栏：主目录、~/.dsh、插件自身目录、盘符根一律拒绝。
+ */
+export function purgeWorkspaceDir(workspacePath, options = {}) {
+  const path = resolve(String(workspacePath || ''))
+  if (!isAbsolute(path) || !existsSync(path)) {
+    return { ok: false, error: { code: 'not-found', message: '工作区目录不存在' } }
+  }
+  let stat
+  try {
+    stat = statSync(path)
+  } catch {
+    return { ok: false, error: { code: 'not-found', message: '工作区目录不可读' } }
+  }
+  if (!stat.isDirectory()) return { ok: false, error: { code: 'bad-request', message: '不是目录' } }
+  const real = realpathOrUndefined(path) || path
+  const home = resolve(homedir())
+  const dsh = resolve(DSH_HOME)
+  const plugin = options.pluginDir === undefined ? undefined : resolve(String(options.pluginDir))
+  const refuse = (message) => ({ ok: false, error: { code: 'refused', message } })
+  if (real === home) return refuse('不能删除用户主目录')
+  if (real === dirname(real)) return refuse('不能删除盘符根目录')
+  if (real === dsh || isInside(real, dsh)) return refuse('不能删除 ~/.dsh 内部目录')
+  if (plugin !== undefined && (real === plugin || isInside(real, plugin) || isInside(plugin, real))) {
+    return refuse('该目录包含 dsh-mobile 插件自身，拒绝删除')
+  }
+  try {
+    rmSync(real, { recursive: true, force: true })
+  } catch (err) {
+    return { ok: false, error: { code: 'delete-failed', message: err && err.message ? err.message : String(err) } }
+  }
+  return { ok: true, dir: real }
+}

package/src/host/config.js

@@ -71,6 +71,8 @@ export const DEFAULT_MOBILE_PORT = 19387
 export const DEFAULT_PAIR_CODE = '123456'
 export const SMALL_BODY = 64 * 1024
 export const PROMPT_BODY = 2 * 1024 * 1024
+/** 手机端「添加文件」的单个文件上限（宿主侧最终把关；客户端也会先挡一次）。 */
+export const MOBILE_FILE_MAX_BYTES = 24 * 1024 * 1024
 // 手机点命令后的单次执行上限：bundle 侧 mobile.commandExec 的 fetch 超时是 180s，
 // 宿主这里留 30s 余量，避免「前端已放弃、宿主还在 await」的悬挂。
 export const COMMAND_EXEC_TIMEOUT_MS = 150 * 1000
@@ -250,6 +252,10 @@ export const PUSH_CHECK_URL = '/m/push-check'
 //   https://<公网域名>:45632/m/shot/<file>.png
 // 安全取舍见 serveShot() 的注释（匿名只读 + 单层文件名白名单 + 扩展名白名单）。
 export const SHOT_PREFIX = '/m/shot'
+/** 文件下载路由前缀：GET /m/file/<token> → 会话工作区里的文件（带 Content-Disposition）。 */
+export const FILE_PREFIX = '/m/file'
+/** 下载令牌有效期（毫秒）。 */
+export const FILE_TOKEN_TTL_MS = 10 * 60 * 1000
 // 只允许单层文件名：不含 / \ : % 与空白，天然挡住目录穿越（.. 另做显式检查）。
 export const SHOT_NAME = /^[A-Za-z0-9._-]+$/
 export const SHOT_TYPES = {