ai_co_discuss 0.2.68 → 0.2.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/backend/server.py CHANGED
@@ -25,7 +25,8 @@ from .free_room import (add_member, after_free_message, authorize_free_write, ch
25
25
  inbox, interrupt_member, member_action, member_values, migrate_free_tables, proxy_member, reserve_execution,
26
26
  discussion_members, room_mode, save_room_access, sync_discussion_members, view_execution)
27
27
  from .free_room import add_discussion_member, convert_suggestion, discussion_member_action, message_suggestions, save_suggestions, sync_participants
28
- from .free_room import active_members, adopt_recommendation, ask_members, asks_view, checked_asks, recommend_member, register_member
28
+ from .free_room import active_members, adopt_recommendation, ask_members, asks_view, checked_asks, recommend_member, register_member, route_held_messages
29
+ from .free_room import reorder_speakers, speaking_order, stop_room_work
29
30
  from .identity import MAX_ROOM_AGENTS, PARTICIPANTS, is_ai, is_participant
30
31
  from .room_import import import_room, imported_attachment
31
32
  from .runtime import (authorize_write, begin_write, configure_runtime, event_action,
@@ -82,6 +83,7 @@ MAX_DECISION_CONTEXT = 500
82
83
  DECISION_SELECT = """SELECT d.*,f.rating AS feedback,COALESCE(f.should_be,'') AS should_be,COALESCE(f.note,'') AS note,c.context
83
84
  FROM scheduler_decisions d LEFT JOIN scheduler_feedback f ON f.decision_id=d.id LEFT JOIN scheduler_decision_context c ON c.decision_id=d.id"""
84
85
  MAX_DECISION_LABEL = 200
86
+ ROUTING_VISIBLE_SECONDS = 120
85
87
  MAX_DECISION_DETAIL = 4000
86
88
  SCHEDULER_PROVIDERS = ("jev", "decisions")
87
89
  ROOM_BACKUP_QUERIES = {
@@ -235,6 +237,8 @@ def require_room(connection, room_id):
235
237
  "SELECT decision_id,detail FROM scheduler_decision_details WHERE decision_id IN (SELECT id FROM scheduler_decisions WHERE room_id=?)", (room_id,))}
236
238
  for decision in room["scheduler_decisions"]:
237
239
  decision["detail"] = details.get(decision["id"])
240
+ room["scheduler_routing"] = [row[0] for row in connection.execute(
241
+ "SELECT message_id FROM scheduler_routing WHERE room_id=? AND created_at>? ORDER BY message_id", (room_id, int(time.time()) - ROUTING_VISIBLE_SECONDS))]
238
242
  room["host_arrangements"] = host_arrangements(connection, room_id, room["scheduler_decisions"])
239
243
  room["cancelled_turns"] = cancelled_turns(connection, room_id)
240
244
  parent = connection.execute("""SELECT rooms.id,rooms.title FROM room_links JOIN rooms ON rooms.id=room_links.parent_id
@@ -249,6 +253,7 @@ def require_room(connection, room_id):
249
253
  # Free rooms have no host hand-off: user messages go straight to the named members.
250
254
  room["held_since"] = 0
251
255
  room["free"] = free_view(connection, room_id)
256
+ room["speaking_order"] = speaking_order(connection, room)
252
257
  return room
253
258
 
254
259
 
@@ -488,6 +493,8 @@ def update_topic(connection, room_id, payload):
488
493
  connection.execute("UPDATE rooms SET title=?,goal=? WHERE id=?", (settings["title"], settings["goal"], room_id))
489
494
  sync_discussion_members(connection, room_id, payload, settings)
490
495
  save_topic_settings(connection, room_id, settings)
496
+ if settings["phase"] == "concluded" and room["phase"] != "concluded" and room["mode"] != "free" and not room["archived"]:
497
+ return_to_free(connection, {**room, "host": settings["host"]})
491
498
  return require_room(connection, room_id)
492
499
 
493
500
 
@@ -616,6 +623,9 @@ def manage_room(connection, room_id, action, payload):
616
623
  elif action in ("archive", "restore"):
617
624
  if action == "archive" and room["phase"] != "concluded":
618
625
  save_topic_settings(connection, room_id, {**room, "phase": "paused"})
626
+ if action == "archive" and room["mode"] == "free":
627
+ # An archived room is read-only: nothing it still owes may be delivered or answered later.
628
+ stop_room_work(connection, room_id, "房间已归档", "archived")
619
629
  connection.execute("UPDATE room_directory SET archived=? WHERE room_id=?", (int(action == "archive"), room_id))
620
630
  elif action == "delete":
621
631
  if payload.get("confirm_title") != room["title"]:
@@ -629,8 +639,8 @@ def manage_room(connection, room_id, action, payload):
629
639
 
630
640
  def delete_room_records(connection, room_id):
631
641
  """Remove a room's dependent records in the caller's transaction."""
632
- for table in ("member_recommendations", "member_requests", "member_executions", "member_sessions", "member_registrations", "room_members", "room_modes", "free_batches", "free_chains", "room_links",
633
- "discussion_options", "round_budgets", "scheduler_decisions", "discussion_sessions"):
642
+ for table in ("member_recommendations", "free_queue", "speaking_orders", "member_requests", "member_executions", "member_sessions", "member_registrations", "room_members", "room_modes", "free_batches", "free_chains", "room_links",
643
+ "discussion_options", "round_budgets", "scheduler_decisions", "scheduler_routing", "discussion_sessions"):
634
644
  if table == "scheduler_decisions":
635
645
  for child in ("scheduler_feedback", "scheduler_decision_context"):
636
646
  connection.execute(f"DELETE FROM {child} WHERE decision_id IN (SELECT id FROM scheduler_decisions WHERE room_id=?)", (room_id,))
@@ -773,13 +783,20 @@ def end_discussion(connection, room_id, token, payload):
773
783
  room = require_room(connection, room_id)
774
784
  if room["mode"] == "free":
775
785
  raise FileExistsError("房间没有进行中的讨论")
776
- if room["runtime"]["status"] in ("running", "ready", "paused"):
777
- configure_runtime(connection, room_id, token, {"action": "stop", "revision": room["runtime"]["revision"]})
786
+ return_to_free(connection, room)
787
+ return require_room(connection, room_id)
788
+
789
+
790
+ def return_to_free(connection, room):
791
+ """End the discussion in place: stop its run and turns, switch back to free collaboration and route held user messages."""
792
+ room_id = room["id"]
793
+ connection.execute("""UPDATE discussion_runtime SET status='stopped',generation=generation+1,revision=revision+1
794
+ WHERE room_id=? AND status IN ('running','ready','paused')""", (room_id,))
778
795
  connection.execute("UPDATE discussion_turns SET status='cancelled' WHERE room_id=? AND status IN ('pending','notified')", (room_id,))
779
796
  connection.execute("UPDATE discussion_turns SET status='skipped' WHERE room_id=? AND status='queued'", (room_id,))
780
797
  connection.execute("UPDATE topic_settings SET phase='concluded' WHERE room_id=?", (room_id,))
781
798
  connection.execute("UPDATE room_modes SET mode='free' WHERE room_id=?", (room_id,))
782
- return require_room(connection, room_id)
799
+ route_held_messages(connection, room_id, room["host"])
783
800
 
784
801
 
785
802
  def message_values(payload):
@@ -1040,6 +1057,10 @@ def append_message(connection, room_id, payload, token="", free_actor=None):
1040
1057
  begin_write(connection)
1041
1058
  room = require_room(connection, room_id)
1042
1059
  if room["mode"] == "free" or free_actor is not None:
1060
+ previous = connection.execute(f"{MESSAGE_QUERY} WHERE room_id=? AND submission_id=?", (room_id, submission_id)).fetchone()
1061
+ # An exact retry of a discussion message saved before the discussion ended keeps its original result.
1062
+ if previous and previous["kind"] != "chat" and (previous["author"], previous["text"]) == (author, text):
1063
+ return {"message": message_with_attachments(connection, previous), "duplicate": True}
1043
1064
  return append_free_message(connection, room, payload, free_actor)
1044
1065
  details = message_details(room, {**payload, "author": author})
1045
1066
  # An expert's opinion answers the arrangement open for that expert; naming it with turn_id is optional.
@@ -1128,8 +1149,10 @@ def roster_view(room):
1128
1149
  last = room["rounds"][-1] if room["rounds"] else None
1129
1150
  spoken = set(last["speakers"]) if last and not last["completed"] else set()
1130
1151
  pending_registration = unregistered_experts(room)
1131
- experts = [{"name": name, "mode": mode, "host": name == room["host"], "spoken": name in spoken,
1132
- "registered": name not in pending_registration} for name, mode in room["experts"].items()]
1152
+ # Experts follow the room's speaking order, so a round plan can take the user's preferred order from the roster.
1153
+ rank = {item["name"]: index for index, item in enumerate(room["speaking_order"]["items"])}
1154
+ experts = [{"name": name, "mode": room["experts"][name], "host": name == room["host"], "spoken": name in spoken,
1155
+ "registered": name not in pending_registration} for name in sorted(room["experts"], key=lambda name: rank.get(name, len(rank)))]
1133
1156
  state = json.dumps([sorted(room["experts"]), sorted(spoken), sorted(pending_registration)], ensure_ascii=False)
1134
1157
  return {"experts": experts, "unregistered": pending_registration,
1135
1158
  "waiting": [item["name"] for item in experts if not item["spoken"] and not item["host"] and item["registered"]],
@@ -1214,6 +1237,20 @@ def rate_scheduler_decision(connection, room_id, decision_id, token, payload):
1214
1237
  return {"decision_id": decision_id, "feedback": rating, "should_be": should_be.strip(), "note": note.strip()}
1215
1238
 
1216
1239
 
1240
+ def mark_scheduler_routing(connection, room_id, token, payload):
1241
+ """The local service marks a message while the decision model is analysing it, and clears the mark when done."""
1242
+ begin_write(connection)
1243
+ require_owner(connection, room_id, token)
1244
+ message_id, active = payload.get("message_id"), payload.get("active")
1245
+ if type(message_id) is not int or message_id <= 0 or type(active) is not bool:
1246
+ raise ValueError("须提供正整数 message_id 与布尔 active")
1247
+ if active:
1248
+ connection.execute("INSERT OR REPLACE INTO scheduler_routing (room_id,message_id,created_at) VALUES (?,?,?)", (room_id, message_id, int(time.time())))
1249
+ else:
1250
+ connection.execute("DELETE FROM scheduler_routing WHERE room_id=? AND message_id=?", (room_id, message_id))
1251
+ return {"message_id": message_id, "active": active}
1252
+
1253
+
1217
1254
  def record_scheduler_decision(connection, room_id, token, payload, owner=False):
1218
1255
  """The dispatcher records one smart-scheduling decision so the transcript shows what it did and how sure it was.
1219
1256
 
@@ -1263,27 +1300,24 @@ def continue_turns(connection, room_id, payload):
1263
1300
  connection.execute("UPDATE discussion_turns SET status='pending' WHERE id=? AND status='queued'", (turn_id,))
1264
1301
  return {"turn": get_turn(connection, room_id, turn_id), "queued": room["queued_turns"][1:]}
1265
1302
 
1266
- def adjust_limits(connection, room_id, payload, action):
1267
- """User-only follow-ups after a limit: append rounds, or reopen a concluded discussion."""
1303
+ def reopen_limits(connection, room_id, payload):
1304
+ """User-only: reopen a concluded discussion that has not returned to free collaboration."""
1268
1305
  begin_write(connection)
1269
1306
  room = require_room(connection, room_id)
1270
1307
  if payload.get("actor") != "用户":
1271
- raise ValueError("仅用户可以追加轮次或重启已收束的讨论")
1308
+ raise ValueError("仅用户可以重启已收束的讨论")
1272
1309
  if room["archived"]:
1273
1310
  raise ValueError("请先恢复已存档房间")
1311
+ if room["mode"] == "free":
1312
+ raise ValueError("房间已回到自由协作;需要讨论时请重新开启讨论")
1274
1313
  if not room["round_budget"]:
1275
- raise ValueError("该房间沿用旧轮次计数,不支持追加轮次或重启")
1276
- required_phase = "concluded" if action == "reopen" else "paused"
1277
- if room["phase"] != required_phase:
1278
- raise ValueError("仅已收束的讨论可以重启" if action == "reopen" else "仅已暂停的讨论可以追加轮次")
1279
- rounds = payload.get("rounds") if action == "extend" else payload.get("max_rounds", room["limits"]["max_rounds"])
1280
- if type(rounds) is not int or not (1 if action == "extend" else 0) <= rounds <= 100:
1281
- raise ValueError("轮次须为整数(追加 1–100,重启 0–100,0 表示不限)")
1314
+ raise ValueError("该房间沿用旧轮次计数,不支持重启")
1315
+ if room["phase"] != "concluded":
1316
+ raise ValueError("仅已收束的讨论可以重启")
1317
+ rounds = payload.get("max_rounds", room["limits"]["max_rounds"])
1318
+ if type(rounds) is not int or not 0 <= rounds <= 100:
1319
+ raise ValueError("轮次须为 0–100 的整数,0 表示不限")
1282
1320
  count = opinion_count(connection, room_id, room["experts"])
1283
- if action == "extend":
1284
- connection.execute("UPDATE round_budgets SET base=?,cap=?,extra=extra+? WHERE room_id=?", (count, rounds, rounds, room_id))
1285
- connection.execute("UPDATE discussion_limits SET stop_reason='',revision=revision+1 WHERE room_id=?", (room_id,))
1286
- return require_room(connection, room_id)
1287
1321
  limits = limit_values({"max_rounds": rounds, "max_minutes": payload.get("max_minutes", room["limits"]["max_minutes"])}, room["limits"])
1288
1322
  connection.execute("UPDATE round_budgets SET base=?,cap=0,extra=0 WHERE room_id=?", (count, room_id))
1289
1323
  connection.execute("""UPDATE discussion_limits SET max_rounds=?,max_minutes=?,started_at=0,stop_reason='',revision=revision+1
@@ -1294,29 +1328,27 @@ def adjust_limits(connection, room_id, payload, action):
1294
1328
 
1295
1329
 
1296
1330
  def check_limits(connection, room_id, payload):
1297
- """Pause at a reached boundary (or once the host declares the goal done); the user then extends or ends the discussion."""
1331
+ """End the discussion at a reached boundary (or once the host declares the goal done); the room returns to free collaboration."""
1298
1332
  action = payload.get("action", "check")
1299
- if action not in ("check", "done", "extend", "reopen"):
1300
- raise ValueError("action 须为 check/done/extend/reopen")
1301
- if action in ("extend", "reopen"):
1302
- return adjust_limits(connection, room_id, payload, action)
1333
+ if action not in ("check", "done", "reopen"):
1334
+ raise ValueError("action 须为 check/done/reopen")
1335
+ if action == "reopen":
1336
+ return reopen_limits(connection, room_id, payload)
1303
1337
  begin_write(connection)
1304
1338
  room = require_room(connection, room_id)
1305
1339
  require_host(room, payload)
1306
1340
  limits = room["limits"]
1307
1341
  done = action == "done"
1308
- inactive = room["phase"] in ("paused", "concluded") or room["archived"] or (done and room["phase"] == "preparing")
1342
+ inactive = (room["mode"] == "free" or room["phase"] in ("paused", "concluded") or room["archived"]
1343
+ or (done and room["phase"] == "preparing"))
1309
1344
  if (not limits["reached"] and not done) or inactive:
1310
1345
  return room
1311
1346
  if done:
1312
1347
  require_conclusion_ready(connection, room, payload, allow_queued=True)
1313
1348
  reason = "goal_done" if done else limits["reason"] or "user_stop"
1314
1349
  connection.execute("UPDATE discussion_limits SET stop_reason=?,revision=revision+1 WHERE room_id=?", (reason, room_id))
1315
- connection.execute("UPDATE discussion_turns SET status='cancelled' WHERE room_id=? AND status IN ('pending','notified')", (room_id,))
1316
- connection.execute("UPDATE discussion_turns SET status='skipped' WHERE room_id=? AND status='queued'", (room_id,))
1317
- connection.execute("UPDATE topic_settings SET phase='paused' WHERE room_id=?", (room_id,))
1318
- # Pausing at the limit also pauses the run, so the board offers restart and the old execution is superseded.
1319
- connection.execute("UPDATE discussion_runtime SET status='paused',generation=generation+1,revision=revision+1 WHERE room_id=? AND status='running'", (room_id,))
1350
+ # The run's generation moves on, so the old execution is superseded; unnamed messages now go to the host as usual.
1351
+ return_to_free(connection, room)
1320
1352
  return require_room(connection, room_id)
1321
1353
 
1322
1354
 
@@ -1443,7 +1475,7 @@ def room_text(connection, room_id, params):
1443
1475
  f"主持人:{room['host']};阶段:{PHASES[room['phase']]};当前焦点:{room['focus'] or '尚未填写'}",
1444
1476
  f"当前记录截止 #{room['latest_id']};共 {room['message_count']} 条;已完成 {room['completed_rounds']} 轮讨论(所有参与专家各发言一次)。"]
1445
1477
  limits = room["limits"]
1446
- content.append(f"讨论上限:{limits['max_rounds'] or '不限'} 轮;总时长 {limits['max_minutes'] or '不限'} 分钟;单次自动执行 {str(limits['execution_minutes']) + ' 分钟' if limits['execution_minutes'] else '不限时长'};到限后暂停,由用户决定追加轮次或结束。到限:{limits['reached']}。")
1478
+ content.append(f"讨论上限:{limits['max_rounds'] or '不限'} 轮;总时长 {limits['max_minutes'] or '不限'} 分钟;单次自动执行 {str(limits['execution_minutes']) + ' 分钟' if limits['execution_minutes'] else '不限时长'};到限后讨论结束,房间回到自由协作。到限:{limits['reached']}。")
1447
1479
  if room["mode"] == "free":
1448
1480
  members = ";".join(f"{item['name']}(已读至 #{item['read_until']},待投递 {item['pending']})" for item in room["free"]["members"])
1449
1481
  content.append(f"自由协作房间:无发言权、安排与轮次。成员:{members or '无'}。用户的消息点名成员后生成请求;成员回答须带本次执行编号,执行结束、被打断或过期后的回答会被拒绝,不能改作普通发言。")
@@ -1526,7 +1558,7 @@ def protocol_text(room):
1526
1558
  "API 参与者由本机 runner 使用相同房间授权和执行约束提交,消息 source=api;CLI 仍使用 source=cli。兼容字段 experts 中的 cli 表示可自行提交,实际接入方式见成员 adapter。",
1527
1559
  "写入使用 POST,通常为 Content-Type: application/json;附件上传使用 application/octet-stream 原始字节。主持操作填写 actor 为当前主持人或用户;这些是声明身份,不是认证凭据。",
1528
1560
  f"附件:POST {base}/attachments?actor=身份&file_name=文件名&submission_id=新编号,原文件最多 20 MiB;GET 同路径默认列已发送附件,加 submission_id 精确核对上传。GET {base}/attachments/ID 读元数据,/ID/content 下载原文件。消息可带 attachment_ids(最多 10 个有序编号);只关联同房间、同提交者的未使用附件,可只有附件无正文。自动任务须在回答完成前上传;消息查询包含附件,按需下载后由当前软件读取,不自动解析。",
1529
- "讨论上限:room.limits 返回轮次、总时长、单次执行和实际进度。准备/暂停时通过 topic 的 limits 对象修改;0 表示不预设轮次/总时长/单次执行时限。POST /api/rooms/ROOM/limits(actor)或 room limits ROOM --check 检查到限处理;到限后暂停并停止新专家安排与观点,由用户决定追加轮次或结束;暂停期间不计时也不消耗总时长。",
1561
+ "讨论上限:room.limits 返回轮次、总时长、单次执行和实际进度。准备/暂停时通过 topic 的 limits 对象修改;0 表示不预设轮次/总时长/单次执行时限。POST /api/rooms/ROOM/limits(actor)或 room limits ROOM --check 检查到限处理;到限后讨论结束并停止新专家安排与观点,房间回到自由协作;暂停期间不计时也不消耗总时长。",
1530
1562
  "运行方式:room.runtime 显示 manual/automatic、状态及真实执行回执。所有房间写入须带 X-Discussion-Token,CLI 用 --access-file 读取私有文件。用户及运行控制使用房主凭据,手动本地成员使用自己的成员凭证,不能相互冒充;在线成员只读,由房主或讨论主持人代发。自动讨论先 execution enter,创建安排或保存关联回答即完成本步,不创建原生定时任务;本机唤醒成员的持久凭证不能替代自动执行,手动接入的专家用自己的成员凭证回答安排,暂停、停止、换代、租约到期后的旧执行失效。run view/start/pause/stop/configure 字段查 CLI schema。",
1531
1563
  "没有发言权:同一话题同时只有一个未完成的发言安排,被安排的专家直接回答它;专家观点自动回答该专家当前有效的安排,turn_id 可省略(填写则须与之相符),没有轮到你时被拒绝。主持发言(moderation)只能由当前主持人署名,任何时候都可发出;创建、取消安排由主持人或用户操作。用户的 @ 直接提问不占安排也不计轮次。失败的写入不会改变安排状态,同编号重试沿用原内容。",
1532
1564
  '创建话题:POST /api/rooms,携带房主控制凭据;字段 title、goal、user_request、background、boundaries、host、experts、members、submission_id(新 UUID)。members 与 experts 名单一致,各项含 name、独立 token、access(手动本地 manual、自动 runner、在线 online)。AI 主持人必须为本地可写成员。CLI room create --access-file 私有房主文件 在请求前保存凭据,确认后返回各本地成员文件路径;同编号重试沿用原资料和全部凭据。名单、主持职责变更仅房主可做。',
@@ -1918,6 +1950,15 @@ class DiscussionHandler(BaseHTTPRequestHandler):
1918
1950
  result = register_member(connection, room_id, token, utc_now())
1919
1951
  connection.commit()
1920
1952
  return self.respond(result)
1953
+ if parts[3:] == ["speaking-order"]:
1954
+ if method == "GET":
1955
+ return self.respond(require_room(connection, room_id)["speaking_order"])
1956
+ payload = self.read_payload()
1957
+ begin_write(connection)
1958
+ reorder_speakers(connection, require_room(connection, room_id), token, payload)
1959
+ result = require_room(connection, room_id)
1960
+ connection.commit()
1961
+ return self.respond(result)
1921
1962
  free = room_mode(connection, room_id) == "free"
1922
1963
  # A discussion keeps the local service's inbox and per-member executions for the user's direct questions.
1923
1964
  if parts[3:4] in (["inbox"], ["executions"]) or (free and parts[3:4] in (["members"], ["suggestions"], ["recommendations"])):
@@ -1933,8 +1974,8 @@ class DiscussionHandler(BaseHTTPRequestHandler):
1933
1974
  return self.respond(result)
1934
1975
  if parts[3:4] == ["attachments"]:
1935
1976
  return self.handle_attachments(connection, parts, params, method)
1936
- if parts[3:4] in (["runtime"], ["events"], ["scheduler-decisions"]):
1937
- if free and method == "POST" and parts[3:4] != ["scheduler-decisions"]:
1977
+ if parts[3:4] in (["runtime"], ["events"], ["scheduler-decisions"], ["scheduler-routing"]):
1978
+ if free and method == "POST" and parts[3:4] not in (["scheduler-decisions"], ["scheduler-routing"]):
1938
1979
  raise ValueError("自由房间不使用讨论运行控制")
1939
1980
  return self.handle_runtime_api(connection, parts, params, method)
1940
1981
  free_actor = None
@@ -2065,6 +2106,8 @@ class DiscussionHandler(BaseHTTPRequestHandler):
2065
2106
  result = event_action(connection, room_id, int(parts[4]), token, self.read_payload())
2066
2107
  elif parts[3:] == ["scheduler-decisions"] and method == "POST":
2067
2108
  result = record_scheduler_decision(connection, room_id, token, self.read_payload(), owner=room_mode(connection, room_id) == "free")
2109
+ elif parts[3:] == ["scheduler-routing"] and method == "POST":
2110
+ result = mark_scheduler_routing(connection, room_id, token, self.read_payload())
2068
2111
  elif len(parts) == 5 and parts[3] == "scheduler-decisions" and method == "POST":
2069
2112
  result = rate_scheduler_decision(connection, room_id, int(parts[4]), token, self.read_payload())
2070
2113
  else:
@@ -223,7 +223,7 @@ Python 通过进程内条件变量唤醒订阅者,不占用数据库连接,
223
223
 
224
224
  ## 讨论选项与智能调度记录
225
225
 
226
- - `round_budgets`:程序统计轮次的预算(`base` 为本段计数起点的专家观点数,`cap` 为本段轮次上限、0 表示取 `discussion_limits.max_rounds`,`extra` 为用户累计追加轮数)。建房时写入;没有记录的旧房间沿用按花名册逐轮统计的旧口径。房间视图的 `limits` 返回 `segment_rounds`、`round_cap`、`extra_rounds`。
226
+ - `round_budgets`:程序统计轮次的预算(`base` 为本段计数起点的专家观点数,`cap` 为本段轮次上限、0 表示取 `discussion_limits.max_rounds`,`extra` 为旧版用户累计追加轮数,追加功能已移除)。建房时写入;没有记录的旧房间沿用按花名册逐轮统计的旧口径。房间视图的 `limits` 返回 `segment_rounds`、`round_cap`、`extra_rounds`。
227
227
  - `discussion_options`:建房时的讨论选项,目前只有 `named_followup`(0/1,建房 `named_followup` 布尔值,默认 false,计入建房幂等比对)。没有记录的旧房间视为 true;房间视图返回 `named_followup`。
228
228
  - `scheduler_decisions`:讨论中每次智能调度判断的可见记录(`kind` 为 `interjection` / `round`,`label`、`confidence`、`applied`、`provider`、`after_message_id`),由接入程序用运行控制凭据 `POST scheduler-decisions` 写入,不是消息,不影响轮次与暂扣;房间视图 `scheduler_decisions` 返回最近 100 条;每条可带 `detail`(独立表 `scheduler_decision_details`,由 `POST scheduler-decisions` 的 `detail` 写入:每个问题的题目说明、选项,以及决策模型选了哪项和各选项概率,最多 4 项、4000 字,不含房间消息摘录,不随备份导出),网页默认折叠,点开才显示“问 / 答”。房间视图另附 `host_arrangements`:由 `discussion_turns` 按同一批创建时间分组得到的主持人安排(不含邀请追加的开场安排,也不含已由智能调度写入决策的那一批),`after_message_id` 取该批之前最新的回答(开场安排前没有回答,取 0,显示在议题卡片下方),网页在该回答后显示与智能调度卡片同样式的“主持人安排:A → B → C”一行,点开才逐条显示专家与主持人写的任务说明(`turns`);没有可跟随的回答(讨论开场)时不显示。不新增表。
229
229
  - 两表都是独立表,D1 重新应用 schema 即可;备份、导入(`after_message_id` 随消息重编号)与删除一并处理。智能调度代主持人执行的写入不新增权限,沿用该主持事件的执行凭据。
@@ -256,8 +256,11 @@ running 状态即使只有 pending 事件,也必须先暂停才能重新启动
256
256
  - **成员**:`room_members` 以 `id` 为稳定主键,`access` 为 `runner`(接入程序投递)、`manual`(成员自行读写)或 `online`(只读、原文代发),`session_mode` 标记是否借用用户正在使用的会话。房主用控制凭据 `POST members` 运行中加入成员,`POST members/ID {action}` 让成员离开(`away`,作废其进行中执行与未投递请求)、请回(`active`,必须提供不同于原凭证的新凭证,旧凭证副本不再有效)或移除(`remove`,保留历史发言)。同一成员凭证不能复用于其他成员或房主;相同凭证与配置的邀请、请回重试返回已有结果。会话续接由本机接入程序负责,服务端不保存会话绑定;唯一例外是手动成员上报的会话:带凭据的请求可带请求头 `X-Discussion-Session` 与 `X-Discussion-Session-Client`,`message post` 也可在正文带 `session_id` 与 `session_client`(CLI 读取 `CLAUDE_CODE_SESSION_ID` 或 `CODEX_THREAD_ID`,取值 `claude` / `codex`),服务端在 `member_sessions` 保存该手动成员最近上报的会话,成员视图以 `reported_session` 暴露。房主用 `POST members/ID {action:"adopt", adapter:"claude", session_id}`(须与上报一致、仅全自动讨论中在场的手动成员)把成员改为 `runner`、`borrowed` 并清除上报,本机接入程序据此接管。两套后端行为一致。
257
257
  - **手动成员注册**:`member_registrations`(`member_id`、`room_id`、`token_hash`、`registered_at`)记录手动成员自己发起的注册,`POST /api/rooms/ID/register` 只接受该成员自己的凭证(房主凭据与他人凭证返回 403),重复调用保留首次时间。记录绑定注册时的凭证哈希:请回换发新凭证后旧记录不再匹配,视图中的 `registered_at` 回到空串,须重新注册。会话 ID 不属于注册内容,仍由 CLI 头部采集进 `member_sessions`;`adopt` 要求已注册。讨论房间的成员视图与自由房间 `free.members` 都带 `registered_at`;新表为独立表,D1 重新应用 schema 即可。
258
258
  - **请求**:用户消息按结构化接收者 `to`(成员名)为每位成员生成一条请求;省略且仅有一位在场成员时默认点名该成员,多位成员时交给主持人(`route`),只有在线成员而没有主持人时只作留言,不广播。网页只从正文中代码与引用之外的 `@成员` 生成 `to`,没有 @ 时省略 `to`。请求状态为 `pending`(待投递)→ `delivering`(处理中)→ `completed` / `cancelled` / `failed`。
259
+ - **取消原因**:`request_cancel_reasons`(`request_id`、`reason`)是独立侧表,记录请求被取消的原因(`user_stop`、`member_away`、`member_removed`、`rerouted` 智能调度改派或换主持人、`no_reply` 无需回应、`archived` 房间归档),房间视图的每条请求带 `cancel_reason`;此表加入前已取消的请求没有记录,旧库重复执行 schema 即可。归档自由房间会作废其未完成的执行与排队请求;主持人离开、被移出或被更换时,其尚未开始的 `route` 请求由新主持人重新接收。
259
260
  - **执行**:`member_executions` 每位成员最多一个 `dispatched/started`(部分唯一索引),不同成员可并行。接入程序用控制凭据 `GET inbox`、`POST executions {member_id, client_id}`(同一 `client_id` 返回同一执行)把成员的全部待投递请求打包;`POST executions/ID {action}` 支持 `renew`(租约 120 秒,不超过单次执行时限,默认 20 分钟)、`fail`(请求标记失败)和 `release`(仅确认未送达时退回队列)。租约过期的执行在下次读取或领取时标记失败,不自动重发。
260
261
  - **主持人与任务链**:用户是需求方,不担任主持人。只要有在场的非在线成员,房间就保持恰好一位主持人:成员变动时,离开或移出的主持人失去角色,由第一位在场的 runner 成员(没有则手动成员)接任;建房和每条房主消息前也做同样的补位,因此旧房间在下一条消息时自动获得主持人。房主用 `POST members/ID {action:"role", role:"host"}` 更换主持人(在线成员不能担任),把现任主持人改为 `member` 会被拒绝。多位成员时未点名的房主消息生成给主持人的 `route` 请求。主持人的回答可带 `to` 点名其他成员(不能点名自己),这些请求组成一个批次(`free_batches`);批次内全部进入终态后:只有一个请求的批次不再回交(该成员的回答直接面向用户);多个请求的批次只要有一个完成就给主持人生成一次 `handoff` 请求;全部失败则停下该任务链。每条房主消息开启一条任务链(`chain_id` 为该消息编号),链上 AI 发起的请求(派活与回交)最多 8 次,超出即停下(`free_chains`,原因 `budget` / `all_failed`),房主发新消息开启新链。Worker 用同一批次内的集合 SQL 完成回交,回交请求按(派活消息,主持人)唯一,重复执行不会重复唤醒。
262
+ - **发言顺序**:房间视图 `speaking_order`(亦可 `GET speaking-order` 单独读取)在两种模式下给出同一结构:`kind`、`items[{name, state}]`(`done` / `speaking` / `queued` / `idle`,依次为已发言、正在发言、待发言、其余成员)、可调整的 `movable`、房间默认顺序 `default` 与 `revision`。自由协作有未完成的依次点名时 `kind=queue`(`message_id` 为该消息),否则 `kind=default`、全体成员按默认顺序为 `idle`;讨论为 `kind=turns`,由本轮已发言者、当前安排与排队安排组成。房主用控制凭据 `POST speaking-order {revision, order}` 调整:缺 revision 400,已变化 409,`order` 须恰好包含 `movable`(缺少或多出的名字列在 400 中)。`queue` 删除并按新顺序重插该消息尚未请求的 `free_queue` 行;`turns` 在排队安排的 id 之间整体交换内容(专家、问题、提交编号、创建时间),id 顺序即接力顺序,原计划的提交编号仍对应原内容;`default` 写入 `speaking_orders`(成员编号 JSON 数组,未列出者排在后面,主持人在前、其余按编号)。主持人的 `turn roster` 按此顺序列出专家。
263
+ - **依次点名**:房主消息带 `to` 且 `sequential: true`(网页 `@全体依次` / `@all-seq`)时把被点名成员按房间默认顺序写入 `free_queue`,只给第一位建 `ask` 请求(`created_by=user`、`chain_id` 为原消息、不进 `free_batches`)。每次结算批次(回答、失败、打断、离开、租约过期)时,该消息已没有 `pending` / `delivering` 请求就为下一位尚未请求的成员建请求;尚未请求且已不在场的成员被删去。已请求的行保留,供发言顺序显示已发言者。Python 与 Worker 用相同的集合 SQL 推进;`free_queue` 与 `speaking_orders` 不进备份,删除房间时一并清除(独立表,D1 重新应用 schema 即可)。
261
264
  - **智能调度推荐**:接入程序用控制凭据 `POST recommendations {message_id, member_id, provider, confidence}` 为一条已交给主持人(`route`)的未点名消息记录推荐对象(在场的非该主持人成员,含手动与在线成员),写入 `member_recommendations`(每条消息一条,重复提交忽略;独立表,D1 重新应用 schema 即可),有效期 60 秒,主持人的请求不受影响。房主用 `POST recommendations/MESSAGE_ID {action:"adopt", mode}` 采纳:`interrupt` 取消主持人这条请求(已投递则作废主持人本次整个执行),`after` 等主持人这条请求进入终态。两种方式都先置为 `waiting`,由 `release`(采纳时与每次 `inbox` 读取时执行)在主持人请求已终态时为推荐成员建一条 `ask` 请求(`created_by=user`、`chain_id` 为原消息),状态改为 `adopted`。过期 5 秒宽限后采纳返回 409,重复采纳返回原结果。同一入口的 `{action:"all"}` / `{action:"none"}` 不经推荐表:全体把主持人尚未开始的 `route` 请求原地改为 `purpose=all`(每条消息每位成员只有一条请求),并为其余在场成员各建一条 `all` 请求(`created_by=user`、`chain_id` 为原消息、不进 `free_batches`,因此没有 `handoff`);无需回应取消该 `route` 请求;主持人请求已不是 `pending` 时返回 409。主持人本次回答的请求全是 `all` 时,带 `to` 的回答被拒绝(400),避免重复请求其他成员。房间视图 `free.recommendations` 带成员名、状态、方式、置信度与剩余秒数 `expires_in`;备份、导入(仅作历史,不再生效)与删除一并处理。`inbox` 的待投递项带 `purpose` 供接入程序识别。`inbox.members` 只列由本机唤醒的成员;手动与在线成员另列于 `inbox.observers`(含待处理请求,供智能调度识别主持人与推荐对象),接入程序从不向它们投递。
262
265
  - **回应建议**:普通成员新发言的结构化 `to` 与正文在场成员 @ 合并保存到 `member_suggestions`(原消息编号、稳定成员编号),排除自己、代码与引用;不会创建请求。消息读取返回 `suggestions`,包含目标在场状态及已转换的请求编号。房主用 `POST suggestions {message_id,member_id}` 转换:同一事务记录用户确认消息,调用现有建请求路径,`message_id` 保留原回答、`chain_id` 使用用户确认消息编号、`created_by=user`。`UNIQUE(message_id,member_id)` 使重复或并发点击只生成一个请求及一条确认,终态不重新派发。权限、在场状态和未存档条件在写入事务内校验;Worker 使用批次断言。升级须应用包含新表的 schema;Python 重启时自动建表,D1 发布前显式执行。已有历史消息不补写建议。
263
266
  - **讨论中的直接提问**:讨论房间的用户消息带 `to`(点名成员名列表)时,除保存消息外为每位被点名的在场成员建一条 `ask` 请求(`created_by=user`,不入 `free_batches`,不占安排);讨论运行中点名主持人不重复建请求。`GET inbox`、`POST executions` 与 `executions/ID` 对讨论房间同样可用,成员以 `execution_id`(接入程序交付)或 `request_ids`(手动 / 代发)提交 `chat` 回答,走自由房间的写入校验。同一成员的 `member_executions` 与 `discussion_events` 互斥(任一方领取时另一方有进行中则返回 409)。房间视图 `asks` 给出最近请求与执行,供消息旁的状态徽标。本机服务以 `DiscussionWithQuestions`(`runner/discussion_service.mjs`)并行运行讨论 runner 与 `FreeRoomRunner`,共用同一成员会话绑定。
package/docs/cli.md CHANGED
@@ -57,7 +57,7 @@ codiscuss message post ROOM --as 用户 --body "请参考附件" --attachment AT
57
57
 
58
58
  ## 讨论上限参数
59
59
 
60
- `room create` / `room update` 支持 `--max-rounds`、`--max-minutes`、`--execution-minutes`(三者均以 0 表示不限;单次执行默认 0,可设 1–60 分钟)。到限一律暂停,不再有 `--on-limit` / `--summary-minutes`(旧客户端传 `on_limit=pause` 被忽略,传 `summarize` 被拒绝)。未传字段沿用旧值;活动阶段须先暂停才能改上限。`room view` 包含 `limits` 与 `completed_rounds`,`room limits ROOM` 单独读取,`room limits ROOM --check --as 身份 --access-file FILE` 检查并执行到限处理;`room limits ROOM --done --conclusion REV --as 主持人`(REV 来自 `room conclusion ROOM`,未带或过期被拒绝)通知程序目标已完成:暂停并保留现场,不直接收束。检查不会启动 AI,也不代写总结。用户侧追加轮次与重启已收束讨论走 `POST /api/rooms/ROOM/limits`,`action` 为 `extend`(`rounds`)、`reopen`(`max_rounds`、`max_minutes`),仅限用户。
60
+ `room create` / `room update` 支持 `--max-rounds`、`--max-minutes`、`--execution-minutes`(三者均以 0 表示不限;单次执行默认 0,可设 1–60 分钟)。到限一律结束讨论、回到自由协作,不再有 `--on-limit` / `--summary-minutes`(旧客户端传 `on_limit=pause` 被忽略,传 `summarize` 被拒绝)。未传字段沿用旧值;活动阶段须先暂停才能改上限。`room view` 包含 `limits` 与 `completed_rounds`,`room limits ROOM` 单独读取,`room limits ROOM --check --as 身份 --access-file FILE` 检查并执行到限处理;`room limits ROOM --done --conclusion REV --as 主持人`(REV 来自 `room conclusion ROOM`,未带或过期被拒绝)通知程序目标已完成:与到限相同,讨论结束、房间回到自由协作。检查不会启动 AI,也不代写总结。讨论结束时,尚未被主持人回应的用户留言(`held_since` 起、主持人最后一条消息之后、未点名任何人的)按自由协作规则补交给主持人。旧版收束但未回到自由协作的讨论,用户可经 `POST /api/rooms/ROOM/limits`(`action: reopen`,`max_rounds`、`max_minutes`)重启;`extend` 已移除。
61
61
 
62
62
  `run start` 的 `--deadline` 可省略,此时采用房间总时长;房间总时长为 0 时不限总时长。显式传 0 也表示不另设运行期限,仍受话题上限约束;非零值与话题截止取更早值。不限总时长仍受轮次上限、主动设置的单次执行超时及手动停止约束。暂停或重新启动不会重置话题计时;继续前需调整已耗尽的上限。
63
63
 
@@ -126,6 +126,7 @@ codiscuss state view $room
126
126
  | 主持发言 | `message post ROOM --as Codex --kind moderation --body-file FILE --submission-id UUID` |
127
127
  | 在线专家代发 | 被正式安排后,主持人 `message post ROOM --as Codex --author Claude --turn TURN --summary-file SUMMARY --summary-by Claude --body-file FILE --submission-id UUID` |
128
128
  | 整轮安排 | 主持人 `turn roster ROOM` 后 `turn create ROOM --as Codex --plan-file PLAN.json --roster REV --submission-id UUID`;PLAN 为 `[{"expert":"Claude","question":"…"}]`,按顺序接力;多项计划须先 `turn roster ROOM` 取得最新专家状态,把其 `revision` 用 `--roster` 带上,并包含 `waiting` 中的每位专家(主持人除外;尚未注册的手动专家列在 `unregistered`,不在 `waiting` 中,也不能被安排,否则返回 400 并列出名字):未带 revision 返回 400,名单已变化返回 409,缺人返回 400 并列出名字 |
129
+ | 发言顺序 | `turn order ROOM` 读取发言顺序(`items` 的已发言 / 正在发言 / 待发言、可调整的 `movable` 与 `revision`),自由协作与讨论通用;房主凭据 `turn reorder ROOM --revision REV --member A --member B …` 按新顺序列出 `movable` 中的全部成员,已发言与正在发言者不动:未带 revision 返回 400,顺序已变化返回 409,缺少或多出成员返回 400 并列出名字 |
129
130
  | 继续原计划 | 用户介入或打断后,主持人 `turn continue ROOM --as Codex`;改用新安排则排队自动作废 |
130
131
  | 取消安排 | 主持人 `turn cancel ROOM TURN --as Codex` |
131
132
  | 切换阶段 | `room update ROOM --as Codex --phase discussing` |