ai_co_discuss 0.2.95 → 0.2.97

package/docs/deployment.md

@@ -25,7 +25,7 @@ python server.py --host 127.0.0.1 --port 8765 --no-demo
 
 Python 3.10+，无第三方依赖。长期部署请自行配置进程管理与 HTTPS 反向代理；代理需对 `/api/updates` 关闭响应缓冲，以支持实时推送。
 
-**管理员**：绑定 `127.0.0.1` 时访问者即管理员。绑定其他地址时，首次打开网站在左下角注册，需要安装令牌（环境变量 `DISCUSS_ADMIN_SETUP_KEY`，未设置时随机生成并写入启动日志）；忘记密码时运行 `python server.py --reset-admin` 后重新注册。
+**管理员**：绑定 `127.0.0.1` 时访问者即管理员。绑定其他地址时，首次打开网站在左下角注册，需要安装令牌（环境变量 `DISCUSS_ADMIN_SETUP_KEY`，未设置时随机生成并写入启动日志）。登录管理员后，在其他设备（平板、手机）上也能以用户身份在任意房间发言和管理；忘记密码时运行 `python server.py --reset-admin` 后重新注册。
 
 **备份**：附件保存在数据库旁的 `<数据库文件名>.attachments/`。停止写入后同时备份数据库与附件目录。
 
@@ -95,11 +95,11 @@ Windows PowerShell 使用 `New-Item -ItemType Directory -Force -Path .wrangler/d
 
 ```sh
 npx wrangler d1 execute DB --remote --config .wrangler/deploy/wrangler.jsonc --file backend/schema.sql
-npx wrangler pages secret put ADMIN_SETUP_KEY --project-name YOUR_PROJECT_NAME
 npm run deploy -- --cwd .wrangler/deploy
+codiscuss admin token
 ```
 
-`ADMIN_SETUP_KEY` 是注册管理员所需的安装令牌。`schema.sql` 可重复执行；升级已有站点前请先备份 D1（`npx wrangler d1 export`）。
+`codiscuss admin token` 生成注册管理员用的一次性令牌（需已 `wrangler login`），在网站左下角注册时填入；在已用 `codiscuss local connect` 连上本机的网页注册时，账号密码会保存到 `~/.codiscuss/admin-accounts.json`。注册后其他设备直接用账号密码登录。`schema.sql` 可重复执行；升级已有站点前请先备份 D1（`npx wrangler d1 export`）。
 
 发布后检查网页、`/api/health`，以及：
 

package/docs/en/deployment.md

@@ -25,7 +25,7 @@ python server.py --host 127.0.0.1 --port 8765 --no-demo
 
 Python 3.10+ with no third-party dependencies. For long-running deployments, add your own process manager and HTTPS reverse proxy, and disable response buffering for `/api/updates` so live updates work.
 
-**Administrator** — when bound to `127.0.0.1`, every visitor is the administrator. On other addresses, register from the bottom-left corner on first visit with the setup token (`DISCUSS_ADMIN_SETUP_KEY`, or a random token printed to the startup log). If you forget the password, run `python server.py --reset-admin` and register again.
+**Administrator** — when bound to `127.0.0.1`, every visitor is the administrator. On other addresses, register from the bottom-left corner on first visit with the setup token (`DISCUSS_ADMIN_SETUP_KEY`, or a random token printed to the startup log). Once logged in as the administrator, you can speak and manage any room as the user from other devices such as a tablet or phone. If you forget the password, run `python server.py --reset-admin` and register again.
 
 **Backup** — attachments are stored next to the database in `<database file>.attachments/`. Stop writes, then back up the database and the attachment directory together.
 
@@ -95,11 +95,11 @@ Keep the binding names `DB` and `ATTACHMENTS`. Without the R2 binding, text disc
 
 ```sh
 npx wrangler d1 execute DB --remote --config .wrangler/deploy/wrangler.jsonc --file backend/schema.sql
-npx wrangler pages secret put ADMIN_SETUP_KEY --project-name YOUR_PROJECT_NAME
 npm run deploy -- --cwd .wrangler/deploy
+codiscuss admin token
 ```
 
-`ADMIN_SETUP_KEY` is the setup token required to register the administrator. `schema.sql` is safe to re-run; back up D1 (`npx wrangler d1 export`) before upgrading an existing site.
+`codiscuss admin token` prints a one-time token for registering the administrator (requires `wrangler login`); enter it when registering from the bottom-left corner. Registering from a page connected with `codiscuss local connect` also saves the account to `~/.codiscuss/admin-accounts.json`. Other devices then simply log in with the username and password. `schema.sql` is safe to re-run; back up D1 (`npx wrangler d1 export`) before upgrading an existing site.
 
 After publishing, check the page, `/api/health`, and:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai_co_discuss",
-  "version": "0.2.95",
+  "version": "0.2.97",
   "bin": {
     "codiscuss": "runner/codiscuss.mjs"
   },
@@ -8,7 +8,7 @@
     "dev": "npm run build && wrangler pages dev --ip 127.0.0.1 --port 8787",
     "db:local": "wrangler d1 execute DB --local --file backend/schema.sql",
     "db:remote": "wrangler d1 execute DB --remote --file backend/schema.sql",
-    "check": "node --check backend/worker.mjs && node --check web/app.js && node --check runner/discussion_runner.mjs && node --check runner/discussion_adapters.mjs && node --check runner/discussion_sidecar.mjs && node --check runner/codex_app_client.mjs && node --check runner/discussion_service.mjs && node --check runner/codiscuss.mjs && node --check runner/discussion_launch.mjs && node --check runner/discussion_models.mjs && node --check runner/discussion_setup.mjs && node --check runner/discussion_skills.mjs && node --check runner/discussion_tui.mjs && node --check runner/discussion_local.mjs && node --check runner/free_runner.mjs && node --check runner/discussion_api.mjs && node --check runner/api_participant.mjs && node --check runner/scheduler.mjs && node --check runner/remote_launch.mjs",
+    "check": "node --check backend/worker.mjs && node --check web/app.js && node --check runner/discussion_runner.mjs && node --check runner/discussion_adapters.mjs && node --check runner/discussion_sidecar.mjs && node --check runner/codex_app_client.mjs && node --check runner/discussion_service.mjs && node --check runner/codiscuss.mjs && node --check runner/discussion_launch.mjs && node --check runner/discussion_models.mjs && node --check runner/discussion_setup.mjs && node --check runner/discussion_skills.mjs && node --check runner/discussion_tui.mjs && node --check runner/discussion_local.mjs && node --check runner/free_runner.mjs && node --check runner/discussion_api.mjs && node --check runner/api_participant.mjs && node --check runner/scheduler.mjs && node --check runner/remote_launch.mjs && node --check runner/admin_account.mjs",
     "runner": "node runner/discussion_runner.mjs",
     "service": "node runner/discussion_service.mjs",
     "build:ui": "vite build --config frontend/vite.config.mjs --mode markdown && vite build --config frontend/vite.config.mjs --mode backup && vite build --config frontend/vite.config.mjs",
@@ -31,6 +31,7 @@
     "fflate": "0.8.3",
     "katex": "0.18.10",
     "markdown-it": "15.0.3",
+    "markdown-it-cjk-friendly": "3.0.0",
     "motion-v": "2.7.0",
     "pdfjs-dist": "6.4.299",
     "vite": "8.3.4",

package/runner/admin_account.mjs

@@ -0,0 +1,66 @@
+/** Site administrator setup from the deploying computer: a one-time registration token and the saved account. */
+import { spawnSync } from 'node:child_process';
+import { createHash, randomBytes } from 'node:crypto';
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join, resolve } from 'node:path';
+import { parseArgs } from 'node:util';
+
+import { atomic_json } from './discussion_adapters.mjs';
+import { service_home } from './discussion_service.mjs';
+
+const DEFAULT_CONFIG = join('.wrangler', 'deploy', 'wrangler.jsonc');
+const ACCOUNTS_FILE = 'admin-accounts.json';
+const TOKEN_BYTES = 32;
+const HELP = `用法：codiscuss admin token [--config WRANGLER_CONFIG]
+
+token  生成一次性管理员注册令牌，经 wrangler 把它的哈希写入线上 D1，立即生效。
+       在线上网页左下角注册管理员时填入；注册成功即作废，重新运行会替换旧令牌。
+       需要这台电脑已 wrangler login；--config 默认为当前目录的 ${DEFAULT_CONFIG}。
+
+在已用 codiscuss local connect 连上本机服务的网页注册后，账号与密码保存在 ~/.codiscuss/${ACCOUNTS_FILE}。
+`;
+
+/** Write a fresh token's hash to the deployed D1 and return the token; the raw value is never stored. */
+export function create_admin_token(config, run = run_wrangler) {
+  const path = resolve(config || DEFAULT_CONFIG);
+  if (!existsSync(path)) throw new Error(`找不到部署配置 ${path}；请在项目目录运行，或用 --config 指定 wrangler.jsonc`);
+  const token = randomBytes(TOKEN_BYTES).toString('hex');
+  const hashed = createHash('sha256').update(token).digest('hex');
+  const directory = mkdtempSync(join(tmpdir(), 'codiscuss-admin-'));
+  const sql = join(directory, 'admin-setup.sql');
+  try {
+    writeFileSync(sql, `INSERT OR REPLACE INTO admin_setup (id,token_hash,created_at) VALUES (1,'${hashed}',${Math.floor(Date.now() / 1000)});\n`);
+    run(['d1', 'execute', 'DB', '--remote', '--config', path, '--file', sql]);
+  } finally { rmSync(directory, { recursive: true, force: true }); }
+  return { token, config: path };
+}
+
+/** Run wrangler through npx; arguments are quoted because Windows needs a shell for npx.cmd. */
+function run_wrangler(args) {
+  const quoted = ['wrangler', ...args].map(arg => `"${arg.replaceAll('"', '\\"')}"`).join(' ');
+  const result = spawnSync(`npx ${quoted}`, { shell: true, stdio: ['ignore', 'ignore', 'pipe'], encoding: 'utf8', windowsHide: true });
+  if (result.status !== 0) throw new Error(`wrangler 写入线上数据库失败：${(result.stderr || result.error?.message || '').trim().slice(-800)}`);
+}
+
+/** Keep the account registered from this computer's browser, one entry per site, in the private service directory. */
+export function save_admin_account(home, { site, username, password }) {
+  if (typeof username !== 'string' || !username.trim() || typeof password !== 'string' || !password) throw new Error('缺少管理员用户名或密码');
+  const origin = new URL(site).origin;
+  const path = join(home, ACCOUNTS_FILE);
+  const accounts = existsSync(path) ? JSON.parse(readFileSync(path, 'utf8')) : { sites: {} };
+  accounts.sites[origin] = { username: username.trim(), password, saved_at: new Date().toISOString() };
+  mkdirSync(home, { recursive: true, mode: 0o700 });
+  atomic_json(path, accounts);
+  return { saved: path };
+}
+
+/** `codiscuss admin ...` */
+export function admin_main(args) {
+  const { values, positionals } = parseArgs({ args, allowPositionals: true, options: {
+    config: { type: 'string' }, help: { type: 'boolean', short: 'h' },
+  } });
+  if (values.help || positionals[0] !== 'token') return process.stdout.write(HELP);
+  const { token } = create_admin_token(values.config);
+  process.stdout.write(`管理员注册令牌（一次性）：\n${token}\n\n在线上网页左下角注册管理员时填入。注册成功后作废；账号密码在已连接本机服务的网页注册时保存到 ${join(service_home(), ACCOUNTS_FILE)}。\n`);
+}

package/runner/codiscuss.mjs

@@ -4,6 +4,7 @@ import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { parseArgs } from 'node:util';
 
+import { admin_main } from './admin_account.mjs';
 import { main as service_main, read_registry, run_service, service_home, service_pid } from './discussion_service.mjs';
 import { launch_main } from './discussion_launch.mjs';
 import { local_settings, setup_main } from './discussion_setup.mjs';
@@ -16,6 +17,7 @@ const HELP = `AI CoDiscuss CLI
   （无命令）            在当前终端启动服务，Ctrl+C 停止
   install / setup       安装持久命令并配置 / 配置已有安装
   local COMMAND         管理本机网站，或 connect 连接线上站点
+  admin token           生成线上网站的一次性管理员注册令牌
   service COMMAND       启动、停止、查询服务，或登记房间
   launch COMMAND        保存启动配置，或从 AI 对话启动讨论
   room COMMAND          创建、读取或更新讨论房间
@@ -118,6 +120,7 @@ async function main(args = process.argv.slice(2)) {
   if (command === 'launch') return launch_main(args.slice(1));
   if (['install', 'setup'].includes(command)) return setup_main(command, args.slice(1));
   if (command === 'local') return local_main(args.slice(1));
+  if (command === 'admin') return admin_main(args.slice(1));
   if (!command || (command === 'run' && args.length === 1)) return service_cli([]);
   if (SERVICE_COMMANDS.has(command) || command === '--json') return service_cli(args);
   return website_cli(args);

package/runner/discussion_launch.mjs

@@ -60,6 +60,7 @@ const HELP = `用法：codiscuss launch settings [--file FILE]
       codiscuss launch projects [--file FILE]
       codiscuss launch presets [--file FILE]
       codiscuss launch machine-link --file FILE
+      codiscuss launch admin-account --file FILE
 
 settings 读取本机软件默认配置；指定文件时保存，不启动 AI。
 start 使用启动 JSON 创建或接入房间并启动；--dry-run 只校验和预览。
@@ -73,6 +74,7 @@ pick-directory 在本机弹出系统目录选择窗口，返回所选路径；
 projects 读取本机已配置的项目（名称与绝对路径）；提供 JSON（projects 列表）时整体替换保存。
 presets 读取本机的专家预设（含内置预设）与各平台默认描述；提供 JSON（presets 列表和/或 description_templates）时替换对应部分。
 machine-link 返回本机连接指定 site 的电脑编号、名称与凭据，供已登录管理员的网页完成配对；不存在时创建。
+admin-account 把在指定 site 注册的管理员用户名与密码保存到服务目录的 admin-accounts.json；须提供 site、username、password。
 room-member 为运行中的自由房间或讨论邀请、请回一位成员（讨论只接受本机唤醒的成员）；须提供 site、room_id、token、action（add/rejoin）、name。
 room-member-access 修改一位本机唤醒成员的项目文件权限（project_access 为 read/write），下次投递起生效、保留原会话；须提供 site、room_id、token、name、project_access。
 room-member-adapter 把自由房间里空闲的 Codex 成员在 App（codex）与 CLI（codex_cli）间切换，保留原会话；须提供 site、room_id、token、name、adapter。
@@ -1111,6 +1113,7 @@ export async function launch_main(args = process.argv.slice(2), input_text) {
   else if (positionals[0] === 'room-restore' && input) result = await restore_room(home, input);
   else if (positionals[0] === 'pick-directory') result = await pick_directory();
   else if (positionals[0] === 'machine-link' && input) result = (await import('./remote_launch.mjs')).machine_link(home, input.site);
+  else if (positionals[0] === 'admin-account' && input) result = (await import('./admin_account.mjs')).save_admin_account(home, input);
   else if (positionals[0] === 'start' && input) result = await launch_discussion(home, input, { dry_run: values['dry-run'], browser_request: values.browser });
   else if (positionals[0] === 'room-config' && input) result = await room_configuration(home, input, { local_guard: values['configuration-locked'] });
   else throw new Error(HELP);

package/runner/free_runner.mjs

@@ -245,7 +245,8 @@ export class FreeRoomRunner {
   }
   /** Ask the scheduler how everyone answers; a failed call still has them answer at once. */
   async order_group(request, room, everyone) {
-    const page = await api(this.config, `/messages?after=${Math.max(0, request.message_id - ROUTE_CONTEXT_MESSAGES - 1)}`);
+    // A page holds at most 20 messages, so the window must end at the message itself or the message falls off the page.
+    const page = await api(this.config, `/messages?after=${Math.max(0, request.message_id - ROUTE_CONTEXT_MESSAGES)}`);
     const message = page.messages.find(item => item.id === request.message_id);
     const members = (room.speaking_order?.items || []).map(item => item.name).filter(name => everyone.some(member => member.name === name));
     const decision = await decide_group_order(this.config.api_home, this.config.scheduler,
@@ -282,9 +283,9 @@ export class FreeRoomRunner {
   }
   /** Decide one message and apply a confident pick: one member, everyone, or no one; otherwise the host keeps it. */
   async recommend(request, room, everyone) {
-    const page = await api(this.config, `/messages?after=${Math.max(0, request.message_id - ROUTE_CONTEXT_MESSAGES - 1)}`);
+    const page = await api(this.config, `/messages?after=${Math.max(0, request.message_id - ROUTE_CONTEXT_MESSAGES)}`);
     const message = page.messages.find(item => item.id === request.message_id);
-    if (!message) return;
+    if (!message) throw new Error('读取不到这条消息');
     const described = this.route_members(everyone, room, message.id);
     const host = described.find(member => member.role === 'host');
     const members = described.filter(member => member !== host);

package/web/app.js

@@ -70,6 +70,8 @@ state.archive_changes = new Map();
 state.archive_version = 0;
 state.directory_error = "";
 state.directory_notice = "";
+// The open import's progress for the import dialog: { done, rooms: [{ title, status, members, error }], errors }.
+state.import_progress = null;
 state.directory_pending = new Map();
 state.directory_version = 0;
 state.navigation_version = 0;
@@ -230,10 +232,15 @@ function accept_admin_session({ token, profile }) {
 
 /** Create the single administrator account and sign in with it. */
 async function register_admin({ username, password, confirm, setup_key }) {
-  const problem = validate_admin_form({ username, password, confirm }) || (String(setup_key ?? "").trim() ? "" : "请填写安装令牌");
+  const problem = validate_admin_form({ username, password, confirm }) || (String(setup_key ?? "").trim() ? "" : "请填写注册令牌");
   if (problem) throw new Error(problem);
   try { accept_admin_session(await request_json("/api/admin/register", { username: username.trim(), password, setup_key: setup_key.trim() })); }
   catch (error) { throw admin_error(error); }
+  // Registered from the computer running the local service: keep the account in its private directory.
+  if (local_connection) {
+    try { show_toast(`账号与密码已保存到本机 ${(await local_launch_request("admin-account", { username: username.trim(), password })).saved}`); }
+    catch (error) { show_toast(`注册成功，但账号未能保存到本机：${error.message}`, true); }
+  }
 }
 
 /** Sign in and keep the session in this browser. */
@@ -289,6 +296,11 @@ async function admin_avatar_from_file(file) {
   } finally { URL.revokeObjectURL(url); }
 }
 
+/** Whether this browser may write as the room owner: its own control credential, or a logged-in administrator session. */
+function has_room_control(room_id) {
+  return Boolean(localStorage.getItem(`discuss-access:${room_id}`) || (state.admin.logged_in && admin_token()));
+}
+
 /** Explain why a management write failed when this browser has neither credential. */
 function management_error_message(room_id, error) {
   if (error.status === 403 && !state.admin.logged_in && !localStorage.getItem(`discuss-access:${room_id}`)) return MANAGEMENT_LOGIN_HINT;
@@ -1691,7 +1703,7 @@ function access_snapshot() {
   const room = state.room;
   if (!room) return { can_manage: false, members: [], notice: "", error: "" };
   const saved = member_credentials(room.id);
-  return { can_manage: Boolean(localStorage.getItem(`discuss-access:${room.id}`)),
+  return { can_manage: has_room_control(room.id),
     members: (room.members || room.free?.members || []).filter(member => member.status !== "removed").map(member => ({
       name: member.name, access: member.access, available: member.status === "active" && member.access !== "online"
         && Boolean(saved[member.name]?.token) && (saved[member.name].access === "online") === (member.access === "online")
@@ -2606,7 +2618,7 @@ async function choose_runtime(mode) {
   const path = `/api/rooms/${room_id}/runtime`;
   const runtime = await request_json(path);
   if (runtime.mode !== mode) {
-    if (!localStorage.getItem(`discuss-access:${room_id}`)) throw new Error("此浏览器缺少房间控制凭据，请使用创建房间的浏览器");
+    if (!has_room_control(room_id)) throw new Error(MANAGEMENT_LOGIN_HINT);
     await request_json(path, { action: "configure", mode, revision: runtime.revision });
   }
   if (state.room?.id !== room_id) return;
@@ -2710,7 +2722,7 @@ async function conclude_discussion() {
 /** Turn this free room into a discussion within the given limits and start the run; the local service takes it over at its next check. */
 async function start_room_discussion({ goal, max_rounds, max_minutes, execution_minutes = 0, named_followup = false }) {
   const room_id = state.room.id, path = `/api/rooms/${room_id}`;
-  if (!localStorage.getItem(`discuss-access:${room_id}`)) throw new Error("此浏览器缺少房间控制凭据，请使用创建房间的浏览器");
+  if (!has_room_control(room_id)) throw new Error(MANAGEMENT_LOGIN_HINT);
   await request_json(`${path}/discussion`, { action: "start", ...(goal ? { goal } : {}), limits: { max_rounds, max_minutes, execution_minutes }, named_followup });
   const runtime = await request_json(`${path}/runtime`);
   await request_json(`${path}/runtime`, { action: "start", mode: "automatic", revision: runtime.revision, deadline: 0 });
@@ -3447,7 +3459,7 @@ function view_snapshot() {
   const experts = Object.fromEntries(["new-expert-modes", "topic-expert-modes"].map((id) =>
     [id, element(id) ? read_expert_inputs(id) : {}]));
   return { rooms: ordered_rooms(), folders: state.folders, folder_groups: ordered_folders(), room: state.room, archive_view: state.archive_view, directory_sort: state.directory_sort, messages: state.messages, total: state.message_total,
-    archive_pending: [...state.archive_changes.keys()], directory_error: state.directory_error, directory_notice: state.directory_notice,
+    archive_pending: [...state.archive_changes.keys()], directory_error: state.directory_error, directory_notice: state.directory_notice, import_progress: structuredClone(state.import_progress),
     directory_pending: [...state.directory_pending.keys()], folder_pending: [...state.folder_moves.keys()], creating_room: state.creating_room,
     connected: state.connected, backup_pending: Boolean(state.backup_pending), page: state.page, pages: state.pages, query: state.query,
     attachment_drafts: state.attachment_drafts.map(item => ({ id: item.id, file_name: item.file.name, size: item.file.size, preview_url: item.preview_url })),
@@ -3586,17 +3598,15 @@ function import_body(snapshot) {
   return { ...body, tables: { ...body.tables, room_members } };
 }
 
-/** Register an imported room's exported members on this machine; returns notices and problems, one per member. */
+/** Register an imported room's exported members on this machine; returns one short line per member and any room-wide problem. */
 async function restore_local_members(room, token, local_members) {
-  if (!state.launch.available) return { notices: [], problems: [`${room.title}：未连接本机服务，成员会话未恢复`] };
+  if (!state.launch.available) return { members: [], problem: "未连接本机服务，成员会话未恢复" };
   try {
     const result = await local_launch_request("room-restore", { room_id: room.id, token, local_members });
-    const notices = result.members.filter(member => member.status !== "failed").map(member => member.status === "resumed"
-      ? `${member.name} 请回后续接原会话`
-      : `${member.name} 已改为手动接入，请回后在原窗口重新注册${member.session_id ? `（会话 ${member.session_id}，目录 ${member.cwd}；没有开着的窗口时在该目录运行 claude --resume ${member.session_id}）` : ""}`);
-    const problems = result.members.filter(member => member.status === "failed").map(member => `${member.name} 未恢复：${member.error}`);
-    return { notices: notices.map(text => `${room.title}：${text}`), problems: problems.map(text => `${room.title}：${text}`) };
-  } catch (error) { return { notices: [], problems: [`${room.title}：成员会话未恢复：${error.message}`] }; }
+    return { members: result.members.map(member => ({ name: member.name, failed: member.status === "failed",
+      text: member.status === "failed" ? `未恢复：${member.error}` : member.status === "resumed" ? "请回后接续原会话" : "已改为手动接入，请回后在原窗口重新注册",
+      resume: member.status === "manual" && member.session_id ? { command: `claude --resume ${member.session_id}`, cwd: member.cwd } : null })) };
+  } catch (error) { return { members: [], problem: `成员会话未恢复：${error.message}` }; }
 }
 
 /** Upload one imported room's original files to the new attachment IDs; returns how many were missing. */
@@ -3615,41 +3625,43 @@ async function upload_imported_files(room_id, token, mapping, files) {
 async function import_rooms({ files, folder_id = null }) {
   if (!files?.length || state.backup_pending) return;
   state.backup_pending = true;
-  state.directory_notice = state.directory_error = "";
+  const progress = state.import_progress = { done: false, rooms: [], errors: [] };
   publish_view();
-  const imported = [], skipped = [], failed = [], restored = [], unrestored = [], unfiled = [];
-  let missing = 0;
   try {
     for (const file of files) {
       let rooms;
       try { rooms = await window.discuss_backup.read_room_archives(file); }
-      catch (error) { failed.push(error.message.includes(file.name) ? error.message : `${file.name}：${error.message}`); continue; }
+      catch (error) { progress.errors.push(error.message.includes(file.name) ? error.message : `${file.name}：${error.message}`); publish_view(); continue; }
       for (const { snapshot, files: originals } of rooms) {
-        const title = snapshot.tables?.rooms?.[0]?.title || file.name, token = crypto.randomUUID() + crypto.randomUUID();
+        const item = { title: snapshot.tables?.rooms?.[0]?.title || file.name, status: "importing", members: [], problems: [] };
+        progress.rooms.push(item);
+        publish_view();
+        const token = crypto.randomUUID() + crypto.randomUUID();
         try {
           const result = await request_json("/api/rooms/import", import_body(snapshot), token);
-          if (result.skipped) { skipped.push(result.title); continue; }
+          item.title = result.title;
+          if (result.skipped) { item.status = "skipped"; continue; }
           save_room_credentials({ id: result.id }, token);
-          missing += await upload_imported_files(result.id, token, result.attachments, originals);
-          imported.push(result.title);
+          const missing = await upload_imported_files(result.id, token, result.attachments, originals);
+          if (missing) item.problems.push(`${missing} 个附件原文件缺失，消息中的这些附件无法打开`);
           if (folder_id) await request_json(`/api/rooms/${result.id}/folder`, { actor: "用户", folder_id })
-            .catch(error => unfiled.push(`${result.title}：未放入文件夹：${error.message}`));
+            .catch(error => item.problems.push(`未放入文件夹：${error.message}`));
           if (snapshot.local_members) {
-            const { notices, problems } = await restore_local_members(result, token, snapshot.local_members);
-            restored.push(...notices); unrestored.push(...problems);
+            const { members, problem } = await restore_local_members(result, token, snapshot.local_members);
+            item.members = members;
+            if (problem) item.problems.push(problem);
           }
-        } catch (error) { failed.push(`${title}：${error.message}`); }
+          item.status = "imported";
+        } catch (error) { Object.assign(item, { status: "failed", error: error.message }); }
+        finally { publish_view(); }
       }
     }
     await refresh_room();
   } finally {
+    progress.done = true;
     state.backup_pending = false;
     publish_view();
   }
-  state.directory_notice = [`已导入 ${imported.length} 个频道`, skipped.length && `跳过已存在的 ${skipped.length} 个（${skipped.join("、")}）`, ...restored]
-    .filter(Boolean).join("；");
-  state.directory_error = [missing && `${missing} 个附件原文件缺失，消息中的这些附件无法打开`, failed.length && `未导入 ${failed.length} 项：${failed.join("；")}`, ...unfiled, ...unrestored]
-    .filter(Boolean).join("；");
 }
 
 /** Execute a named view command, retaining existing retry and provenance rules. */