@agentdocumentformat/cli 0.7.8 → 0.8.0

package/dist/chunks/{chunk-J74STFKE.mjs → chunk-WX6QCUWI.mjs}

@@ -4,22 +4,24 @@ import { dirname as __adfDirname } from 'node:path';
 const require = __adfCreateRequire(import.meta.url);
 const __filename = __adfFileURLToPath(import.meta.url);
 const __dirname = __adfDirname(__filename);
+import {
+  types_exports
+} from "./chunk-75DC5EWN.mjs";
 import {
   require_jsx_runtime
 } from "./chunk-7CV2SA3H.mjs";
-import {
-  DaemonError,
-  MAIN_LOOP
-} from "./chunk-XNPZBLYL.mjs";
 import {
   cjs
 } from "./chunk-SGUTYISF.mjs";
 import {
   loop_parser_exports
-} from "./chunk-5PO5PKRV.mjs";
+} from "./chunk-4OGZFUKA.mjs";
 import {
   require_react
 } from "./chunk-6GJ4QHRI.mjs";
+import {
+  file_ref_exports
+} from "./chunk-LKFHERRV.mjs";
 import {
   __toESM
 } from "./chunk-M2RX3S2T.mjs";
@@ -27,6 +29,9 @@ import {
 // src/main/tui/state/store.tsx
 var import_react = __toESM(require_react(), 1);
 
+// src/main/tui/api/types.ts
+var shared = cjs(types_exports), MAIN_LOOP = shared.MAIN_LOOP, DaemonError = shared.DaemonError, isCredentialsLocked = shared.isCredentialsLocked, SUPPORTED_CLIENT_API_VERSION = shared.SUPPORTED_CLIENT_API_VERSION;
+
 // src/main/tui/state/tracked.ts
 var TRACKED_PREFIX = "file:";
 function trackedKey(filePath) {
@@ -130,7 +135,14 @@ function reconcileSelection(state, previousSummaries = {}, trackedFresh = !1) {
 }
 
 // src/main/tui/state/transcript.ts
-var MAX_TRANSCRIPT_ITEMS = 2e3, { parseLoopToDisplay } = cjs(loop_parser_exports), localCounter = 0;
+var MAX_TRANSCRIPT_ITEMS = 2e3, { parseLoopToDisplay } = cjs(loop_parser_exports), { attachmentText } = cjs(file_ref_exports);
+function withAttachments(text, attachments) {
+  if (!Array.isArray(attachments) || attachments.length === 0) return text;
+  let lines = attachments.map(attachmentText);
+  return [text, ...lines].filter(Boolean).join(`
+`);
+}
+var localCounter = 0;
 function localId(prefix = "l") {
   return localCounter += 1, `${prefix}:${Date.now().toString(36)}:${localCounter}`;
 }
@@ -151,6 +163,19 @@ function isTaskRef(text) {
     return !1;
   }
 }
+function taskRefId(text) {
+  if (isTaskRef(text))
+    return JSON.parse(text).task_id;
+}
+function unresolvedTasks(items) {
+  let out = [];
+  for (let item of items) {
+    if (item.kind !== "tool" || item.status !== "running" || !item.toolUseId) continue;
+    let taskId = taskRefId(item.taskRef);
+    taskId && out.push({ toolUseId: item.toolUseId, taskId });
+  }
+  return out;
+}
 function askQuestion(input) {
   let q = input && typeof input == "object" ? input.question : void 0;
   return typeof q == "string" ? q : "";
@@ -161,13 +186,13 @@ function historyToItems(entries) {
     let meta = entry.metadata ?? {}, base = { id: `h:${entry.id}`, at: entry.timestamp, seq: typeof meta.seq == "number" ? meta.seq : void 0 };
     switch (entry.type) {
       case "user":
-        items.push({ ...base, kind: "user", text: entry.content, origin: "owner" });
+        items.push({ ...base, kind: "user", text: withAttachments(entry.content, meta.attachments), origin: "owner" });
         break;
       case "trigger":
         items.push({ ...base, kind: "user", text: entry.content, origin: "runtime" });
         break;
       case "context":
-        meta.category === "loop" && typeof meta.fromLoop == "string" ? items.push({ ...base, kind: "user", text: entry.content, origin: "loop", from: meta.fromLoop }) : items.push({ ...base, kind: "context", category: String(meta.category ?? "context"), text: entry.content });
+        meta.category === "loop" && typeof meta.fromLoop == "string" ? items.push({ ...base, kind: "user", text: entry.content, origin: "loop", from: meta.fromLoop }) : meta.category === "runtime" ? items.push({ ...base, kind: "user", text: entry.content, origin: "runtime" }) : items.push({ ...base, kind: "context", category: String(meta.category ?? "context"), text: entry.content });
         break;
       case "compaction":
         items.push({ ...base, kind: "context", category: "compaction", text: entry.content });
@@ -176,7 +201,7 @@ function historyToItems(entries) {
         items.push({ ...base, kind: "error", text: entry.content });
         break;
       case "text":
-        items.push({ ...base, kind: "assistant", text: entry.content, streaming: !1, model: typeof meta.model == "string" ? meta.model : void 0 });
+        items.push({ ...base, kind: "assistant", text: entry.content, streaming: !1, model: typeof meta.model == "string" ? meta.model : void 0, ...meta.interrupted === !0 ? { interrupted: !0 } : {} });
         break;
       case "thinking":
         items.push({ ...base, kind: "thinking", text: entry.content, streaming: !1 });
@@ -196,7 +221,14 @@ function historyToItems(entries) {
       }
       case "tool_result": {
         let useId = typeof meta.tool_use_id == "string" ? meta.tool_use_id : void 0, call = useId ? toolsById.get(useId) : void 0, status = meta.isError ? "error" : "ok";
-        call ? (call.status = status, call.result = entry.content, call.completedAt = entry.timestamp, !meta.isError && isTaskRef(entry.content) && (call.async = !0, call.taskRef = entry.content)) : items.push({ ...base, kind: "tool", toolUseId: useId, name: typeof meta.name == "string" ? meta.name : "tool", input: void 0, status, result: entry.content, completedAt: entry.timestamp });
+        if (call) {
+          if (!meta.isError && isTaskRef(entry.content)) {
+            call.async = !0, call.taskRef = entry.content;
+            break;
+          }
+          call.status = status, call.result = withAttachments(entry.content, meta.attachments), call.completedAt = entry.timestamp;
+        } else
+          items.push({ ...base, kind: "tool", toolUseId: useId, name: typeof meta.name == "string" ? meta.name : "tool", input: void 0, status, result: entry.content, completedAt: entry.timestamp });
         break;
       }
     }
@@ -210,7 +242,7 @@ function mergeHistory(existing, incoming) {
   let history = incoming.map((item) => {
     if (item.kind !== "tool" || item.taskRef === void 0 || !item.toolUseId) return item;
     let live = finished.get(item.toolUseId);
-    return !live || live.result === item.taskRef ? item : { ...item, status: live.status, result: live.result, completedAt: live.completedAt };
+    return live ? { ...item, status: live.status, result: live.result, completedAt: live.completedAt } : item;
   }), historyTools = /* @__PURE__ */ new Set(), historyTexts = /* @__PURE__ */ new Map(), countText = (key) => historyTexts.set(key, (historyTexts.get(key) ?? 0) + 1);
   for (let item of history)
     item.kind === "tool" && item.toolUseId && historyTools.add(item.toolUseId), (item.kind === "user" || item.kind === "assistant" || item.kind === "thinking") && countText(`${item.kind}:${item.text.trim()}`), item.kind === "tool" && item.name === "ask" && countText(`ask:${askQuestion(item.input).trim()}`);
@@ -254,6 +286,9 @@ function finalizeStreaming(items) {
   let changed = !1, next = items.map((item) => (item.kind === "assistant" || item.kind === "thinking") && item.streaming ? (changed = !0, { ...item, streaming: !1 }) : item);
   return changed ? next : items;
 }
+function markInterrupted(items) {
+  return items.map((item) => item.kind === "assistant" && item.streaming ? { ...item, interrupted: !0 } : item);
+}
 function cap(items) {
   return items.length > MAX_TRANSCRIPT_ITEMS ? items.slice(items.length - MAX_TRANSCRIPT_ITEMS) : items;
 }
@@ -332,7 +367,7 @@ function applyEventToItems(items, event) {
       return next[index] = { ...next[index], ...patch }, next;
     }
     case "turn.completed": {
-      let closed = finalizeStreaming(items), content = str(p.content)?.trim();
+      let closed = finalizeStreaming(p.interrupted === !0 && p.partial === !0 ? markInterrupted(items) : items), content = str(p.content)?.trim();
       if (!content) return closed;
       let lastUser = -1;
       for (let i = closed.length - 1; i >= 0; i--) if (closed[i].kind === "user") {
@@ -346,7 +381,7 @@ function applyEventToItems(items, event) {
       return !taskId || items.some((item) => item.kind === "hil" && item.taskId === taskId) ? items : cap([...finalizeStreaming(items), { id: localId(), at, local: !0, kind: "hil", taskId, tool: str(p.tool) ?? "tool", input: p.input, reason: str(p.reason), status: "pending" }]);
     }
     case "hil.resolved": {
-      let taskId = str(p.task_id) ?? str(p.request_id), index = items.findIndex((item) => item.kind === "hil" && item.taskId === taskId), status = p.approved === !0 ? "approved" : "denied";
+      let taskId = str(p.task_id) ?? str(p.request_id), index = items.findIndex((item) => item.kind === "hil" && item.taskId === taskId), status = p.settled === !0 ? "completed" : p.approved === !0 ? "approved" : "denied";
       if (index < 0)
         return cap([...items, { id: localId(), at, local: !0, kind: "notice", level: "info", event: event.event_type, text: `Approval ${taskId ?? ""} ${status}${p.timed_out ? " (timed out)" : ""}` }]);
       let next = items.slice();
@@ -651,10 +686,31 @@ function tuiReducer(state, action) {
       return patchTranscript(state, action.key, () => ({ ...emptyTranscript(), loaded: !0 }));
     case "transcript/idle":
       return patchTranscript(state, action.key, endLive);
+    case "tool/result":
+      return patchTranscript(state, action.key, (t) => {
+        let index = t.items.findIndex((item2) => item2.kind === "tool" && item2.toolUseId === action.toolUseId), item = t.items[index];
+        if (!item || item.kind !== "tool" || item.result === action.result) return t;
+        let items = t.items.slice();
+        return !action.isError && isTaskRef(action.result) ? (items[index] = { ...item, async: !0, taskRef: action.result }, { ...t, items }) : (items[index] = { ...item, result: action.result, status: action.isError ? "error" : "ok", completedAt: item.completedAt ?? Date.now() }, { ...t, items });
+      });
+    case "tool/task":
+      return patchTranscript(state, action.key, (t) => {
+        let index = t.items.findIndex((item2) => item2.kind === "tool" && item2.toolUseId === action.toolUseId), item = t.items[index];
+        if (!item || item.kind !== "tool" || item.status !== "running") return t;
+        let task = action.task, patch;
+        if (!task) patch = { status: "ok", result: item.taskRef };
+        else if (task.status === "completed") patch = { status: "ok", result: task.result ?? "" };
+        else if (task.status === "failed" || task.status === "denied" || task.status === "cancelled") patch = { status: "error", result: task.error ?? task.result ?? task.status };
+        else return t;
+        let items = t.items.slice();
+        return items[index] = { ...item, ...patch, completedAt: task?.completed_at ?? item.at }, { ...t, items };
+      });
     case "event":
-      return applyEvent(state, action.frame.event);
+      return applyEvent(state, action.frame.event, !isSynthetic(action.frame));
     case "events":
-      return action.frames.reduce((next, frame) => applyEvent(next, frame.event), state);
+      return action.frames.reduce((next, frame) => applyEvent(next, frame.event, !isSynthetic(frame)), state);
+    case "activity/note":
+      return { ...state, activity: pushBounded(state.activity, { id: localId("a"), at: Date.now(), agentId: null, loop: MAIN_LOOP, type: action.kind, summary: action.text }, MAX_ACTIVITY) };
     case "viewState/set":
       return { ...state, viewState: { ...state.viewState, [action.view]: action.value } };
     default:
@@ -690,8 +746,11 @@ var TRANSCRIPT_EVENTS = /* @__PURE__ */ new Set([
   "chat.delivered",
   "chat.discarded"
 ]);
-function applyEvent(state, event) {
-  let agentId = event.agent_id ?? null, loop = eventLoop(event), next = {
+function isSynthetic(frame) {
+  return frame.synthetic === !0;
+}
+function applyEvent(state, event, log = !0) {
+  let agentId = event.agent_id ?? null, loop = eventLoop(event), next = log ? {
     ...state,
     activity: pushBounded(state.activity, {
       id: localId("a"),
@@ -702,7 +761,7 @@ function applyEvent(state, event) {
       summary: summarizeEvent(event)
     }, MAX_ACTIVITY),
     lastEvents: pushBounded(state.lastEvents, event, MAX_LAST_EVENTS)
-  };
+  } : state;
   if (!agentId || !next.agents[agentId]) return next;
   let p = event.payload ?? {};
   switch (event.event_type) {
@@ -808,6 +867,49 @@ function num(value) {
   return typeof value == "number" && Number.isFinite(value) ? value : 0;
 }
 
+// src/main/tui/state/client-stream.ts
+var MAIN = "main", NONE = { frames: [] };
+function clientFrameEffects(frame) {
+  if (frame.kind === "umbilical") return { frames: [{ cursor: frame.cursor, event: frame.event }] };
+  if (frame.kind === "push" && frame.topic === "daemon_orphan_hold") {
+    let payload2 = frame.payload;
+    return { frames: [], notice: payload2.holding ? { text: `The daemon stays up because this app is connected: ${payload2.reason}`, level: "warn" } : { text: "The daemon is no longer waiting for this app to close", level: "info" } };
+  }
+  if (frame.kind !== "executor") return NONE;
+  let { event, agentId } = frame, loop = frame.loop ?? event.loop ?? MAIN, payload = event.payload ?? {};
+  switch (event.type) {
+    case "text_delta":
+    case "text_delta_batch":
+    case "thinking_delta":
+    case "thinking_delta_batch": {
+      let text = deltaText(payload);
+      if (!text) return NONE;
+      let kind = event.type.startsWith("thinking") ? "thinking" : "text", delta = {
+        seq: frame.cursor,
+        event_type: "turn.delta",
+        timestamp: event.timestamp,
+        source: `agent:${agentId}`,
+        agent_id: agentId,
+        ...loop !== MAIN ? { loop } : {},
+        payload: { kind, text }
+      };
+      return { frames: [{ cursor: frame.cursor, event: delta, synthetic: !0 }] };
+    }
+    case "tool_call_result": {
+      if (frame.stripped) return NONE;
+      let id = typeof payload.id == "string" ? payload.id : void 0, result = payload.result;
+      return !id || typeof result?.content != "string" ? NONE : { frames: [], toolResult: { agentId, loop, toolUseId: id, result: result.content, isError: result.isError === !0 } };
+    }
+    case "chat_updated":
+      return { frames: [], reload: { agentId, loop } };
+    default:
+      return NONE;
+  }
+}
+function deltaText(payload) {
+  return Array.isArray(payload.deltas) ? payload.deltas.filter((d) => typeof d == "string").join("") : typeof payload.delta == "string" ? payload.delta : typeof payload.text == "string" ? payload.text : "";
+}
+
 // src/main/tui/web/model.ts
 var isRecord = (v) => typeof v == "object" && v !== null && !Array.isArray(v);
 function parseServer(raw) {
@@ -892,13 +994,14 @@ function serverText(server) {
 }
 
 // src/main/tui/state/store.tsx
-var import_jsx_runtime = __toESM(require_jsx_runtime(), 1), REFRESH_DEBOUNCE_MS = 120, WEB_EVENT_DEBOUNCE_MS = 900, RESUME_VERDICT_MS = 1500, WEB_POLL_MS = 2e4, TRACKED_POLL_MS = 15e3, FOLDER_OVERLAY = "fleet.track", PROMPT_PREFILL_KEY = "shell.prompt.prefill", CHAT_VIEW_ID = "chat";
+var import_jsx_runtime = __toESM(require_jsx_runtime(), 1), TUI_MIN_CLIENT_API_VERSION = 1, REFRESH_DEBOUNCE_MS = 120, WEB_EVENT_DEBOUNCE_MS = 900, RESUME_VERDICT_MS = 1500, WEB_POLL_MS = 2e4, TRACKED_POLL_MS = 15e3, FOLDER_OVERLAY = "fleet.track", PROMPT_PREFILL_KEY = "shell.prompt.prefill", CHAT_VIEW_ID = "chat";
 function createTuiStore(options) {
-  let client = options.client, pageSize = options.pageSize ?? 100, state = initialState(client.baseUrl, options.initialView), listeners = /* @__PURE__ */ new Set(), confirmResolvers = /* @__PURE__ */ new Map(), toastTimers = /* @__PURE__ */ new Map(), debounced = /* @__PURE__ */ new Map(), stream = null, webTick = null, trackedTick = null, stopped = !1, needsResync = !1, resumeFallback = null, getState = () => state, dispatch = (action) => {
+  let client = options.client, plain = options.client, current = new WeakSet([client]), pageSize = options.pageSize ?? 100, state = initialState(client.baseUrl, options.initialView), selectionRevision = 0, listeners = /* @__PURE__ */ new Set(), confirmResolvers = /* @__PURE__ */ new Map(), toastTimers = /* @__PURE__ */ new Map(), debounced = /* @__PURE__ */ new Map(), stream = null, sessionId = null, fallbackNoticed = !1, sessionRetry = !1, reopening = !1, focusSent, focusInFlight = !1, focusRetryAt = 0, lastResyncAt = 0, webTick = null, trackedTick = null, stopped = !1, needsResync = !1, resumeFallback = null, getState = () => state, dispatch = (action) => {
     let next = tuiReducer(state, action);
     if (next !== state) {
-      state = next;
+      action.type === "select/agent" && selectionRevision++, state = next;
       for (let listener of listeners) listener();
+      sessionId && desiredFocus() !== focusSent && syncFocus();
     }
   }, subscribe = (listener) => (listeners.add(listener), () => {
     listeners.delete(listener);
@@ -919,9 +1022,21 @@ function createTuiStore(options) {
       err instanceof DaemonError && err.unreachable && dispatch({ type: "daemon/reachable", reachable: !1 }), toast(`${label}: ${describe(err)}`, "error");
       return;
     }
-  }, selectedLoopOf = (agentId) => state.selectedLoop[agentId] ?? MAIN_LOOP, stale = (c) => c !== client, actions = {
+  }, selectedLoopOf = (agentId) => state.selectedLoop[agentId] ?? MAIN_LOOP, stale = (c) => !current.has(c), settleBackgroundTasks = (c, agentId, key) => {
+    for (let { toolUseId, taskId } of unresolvedTasks(state.transcripts[key]?.items ?? []))
+      c.task(agentId, taskId).then(
+        (result) => {
+          stale(c) || dispatch({ type: "tool/task", key, toolUseId, task: result.task });
+        },
+        (err) => {
+          !stale(c) && err instanceof DaemonError && err.status === 404 && dispatch({ type: "tool/task", key, toolUseId, task: null });
+        }
+      );
+  }, useSession = (id) => {
+    client = id ? plain.withClientSession(id) : plain, current.add(client);
+  }, actions = {
     async setDaemonUrl(url, token) {
-      let next = client.withBaseUrl(url, token);
+      let next = plain.withBaseUrl(url, token);
       if (next.baseUrl === client.baseUrl && token === void 0)
         return toast(`Already connected to ${next.baseUrl}`, "info"), !0;
       client.hasToken && !next.hasToken && toast(`Not sending this daemon's token to ${next.baseUrl}; use /url <url> --token <token> if it needs one`, "warn", 6e3), toast(`Checking ${next.baseUrl}\u2026`, "info", 2e3);
@@ -931,9 +1046,9 @@ function createTuiStore(options) {
         return toast(`Not switching: ${next.baseUrl} is not answering (${describe(err)}). Still on ${client.baseUrl}.`, "error"), !1;
       }
       let previous = client.baseUrl;
-      stream?.close(), stream = null;
+      stream?.close(), stream = null, endSession(client);
       for (let timer of debounced.values()) clearTimeout(timer);
-      return debounced.clear(), client = next, dispatch({ type: "daemon/switch", url: next.baseUrl }), toast(`Switched from ${previous} to ${next.baseUrl} \u2014 agents on the old daemon keep running`, "success", 6e3), await start(), !0;
+      return debounced.clear(), client = next, plain = next, current = new WeakSet([next]), dispatch({ type: "daemon/switch", url: next.baseUrl }), toast(`Switched from ${previous} to ${next.baseUrl} \u2014 agents on the old daemon keep running`, "success", 6e3), await start(), !0;
     },
     async refreshAgents() {
       let c = client;
@@ -1051,7 +1166,7 @@ function createTuiStore(options) {
         return toast(`${agent.name}: its identity is password-protected. Load it with /load ${filePath} and unlock it`, "warn", 8e3), null;
       let review = () => (toast(`${agent.name} has not been reviewed on this daemon: review it first`, "warn", 5e3), actions.pushOverlay({ kind: FOLDER_OVERLAY, props: { folder, review: filePath } }), null);
       if (agent.status === "needs_review") return review();
-      let start2 = options2.start ?? !0, c = client;
+      let start2 = options2.start ?? !0, selectionAtStart = selectionRevision, c = client;
       dispatch({ type: "tracked/busy", filePath, busy: "loading" }), dispatch({ type: "tracked/file-error", filePath, error: void 0 });
       let ref;
       try {
@@ -1073,8 +1188,10 @@ function createTuiStore(options) {
       if (dispatch({ type: "tracked/busy", filePath, busy: void 0 }), stale(c)) return null;
       let text = `Loaded ${name}${started}`;
       toast(text, level, 5e3);
-      let wasSelected = state.selectedAgentId === key || state.selectedAgentId === entry.key;
-      return await actions.refreshAgents(), actions.refreshTracked(), (wasSelected || !state.selectedAgentId || isTrackedKey(state.selectedAgentId)) && state.agents[ref.id] && actions.selectAgent(ref.id), actions.notice(ref.id, MAIN_LOOP, text, level === "success" ? "info" : "warn"), ref.id;
+      let selectedBefore = state.selectedAgentId, wasSelected = selectedBefore === key || selectedBefore === entry.key;
+      await actions.refreshAgents(), actions.refreshTracked();
+      let current2 = state.selectedAgentId, untouched = current2 === selectedBefore || current2 === ref.id;
+      return selectionRevision === selectionAtStart && untouched && (wasSelected || !selectedBefore || isTrackedKey(selectedBefore)) && state.agents[ref.id] && actions.selectAgent(ref.id), actions.notice(ref.id, MAIN_LOOP, text, level === "success" ? "info" : "warn"), ref.id;
     },
     selectAgent(agentId) {
       dispatch({ type: "select/agent", agentId }), !isTrackedKey(agentId) && agentId && (actions.ensureTranscript(agentId, selectedLoopOf(agentId)), state.agents[agentId]?.config || actions.loadConfig(agentId));
@@ -1126,7 +1243,8 @@ function createTuiStore(options) {
       dispatch({ type: "transcript/loading", key });
       try {
         let page = await c.loopHistory(agentId, { loop, limit: pageSize });
-        stale(c) || dispatch({ type: "transcript/history", key, entries: page.entries, total: page.total, offset: page.offset, mode: "replace" });
+        if (stale(c)) return;
+        dispatch({ type: "transcript/history", key, entries: page.entries, total: page.total, offset: page.offset, mode: "replace" }), settleBackgroundTasks(c, agentId, key);
       } catch (err) {
         stale(c) || dispatch({ type: "transcript/error", key, error: describe(err) });
       }
@@ -1138,7 +1256,8 @@ function createTuiStore(options) {
       dispatch({ type: "transcript/loading", key });
       try {
         let page = await c.loopHistory(agentId, { loop, limit, offset });
-        stale(c) || dispatch({ type: "transcript/history", key, entries: page.entries, total: page.total, offset: page.offset, mode: "prepend" });
+        if (stale(c)) return;
+        dispatch({ type: "transcript/history", key, entries: page.entries, total: page.total, offset: page.offset, mode: "prepend" }), settleBackgroundTasks(c, agentId, key);
       } catch (err) {
         stale(c) || dispatch({ type: "transcript/error", key, error: describe(err) });
       }
@@ -1223,7 +1342,7 @@ function createTuiStore(options) {
       }
     },
     async logoutSubscription(provider) {
-      let label = provider === "chatgpt" ? "ChatGPT" : "Grok", result = await run(`Sign out of ${label}`, (c) => c.logoutSubscription(provider));
+      let label = { chatgpt: "ChatGPT", grok: "Grok", claude: "Claude" }[provider], result = await run(`Sign out of ${label}`, (c) => c.logoutSubscription(provider));
       return result && toast(`Signed the daemon out of ${label}`, "success"), await actions.refreshAuth(), !!result;
     },
     async refreshWeb() {
@@ -1386,40 +1505,132 @@ function createTuiStore(options) {
     } catch {
       dispatch({ type: "daemon/reachable", reachable: !1 });
     }
-    options.live !== !1 && (stream = client.events({
-      onEvent: onFrame,
-      onState: (info) => {
-        dispatch({ type: "connection", info }), info.state === "reconnecting" && (needsResync = !0, info.error && dispatch({ type: "daemon/reachable", reachable: !1 })), info.state === "open" && info.resumed ? (needsResync = !1, resumeFallback && clearTimeout(resumeFallback), resumeFallback = setTimeout(() => {
-          resumeFallback = null, toast("Reconnected to daemon \u2014 resyncing", "info", 2500), resync();
-        }, RESUME_VERDICT_MS)) : info.state === "open" && needsResync && (needsResync = !1, toast("Connected to daemon", "info", 2500), resync());
-      },
-      onResume: (info) => {
-        if (resumeFallback && (clearTimeout(resumeFallback), resumeFallback = null), info.exact) {
-          toast("Reconnected to daemon \u2014 no events missed", "info", 2500), Promise.all([actions.refreshIdentity(), actions.refreshAuth(), actions.refreshAgents(), actions.refreshWeb()]);
-          return;
-        }
-        toast(info.reason === "epoch_changed" ? "The daemon restarted \u2014 reloading" : "Events were missed while disconnected \u2014 reloading", "warn", 4e3), resync();
-      }
-    }).start(), webTick && clearInterval(webTick), webTick = setInterval(() => {
+    let opening = Promise.resolve();
+    options.live !== !1 && (opening = openStream(), webTick && clearInterval(webTick), webTick = setInterval(() => {
       stopped || actions.refreshWeb();
     }, WEB_POLL_MS), trackedTick && clearInterval(trackedTick), trackedTick = setInterval(() => {
       !stopped && state.daemonReachable !== !1 && actions.refreshTracked();
-    }, TRACKED_POLL_MS)), await Promise.all([actions.refreshIdentity(), actions.refreshAuth(), actions.refreshAgents(), actions.refreshWeb()]), await actions.refreshTracked();
+    }, TRACKED_POLL_MS)), await Promise.all([opening, actions.refreshIdentity(), actions.refreshAuth(), actions.refreshAgents(), actions.refreshWeb()]), await actions.refreshTracked();
+  }
+  function onStreamState(info) {
+    if (dispatch({ type: "connection", info }), info.state === "reconnecting" && (needsResync = !0, info.error && dispatch({ type: "daemon/reachable", reachable: !1 }), sessionId && info.error?.startsWith("HTTP 404") && reopenSession()), info.state === "open" && sessionRetry && !sessionId) {
+      sessionRetry = !1, reopenSession();
+      return;
+    }
+    info.state === "open" && info.resumed ? (needsResync = !1, resumeFallback && clearTimeout(resumeFallback), resumeFallback = setTimeout(() => {
+      resumeFallback = null, toast("Reconnected to daemon \u2014 resyncing", "info", 2500), resync();
+    }, RESUME_VERDICT_MS)) : info.state === "open" && needsResync && (needsResync = !1, toast("Connected to daemon", "info", 2500), resync());
+  }
+  function onStreamResume(info) {
+    if (resumeFallback && (clearTimeout(resumeFallback), resumeFallback = null), info.exact) {
+      toast("Reconnected to daemon \u2014 no events missed", "info", 2500), Promise.all([actions.refreshIdentity(), actions.refreshAuth(), actions.refreshAgents(), actions.refreshWeb()]);
+      return;
+    }
+    toast(info.reason === "epoch_changed" ? "The daemon restarted \u2014 reloading" : "Events were missed while disconnected \u2014 reloading", "warn", 4e3), resync();
+  }
+  function onStreamGap(gap) {
+    Date.now() - lastResyncAt < RESUME_VERDICT_MS || (toast(`${gap.dropped ? `${gap.dropped} live event${gap.dropped === 1 ? " was" : "s were"}` : "Live events were"} dropped \u2014 reloading`, "warn", 4e3), resync());
+  }
+  function onClientFrame(frame) {
+    let effects = clientFrameEffects(frame);
+    for (let envelope of effects.frames) onFrame(envelope);
+    if (effects.toolResult) {
+      flushFrames();
+      let { agentId, loop, toolUseId, result, isError } = effects.toolResult;
+      dispatch({ type: "tool/result", key: transcriptKey(agentId, loop), toolUseId, result, isError });
+    }
+    if (effects.notice && toast(effects.notice.text, effects.notice.level, effects.notice.level === "warn" ? 1e4 : 4e3), effects.reload) {
+      let { agentId, loop } = effects.reload, key = transcriptKey(agentId, loop);
+      state.transcripts[key]?.loaded && debounce(`t:${key}`, () => {
+        actions.loadTranscript(agentId, loop);
+      });
+    }
+  }
+  function noticeFallback(reason) {
+    fallbackNoticed || (fallbackNoticed = !0, dispatch({ type: "activity/note", kind: "client.fallback", text: `Live events over /events: ${reason}. Token streaming follows each agent's umbilical.stream_deltas.` }));
+  }
+  async function openSession(c) {
+    try {
+      let version = (await c.version()).clientApiVersion;
+      if (typeof version != "number" || version < TUI_MIN_CLIENT_API_VERSION || version > SUPPORTED_CLIENT_API_VERSION)
+        return noticeFallback(`the daemon speaks client API ${version}, this app ${TUI_MIN_CLIENT_API_VERSION}-${SUPPORTED_CLIENT_API_VERSION}`), null;
+    } catch (err) {
+      return err instanceof DaemonError && err.unreachable ? (sessionRetry = !0, null) : (noticeFallback(err instanceof DaemonError && err.status === 404 ? "the daemon has no client sessions (an older version)" : `GET /version failed (${describe(err)})`), null);
+    }
+    try {
+      return (await c.createClientSession({ client: "tui", version: options.clientVersion ?? process.env.ADF_VERSION ?? "dev", umbilical: !0 })).sessionId;
+    } catch (err) {
+      return err instanceof DaemonError && err.unreachable ? (sessionRetry = !0, null) : (noticeFallback(err instanceof DaemonError && err.status === 404 ? "the daemon has no client sessions (an older version)" : `opening a client session failed (${describe(err)})`), null);
+    }
+  }
+  async function openStream() {
+    let c = plain, id = options.clientSessions === !1 ? null : await openSession(c);
+    if (stale(c) || stopped) {
+      id && c.endClientSession(id).catch(() => {
+      });
+      return;
+    }
+    sessionId = id, useSession(id), focusSent = void 0, id ? (stream = c.clientSessionEvents(id, { onEvent: onClientFrame, onState: onStreamState, onResume: onStreamResume, onGap: onStreamGap }).start(), syncFocus()) : stream = c.events({ onEvent: onFrame, onState: onStreamState, onResume: onStreamResume }).start();
+  }
+  async function reopenSession() {
+    if (!(reopening || stopped)) {
+      reopening = !0;
+      try {
+        let hadSession = sessionId !== null;
+        if (stream?.close(), stream = null, sessionId = null, useSession(null), await openStream(), stopped) return;
+        hadSession && toast("The daemon no longer had this app's client session \u2014 reopened, reloading", "warn", 4e3), await resync();
+      } finally {
+        reopening = !1;
+      }
+    }
+  }
+  function desiredFocus() {
+    let id = state.selectedAgentId;
+    return state.activeView === CHAT_VIEW_ID && id && !isTrackedKey(id) ? id : null;
+  }
+  async function syncFocus() {
+    if (!sessionId || focusInFlight || Date.now() < focusRetryAt) return;
+    let want = desiredFocus();
+    if (want === focusSent) return;
+    let id = sessionId, c = client;
+    focusInFlight = !0;
+    try {
+      await c.setClientSessionFocus(id, want), sessionId === id && (focusSent = want);
+    } catch {
+      focusRetryAt = Date.now() + 2e3;
+    } finally {
+      focusInFlight = !1;
+    }
+    sessionId === id && desiredFocus() !== focusSent && syncFocus();
+  }
+  function endSession(c) {
+    let id = sessionId;
+    return sessionId = null, c === client && useSession(null), focusSent = void 0, id ? c.endClientSession(id).then(() => {
+    }, () => {
+    }) : Promise.resolve();
   }
   async function resync() {
-    await Promise.all([actions.refreshIdentity(), actions.refreshAuth(), actions.refreshAgents(), actions.refreshWeb()]), actions.refreshTracked();
+    lastResyncAt = Date.now(), await Promise.all([actions.refreshIdentity(), actions.refreshAuth(), actions.refreshAgents(), actions.refreshWeb()]), actions.refreshTracked();
     for (let key of Object.keys(state.transcripts)) {
       let at = key.indexOf("\0"), agentId = key.slice(0, at);
       state.agents[agentId] && state.transcripts[key].loaded && actions.loadTranscript(agentId, key.slice(at + 1));
     }
   }
   function stop() {
-    stopped = !0, stream?.close(), stream = null, resumeFallback && (clearTimeout(resumeFallback), resumeFallback = null), webTick && (clearInterval(webTick), webTick = null), trackedTick && (clearInterval(trackedTick), trackedTick = null), pendingFrames = [];
+    stopped = !0, stream?.close(), stream = null;
+    let ended = endSession(client);
+    resumeFallback && (clearTimeout(resumeFallback), resumeFallback = null), webTick && (clearInterval(webTick), webTick = null), trackedTick && (clearInterval(trackedTick), trackedTick = null), pendingFrames = [];
     for (let timer of toastTimers.values()) clearTimeout(timer);
     for (let timer of debounced.values()) clearTimeout(timer);
     toastTimers.clear(), debounced.clear();
     for (let resolve of confirmResolvers.values()) resolve(!1);
-    confirmResolvers.clear();
+    return confirmResolvers.clear(), ended;
+  }
+  async function close() {
+    let ended = stop(), timer;
+    await Promise.race([ended, new Promise((resolve) => {
+      timer = setTimeout(resolve, 1e3);
+    })]), timer && clearTimeout(timer);
   }
   function resolveConfirm(id, confirmed) {
     let resolve = confirmResolvers.get(id);
@@ -1434,7 +1645,13 @@ function createTuiStore(options) {
     dispatch,
     subscribe,
     start,
-    stop,
+    stop: () => {
+      stop();
+    },
+    close,
+    get liveMode() {
+      return sessionId ? "session" : stream ? "events" : "none";
+    },
     resolveConfirm
   };
 }
@@ -1477,6 +1694,9 @@ function shallowEqual(a, b) {
 }
 
 export {
+  MAIN_LOOP,
+  DaemonError,
+  isCredentialsLocked,
   emptyTranscript,
   isAsyncInput,
   askQuestion,
@@ -1495,6 +1715,7 @@ export {
   SERVER_STOPPED_TEXT,
   serverBadge,
   serverText,
+  TUI_MIN_CLIENT_API_VERSION,
   PROMPT_PREFILL_KEY,
   createTuiStore,
   StoreProvider,