bothouse-dsh 0.1.47 → 0.1.48

package/client/client.js

@@ -1,4 +1,4 @@
-// dsh-client-source-sha256: c6169b4843e9e2e6d885ef37f3a5ee6a3047260c3c6abdb4e3c4c58e93175a1f
+// dsh-client-source-sha256: 4cdb6b6bd9c4f3a8ef008fced3e4c011501f74d835505b158ecc38bde39ca3a8
 // dsh-style-sha256: f5d384a5b03e6c383f622d9f8cb3563fb1695e55146740801d238d6606619709
 window.__ModuleLoader__.load({
  id: "bothouse-dsh",
@@ -104,6 +104,24 @@ const INITIAL = {
 const MAX_BACKOFF_MS = 3e4;
 /** Messages requested per page, both for the first read and for `loadOlder`. */
 const PAGE_SIZE = 100;
+/** Browser storage key holding the channel the owner had open before a reload. */
+const ROOM_KEY = "dsh-collab.room";
+/** Remember the open channel so reopening the panel returns to it instead of the first one. */
+const rememberRoom = (roomId) => {
+	try {
+		globalThis.localStorage?.setItem(ROOM_KEY, String(roomId));
+	} catch (error) {}
+};
+/** Channel id remembered by an earlier visit, or undefined when absent or unreadable. */
+const rememberedRoom = () => {
+	try {
+		const raw = globalThis.localStorage?.getItem(ROOM_KEY);
+		const id = raw === null || raw === void 0 || raw === "" ? NaN : Number(raw);
+		return Number.isInteger(id) ? id : void 0;
+	} catch (error) {
+		return;
+	}
+};
 /** Messages requested per catch-up read after a reconnect. */
 const CATCH_UP_LIMIT = 200;
 /** Status-coded service failure so the panel can tell "not enabled" from "not signed in". */
@@ -319,7 +337,8 @@ function createChannelSource(transport) {
 		try {
 			const state = await request("collab/api/state", { signal: read.controller.signal });
 			if (!current()) return;
-			const roomId = state.rooms.some((r) => r.id === previous.roomId) ? previous.roomId : state.rooms[0]?.id;
+			const remembered = previous.roomId === void 0 ? rememberedRoom() : void 0;
+			const roomId = state.rooms.some((r) => r.id === previous.roomId) ? previous.roomId : state.rooms.some((r) => r.id === remembered) ? remembered : state.rooms[0]?.id;
 			const rows = [];
 			let hasMoreOlder = false;
 			if (roomId !== void 0) {
@@ -391,6 +410,7 @@ function createChannelSource(transport) {
 	};
 	const selectRoom = async (roomId) => {
 		historyEpoch += 1;
+		rememberRoom(roomId);
 		if (roomId !== snapshot.roomId) earlyTasks.clear();
 		const shown = outbox.filter((entry) => entry.roomId === roomId);
 		set(roomId === snapshot.roomId ? {

package/collab/cloudweb.mjs

@@ -52,7 +52,9 @@ export const NOTICE_PREFIXES = ['📬', '✅', '↪', '⏳', '🔄', '⏹', '⏸
 const FOOTER = /(?:^|\n+)\*[^*\n]*·[^*]*\*\s*$/s;
 const BARE_MENTION = '（只 @ 了你，没写内容：看上面的频道消息判断要你做什么；看不出来就问）';
 export const PROGRESS_PREFIX = '__cc_connect_progress_card_v1__:';
-const CARD_STATES = { running: '处理中', completed: '已完成', failed: '失败' };
+// cancelled (#913): a card whose turn was cut without an outcome — a restarted bridge, a
+// cancelled DSH job. page.html styles it like any other card state.
+const CARD_STATES = { running: '处理中', completed: '已完成', failed: '失败', cancelled: '已取消' };
 const RESERVED_IDS = new Set(['user', 'system']);
 const MAX_NAME = 64;
 
@@ -245,9 +247,40 @@ export class CloudWebGateway {
     this.hub.dropDrafts('role', id);
     // ...and its pending permission requests are gone with the old process.
     this.approvals.expireWhere(p => p.meta?.gateway === this && p.meta.bot === id);
+    // ...and the progress cards it already posted would stay 「处理中」 forever: the old
+    // process held the only handle, and the turn it resumes posts a second card (#913).
+    this.closeStaleCards(id);
     return bot;
   }
 
+  /**
+   * #913: close the progress cards a bot left running. A restarted cc-connect keeps no
+   * message ids, so nothing will ever edit those rows again, while its resumed turn posts
+   * a fresh card; the room then shows two 「处理中」 and no way to tell which is alive.
+   * They are closed as 已取消 (page.html already styles that state) and keep their steps,
+   * plus a line saying the turn was cut, so the history stays readable.
+   *
+   * Every card row this member posted is looked at, not the last page of one room: the
+   * room may have carried a hundred messages since (a busy channel, a workshop), and a
+   * running card there must still be closed. Only this member's own rows are touched,
+   * and only rows still `running`: a card the resumed turn reopens by its own handle goes
+   * back to 处理中 on the next frame.
+   */
+  closeStaleCards(memberId) {
+    for (const row of this.hub.store.authorCards('role', memberId)) {
+      let card;
+      try { card = JSON.parse(row.card); } catch { continue; }
+      if (card?.state !== 'running') continue;
+      const note = '⏹ 已中断（桥重启），这一步不会再更新';
+      const brief = typeof card.brief === 'string' && card.brief !== '' ? `${card.brief}\n${note}` : note;
+      // The stored title is already rendered ("CC · 处理中"): swap only its state label,
+      // so the card keeps its agent name.
+      const label = ` · ${CARD_STATES[card.state] ?? ''}`;
+      const agent = typeof card.title === 'string' && card.title.endsWith(label) ? card.title.slice(0, -label.length) : (card.title ?? 'Agent');
+      this.hub.edit(row.id, 'role', memberId, `${row.text}\n${note}`, JSON.stringify({ ...card, state: 'cancelled', title: `${agent} · ${CARD_STATES.cancelled}`, brief }));
+    }
+  }
+
   /** Forward one new channel message to every connected bot except its author. */
   onNew(msg) {
     if (msg.author_kind === 'system' || msg.card !== null || this.bots.size === 0 || this.hub.teamExit?.answerFor(msg)) return;