@oar-sh/oar 0.9.20 → 0.9.22

package/server/public/app/conversation-group-order.mjs

@@ -211,6 +211,9 @@ export function pageConversationRows(rows, groups = null, { limit = 40, beforeCo
  * match a filter (a group shows when any row matches: its head as context
  * with the matching members, or whole when the head or its name matches).
  *
+ * `keepVisibleId` is the open conversation: a member of a folded group with
+ * that id still shows under its head, as `{ kind: 'member', kept: true }`.
+ *
  * With `emptyGroups`, an owner's group an agent emptied (`keptEmptyAt`, no
  * row here) shows too: a head item without members (`group.empty`), placed
  * by the time it was emptied; under a filter only when its name matches.
@@ -220,8 +223,9 @@ export function arrangeConversationList(rows, groups = null, {
   matches = null,
   groupNameMatches = null,
   emptyGroups = false,
+  keepVisibleId = null,
 } = {}) {
-  const items = arrangeGroupedRows(rows, groups, { isOpen, matches, groupNameMatches });
+  const items = arrangeGroupedRows(rows, groups, { isOpen, matches, groupNameMatches, keepVisibleId: toText(keepVisibleId) });
   if (!emptyGroups || !groups) return items;
   const present = new Set((Array.isArray(rows) ? rows : []).map(rowGroupId).filter(Boolean));
   const entries = typeof groups.entries === 'function' && typeof groups.get === 'function' ? [...groups.entries()] : Object.entries(groups);
@@ -250,7 +254,7 @@ export function arrangeConversationList(rows, groups = null, {
   return out;
 }
 
-function arrangeGroupedRows(rows, groups, { isOpen, matches, groupNameMatches }) {
+function arrangeGroupedRows(rows, groups, { isOpen, matches, groupNameMatches, keepVisibleId = '' }) {
   const ordered = orderConversationRows(rows, groups);
   const activity = groupActivityTimes(ordered);
   const items = [];
@@ -294,6 +298,9 @@ function arrangeGroupedRows(rows, groups, { isOpen, matches, groupNameMatches })
     items.push({ kind: 'head', conversation: headRow, group });
     if (group.open) {
       for (const member of shownMembers) items.push({ kind: 'member', conversation: member, group });
+    } else if (keepVisibleId) {
+      const kept = shownMembers.find((member) => rowId(member) === keepVisibleId);
+      if (kept) items.push({ kind: 'member', conversation: kept, group, kept: true });
     }
   }
   return items;

package/server/public/app/conversation-group-state.mjs

@@ -42,12 +42,24 @@ export function summarizeGroupMembers(states = []) {
 export function groupSummaryText(summary) {
   const count = Number(summary?.count || 0);
   if (!count) return '';
+  const activity = groupActivityText(summary);
+  if (!activity) return groupSessionCountText(count);
+  return `${count} · ${activity}`;
+}
+
+/** "1 waiting for you, 2 running", or "" while nothing waits, runs or failed. */
+export function groupActivityText(summary) {
   const parts = [];
-  if (summary.waiting > 0) parts.push(`${summary.waiting} waiting for you`);
-  if (summary.running > 0) parts.push(`${summary.running} running`);
-  if (summary.error > 0) parts.push(`${summary.error} failed`);
-  if (!parts.length) return `${count} session${count === 1 ? '' : 's'}`;
-  return `${count} · ${parts.join(', ')}`;
+  if (Number(summary?.waiting) > 0) parts.push(`${summary.waiting} waiting for you`);
+  if (Number(summary?.running) > 0) parts.push(`${summary.running} running`);
+  if (Number(summary?.error) > 0) parts.push(`${summary.error} failed`);
+  return parts.join(', ');
+}
+
+/** "1 session", "4 sessions". */
+export function groupSessionCountText(count) {
+  const n = Number(count) || 0;
+  return `${n} session${n === 1 ? '' : 's'}`;
 }
 
 /** Whether a group has something going on: a member runs or waits. */
@@ -55,14 +67,39 @@ export function groupIsActive(summary) {
   return Number(summary?.running || 0) > 0 || Number(summary?.waiting || 0) > 0;
 }
 
+/**
+ * A member's colour in its group's name: 'waiting', 'running', 'ready' (idle
+ * with a live worker, the darker green) or 'offline'. A failed member does
+ * not colour the name; the pill says so.
+ */
+export function memberTone({ memberState = 'idle', visualState = '' } = {}) {
+  if (memberState === 'waiting' || memberState === 'running') return memberState;
+  return String(visualState || '').trim().toLowerCase() === 'ready' ? 'ready' : 'offline';
+}
+
+/**
+ * The colour of a group's name from its members' tones: red while one waits
+ * for the user, bright green while one works, the darker green while one is
+ * ready, else the plain title colour. Returns 'question' | 'working' |
+ * 'ready' | 'offline'.
+ */
+export function groupTitleTone(tones = []) {
+  const list = Array.isArray(tones) ? tones : [];
+  if (list.includes('waiting')) return 'question';
+  if (list.includes('running')) return 'working';
+  if (list.includes('ready')) return 'ready';
+  return 'offline';
+}
+
 /**
  * Open or folded. The user's choice ('open' | 'folded') wins; otherwise a
- * group is open while active and folded once everything is finished. The
- * group that holds the open conversation, and every group under a title
- * filter, is always open.
+ * group is open while active and folded once everything is finished. Every
+ * group under a title filter is always open. A folded group that holds the
+ * open conversation still shows that row (arrangeConversationList's
+ * keepVisibleId).
  */
-export function resolveGroupFold({ choice = null, active = false, holdsOpenConversation = false, filterActive = false } = {}) {
-  if (holdsOpenConversation || filterActive) return true;
+export function resolveGroupFold({ choice = null, active = false, filterActive = false } = {}) {
+  if (filterActive) return true;
   if (choice === 'open') return true;
   if (choice === 'folded') return false;
   return active === true;

package/server/public/app/conversation-origin-ui.js

@@ -6,7 +6,23 @@
 // marker is all there is), and neither has one a person started.
 
 import { conversations, currentConvId, IS_SHARED_VIEW } from './store.js';
-import { renderConversationHeaderOriginHtml } from './remote-relay-origin-view.mjs';
+import { conversationOriginInfo, renderConversationHeaderOriginHtml } from './remote-relay-origin-view.mjs';
+
+/**
+ * The ︙ entry that stands in for the line where the meta line is hidden
+ * (phone landscape): `{ label: 'Started by an agent in “title”',
+ * conversationId }` while the line is a button that opens that conversation,
+ * else null.
+ */
+export function conversationOriginMenuEntry() {
+  if (IS_SHARED_VIEW) return null;
+  const id = String(currentConvId || '').trim();
+  const conversation = id ? (conversations[id] || null) : null;
+  if (!conversation) return null;
+  const info = conversationOriginInfo(conversation, { conversations, linkable: true });
+  if (!info || info.kind !== 'local' || !info.linkable || !info.conversationId) return null;
+  return { label: info.label, conversationId: info.conversationId };
+}
 
 let renderedHtml = '';