@oar-sh/oar 0.9.8 → 0.9.10

package/server/public/app/back-guard.mjs

@@ -0,0 +1,58 @@
+// In the installed app, the system back button with nothing left to go back
+// to closes the app. There is no way for a page to send itself to the
+// background instead, but it can make sure that moment never comes: one
+// entry marked as the floor is kept beneath the app's own entry, and when
+// back lands on the floor the app's entry is pushed again at once. Back
+// still closes the file viewer (which pushes its own entry above); only the
+// last step out is swallowed. A browser tab keeps its back button: this is
+// for the installed app alone.
+
+export const BACK_GUARD_FLOOR = 'oarBackGuardFloor';
+export const BACK_GUARD_APP = 'oarApp';
+const FIRST_INTERACTION_EVENTS = ['pointerdown', 'keydown', 'touchstart'];
+
+/**
+ * Lay the floor at the first touch or key, not at start-up: an entry a page
+ * leaves through pushState before the user has done anything is one the
+ * browser skips on back (its guard against pages that hijack the button),
+ * so a floor laid at start-up would be stepped over. Before the first
+ * interaction nothing a page does keeps back from leaving; from then on
+ * the floor holds.
+ */
+export function armBackGuardOnFirstInteraction({ history, enabled = true, target, onFloor = null } = {}) {
+  if (!enabled || !history || !target) return null;
+  const state = { guard: null };
+  const arm = () => {
+    for (const eventName of FIRST_INTERACTION_EVENTS) target.removeEventListener(eventName, arm, true);
+    if (state.guard) return;
+    state.guard = installBackGuard({ history, enabled: true, onFloor });
+    target.addEventListener('popstate', () => state.guard.onPopState());
+  };
+  for (const eventName of FIRST_INTERACTION_EVENTS) target.addEventListener(eventName, arm, true);
+  return { get armed() { return Boolean(state.guard); } };
+}
+
+/**
+ * `onFloor` is told each time back lands on the floor and is swallowed.
+ * The entry pushed again then is pushed without a touch, so the browser
+ * lets the next back leave unless the user touches the app in between:
+ * one swallowed press, then the app closes — the pattern phones use, and
+ * the moment to say "press back again to close".
+ */
+export function installBackGuard({ history, enabled = true, onFloor = null } = {}) {
+  if (!enabled || !history) return null;
+  const current = history.state && typeof history.state === 'object' ? history.state : {};
+  // After a reload on the app's entry the floor already lies beneath it.
+  if (!current[BACK_GUARD_FLOOR] && !current[BACK_GUARD_APP]) {
+    history.replaceState({ ...current, [BACK_GUARD_FLOOR]: true }, '');
+    history.pushState({ [BACK_GUARD_APP]: true }, '');
+  }
+  return {
+    /** Feed every popstate here. */
+    onPopState() {
+      if (!history.state?.[BACK_GUARD_FLOOR]) return;
+      history.pushState({ [BACK_GUARD_APP]: true }, '');
+      onFloor?.();
+    },
+  };
+}

package/server/public/app/background-tasks-view.mjs

@@ -5,8 +5,12 @@
 // `backgroundTasks` on reload; hidden whenever the set is empty.
 
 import { apiFetch } from './api-client.js';
-import { humanizeModelLabel } from './model-selector-options.mjs';
+import { formatTaskModelLabel, formatTaskTokens } from './task-row-format.mjs';
 import { prefixToolActivityEmoji } from './tool-activity-emoji.mjs';
+
+// Shared with the sub-agent rows (subagent-row.mjs); re-exported for the
+// transcript's finished-workflow card and the existing importers.
+export { formatTaskModelLabel, formatTaskTokens };
 import {
   getPreviewsForConversation,
   renderPreviewRowsInto,
@@ -71,16 +75,6 @@ function taskKindLabel(task) {
   return label === 'Subagent' && subagentType ? subagentType : label;
 }
 
-// "claude-opus-5-5" → "Opus 5.5". A bare alias ("opus") is what a spawn pin
-// carries until the subagent's first answer names the real model.
-export function formatTaskModelLabel(model) {
-  const value = String(model || '').trim();
-  if (!value) return '';
-  if (/^claude-/i.test(value)) return humanizeModelLabel(value);
-  if (/^[a-z]+(\[[^\]]+\])?$/i.test(value)) return value.charAt(0).toUpperCase() + value.slice(1);
-  return humanizeModelLabel(value);
-}
-
 // Detail line: the live tool call when the worker saw one ("🪓 Tool
 // (PowerShell): cd …", cropped to the row by CSS), else the SDK's progress
 // summary, else the bare tool name.
@@ -93,20 +87,6 @@ export function taskActivityText(task) {
   return { text: lastToolName ? `using ${lastToolName}` : '', toolCall: false };
 }
 
-// Compact token counts: "812 tok", "62.2k tok", "1.2M tok". Exported for the
-// transcript's finished-workflow card, which shares the panel's formatting.
-export function formatTaskTokens(totalTokens) {
-  const tokens = Number(totalTokens);
-  if (!Number.isFinite(tokens) || tokens <= 0) return '';
-  if (tokens < 1000) return `${tokens} tok`;
-  if (tokens < 1_000_000) {
-    const thousands = tokens / 1000;
-    return `${thousands >= 100 ? Math.round(thousands) : thousands.toFixed(1)}k tok`;
-  }
-  const millions = tokens / 1_000_000;
-  return `${millions >= 100 ? Math.round(millions) : millions.toFixed(1)}M tok`;
-}
-
 function escHtml(value) {
   return String(value ?? '').replace(/[&<>"']/g, (ch) => ({
     '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;',
@@ -377,6 +357,16 @@ async function stopBackgroundTask(conversationId, taskId) {
   }
 }
 
+// A sub-agent task opens its record in the viewer: the task's spawning
+// tool_use id is the run's id. Bash tasks, monitors and workflows have no
+// record, and Copilot's tasks carry no run id.
+export function subagentRunIdForTask(task) {
+  const runId = String(task?.toolUseId || '').trim();
+  if (!runId) return '';
+  const type = String(task?.taskType || '').trim();
+  return type === 'local_agent' || type === 'agent' || type === 'subagent' ? runId : '';
+}
+
 function renderTaskRow(conversationId, task) {
   const key = `${conversationId}:${task.taskId}`;
   const stopping = stopsInFlight.has(key);
@@ -403,7 +393,9 @@ function renderTaskRow(conversationId, task) {
     <div class="bg-task-row" data-task-id="${escHtml(task.taskId)}">
       ${foldButton}<span class="bg-task-icon" title="${escHtml(task.taskType || 'task')}">${taskIcon(task.taskType)}</span>
       <span class="bg-task-main">
-        <span class="bg-task-desc">${escHtml(task.description || task.taskId)}</span>
+        ${subagentRunIdForTask(task)
+          ? `<button type="button" class="subagent-open bg-task-desc" data-subagent-open="${escHtml(subagentRunIdForTask(task))}" title="Open this sub-agent's thoughts, tool calls and reply">${escHtml(task.description || task.taskId)}</button>`
+          : `<span class="bg-task-desc">${escHtml(task.description || task.taskId)}</span>`}
         ${activity.text ? `<span class="bg-task-detail${activity.toolCall ? ' bg-task-toolcall' : ''}" title="${escHtml(activity.text)}">${escHtml(activity.text)}</span>` : ''}
       </span>
       <span class="bg-task-side">