ai_co_discuss 0.3.31 → 0.3.33

package/backend/free_room.py

@@ -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/package.json

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

package/web/app.js

@@ -361,9 +361,10 @@ async function admin_avatar_from_file(file) {
   } finally { URL.revokeObjectURL(url); }
 }
 
-/** Whether this browser may write as the room owner: its own control credential, or a logged-in administrator session. */
+/** Whether this browser may write as the room owner: its own control credential, a logged-in administrator session, or the
+ *  loopback-only local site, whose server writes as the owner for every visitor (`admin_as_owner`). */
 function has_room_control(room_id) {
-  return Boolean(localStorage.getItem(`discuss-access:${room_id}`) || (state.admin.logged_in && admin_token()));
+  return Boolean(localStorage.getItem(`discuss-access:${room_id}`) || state.admin.local || (state.admin.logged_in && admin_token()));
 }
 
 /** Explain why a management write failed when this browser has neither credential. */
@@ -947,7 +948,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 +965,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 +1003,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;
@@ -3862,8 +3875,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();