ai_co_discuss 0.2.48 → 0.2.50

package/backend/runtime.py

@@ -7,8 +7,9 @@ import uuid
 
 LEASE_SECONDS = 120
 MAX_RUN_SECONDS = 86400
-LIMIT_DEFAULTS = {"max_rounds": 0, "max_minutes": 0, "execution_minutes": 0,
-                  "on_limit": "pause", "summary_minutes": 5}
+LIMIT_DEFAULTS = {"max_rounds": 0, "max_minutes": 0, "execution_minutes": 0}
+# Older clients may still send these; reaching a limit always pauses, so only the pause value is accepted and the reserve is ignored.
+LEGACY_LIMIT_FIELDS = ("on_limit", "summary_minutes")
 PUBLIC_EVENT_FIELDS = ("id", "room_id", "run_id", "generation", "cause", "participant",
                        "role", "turn_id", "status", "session_id", "lease_until", "result", "created_at")
 LIMITS_SQL = """SELECT limits.*,COALESCE(pauses.paused_seconds,0)+CASE WHEN COALESCE(pauses.paused_at,0)>0
@@ -39,18 +40,15 @@ def begin_write(connection):
 
 def limit_values(payload, current=None):
     """Validate bounded discussion settings; zero means no round/time preset."""
-    if not isinstance(payload, dict) or set(payload) - set(LIMIT_DEFAULTS):
+    if not isinstance(payload, dict) or set(payload) - set(LIMIT_DEFAULTS) - set(LEGACY_LIMIT_FIELDS):
         raise ValueError("limits 仅接受讨论上限配置字段")
+    if payload.get("on_limit", "pause") != "pause":
+        raise ValueError("到限后只会暂停；需要总结时请主持人在暂停后按你的要求写出")
     result = {key: (current or {}).get(key, value) for key, value in LIMIT_DEFAULTS.items()}
-    result.update(payload)
-    for key, minimum, maximum in (("max_rounds", 0, 100), ("max_minutes", 0, 1440),
-                                  ("execution_minutes", 0, 60), ("summary_minutes", 1, 60)):
+    result.update({key: value for key, value in payload.items() if key in LIMIT_DEFAULTS})
+    for key, minimum, maximum in (("max_rounds", 0, 100), ("max_minutes", 0, 1440), ("execution_minutes", 0, 60)):
         if type(result[key]) is not int or not minimum <= result[key] <= maximum:
             raise ValueError(f"{key} 须为 {minimum}–{maximum} 的整数")
-    if result["on_limit"] not in ("pause", "summarize"):
-        raise ValueError("on_limit 须为 pause 或 summarize")
-    if result["on_limit"] == "summarize" and result["max_minutes"] and result["summary_minutes"] >= result["max_minutes"]:
-        raise ValueError("收束预留时间必须小于讨论总时长")
     return result
 
 
@@ -63,10 +61,6 @@ def limits_view(row, room):
     if room.get("runtime", {}).get("deadline") and (room["runtime"]["status"] == "running" or result["stop_reason"]):
         runtime_deadline = room["runtime"]["deadline"]
         deadline = min(deadline or runtime_deadline, runtime_deadline)
-    if result["closing_at"]:
-        closing_deadline = result["closing_at"] + result["summary_minutes"] * 60
-        deadline = min(deadline or closing_deadline, closing_deadline)
-    cutoff = deadline - result["summary_minutes"] * 60 if deadline and result["on_limit"] == "summarize" and not result["closing_at"] else deadline
     reason = ""
     budget = room.get("round_budget")
     experts = len(room.get("experts") or {})
@@ -78,14 +72,9 @@ def limits_view(row, room):
     round_cap = (budget["cap"] or result["max_rounds"]) if budget else result["max_rounds"]
     if deadline and now >= deadline:
         reason = "time_limit"
-    elif result["closing_at"]:
-        reason = result["stop_reason"]
     elif round_cap and segment_rounds >= round_cap:
         reason = "round_limit"
-    elif cutoff and now >= cutoff:
-        reason = "summary_reserved" if result["on_limit"] == "summarize" else "time_limit"
-    result.update(deadline=deadline, cutoff=cutoff, reached=bool(reason), reason=reason,
-                  closing=bool(result["closing_at"]) and room["phase"] not in ("paused", "concluded"), completed_rounds=room["completed_rounds"],
+    result.update(deadline=deadline, reached=bool(reason), reason=reason, completed_rounds=room["completed_rounds"],
                   segment_rounds=segment_rounds, round_cap=round_cap, extra_rounds=budget["extra"] if budget else 0,
                   remaining_seconds=max(0, deadline - now) if deadline else None,
                   elapsed_seconds=max(0, now - result["started_at"] - idle) if result["started_at"] else 0)
@@ -95,7 +84,7 @@ def limits_view(row, room):
 def require_within_limits(room):
     """Stop new expert work at the configured boundary, preserving user notes."""
     if room["limits"]["reached"]:
-        raise FileExistsError("已达到讨论上限；请检查上限并暂停或由主持人总结")
+        raise FileExistsError("已达到讨论上限；请检查上限并暂停，由用户决定追加轮次或结束")
 
 
 def execution_seconds(connection, room_id):
@@ -191,12 +180,6 @@ def authorize_participant(connection, room_id, identity, operation, payload):
                                     (room_id, author)).fetchone()
         if author != actor and not (online and identity["role"] in ("owner", "host")):
             raise PermissionError("只能提交本人观点，或由房主、主持人代发在线成员原文")
-    elif operation == "floor":
-        speaker = payload.get("speaker", actor)
-        online = connection.execute("SELECT 1 FROM room_members WHERE room_id=? AND name=? AND access='online' AND status='active'",
-                                    (room_id, speaker)).fetchone()
-        if identity["role"] != "owner" and speaker != actor and not (identity["role"] == "host" and online):
-            raise PermissionError("只能操作本人发言权")
     elif operation != "attachments" and identity["role"] != "owner":
         if identity["role"] != "host" or operation not in ("topic", "state", "turns", "limits"):
             raise PermissionError("本成员没有此管理权限")
@@ -235,11 +218,14 @@ def authorize_write(connection, room_id, token, operation, payload):
     if operation == "messages":
         if payload.get("author") != actor:
             raise PermissionError("自动执行不能代发其他参与者")
-        if event["role"] == "expert" and payload.get("turn_id") != event["turn_id"]:
+        if event["role"] == "expert" and payload.get("turn_id") not in (None, event["turn_id"]):
             raise PermissionError("回答必须关联本次安排")
-    elif operation == "floor":
-        if payload.get("speaker", actor) != actor:
-            raise PermissionError("自动执行只能操作本人发言权")
+        if event["role"] == "expert" and payload.get("turn_id") is None:
+            # Without a named arrangement the answer belongs to the expert's open one, which must be this execution's.
+            open_turn = connection.execute("SELECT id FROM discussion_turns WHERE room_id=? AND expert=? AND status IN ('pending','notified')",
+                                           (room_id, actor)).fetchone()
+            if not open_turn or open_turn["id"] != event["turn_id"]:
+                raise PermissionError("回答必须关联本次安排")
     elif operation == "attachments":
         pass
     elif event["role"] != "host" or operation not in ("topic", "state", "turns", "limits"):
@@ -292,10 +278,6 @@ def validate_start(connection, room_id, payload):
     limits = connection.execute(LIMITS_SQL, (room_id,)).fetchone()
     configured = ((limits["started_at"] or int(time.time())) + limits["max_minutes"] * 60 + limits["idle_seconds"]
                   if limits["max_minutes"] else 0)
-    if limits["closing_at"]:
-        closing_deadline = limits["closing_at"] + limits["summary_minutes"] * 60
-        previous_deadline = runtime_view(connection, room_id).get("deadline", 0)
-        configured = min(value for value in (configured, closing_deadline, previous_deadline) if value)
     deadline = payload.get("deadline", configured)
     if type(deadline) is int and configured:
         deadline = min(deadline or configured, configured)
@@ -379,6 +361,10 @@ def reserve_event(connection, event, payload):
     if connection.execute("SELECT 1 FROM discussion_events WHERE room_id=? AND status IN ('dispatched','started')",
                           (event["room_id"],)).fetchone():
         raise FileExistsError("已有在途执行")
+    if connection.execute("""SELECT 1 FROM member_executions JOIN room_members ON room_members.id=member_executions.member_id
+                          WHERE member_executions.room_id=? AND room_members.name=? AND member_executions.status IN ('dispatched','started')""",
+                          (event["room_id"], event["participant"])).fetchone():
+        raise FileExistsError("该参与者正在回答用户的直接提问；同一会话不并发续接")
     connection.execute("UPDATE discussion_events SET status='dispatched',token_hash=? WHERE id=?", (hashed, event["id"]))
     if event["role"] == "host":
         connection.execute("UPDATE discussion_events SET status='completed',result=? WHERE room_id=? AND role='host' AND status='pending' AND id<?",

package/backend/schema.sql

@@ -144,27 +144,9 @@ CREATE TABLE IF NOT EXISTS room_floor (
     next_speaker TEXT NOT NULL,
     revision INTEGER NOT NULL DEFAULT 0
 );
-INSERT OR IGNORE INTO room_floor (room_id,holder,next_speaker)
-    SELECT rooms.id,CASE WHEN turns.id IS NULL THEN COALESCE(settings.host,'用户') END,
-        COALESCE(turns.expert,settings.host,'用户')
-    FROM rooms LEFT JOIN topic_settings AS settings ON settings.room_id=rooms.id
-    LEFT JOIN discussion_turns AS turns ON turns.room_id=rooms.id AND turns.status IN ('pending','notified');
-CREATE TRIGGER IF NOT EXISTS initialize_room_floor AFTER INSERT ON topic_settings
-BEGIN
-    INSERT INTO room_floor (room_id,holder,next_speaker) VALUES (NEW.room_id,NEW.host,NEW.host)
-        ON CONFLICT(room_id) DO UPDATE SET
-        holder=CASE WHEN holder='用户' THEN NEW.host ELSE holder END,
-        next_speaker=CASE WHEN next_speaker='用户' THEN NEW.host ELSE next_speaker END,
-        revision=revision+1;
-END;
-CREATE TRIGGER IF NOT EXISTS transfer_host_floor AFTER UPDATE OF host ON topic_settings
-WHEN OLD.host<>NEW.host
-BEGIN
-    UPDATE room_floor SET holder=CASE WHEN holder=OLD.host THEN NEW.host ELSE holder END,
-        next_speaker=CASE WHEN next_speaker=OLD.host THEN NEW.host ELSE next_speaker END,
-        revision=revision+1 WHERE room_id=NEW.room_id
-        AND NOT EXISTS (SELECT 1 FROM discussion_turns WHERE room_id=NEW.room_id AND status IN ('pending','notified') AND expert=OLD.host);
-END;
+-- The speaking floor is retired: the table stays only so old databases and backups load, and nothing reads or writes it.
+DROP TRIGGER IF EXISTS initialize_room_floor;
+DROP TRIGGER IF EXISTS transfer_host_floor;
 -- Site administrator account (single user) and its login sessions. Raw tokens and passwords are never stored.
 CREATE TABLE IF NOT EXISTS site_admin (
     id INTEGER PRIMARY KEY CHECK(id=1),
@@ -186,16 +168,12 @@ CREATE TABLE IF NOT EXISTS room_modes (
     mode TEXT NOT NULL CHECK(mode IN ('free','brainstorm')),
     control_hash TEXT NOT NULL DEFAULT ''
 );
--- Replaced on every start so existing databases drop the floor rule for free rooms.
+-- Replaced on every start so existing databases drop every speaking-floor rule.
 DROP TRIGGER IF EXISTS require_message_floor;
-CREATE TRIGGER require_message_floor BEFORE INSERT ON messages
-WHEN NEW.author<>'用户'
-    AND NOT EXISTS (SELECT 1 FROM messages WHERE room_id=NEW.room_id AND submission_id=NEW.submission_id)
-    AND NOT EXISTS (SELECT 1 FROM room_floor WHERE room_id=NEW.room_id AND holder=NEW.author)
-    AND NOT EXISTS (SELECT 1 FROM room_modes WHERE room_id=NEW.room_id AND mode='free')
-BEGIN
-    SELECT RAISE(ABORT, 'floor_required');
-END;
+DROP TRIGGER IF EXISTS return_message_floor;
+DROP TRIGGER IF EXISTS require_host_floor;
+DROP TRIGGER IF EXISTS nominate_expert_floor;
+DROP TRIGGER IF EXISTS cancel_turn_floor;
 CREATE TRIGGER IF NOT EXISTS require_opinion_turn BEFORE INSERT ON message_details
 WHEN NEW.kind='opinion' AND NEW.turn_id IS NULL
     AND NOT EXISTS (SELECT 1 FROM message_details WHERE message_id=NEW.message_id)
@@ -203,35 +181,6 @@ WHEN NEW.kind='opinion' AND NEW.turn_id IS NULL
 BEGIN
     SELECT RAISE(ABORT, 'floor_turn_required');
 END;
-CREATE TRIGGER IF NOT EXISTS return_message_floor AFTER INSERT ON message_details
-WHEN EXISTS (SELECT 1 FROM messages WHERE id=NEW.message_id AND author<>'用户')
-BEGIN
-    UPDATE room_floor SET holder=NULL,
-        next_speaker=COALESCE((SELECT host FROM topic_settings WHERE room_id=room_floor.room_id),'用户'),
-        revision=revision+1 WHERE room_id=(SELECT room_id FROM messages WHERE id=NEW.message_id);
-END;
-DROP TRIGGER IF EXISTS require_host_floor;
--- Queued turns of a round plan are inserted after the first one has already nominated an expert.
-CREATE TRIGGER require_host_floor BEFORE INSERT ON discussion_turns
-WHEN NEW.status<>'queued' AND NOT EXISTS (SELECT 1 FROM discussion_turns WHERE room_id=NEW.room_id AND submission_id=NEW.submission_id)
-    AND NOT EXISTS (SELECT 1 FROM room_floor WHERE room_id=NEW.room_id
-                    AND holder=COALESCE((SELECT host FROM topic_settings WHERE room_id=NEW.room_id),'用户'))
-BEGIN
-    SELECT RAISE(ABORT, 'floor_required');
-END;
-DROP TRIGGER IF EXISTS nominate_expert_floor;
-CREATE TRIGGER nominate_expert_floor AFTER INSERT ON discussion_turns
-WHEN NEW.status<>'queued'
-BEGIN
-    UPDATE room_floor SET holder=NULL,next_speaker=NEW.expert,revision=revision+1 WHERE room_id=NEW.room_id;
-END;
-CREATE TRIGGER IF NOT EXISTS cancel_turn_floor AFTER UPDATE OF status ON discussion_turns
-WHEN NEW.status='cancelled' AND OLD.status<>NEW.status
-BEGIN
-    UPDATE room_floor SET holder=NULL,
-        next_speaker=COALESCE((SELECT host FROM topic_settings WHERE room_id=NEW.room_id),'用户'),
-        revision=revision+1 WHERE room_id=NEW.room_id;
-END;
 
 -- Runtime control is opt-in. Legacy rooms have no runtime row and keep manual entry.
 CREATE TABLE IF NOT EXISTS discussion_limits (
@@ -369,7 +318,6 @@ DROP TRIGGER IF EXISTS relay_turn_promoted;
 CREATE TRIGGER relay_turn_promoted AFTER UPDATE OF status ON discussion_turns
 WHEN OLD.status='queued' AND NEW.status='pending'
 BEGIN
-    UPDATE room_floor SET holder=NULL,next_speaker=NEW.expert,revision=revision+1 WHERE room_id=NEW.room_id;
     UPDATE turn_relay SET held_since=0 WHERE room_id=NEW.room_id
         AND NOT EXISTS(SELECT 1 FROM messages m JOIN discussion_events e ON e.room_id=m.room_id AND e.role='host' AND e.status='started'
         WHERE m.room_id=NEW.room_id AND m.author='用户' AND CAST(strftime('%s',m.created_at) AS INTEGER)>e.started_at);
@@ -679,3 +627,47 @@ CREATE TABLE IF NOT EXISTS room_links (
     parent_id TEXT NOT NULL,
     created_at TEXT NOT NULL
 );
+
+-- A discussion is a switch on a room, not a room type: one thin session per started discussion. Its status mirrors the legacy
+-- topic phase until the phase machinery is retired. Free rooms have none.
+CREATE TABLE IF NOT EXISTS discussion_sessions (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    room_id TEXT NOT NULL REFERENCES rooms(id) ON DELETE CASCADE,
+    goal TEXT NOT NULL,
+    status TEXT NOT NULL DEFAULT 'paused' CHECK(status IN ('active','paused','concluded')),
+    started_message_id INTEGER NOT NULL DEFAULT 0,
+    ended_message_id INTEGER NOT NULL DEFAULT 0,
+    created_at TEXT NOT NULL
+);
+CREATE UNIQUE INDEX IF NOT EXISTS one_open_session ON discussion_sessions(room_id) WHERE status IN ('active','paused');
+-- Rooms that predate sessions: every non-free room with topic settings gets one, mapped from its phase. Safe to repeat.
+INSERT INTO discussion_sessions (room_id,goal,status,started_message_id,ended_message_id,created_at)
+SELECT rooms.id,rooms.goal,
+       CASE WHEN topic_settings.phase='concluded' THEN 'concluded' WHEN topic_settings.phase IN ('preparing','paused') THEN 'paused' ELSE 'active' END,
+       0,CASE WHEN topic_settings.phase='concluded' THEN COALESCE((SELECT MAX(id) FROM messages WHERE room_id=rooms.id),0) ELSE 0 END,rooms.created_at
+FROM rooms JOIN topic_settings ON topic_settings.room_id=rooms.id
+WHERE NOT EXISTS (SELECT 1 FROM room_modes WHERE room_id=rooms.id AND mode='free')
+  AND NOT EXISTS (SELECT 1 FROM discussion_sessions WHERE room_id=rooms.id);
+DROP TRIGGER IF EXISTS session_for_new_discussion;
+CREATE TRIGGER session_for_new_discussion AFTER INSERT ON room_modes
+WHEN NEW.mode='brainstorm' AND NOT EXISTS (SELECT 1 FROM discussion_sessions WHERE room_id=NEW.room_id)
+BEGIN
+    INSERT INTO discussion_sessions (room_id,goal,status,created_at)
+    SELECT rooms.id,rooms.goal,
+           COALESCE((SELECT CASE WHEN phase='concluded' THEN 'concluded' WHEN phase IN ('preparing','paused') THEN 'paused' ELSE 'active' END
+                     FROM topic_settings WHERE room_id=rooms.id),'paused'),rooms.created_at
+    FROM rooms WHERE rooms.id=NEW.room_id;
+END;
+DROP TRIGGER IF EXISTS session_follows_phase_insert;
+CREATE TRIGGER session_follows_phase_insert AFTER INSERT ON topic_settings
+BEGIN
+    UPDATE discussion_sessions SET status=CASE WHEN NEW.phase='concluded' THEN 'concluded' WHEN NEW.phase IN ('preparing','paused') THEN 'paused' ELSE 'active' END
+    WHERE id=(SELECT MAX(id) FROM discussion_sessions WHERE room_id=NEW.room_id);
+END;
+DROP TRIGGER IF EXISTS session_follows_phase;
+CREATE TRIGGER session_follows_phase AFTER UPDATE OF phase ON topic_settings
+BEGIN
+    UPDATE discussion_sessions SET status=CASE WHEN NEW.phase='concluded' THEN 'concluded' WHEN NEW.phase IN ('preparing','paused') THEN 'paused' ELSE 'active' END,
+        ended_message_id=CASE WHEN NEW.phase='concluded' THEN COALESCE((SELECT MAX(id) FROM messages WHERE room_id=NEW.room_id),0) ELSE 0 END
+    WHERE id=(SELECT MAX(id) FROM discussion_sessions WHERE room_id=NEW.room_id);
+END;