ai_co_discuss 0.3.30 → 0.3.32

package/backend/free_room.py

@@ -521,7 +521,7 @@ def describe_members(connection, room_id, token, payload):
 
 
 def member_labels(connection, room_id):
-    """The owner's display labels of members by name; only screens use them, never addressing or credentials."""
+    """The owner's display labels of members by name; screens show them and the page turns a user's @label into the member name, never credentials."""
     return {row["name"]: row["label"] for row in connection.execute(
         "SELECT name,label FROM member_labels WHERE room_id=? ORDER BY name", (room_id,))}
 
@@ -1699,6 +1699,8 @@ def execution_action(connection, room_id, execution_id, token, payload):
         connection.execute("""INSERT INTO execution_capabilities (execution_id,room_id,stoppable,progress) VALUES (?,?,?,?)
             ON CONFLICT(execution_id) DO UPDATE SET stoppable=excluded.stoppable,progress=excluded.progress""",
                            (execution_id, room_id, int(payload["stoppable"]), int(payload["progress"])))
+    elif action == "retry":
+        retry_failed(connection, room_id, row)
     elif row["status"] not in ACTIVE:
         raise FileExistsError("执行已结束")
     elif action == "renew":
@@ -1745,11 +1747,35 @@ def execution_action(connection, room_id, execution_id, token, payload):
         # Only for proven non-delivery: the requests return to the queue unchanged.
         finish_execution(connection, execution_id, "cancelled", str(payload.get("reason") or "未送达"), "pending")
     else:
-        raise ValueError("action 须为 renew、fail、release、report、segments、retry_wait、retry_start、retry_now 或 retry_stop")
+        raise ValueError("action 须为 renew、fail、release、report、segments、retry_wait、retry_start、retry_now、retry_stop 或 retry")
     detail = execution_detail(connection, connection.execute("SELECT * FROM member_executions WHERE id=?", (execution_id,)).fetchone())
     return {**detail, "duplicate": duplicate} if action == "stopped" else detail
 
 
+def retry_failed(connection, room_id, execution):
+    """Owner retry of a failed execution: its requests go back to the same member's queue and the runner delivers them anew.
+
+    The failed execution stays as history but no longer carries the requests, so a second retry is refused. A host batch
+    that failed as a whole reopens and its chain resumes, so the host still gets the answer back.
+    """
+    if execution["status"] != "failed":
+        raise FileExistsError("只有失败的执行可以重试")
+    requests = connection.execute("""SELECT id,batch_id,chain_id FROM member_requests r WHERE execution_id=? AND status='failed'
+        AND NOT EXISTS(SELECT 1 FROM session_requests s WHERE s.member_request_id=r.id)""", (execution["id"],)).fetchall()
+    if not requests:
+        raise FileExistsError("这次执行没有可重试的请求：已重试过，或是讨论发言（由主持人重新安排）")
+    if not connection.execute("SELECT 1 FROM room_members WHERE id=? AND status='active'", (execution["member_id"],)).fetchone():
+        raise FileExistsError("该成员已离开或暂离，无法重试")
+    connection.execute(f"UPDATE member_requests SET status='pending',execution_id=NULL WHERE id IN ({','.join('?' * len(requests))})",
+                       [request["id"] for request in requests])
+    for request in requests:
+        batch_id, chain_id = request["batch_id"], request["chain_id"]
+        if batch_id and not connection.execute(
+                "SELECT 1 FROM member_requests WHERE room_id=? AND batch_id=? AND status='completed'", (room_id, batch_id)).fetchone():
+            connection.execute("UPDATE free_batches SET settled=0 WHERE room_id=? AND batch_id=?", (room_id, batch_id))
+            connection.execute("DELETE FROM free_chains WHERE room_id=? AND chain_id=? AND reason='all_failed'", (room_id, chain_id))
+
+
 def owned_member(connection, room_id, member_id, token):
     """Read one member after proving the owner's credential."""
     require_owner(connection, room_id, token)

package/docs/workflow.md

@@ -15,7 +15,7 @@
 
 ## 自由协作房间
 
-- **点名**：`@成员` 后，它在自己的原会话中处理并回复，多位可并行。
+- **点名**：`@成员` 后，它在自己的原会话中处理并回复，多位可并行。用界面上显示的昵称点名即可（如 `@Gemini`），输入 `@` 后从列表选择最方便。
 - **未点名的消息**：交给主持人分派；只有一位成员时直接交给它。
 - **主持人派活**：主持人点名一位成员时，该成员直接回复你；主持人需要接着安排（如做完再交评审）时会要求它做完交回，点名多位时都完成后主持人再汇总。你的一条消息最多让主持人推进 3 轮（主持人派活、成员回答、交回汇总为一轮），建房时在“推进方式”里或建房后在房间页的“协作设置”里调整（1–20 轮）；到上限会停下等你，右栏点“继续”即接着推进。
 - **全体回答**：`@全体成员` 请所有成员各自回答，`@全体依次` 按发言顺序逐个回答。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai_co_discuss",
-  "version": "0.3.30",
+  "version": "0.3.32",
   "bin": {
     "codiscuss": "runner/codiscuss.mjs"
   },

package/web/app.js

@@ -947,7 +947,7 @@ async function refresh_room({ room: read_room = true } = {}) {
   }
   if (state.room && !state.rooms.some((item) => item.id === state.room.id)) return select_room(visible_rooms()[0]?.id);
   if (!state.room || !read_room) {
-    if (!state.room && visible_rooms().length) return select_room(visible_rooms()[0].id);
+    if (!state.room && visible_rooms().length) return select_room(opening_room());
     render_rooms();
     set_connection(true);
     return;
@@ -964,6 +964,17 @@ async function refresh_room({ room: read_room = true } = {}) {
 }
 
 /** Select a room and reset room-specific draft and filter state. */
+// The room last opened in this browser, reopened on the next visit instead of the first in the list.
+const LAST_ROOM_KEY = "ai-codiscuss-last-room";
+
+/** The room to open when none is chosen: the address's room, else the one last opened here, else the first listed. */
+function opening_room() {
+  let last = null;
+  try { last = localStorage.getItem(LAST_ROOM_KEY); } catch { /* Storage may be unavailable. */ }
+  const wanted = [new URLSearchParams(location.search).get("room"), last].find((id) => id && state.rooms.some((room) => room.id === id));
+  return wanted || visible_rooms()[0]?.id;
+}
+
 async function select_room(room_id) {
   state.navigation_version++;
   state.refresh_version++;
@@ -991,6 +1002,7 @@ async function select_room(room_id) {
   cancel_reply();
   select_tab("discussion", { refresh: false });
   history.replaceState(null, "", state.room ? `/?room=${encodeURIComponent(room_id)}` : "/");
+  if (state.room) try { localStorage.setItem(LAST_ROOM_KEY, room_id); } catch { /* Keep working without remembering. */ }
   if (state.room) state.archive_view = Boolean(state.room.archived);
   else {
     element("host-brief-panel").hidden = true;
@@ -1036,10 +1048,13 @@ function message_payload() {
   const members = state.room.free?.members || [];
   const payload = { author: "用户", text, reply_to: state.reply_to, kind: "chat", submitted_by: "用户" };
   const active = members.filter(member => member.status === "active" && (member.access !== "manual" || member.registered_at)).map(member => member.name);
+  // Members are named by the nickname shown on screen (or their name); the request carries the member name.
+  const named_here = mentioned_members(text, active);
+  const mentioned_member = name => named_here.has(name);
   const session = state.room.session;
   const session_live = session && ["active", "paused"].includes(session.status);
   if (session_live) {
-    const direct = active.filter(name => mentioned(text, name));
+    const direct = active.filter(mentioned_member);
     if (direct.length) payload.to = direct;
     return payload;
   }
@@ -1047,7 +1062,7 @@ function message_payload() {
   // @全体依次 or @all-seq has them answer one after another, the host first); without any, the server gives the message to the only member or the host.
   const sequential = mentioned(text, "全体依次") || mentioned(text, "all-seq");
   const everyone = !sequential && (mentioned(text, "全体成员") || mentioned(text, "all"));
-  const named = sequential || everyone ? active : active.filter(name => mentioned(text, name));
+  const named = sequential || everyone ? active : active.filter(mentioned_member);
   if (named.length) payload.to = named;
   if (sequential && named.length) payload.sequential = true;
   if (everyone && named.length) payload.order = "auto";
@@ -1056,6 +1071,32 @@ function message_payload() {
   return payload;
 }
 
+/**
+ * How a member may be @named: by the nickname shown on screen, and always by its member name. A nickname shared with
+ * another member (or equal to another member's name) is ambiguous and is not used, so the member name stays the only way.
+ */
+function mention_handles(name, names) {
+  const nickname = display_name(name);
+  const taken = names.filter(other => other !== name).flatMap(other => [other, display_name(other)]);
+  return nickname && nickname !== name && !taken.includes(nickname) ? [nickname, name] : [name];
+}
+
+/**
+ * The members a text @names, longest handle first: once "@Claude评审" names one member, the shorter "@Claude" inside it
+ * does not also name another (Chinese nicknames have no space after them).
+ */
+function mentioned_members(text, names) {
+  let prose = text.replace(/```[\s\S]*?```/g, "").replace(/`[^`\n]*`/g, "").replace(/^>.*$/gm, "");
+  const handles = names.flatMap(name => mention_handles(name, names).map(handle => ({ name, handle })))
+    .sort((left, right) => right.handle.length - left.handle.length);
+  const found = new Set();
+  for (const { name, handle } of handles) {
+    const pattern = new RegExp(`(^|[\\s(（，,。；;：:])@${handle.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?![\\w-])`, "gu");
+    prose = prose.replace(pattern, (match, lead) => { found.add(name); return lead + " ".repeat(match.length - lead.length); });
+  }
+  return found;
+}
+
 /** Whether plain text (not code or quotes) names a member with @, so a typed mention selects it. */
 function mentioned(text, name) {
   const prose = text.replace(/```[\s\S]*?```/g, "").replace(/`[^`\n]*`/g, "").replace(/^>.*$/gm, "");
@@ -3833,8 +3874,7 @@ async function initialize() {
     const result = computer_rooms_only() && !state.remote_rooms ? { rooms: [] } : await request_json("/api/rooms");
     state.rooms = result.rooms;
     set_folder_directory(result);
-    const requested = new URLSearchParams(location.search).get("room");
-    await select_room(state.rooms.some((room) => room.id === requested) ? requested : visible_rooms()[0]?.id);
+    await select_room(opening_room());
     set_connection(true);
   } catch (error) { set_connection(false); show_toast(error.message, true); }
   start_live_updates();
@@ -4111,7 +4151,7 @@ window.discuss_view = { snapshot: view_snapshot, write_field: write_view_field,
   write_expert: write_view_expert, add_instance: add_view_instance, add_preset: add_preset_instance, platform_of, execute: execute_view_action, theme: change_view_theme,
   admin: { register: register_admin, login: login_admin, logout: logout_admin,
     update_profile: update_admin_profile, avatar_from_file: admin_avatar_from_file, validate: validate_admin_form },
-  request: request_json, rewind_plan, identities: IDENTITIES, display_name, sources: SOURCE_LABELS,
+  request: request_json, rewind_plan, identities: IDENTITIES, display_name, mention_handles, mentioned_members, sources: SOURCE_LABELS,
   set_member_access, set_member_model, allow_denials, set_member_adapter, reload_room_models, limits_label, stop_reason_label, participant_model, participant_files, participant_session_hint, participant_access,
   turn_label, turn_guidance, round_groups, limit_rounds, progress_speaker, brief_meta, max_message_length: MAX_MESSAGE_LENGTH, provenance: message_provenance, format_time };