ai_co_discuss 0.2.48 → 0.2.49

package/runner/discuss.py

@@ -30,17 +30,19 @@ MAX_BRIEF_LENGTH = 1600
 PARTICIPANTS = ("用户", "Codex", "Claude", "Gemini", "DeepSeek", "Qwen", "Grok")
 # A platform is a type; `Claude-评审` is a second Claude instance with its own session. Mirrors backend/identity.py.
 INSTANCE_PATTERN = re.compile(r"(Codex|Claude|Gemini|DeepSeek|Qwen|Grok)(?:-[0-9A-Za-z_一-鿿]{1,16})?")
-PHASES = ("preparing", "initial", "discussing", "reviewing", "paused", "concluded")
-KINDS = ("opinion", "moderation", "receipt", "chat")
+PHASES = ("preparing", "initial", "discussing", "paused", "concluded")
+KINDS = ("opinion", "moderation", "chat")
+# Old rooms keep receipts they already hold, so reading can still filter them; new ones cannot be written.
+READ_KINDS = (*KINDS, "receipt")
 OVERVIEW_FIELDS = ("id", "title", "goal", "host", "phase", "focus", "message_count",
-                   "latest_id", "state_until", "current_turn", "queued_turns", "held_since", "floor", "runtime", "limits", "completed_rounds", "latest_receipts", "answered_turns", "duplicate", "submission_id",
+                   "latest_id", "state_until", "current_turn", "queued_turns", "held_since", "runtime", "limits", "completed_rounds", "answered_turns", "duplicate", "submission_id",
                    "mode", "members", "free", "parent_room", "linked_rooms")
 BRIEF_FIELDS = ("id", "title", "goal", "host", "user_request", "background", "boundaries", "experts")
 ROOM_LIST_FIELDS = ("id", "title", "goal", "message_count", "latest_id", "created_at")
 GUIDANCE = {
     "initial": "先基于目标、背景和边界独立形成观点；提交前不读他人观点或主持总结。",
-    "paused": "停止处理安排并停止本讨论自己的后台任务，核对实际状态；非必要不生成 receipt，正常停止无需回执。",
-    "concluded": "话题已收束；停止本讨论自己的后台任务并核对实际状态；非必要不生成 receipt，正常停止无需回执。",
+    "paused": "停止处理安排并停止本讨论自己的后台任务，核对实际状态。",
+    "concluded": "话题已收束；停止本讨论自己的后台任务并核对实际状态。",
 }
 EXIT_CODES = {"0": "成功", "1": "HTTP/API 错误", "2": "参数或输入错误",
               "3": "网络失败或响应无法确认", "130": "被中断，写入结果需核对"}
@@ -169,9 +171,8 @@ def add_topic(parser, create=False):
     parser.add_argument("--phase", choices=PHASES, default=argparse.SUPPRESS)
     parser.add_argument("--experts-file", default=argparse.SUPPRESS,
                         help='完整参与者映射 JSON，如 {"Codex":"cli","Gemini":"cli"}；替换整个映射')
-    for name in ("max-rounds", "max-minutes", "execution-minutes", "summary-minutes"):
+    for name in ("max-rounds", "max-minutes", "execution-minutes"):
         parser.add_argument(f"--{name}", type=non_negative_int, default=argparse.SUPPRESS)
-    parser.add_argument("--on-limit", choices=("pause", "summarize"), default=argparse.SUPPRESS)
 
 
 def add_leaf(subcommands, registry, name, description, needs_room=False):
@@ -197,7 +198,7 @@ def room_commands(subcommands, registry):
             parser.add_argument("--submission-id", type=submission_id, help="按建房提交编号精确查询")
     limits = add_leaf(subcommands, registry, "room limits", "查看上限；--check 检查并执行到限处理；--done 通知程序目标已完成", True)
     limits.add_argument("--check", action="store_true")
-    limits.add_argument("--done", action="store_true", help="主持人宣告目标已完成：按到限方式暂停或进入总结，不直接收束；须带 --conclusion")
+    limits.add_argument("--done", action="store_true", help="主持人宣告目标已完成：暂停讨论，由用户决定追加轮次或结束；须带 --conclusion")
     limits.add_argument("--conclusion", help="room conclusion 返回的 revision；--done 必填")
     create = add_leaf(subcommands, registry, "room create", "创建话题；不自动启动讨论或监控")
     create.add_argument("--folder-id", help="直接在指定文件夹中创建；省略则未归类")
@@ -218,11 +219,11 @@ def message_commands(subcommands, registry):
     listing.add_argument("--query", help="关键词或消息编号")
     listing.add_argument("--author", type=participant)
     listing.add_argument("--mention", type=participant)
-    listing.add_argument("--kind", choices=KINDS, help="筛选观点、主持说明或运行回执")
+    listing.add_argument("--kind", choices=READ_KINDS, help="筛选观点、主持说明、协作消息或旧房间的历史回执")
     listing.add_argument("--submission-id", type=submission_id, help="按提交编号精确查询结果")
     view = add_leaf(subcommands, registry, "message view", "读取一条精确原文与来源", True)
     view.add_argument("id", type=positive_int, help="消息编号")
-    post = add_leaf(subcommands, registry, "message post", "提交观点、主持说明、代发或运行回执", True)
+    post = add_leaf(subcommands, registry, "message post", "提交观点、主持说明、协作回答或代发", True)
     add_text(post, "body")
     post.add_argument("--attachment", action="append", type=attachment_id, default=[],
                       help="已上传附件 ID；可重复指定，最多 10 个")
@@ -230,7 +231,7 @@ def message_commands(subcommands, registry):
     post.add_argument("--summary-by", type=participant, help="摘要撰写者：原作者或实际操作者；默认操作者")
     post.add_argument("--author", type=participant, help="原作者；默认等于 --as；不同即代发")
     post.add_argument("--kind", choices=KINDS, default="opinion")
-    post.add_argument("--turn", type=positive_int, help="所回答的安排编号，仅 opinion 可用")
+    post.add_argument("--turn", type=positive_int, help="所回答的安排编号，仅 opinion 可用；省略时回答你当前有效的安排")
     post.add_argument("--execution", type=positive_int, help="自由房间：本次执行编号，仅 chat 可用；执行失效后不能改作普通发言")
     post.add_argument("--to", type=ai_name, action="append", default=[],
                       help="自由房间：主持人点名派活，普通成员提出回应建议（须房主确认）；可重复")
@@ -290,15 +291,6 @@ def state_commands(subcommands, registry):
     parser.add_argument("--until", type=int, required=True, help="实际已读的材料截止编号，可为 0")
 
 
-def floor_commands(subcommands, registry):
-    """Expose explicit floor inspection, nominated claims and early returns."""
-    add_leaf(subcommands, registry, "floor view", "读取当前持有者、下一位与版本", True)
-    for action in ("take", "return"):
-        parser = add_leaf(subcommands, registry, f"floor {action}", "领取或归还发言权", True)
-        parser.add_argument("--speaker", type=participant, help="实际持有者；代操作时显式指定，默认 --as")
-        parser.add_argument("--revision", type=non_negative_int, required=True, help="刚读取的发言权版本；变化后需重新核对")
-
-
 def run_commands(subcommands, registry):
     """Expose mode and lifecycle controls independently of discussion phases."""
     for action in ("view", "configure", "start", "pause", "stop"):
@@ -308,7 +300,7 @@ def run_commands(subcommands, registry):
             parser.add_argument("--mode", choices=("manual", "automatic"))
         if action == "start":
             parser.add_argument("--deadline", type=non_negative_int, help="截止时间 Unix 秒数；0 表示不限时长，仍受话题上限约束；省略时使用话题上限")
-            parser.add_argument("--phase", choices=("initial", "discussing", "reviewing"))
+            parser.add_argument("--phase", choices=("initial", "discussing"))
 
 
 def execution_commands(subcommands, registry):
@@ -337,7 +329,7 @@ def build_parser(prog="discuss"):
     registry = {}
     for name, register in (("room", room_commands), ("message", message_commands),
                            ("attachment", attachment_commands),
-                           ("turn", turn_commands), ("state", state_commands), ("floor", floor_commands),
+                           ("turn", turn_commands), ("state", state_commands),
                            ("run", run_commands), ("execution", execution_commands), ("member", member_commands)):
         group = subcommands.add_parser(name, help=f"{name} 操作", allow_abbrev=False)
         add_common(group)
@@ -410,7 +402,7 @@ def require_actor(args):
 def topic_payload(args):
     """Collect only supplied topic fields; expert configuration is a full map."""
     payload = {}
-    limits = {key: getattr(args, key) for key in ("max_rounds", "max_minutes", "execution_minutes", "on_limit", "summary_minutes") if hasattr(args, key)}
+    limits = {key: getattr(args, key) for key in ("max_rounds", "max_minutes", "execution_minutes") if hasattr(args, key)}
     if limits:
         payload["limits"] = limits
     for field in ("title", "goal", "user_request", "background", "boundaries", "focus"):
@@ -473,7 +465,7 @@ def plan_message(args):
         return RequestPlan(base, params={key: value for key, value in params.items() if value is not None})
     actor = require_actor(args)
     if args.turn and args.kind != "opinion":
-        raise CliError("只有 opinion 可以关联 --turn；receipt 不完成安排")
+        raise CliError("只有 opinion 可以关联 --turn")
     if (args.execution or args.request or args.to) and (args.kind != "chat" or args.turn):
         raise CliError("--execution / --request 仅用于自由房间的 chat 回答，不能与 --turn 同时使用")
     if args.execution and args.request:
@@ -578,16 +570,6 @@ def turn_payload(args):
     return {**payload, "expert": args.expert, "question": question}
 
 
-def plan_floor(args):
-    """Send one versioned operation without silently claiming on a failed write."""
-    path = f"/api/rooms/{args.room}/floor"
-    if args.action == "view":
-        return RequestPlan(path)
-    actor = require_actor(args)
-    return RequestPlan(path, "POST", {"actor": actor, "speaker": args.speaker or actor,
-                                      "action": args.action, "revision": args.revision})
-
-
 def plan_state(args):
     """Keep a host summary's cutoff explicit instead of assuming latest means read."""
     base = f"/api/rooms/{args.room}"
@@ -658,7 +640,7 @@ def build_plan(args):
         raise CliError("一次命令只能有一个字段从标准输入读取")
     handlers = {"room": plan_room, "message": plan_message, "turn": plan_turn,
                 "attachment": plan_attachment,
-                "state": plan_state, "floor": plan_floor, "api": plan_api,
+                "state": plan_state, "api": plan_api,
                 "run": plan_run, "execution": plan_execution, "member": plan_member}
     plan = RequestPlan("/api/health") if args.resource == "health" else handlers[args.resource](args)
     if getattr(args, "dry_run", False) and plan.method != "POST" and plan.download_file is None:
@@ -782,8 +764,8 @@ def project_result(value, plan, site):
         return {"rooms": [select_fields(room, ROOM_LIST_FIELDS) for room in value["rooms"]]}
     if plan.view in ("overview", "brief", "state", "current"):
         fields = {"overview": OVERVIEW_FIELDS, "brief": BRIEF_FIELDS,
-                  "state": ("id", "state_text", "state_until", "host_brief", "latest_receipts", "answered_turns"),
-                  "current": ("id", "phase", "current_turn", "queued_turns", "held_since", "floor", "answered_turns")}[plan.view]
+                  "state": ("id", "state_text", "state_until", "host_brief", "answered_turns"),
+                  "current": ("id", "phase", "current_turn", "queued_turns", "held_since", "answered_turns")}[plan.view]
         result = select_fields(value, fields)
         if plan.view in ("overview", "current"):
             result["guidance"] = GUIDANCE.get(value["phase"], "按本次主持或专家职责，结合最新阶段、安排和必要原文决定下一步。")

package/runner/discussion_adapters.mjs

@@ -16,7 +16,7 @@ const CLI_EXIT_GRACE_MS = 1500;
 const CLI_MAX_RUN_MS = 2 * 60 * 60_000;
 const CODEX_PERMISSIONS_MIN_MINOR = 163;
 /** Website subcommands an automatic task may run; service, launch, run, api and setup stay unapproved. */
-export const TASK_SUBCOMMANDS = ['room', 'message', 'turn', 'state', 'floor', 'execution', 'health', 'schema'];
+export const TASK_SUBCOMMANDS = ['room', 'message', 'turn', 'state', 'execution', 'health', 'schema'];
 
 /** Only failures before a software invocation are safe for automatic redelivery. */
 function not_sent(error) { return Object.assign(error, { delivery_status: 'not_sent' }); }

package/runner/discussion_runner.mjs

@@ -448,7 +448,6 @@ export class DiscussionRunner {
     const room = await api(this.config, '');
     if (room.latest_id !== seen.latest_id || (room.held_since || 0) !== seen.held_since) throw new Error('判断期间房间有新留言或用户操作，放弃应用');
     const actor = room.host;
-    if (room.floor.holder !== actor) await api(this.config, '/floor', { actor, speaker: actor, action: 'take', revision: room.floor.revision }, token);
     if (plan.phase) await api(this.config, '/topic', { actor, phase: plan.phase }, token);
     if (plan.continue_plan) await api(this.config, '/turns/continue', { actor }, token);
     else {
@@ -539,7 +538,7 @@ export class DiscussionRunner {
       if (/^HTTP 404: 房间不存在/.test(error.message)) remove_agy_projects(this.config.directory);
       throw error;
     }
-    if (room.limits?.reached && (!room.limits.closing || room.limits.reason === 'time_limit') && room.runtime.status === 'running') {
+    if (room.limits?.reached && room.runtime.status === 'running') {
       const generation = room.runtime.generation;
       room = await api(this.config, '/limits', { actor: '用户' });
       if (room.runtime.generation !== generation) this.stop_children();

package/runner/discussion_service.mjs

@@ -165,6 +165,50 @@ export function unregister_room(home, config_path) {
   });
 }
 
+/**
+ * A discussion room's dispatcher plus delivery of the user's direct questions. The questions are free-room requests that sit
+ * beside the discussion's turns: they wake a named member at any phase, and the website refuses to run one member's question
+ * and discussion turn at the same time, so one session never has two writers.
+ */
+export class DiscussionWithQuestions {
+  constructor(discussion, questions) { this.discussion = discussion; this.questions = questions; }
+  get members() { return this.discussion.members; }
+  get children() { return new Set([...this.discussion.children, ...this.questions.children]); }
+  get config() { return this.discussion.config; }
+  async tick() {
+    const result = await this.discussion.tick();
+    this.questions.adopt({ ...this.discussion.config, draft_directory: this.discussion.config.draft_directory });
+    try { await this.questions.tick(); }
+    catch (error) { this.questions.log(`直接提问投递出错：${error.message}`); }
+    return result;
+  }
+  stop_children() { this.discussion.stop_children(); this.questions.stop_children(); }
+}
+
+/**
+ * A free room's dispatcher. Its requests are always delivered; once the website says the room is in a discussion
+ * (the owner opened one), the discussion engine runs beside them, and when it ends the room simply goes on freely.
+ */
+export class FreeRoomWithDiscussion {
+  constructor(questions) { this.questions = questions; this.discussion = null; }
+  get config() { return this.questions.config; }
+  get members() { return this.discussion?.members; }
+  get children() { return new Set([...(this.discussion?.children || []), ...this.questions.children]); }
+  adopt(config) { this.questions.adopt(config); }
+  async tick() {
+    const room = await api(this.questions.config, '');
+    let result;
+    if (room.mode !== 'free') {
+      this.discussion ??= new DiscussionRunner(this.questions.config, this.questions.store, undefined, this.questions.log);
+      this.discussion.config = this.questions.config;
+      result = await this.discussion.tick();
+    }
+    await this.questions.tick();
+    return result;
+  }
+  stop_children() { this.discussion?.stop_children(); this.questions.stop_children(); }
+}
+
 /** One registered room: its own data-directory lock, store and dispatcher. */
 class RoomWorker {
   constructor(path, create_runner, log, home) {
@@ -280,7 +324,8 @@ class RoomWorker {
 
 /** Keep workers aligned with the registry and tick each one per poll. */
 export class DiscussionService {
-  constructor(home, create_runner = (config, store, log) => config.mode === 'free' ? new FreeRoomRunner(config, store, undefined, log) : new DiscussionRunner(config, store, undefined, log), log = () => {}) {
+  constructor(home, create_runner = (config, store, log) => config.mode === 'free' ? new FreeRoomWithDiscussion(new FreeRoomRunner(config, store, undefined, log))
+      : new DiscussionWithQuestions(new DiscussionRunner(config, store, undefined, log), new FreeRoomRunner(config, store, undefined, log)), log = () => {}) {
     this.home = home;
     this.create_runner = create_runner;
     this.log = log;

package/runner/free_runner.mjs

@@ -69,7 +69,8 @@ export function free_task_files(config, member, execution, binding) {
     : profile.project_access === 'write' ? '用户允许按请求修改 cwd 中的项目文件。' : 'cwd 中的项目文件只读，不修改。';
   const messages = execution.requests.map(item => `#${item.message_id}`).join('、');
   // The host routes unnamed messages and receives hand-backs; it may name members in its answer.
-  const host_rule = member.role === 'host'
+  const discussion = config.mode !== 'free';
+  const host_rule = member.role === 'host' && !discussion
     ? `你是本房间的主持人：purpose 为 route 的请求是用户未点名的消息，handoff 表示你派出的成员都已结束。先用 ${cli} room view ${config.room} 查看成员与状态，再决定由谁处理；需要派活时在回答中加 --to 成员名（可重复，不能点名自己），被点名的成员都结束后你会再被唤醒一次。不需要他人时不加 --to，本次即结束。只派分给各成员的文件或模块，避免多人改同一文件。`
     : '';
   atomic_json(task_path, { site: config.site, room: config.room, mode: 'free', member: member.name,
@@ -78,8 +79,8 @@ export function free_task_files(config, member, execution, binding) {
     read_after: execution.read_until, cwd: profile.cwd || null, project_access: profile.project_access, draft_directory,
     skills: [join(config.project, '.agents/skills/discuss-participant/SKILL.md')], cli, subcommands: TASK_SUBCOMMANDS,
     ...(bound_access ? { access_env: 'DISCUSS_ACCESS_FILE' } : { access_file: access_path }),
-    instructions: `自由协作房间：用户点名了你（${messages}）。${access_rule}先用 ${cli} message list ${config.room} --after ${execution.read_until}${access_arg} 读取新消息，按时间顺序处理，后面的消息可能修正前面的，以最新指令为准。${host_rule}完成后用 ${cli} message post ${config.room} --as ${member.name} --kind chat --execution ${execution.id} --body-file 草稿 --submission-id 新UUID${access_arg} 提交一次回答。提交被拒绝说明本次执行已被打断或过期：保留草稿并结束，不要去掉 --execution 改作普通发言。草稿只写入 draft_directory；${project_rule}不读取或打印凭据内容，不建定时任务。` });
-  const prompt = `用户在自由协作房间点名了你（${member.name}），对应消息 ${messages}。请先读取任务文件：${task_path}，按其中说明读取新消息、完成请求，并用 ${cli} message post 带 --execution ${execution.id} 提交一次回答后结束。命令只用任务内 subcommands 列出的 ${cli} 子命令；${project_rule}不读取凭据内容。`;
+    instructions: `${discussion ? '讨论房间：用户直接向你提问（' + messages + '）。这不是你的发言安排，不要领取发言权、不要安排他人，也不改变讨论进度，只回答这个提问。' : '自由协作房间：用户点名了你（' + messages + '）。'}${access_rule}先用 ${cli} message list ${config.room} --after ${execution.read_until}${access_arg} 读取新消息，按时间顺序处理，后面的消息可能修正前面的，以最新指令为准。${host_rule}完成后用 ${cli} message post ${config.room} --as ${member.name} --kind chat --execution ${execution.id} --body-file 草稿 --submission-id 新UUID${access_arg} 提交一次回答。提交被拒绝说明本次执行已被打断或过期：保留草稿并结束，不要去掉 --execution 改作普通发言。草稿只写入 draft_directory；${project_rule}不读取或打印凭据内容，不建定时任务。` });
+  const prompt = `用户在${discussion ? '讨论' : '自由协作'}房间点名了你（${member.name}），对应消息 ${messages}。请先读取任务文件：${task_path}，按其中说明读取新消息、完成请求，并用 ${cli} message post 带 --execution ${execution.id} 提交一次回答后结束。命令只用任务内 subcommands 列出的 ${cli} 子命令；${project_rule}不读取凭据内容。`;
   return { id, participant: member.name, directory: config.directory, draft_directory,
     skills_directory: join(config.project, '.agents', 'skills'), access_path, prompt };
 }

package/web/app.js

@@ -48,7 +48,7 @@ const PLATFORM_IDENTITIES = {
 };
 const IDENTITIES = by_platform(PLATFORM_IDENTITIES, (identity, name) => ({ ...identity, label: name, description: "AI 实例" }));
 const state = { rooms: [], folders: [], room: null, page: 1, pages: 1, query: "", mention_only: false, free_notice: "", free_error: "",
-  free_proxy: "", create_parent: null, named_followup: false,
+  free_proxy: "", create_parent: null, named_followup: false, create_discussion: false,
   archive_view: false, directory_sort: "manual", management: null, dragged_room: null, folder_moves: new Map(), folder_version: 0,
   reply_to: null, turn_reply_to: null, tab: "topic", refresh_version: 0, context_dirty: false, topic_dirty: false,
   snapshot_id: 0, pending_submission: null, pending_turn: null, pending_room: null, toast_timer: null,
@@ -690,7 +690,7 @@ function render_room() {
   if (!state.room) return;
   const room = state.room;
   element("room-title").textContent = room.title;
-  element("room-subtitle").textContent = `${room.archived ? '已存档 · ' : ''}${room.message_count} 条发言 · 发言权：${floor_status(room)}`;
+  element("room-subtitle").textContent = `${room.archived ? '已存档 · ' : ''}${room.message_count} 条发言`;
   element("message-count").textContent = room.message_count;
   element("room-goal").textContent = room.goal || "尚未填写议题目标。";
   element("latest-id").textContent = `#${room.latest_id}`;
@@ -704,16 +704,10 @@ function render_room() {
   }
   render_access();
   render_topic();
-  render_receipts();
   render_host_brief();
   update_composer_role();
 }
 
-/** Describe the actual holder or nominated recipient for both themes. */
-function floor_status(room) {
-  return room.floor?.holder ? `${display_name(room.floor.holder)} 持有` : `待 ${display_name(room.floor?.next_speaker || room.host)} 领取`;
-}
-
 /** A round completes only after all configured experts have contributed. */
 function progress_round(room) {
   const groups = round_groups(room);
@@ -771,16 +765,6 @@ function render_host_brief() {
   element("host-brief-meta").textContent = brief_meta(room);
 }
 
-/** Show bounded receipt references without interpreting free-form reports as status. */
-function render_receipts() {
-  const receipts = state.room.latest_receipts;
-  const links = receipts?.map((receipt) => `<button type="button" class="text-button" data-receipt-detail="${receipt.id}">${escape_html(display_name(receipt.author))} #${receipt.id} · ${escape_html(new Date(receipt.created_at).toLocaleString("zh-CN"))}${receipt.id > state.room.state_until ? " · 晚于摘要" : ""}</button>`).join("") || "尚无运行回执。";
-  for (const id of ["topic-receipts", "state-receipts"]) {
-    element(id).hidden = !Array.isArray(receipts);
-    element(`${id}-links`).innerHTML = links;
-  }
-}
-
 /** Describe roles separately from authors and the actual submitter. */
 function message_provenance(message) {
   const role = message.kind === "receipt" ? "运行回执" : message.kind === "moderation" ? "主持发言" : (message.author === "用户" ? "用户发言" : "专家观点");
@@ -961,10 +945,15 @@ function message_payload() {
     return payload;
   }
   const mode = element("message-kind").value;
-  const author = ["moderation", "receipt"].includes(mode) ? "用户" : element("author-select").value;
+  const author = mode === "moderation" ? "用户" : element("author-select").value;
   if (author !== "用户" && state.room.experts?.[author] !== "online") throw new Error("本地 AI 须自行提交回答；网页仅代发在线成员的真实原文");
   const payload = { author, text, reply_to: state.reply_to, turn_id: state.turn_reply_to,
-    kind: ["moderation", "receipt"].includes(mode) ? mode : "opinion", submitted_by: "用户" };
+    kind: mode === "moderation" ? mode : "opinion", submitted_by: "用户" };
+  // @mentions of active members outside code are direct questions; the website queues them beside the discussion.
+  if (payload.kind === "opinion" && payload.author === "用户") {
+    const named = (state.room.members || []).filter(member => member.status === "active" && member.name !== "用户" && mentioned(text, member.name)).map(member => member.name);
+    if (named.length) payload.to = named;
+  }
   if (payload.kind === "opinion" && payload.author !== "用户") {
     payload.summary = element("message-summary").value.trim();
     payload.summary_by = element("message-summary-source").value === "submitter" ? payload.submitted_by : payload.author;
@@ -1002,6 +991,7 @@ function reset_create_form() {
   state.launch.workspace = {};
   state.launch.scheduler = {};
   state.named_followup = false;
+  state.create_discussion = false;
   state.launch.profiles = JSON.parse(JSON.stringify(state.launch.saved_profiles || {}));
   Object.values(state.launch.profiles).forEach(fill_api_key);
   state.launch.notice = "";
@@ -1427,9 +1417,9 @@ function render_access() {
 
 /** Read numeric limits from the shared classic/modern form controls. */
 function read_limits(prefix) {
-  return Object.fromEntries(["max_rounds", "max_minutes", "execution_minutes", "on_limit", "summary_minutes"].map(key => {
+  return Object.fromEntries(["max_rounds", "max_minutes", "execution_minutes"].map(key => {
     const value = element(`${prefix}-limit-${key}${prefix === "topic" ? "-input" : ""}`).value;
-    return [key, key === "on_limit" ? value : Number(value)];
+    return [key, Number(value)];
   }));
 }
 
@@ -1447,9 +1437,8 @@ function limits_label(limits = {}) {
   const rounds = limits.round_cap || limits.max_rounds ? limit_rounds(limits).text : `${limits.completed_rounds || 0} 轮 · 未设轮次上限`;
   const duration = limits.max_minutes ? `总时长 ${limits.max_minutes} 分钟` : "未设总时长";
   const progress = finished ? "讨论已收束" : !limits.started_at ? "尚未计时" : `已用 ${Math.floor((limits.elapsed_seconds || 0) / 60)} 分钟${limits.remaining_seconds == null ? "" : ` · 剩余 ${Math.ceil(limits.remaining_seconds / 60)} 分钟`}`;
-  const status = finished ? "" : limits.closing ? "正在收束" : limits.reached ? "已达上限，停止新增安排" : "";
-  const summary = limits.max_minutes || limits.deadline ? `总时长内预留 ${limits.summary_minutes} 分钟` : `收束最多 ${limits.summary_minutes} 分钟`;
-  const action = limits.on_limit === "summarize" ? `主持人总结 · ${summary}` : "到限暂停";
+  const status = finished ? "" : limits.reached ? "已达上限，停止新增安排" : "";
+  const action = "到限暂停";
   const execution = limits.execution_minutes ? `${limits.execution_minutes} 分钟` : "不限时长";
   return `${rounds}；${duration}；${progress}。单次自动执行 ${execution}。${action}${status ? `；${status}` : ""}。`;
 }
@@ -1538,7 +1527,13 @@ async function submit_room(event, folder_id = null) {
   const launching = free ? Object.values(payload.experts).includes("cli") || (state.launch.available && Boolean(creation_launch_options().scheduler)) : state.launch.create && state.launch.available;
   if (launching && !state.launch.available) throw new Error("本机唤醒的成员需要连接本机服务；也可改为手动接入或网页代发");
   const launch_draft = launching ? creation_launch_options() : null;
-  const signature = JSON.stringify({ payload, launch_draft });
+  // A discussion is only a way to push the room forward: the room is created as a free room, then opened with these limits.
+  const discussion = free && state.create_discussion ? { goal: payload.goal.trim(), named_followup: state.named_followup,
+    limits: read_limits("new-room") } : null;
+  if (discussion && !(launching && payload.host && payload.experts[payload.host] === "cli")) throw new Error("开启讨论需要一位由本机唤醒的 AI 主持人；请先添加并设为主持人");
+  // The key joins the signature only when a discussion is requested, so recovered requests keep matching their stored signature.
+  const signed = (current_payload, current_draft) => JSON.stringify(discussion ? { payload: current_payload, launch_draft: current_draft, discussion } : { payload: current_payload, launch_draft: current_draft });
+  const signature = signed(payload, launch_draft);
   const navigation = state.navigation_version;
   if (!launching) element("room-dialog").close();
   state.launch.error = "";
@@ -1564,7 +1559,8 @@ async function submit_room(event, folder_id = null) {
   }
   state.pending_room = null;
   state.create_parent = null;
-  if (JSON.stringify({ payload: room_creation_payload(folder_id), launch_draft: launching ? creation_launch_options() : null }) === signature) {
+  if (discussion) await open_discussion_after_creation(room.id, discussion);
+  if (signed(room_creation_payload(folder_id), launching ? creation_launch_options() : null) === signature) {
     element("room-form").reset();
     reset_creation_mode();
     render_expert_inputs("new-expert-modes", default_experts());
@@ -1575,6 +1571,18 @@ async function submit_room(event, folder_id = null) {
   if (state.navigation_version === navigation) { state.archive_view = false; await select_room(room.id); }
 }
 
+/** Open and start the discussion of a room just created; a failure leaves the room as an ordinary free room. */
+async function open_discussion_after_creation(room_id, { goal, named_followup, limits }) {
+  const path = `/api/rooms/${room_id}`;
+  try {
+    await request_json(`${path}/discussion`, { action: "start", ...(goal ? { goal } : {}), limits, named_followup });
+    const runtime = await request_json(`${path}/runtime`);
+    await request_json(`${path}/runtime`, { action: "start", mode: "automatic", revision: runtime.revision, deadline: 0 });
+  } catch (error) {
+    show_toast(`房间已创建，但开启讨论失败：${error.message}；可在右侧成员栏重试`);
+  }
+}
+
 /** Read a site-bound connection without exposing its credential to the shared view snapshot. */
 function restore_local_connection() {
   const fragment = new URLSearchParams(location.hash?.slice(1) || "");
@@ -1939,6 +1947,12 @@ function write_named_followup(value) {
   publish_view();
 }
 
+/** Choose whether a new room opens a discussion right away; the room itself is always the same collaboration room. */
+function write_create_discussion(value) {
+  state.create_discussion = Boolean(value);
+  publish_view();
+}
+
 /** Change the smart scheduling draft; a new provider starts from its preset model and any key saved for its root. */
 function write_scheduler(field, value) {
   const scheduler = state.launch.scheduler;
@@ -2333,8 +2347,6 @@ async function skip_turn() {
   const revision = runtime.revision;
   let saved = false;
   try {
-    const floor = room.floor;
-    if (floor.holder !== turn.expert) await request_json(`${path}/floor`, { actor: "用户", speaker: turn.expert, action: "take", revision: floor.revision });
     await request_json(`${path}/messages`, { author: turn.expert, submitted_by: "用户", kind: "opinion", turn_id: turn.id,
       text: "（本次发言已被用户跳过）", submission_id: new_submission_id() });
     saved = true;
@@ -2364,14 +2376,6 @@ async function extend_rounds(rounds) {
   show_toast(`已追加 ${rounds} 轮并重启讨论`);
 }
 
-/** Ask the host for a summary of the paused discussion; it ends in the concluded state. */
-async function request_summary() {
-  await request_json(`/api/rooms/${state.room.id}/limits`, { actor: "用户", action: "summarize" });
-  await resume_after_limit_decision();
-  await refresh_room();
-  show_toast("已请主持人总结，总结后讨论收束");
-}
-
 /** Reopen a concluded discussion with a fresh round and time budget; history stays. */
 async function reopen_discussion({ max_rounds, max_minutes }) {
   await request_json(`/api/rooms/${state.room.id}/limits`, { actor: "用户", action: "reopen", max_rounds, max_minutes });
@@ -2380,13 +2384,6 @@ async function reopen_discussion({ max_rounds, max_minutes }) {
   show_toast("讨论已重启，按新的轮次与时长上限继续");
 }
 
-/** End early with a host summary limited to the configured closing reserve. */
-async function force_close() {
-  await request_json(`/api/rooms/${state.room.id}/limits`, { actor: "用户", force: true });
-  await refresh_room();
-  show_toast("已取消当前安排，等待主持人总结收尾");
-}
-
 /** End early without a summary, keeping every original message. */
 async function conclude_discussion() {
   const turn = state.room.current_turn;
@@ -2398,6 +2395,24 @@ async function conclude_discussion() {
   show_toast("讨论已直接收束，历史记录保留");
 }
 
+/** 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 }) {
+  const room_id = state.room.id, path = `/api/rooms/${room_id}`;
+  if (!localStorage.getItem(`discuss-access:${room_id}`)) throw new Error("此浏览器缺少房间控制凭据，请使用创建房间的浏览器");
+  await request_json(`${path}/discussion`, { action: "start", ...(goal ? { goal } : {}), limits: { max_rounds, max_minutes } });
+  const runtime = await request_json(`${path}/runtime`);
+  await request_json(`${path}/runtime`, { action: "start", mode: "automatic", revision: runtime.revision, deadline: 0 });
+  await refresh_room();
+  show_toast("讨论已开启，由主持人推进；需本机接入程序保持运行");
+}
+
+/** Conclude the discussion and go on as a free room; every message and the conclusion stay. */
+async function end_room_discussion() {
+  await request_json(`/api/rooms/${state.room.id}/discussion`, { action: "end" });
+  await refresh_room();
+  show_toast("讨论已结束，房间回到自由协作，历史记录保留");
+}
+
 /** Revoke active execution before the local adapters are stopped. */
 async function pause_runtime() {
   await request_json(`/api/rooms/${state.room.id}/runtime`, { action: "pause", revision: state.room.runtime.revision });
@@ -2540,7 +2555,7 @@ async function adopt_recommendation({ message_id, mode }) {
 
 /** A completed creation starts the next form with fresh mode defaults. */
 function reset_creation_mode() {
-  state.creation_mode = "brainstorm";
+  state.creation_mode = "free";
   state.creation_drafts = {};
 }
 
@@ -2574,9 +2589,9 @@ function render_topic() {
     for (const field of ["title", "goal", "focus", "user_request", "background", "boundaries"]) element(`topic-${field}-input`).value = room[field] || "";
     render_host_options("topic-host-select", Object.keys(room.experts).filter(name => room.experts[name] === "cli"), room.host);
     element("topic-phase-select").value = room.phase;
-    for (const key of ["max_rounds", "max_minutes", "execution_minutes", "on_limit", "summary_minutes"]) {
+    for (const key of ["max_rounds", "max_minutes", "execution_minutes"]) {
       const input = element(`topic-limit-${key}-input`);
-      input.value = room.limits?.[key] || (key === "on_limit" ? "pause" : "");
+      input.value = room.limits?.[key] || "";
       input.disabled = !["preparing", "paused"].includes(room.phase);
     }
     render_expert_inputs("topic-expert-modes", room.experts);
@@ -2589,11 +2604,6 @@ function render_topic() {
 
 /** Display the actual assignment state without implying an external delivery. */
 function render_current_turn() {
-  const floor = state.room.floor;
-  element("floor-status").textContent = floor_status(state.room);
-  element("take-floor").disabled = !floor || Boolean(floor.holder);
-  element("take-floor").textContent = `为 ${display_name(floor?.next_speaker || state.room.host)} 领取`;
-  element("return-floor").disabled = !floor?.holder;
   const turn = state.room.current_turn;
   const active = turn && ["pending", "notified"].includes(turn.status);
   const inactive = ["paused", "concluded"].includes(state.room.phase);
@@ -2607,20 +2617,10 @@ function render_current_turn() {
   element("cancel-turn").disabled = !active;
   element("view-turn-answer").hidden = !turn?.answer_id;
   const limited = state.room.limits?.reached;
-  const unavailable = active || inactive || limited || !Object.keys(state.room.experts).length || floor?.holder !== state.room.host;
+  const unavailable = active || inactive || limited || !Object.keys(state.room.experts).length;
   element("schedule-turn").disabled = Boolean(unavailable);
   element("schedule-note").textContent = inactive ? "话题已暂停或收束；恢复阶段后才能继续安排。" :
-    (active ? "先完成或取消当前安排，再安排下一位。" : limited ? "已达到讨论上限，请检查到限处理；需要继续时先暂停并调整参数。" : floor?.holder !== state.room.host ? "主持人领取发言权后可安排下一位。" : "创建后本地专家可自行检查；在线专家需由主持人或用户联系。");
-}
-
-/** Perform one explicit, versioned floor operation on behalf of its speaker. */
-async function change_floor(action) {
-  const floor = state.room.floor;
-  const speaker = action === "take" ? floor.next_speaker : floor.holder;
-  try {
-    await request_json(`/api/rooms/${state.room.id}/floor`, { actor: "用户", speaker, action, revision: floor.revision });
-    show_toast(action === "take" ? `${display_name(speaker)} 已领取发言权` : "发言权已归还");
-  } finally { await refresh_room(); }
+    (active ? "先完成或取消当前安排，再安排下一位。" : limited ? "已达到讨论上限，请检查到限处理；需要继续时先暂停并调整参数。" : "创建后本地专家可自行检查；在线专家需由主持人或用户联系。");
 }
 
 /** Distinguish local work discovery from contacting an online expert. */
@@ -2719,12 +2719,12 @@ function cancel_turn_reply() {
 /** Keep moderator statements distinct from opinions in the same identity. */
 function update_composer_role() {
   const mode = element("message-kind").value;
-  element("author-select").disabled = ["moderation", "receipt"].includes(mode);
-  if (["moderation", "receipt"].includes(mode)) element("author-select").value = "用户";
+  element("author-select").disabled = mode === "moderation";
+  if (mode === "moderation") element("author-select").value = "用户";
   const needs_summary = ["opinion", "forward"].includes(mode) && element("author-select").value !== "用户";
   element("message-summary-fields").hidden = !needs_summary;
   element("message-summary").required = needs_summary;
-  element("author-note").textContent = mode === "receipt" ? "运行回执，由用户录入" : mode === "moderation" ? "主持发言" :
+  element("author-note").textContent = mode === "moderation" ? "主持发言" :
     (mode === "forward" ? "由用户代发" : (element("author-select").value === "用户" ? "发言" : "的观点代发"));
 }
 
@@ -2738,7 +2738,6 @@ function bind_host_controls() {
     "local-room-configuration-load": load_room_configuration, "local-room-configuration-save": save_room_configuration,
     "local-room-configuration-restart": restart_discussion,
     "runtime-pause": pause_runtime, "check-discussion-limits": check_limits,
-    "take-floor": () => change_floor("take"), "return-floor": () => change_floor("return"),
     "copy-turn": copy_turn, "confirm-notified": () => change_turn_status("notified"), "cancel-turn": () => change_turn_status("cancelled"),
     "forward-turn": prepare_turn_answer, "cancel-turn-answer": cancel_turn_reply,
     "view-turn-answer": () => show_message(state.room.current_turn.answer_id),
@@ -2758,10 +2757,6 @@ async function run_action(action) {
 
 /** Delegate room and message actions to their actual visible controls. */
 function bind_delegated_actions() {
-  element("room-content").addEventListener("click", (event) => {
-    const receipt = event.target.closest("[data-receipt-detail]");
-    if (receipt) run_action(() => show_message(receipt.dataset.receiptDetail));
-  });
   element("room-list").addEventListener("click", (event) => {
     const management = event.target.closest("[data-manage-room]");
     if (management) {
@@ -3148,7 +3143,7 @@ function view_snapshot() {
     free_notice: state.free_notice, free_error: state.free_error, free_proxy: state.free_proxy,
     create_parent: state.create_parent, access: access_snapshot(), admin: admin_snapshot(),
     tab: state.tab, snapshot_id: state.snapshot_id, context_dirty: state.context_dirty,
-    theme: document.documentElement.dataset.theme, fields, experts, launch: structuredClone(state.launch), named_followup: state.named_followup };
+    theme: document.documentElement.dataset.theme, fields, experts, launch: structuredClone(state.launch), named_followup: state.named_followup, create_discussion: state.create_discussion };
 }
 
 /** Update a shared draft using the same input events as the original controls. */
@@ -3315,9 +3310,8 @@ async function execute_view_action(name, value) {
     schedule: () => schedule_turn(event), filter: filter_view, reply: set_view_reply,
     cancel_reply, cancel_answer: cancel_turn_reply, prepare_answer: prepare_turn_answer,
     copy_turn, notify: () => change_turn_status("notified"), cancel_turn: () => change_turn_status("cancelled"), skip_turn,
-    take_floor: () => change_floor("take"), return_floor: () => change_floor("return"),
     copy_online: () => copy_context(), copy_cli: () => copy_context("cli"), copy_background,
-    choose_runtime, export_runtime, download_member_access, copy_member_access_text, copy_member_join, copy_member_launch: name => copy_member_join(name, true), pause_runtime, check_limits, pause_discussion, restart_discussion, retry_execution, force_close, conclude_discussion, extend_rounds, request_summary, reopen_discussion,
+    choose_runtime, export_runtime, download_member_access, copy_member_access_text, copy_member_join, copy_member_launch: name => copy_member_join(name, true), pause_runtime, check_limits, pause_discussion, restart_discussion, retry_execution, conclude_discussion, start_room_discussion, end_room_discussion, extend_rounds, reopen_discussion,
     save_launch_defaults, launch_current_room, resume_launch, discard_launch, retry_launch_connection, check_launch_connection: load_launch_settings,
     load_room_configuration, save_room_configuration, interrupt_member, change_member, invite_member, set_proxy, copy_online_notice,
     prepare_brainstorm, return_conclusion, convert_suggestion, adopt_recommendation,
@@ -3343,7 +3337,7 @@ function change_view_theme(theme) {
 
 window.discuss_view = { snapshot: view_snapshot, write_field: write_view_field,
   write_launch: write_launch_field, write_room_connection, write_room_adapter, launch_clients: LAUNCH_CLIENTS,
-  launch_model_state, load_launch_models, write_launch_model, save_launch_api_key, write_scheduler, save_scheduler_api_key, check_scheduler, write_named_followup, check_launch_api, launch_summary, launch_can_set_access, launch_can_bind_session, pick_launch_directory, restore_launch_profile, reset_create_form, empty_discussion_message,
+  launch_model_state, load_launch_models, write_launch_model, save_launch_api_key, write_scheduler, save_scheduler_api_key, check_scheduler, write_named_followup, write_create_discussion, check_launch_api, launch_summary, launch_can_set_access, launch_can_bind_session, pick_launch_directory, restore_launch_profile, reset_create_form, empty_discussion_message,
   start_drag: start_directory_drag,
   attachment_markup, attachment_size, attachment_file_icon, drop_attachments, paste_attachments,
   write_expert: write_view_expert, add_instance: add_view_instance, platform_of, execute: execute_view_action, theme: change_view_theme,
@@ -3351,7 +3345,7 @@ window.discuss_view = { snapshot: view_snapshot, write_field: write_view_field,
     update_profile: update_admin_profile, avatar_from_file: admin_avatar_from_file, validate: validate_admin_form },
   request: request_json, identities: IDENTITIES, display_name, sources: SOURCE_LABELS, phases: PHASE_LABELS,
   runtime_label, execution_label, limits_label, participant_model, participant_access, can_retry_execution,
-  turns: TURN_LABELS, turn_label, turn_guidance, floor_status, progress_round, round_groups, limit_rounds, progress_speaker, brief_meta, max_message_length: MAX_MESSAGE_LENGTH, provenance: message_provenance, format_time };
+  turns: TURN_LABELS, turn_label, turn_guidance, progress_round, round_groups, limit_rounds, progress_speaker, brief_meta, max_message_length: MAX_MESSAGE_LENGTH, provenance: message_provenance, format_time };
 
 restore_theme();
 restore_directory_sort();