@lelouchhe/webagent 0.8.0 → 0.9.0

package/dist/js/{login.2WA6DTGM.js → login.WMURU4NI.js}

@@ -1 +1 @@
-import{b as r,c as i}from"./chunk.UMQMOGWO.js";import"./chunk.AJZBJBMO.js";localStorage.getItem(r)&&location.replace("/");var s=document.getElementById("login-form"),n=document.getElementById("token-input"),o=document.getElementById("error"),t=document.getElementById("submit-btn");function u(e){o&&(o.textContent=e,o.style.display=e?"block":"none")}s&&n&&t&&(s.addEventListener("submit",e=>{e.preventDefault(),u(""),t.disabled=!0,t.textContent="Verifying\u2026",(async()=>{try{let l=await i(n.value);l.ok?location.replace("/"):u(l.error)}finally{t.disabled=!1,t.textContent="Sign in"}})()}),n.focus());
+import{b as r,c as i}from"./chunk.3CLGCUHW.js";import"./chunk.AJZBJBMO.js";localStorage.getItem(r)&&location.replace("/");var s=document.getElementById("login-form"),n=document.getElementById("token-input"),o=document.getElementById("error"),t=document.getElementById("submit-btn");function u(e){o&&(o.textContent=e,o.style.display=e?"block":"none")}s&&n&&t&&(s.addEventListener("submit",e=>{e.preventDefault(),u(""),t.disabled=!0,t.textContent="Verifying\u2026",(async()=>{try{let l=await i(n.value);l.ok?location.replace("/"):u(l.error)}finally{t.disabled=!1,t.textContent="Sign in"}})()}),n.focus());

package/dist/js/{viewer.CVWXSKJM.js → viewer.GP5VXAUY.js}

@@ -1 +1 @@
-import{b as g,d as h,m as y,o as T,p as C}from"./chunk.CT5WBNGZ.js";import{a as p}from"./chunk.UMQMOGWO.js";import"./chunk.AJZBJBMO.js";var $=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function f(t){return String(t).padStart(2,"0")}function E(t,n){if(!t)return"";let s=new Date(t),i=s.getTime();if(isNaN(i))return"";let l=Math.floor((n.getTime()-i)/1e3);if(l<60)return"just now";let c=Math.floor(l/60);if(c<60)return`${c}m ago`;let o=Math.floor(c/60);if(o<24)return`${o}h ago`;let e=Math.floor(o/24);if(e<7)return`${e}d ago`;let m=s.getUTCFullYear()===n.getUTCFullYear(),r=$[s.getUTCMonth()],a=s.getUTCDate();return m?`${r} ${a}`:`${r} ${a}, ${s.getUTCFullYear()}`}function _(t){if(!t)return"";let n=new Date(t);return isNaN(n.getTime())?"":`${n.getUTCFullYear()}-${f(n.getUTCMonth()+1)}-${f(n.getUTCDate())} ${f(n.getUTCHours())}:${f(n.getUTCMinutes())} UTC`}function S(t){let n=/^\/api\/v1\/sessions\/[^/]+\/attachments\/([A-Za-z0-9._-]+)(?:\?.*)?$/;return s=>{let i=n.exec(s);return i?`/s/${encodeURIComponent(t)}/attachments/${i[1]}`:s}}function w(t){if(typeof t.data=="string")try{return JSON.parse(t.data)}catch{return{}}return t.data}function x(t,n,s,i){if(t.type!=="assistant_message"||n?.type!=="assistant_message"||t.seq!==n.seq+1||!s?.classList.contains("assistant"))return!1;let l=(s.getAttribute("data-raw")??"")+(typeof i.text=="string"?i.text:"");return s.setAttribute("data-raw",l),C(s,l,void 0,!0),g(s),!0}function v(t,n,s){let i=new Set;for(let r of t)if(r.type==="permission_response")try{let a=JSON.parse(r.data);typeof a.requestId=="string"&&i.add(a.requestId)}catch{}let l=new Map,c=new Map,o=null,e=null,m={rewriteAttachmentSrc:S(s),enhanceMarkdown:g,findToolCallEl:r=>l.get(r)??null,findPermissionEl:r=>c.get(r)??null,findBashEl:()=>o,isPermissionResolved:r=>i.has(r),finalAnswerToolText:null};for(let r=0;r<t.length;r++){let a=t[r];if(!y(a.type))continue;let u=w(a),A=r>0?t[r-1]:null,M=n.lastElementChild;if(x(a,A,M,u)){e=null;continue}m.finalAnswerToolText=a.type==="assistant_message"?e:null;let d=T(a.type,u,m);d?(n.appendChild(d),a.type==="tool_call"&&typeof u.id=="string"?l.set(u.id,d):a.type==="permission_request"&&typeof u.requestId=="string"?c.set(u.requestId,d):a.type==="bash_command"&&(o=d)):a.type==="bash_result"&&(o=null),a.type==="tool_call_update"?e=h(typeof u.status=="string"?u.status:"",Array.isArray(u.content)?u.content:void 0):e=null}}async function U(){try{let e=localStorage.getItem("theme")??"auto";document.documentElement.setAttribute("data-theme",e)}catch{}let t=/^\/s\/([A-Za-z0-9_-]{24})(?:[/?#]|$)/.exec(location.pathname);if(!t){document.body.textContent="invalid share URL";return}let n=t[1],s=document.getElementById("session-info"),i=document.getElementById("messages"),l=document.querySelector(".share-footer-author"),c=document.querySelector(".share-footer-meta");if(!i)return;let o;try{let e=await fetch(`/api/v1/shared/${encodeURIComponent(n)}/events`,{headers:{Accept:"application/json"},credentials:"omit"});if(e.status===p.GONE){document.body.innerHTML="<div class='share-gone'>\u6B64\u94FE\u63A5\u5DF2\u64A4\u9500\u6216\u8FC7\u671F\u3002</div>";return}if(!e.ok){document.body.textContent=`error ${e.status}`;return}o=await e.json()}catch(e){document.body.textContent=`failed to load: ${String(e)}`;return}if(document.title=o.share.session_title?`${o.share.session_title} \u2014 shared`:"shared session",s&&(s.textContent=o.share.session_title??"(untitled)"),l){let e=o.share.display_name??"";l.textContent=e?`by ${e}`:""}if(v(o.events,i,n),c){let e=o.share.shared_at??o.share.created_at;c.textContent=E(e,new Date),c instanceof HTMLElement&&(c.title=_(e))}}U();
+import{c as g,e as h,n as y,p as T,q as C}from"./chunk.S5LRNRJI.js";import{a as p}from"./chunk.3CLGCUHW.js";import"./chunk.AJZBJBMO.js";var $=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function f(t){return String(t).padStart(2,"0")}function E(t,n){if(!t)return"";let s=new Date(t),i=s.getTime();if(isNaN(i))return"";let l=Math.floor((n.getTime()-i)/1e3);if(l<60)return"just now";let c=Math.floor(l/60);if(c<60)return`${c}m ago`;let o=Math.floor(c/60);if(o<24)return`${o}h ago`;let e=Math.floor(o/24);if(e<7)return`${e}d ago`;let m=s.getUTCFullYear()===n.getUTCFullYear(),r=$[s.getUTCMonth()],a=s.getUTCDate();return m?`${r} ${a}`:`${r} ${a}, ${s.getUTCFullYear()}`}function _(t){if(!t)return"";let n=new Date(t);return isNaN(n.getTime())?"":`${n.getUTCFullYear()}-${f(n.getUTCMonth()+1)}-${f(n.getUTCDate())} ${f(n.getUTCHours())}:${f(n.getUTCMinutes())} UTC`}function S(t){let n=/^\/api\/v1\/sessions\/[^/]+\/attachments\/([A-Za-z0-9._-]+)(?:\?.*)?$/;return s=>{let i=n.exec(s);return i?`/s/${encodeURIComponent(t)}/attachments/${i[1]}`:s}}function w(t){if(typeof t.data=="string")try{return JSON.parse(t.data)}catch{return{}}return t.data}function x(t,n,s,i){if(t.type!=="assistant_message"||n?.type!=="assistant_message"||t.seq!==n.seq+1||!s?.classList.contains("assistant"))return!1;let l=(s.getAttribute("data-raw")??"")+(typeof i.text=="string"?i.text:"");return s.setAttribute("data-raw",l),C(s,l,void 0,!0),g(s),!0}function v(t,n,s){let i=new Set;for(let r of t)if(r.type==="permission_response")try{let a=JSON.parse(r.data);typeof a.requestId=="string"&&i.add(a.requestId)}catch{}let l=new Map,c=new Map,o=null,e=null,m={rewriteAttachmentSrc:S(s),enhanceMarkdown:g,findToolCallEl:r=>l.get(r)??null,findPermissionEl:r=>c.get(r)??null,findBashEl:()=>o,isPermissionResolved:r=>i.has(r),finalAnswerToolText:null};for(let r=0;r<t.length;r++){let a=t[r];if(!y(a.type))continue;let u=w(a),A=r>0?t[r-1]:null,M=n.lastElementChild;if(x(a,A,M,u)){e=null;continue}m.finalAnswerToolText=a.type==="assistant_message"?e:null;let d=T(a.type,u,m);d?(n.appendChild(d),a.type==="tool_call"&&typeof u.id=="string"?l.set(u.id,d):a.type==="permission_request"&&typeof u.requestId=="string"?c.set(u.requestId,d):a.type==="bash_command"&&(o=d)):a.type==="bash_result"&&(o=null),a.type==="tool_call_update"?e=h(typeof u.status=="string"?u.status:"",Array.isArray(u.content)?u.content:void 0):e=null}}async function U(){try{let e=localStorage.getItem("theme")??"auto";document.documentElement.setAttribute("data-theme",e)}catch{}let t=/^\/s\/([A-Za-z0-9_-]{24})(?:[/?#]|$)/.exec(location.pathname);if(!t){document.body.textContent="invalid share URL";return}let n=t[1],s=document.getElementById("session-info"),i=document.getElementById("messages"),l=document.querySelector(".share-footer-author"),c=document.querySelector(".share-footer-meta");if(!i)return;let o;try{let e=await fetch(`/api/v1/shared/${encodeURIComponent(n)}/events`,{headers:{Accept:"application/json"},credentials:"omit"});if(e.status===p.GONE){document.body.innerHTML="<div class='share-gone'>\u6B64\u94FE\u63A5\u5DF2\u64A4\u9500\u6216\u8FC7\u671F\u3002</div>";return}if(!e.ok){document.body.textContent=`error ${e.status}`;return}o=await e.json()}catch(e){document.body.textContent=`failed to load: ${String(e)}`;return}if(document.title=o.share.session_title?`${o.share.session_title} \u2014 shared`:"shared session",s&&(s.textContent=o.share.session_title??"(untitled)"),l){let e=o.share.display_name??"";l.textContent=e?`by ${e}`:""}if(v(o.events,i,n),c){let e=o.share.shared_at??o.share.created_at;c.textContent=E(e,new Date),c instanceof HTMLElement&&(c.title=_(e))}}U();

package/dist/login.html

@@ -17,7 +17,7 @@
       media="(prefers-color-scheme: light)"
     />
     <script src="/theme-init.js"></script>
-    <link rel="stylesheet" href="/styles.00etlpgs.css" />
+    <link rel="stylesheet" href="/styles.00nlhhf3.css" />
   </head>
   <body class="login-page">
     <div class="login-card">
@@ -44,6 +44,6 @@
         <code>webagent --create-token &lt;name&gt;</code> on the server.
       </p>
     </div>
-    <script type="module" src="/js/login.2WA6DTGM.js"></script>
+    <script type="module" src="/js/login.WMURU4NI.js"></script>
   </body>
 </html>

package/dist/share-viewer.html

@@ -16,10 +16,10 @@
       media="(prefers-color-scheme: light)"
     />
     <meta name="robots" content="noindex, nofollow" />
-    <link rel="stylesheet" href="/s/_/styles.00etlpgs.css" />
+    <link rel="stylesheet" href="/s/_/styles.00nlhhf3.css" />
     <link rel="stylesheet" href="/s/_/share-viewer.00gubshk.css" />
-  <link rel="modulepreload" href="/s/_/chunk.CT5WBNGZ.js">
-<link rel="modulepreload" href="/s/_/chunk.UMQMOGWO.js">
+  <link rel="modulepreload" href="/s/_/chunk.S5LRNRJI.js">
+<link rel="modulepreload" href="/s/_/chunk.3CLGCUHW.js">
 <link rel="modulepreload" href="/s/_/chunk.AJZBJBMO.js">
 </head>
   <body class="share-viewer">
@@ -49,6 +49,6 @@
         >
       </div>
     </footer>
-  <script type="module" src="/s/_/viewer.CVWXSKJM.js"></script>
+  <script type="module" src="/s/_/viewer.GP5VXAUY.js"></script>
 </body>
 </html>

package/dist/{styles.00etlpgs.css → styles.00nlhhf3.css}

@@ -165,7 +165,8 @@ body {
   width: 100%;
   text-align: center;
 }
-#theme-btn {
+#theme-btn,
+#file-viewer-close {
   background: transparent;
   border: none;
   color: var(--text-dim);
@@ -174,7 +175,8 @@ body {
   font-family: inherit;
   padding: 2px 6px;
 }
-#theme-btn:hover {
+#theme-btn:hover,
+#file-viewer-close:hover {
   color: var(--text);
 }
 @media (max-width: 640px) {
@@ -748,7 +750,25 @@ body {
 #status-bar::before {
   content: "\200b";
 }
+#status-bar .status-model {
+  flex: 0 0 auto;
+}
+#status-bar .status-separator,
+#status-bar .status-usage {
+  flex: 0 0 auto;
+}
 #status-bar .status-cwd {
+  display: flex;
+  flex: 1 1 auto;
+  min-width: 0;
+  overflow: hidden;
+}
+#status-bar .status-cwd-prefix {
+  flex: 0 0 auto;
+}
+#status-bar .status-cwd-tail {
+  flex: 1 1 auto;
+  min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   direction: rtl;
@@ -990,6 +1010,151 @@ body {
   cursor: default;
 }
 
+/* Read-only file viewer */
+#file-viewer[hidden] {
+  display: none;
+}
+#file-viewer {
+  position: fixed;
+  inset: 0;
+  z-index: 100;
+  min-width: 0;
+  background: var(--bg);
+  color: var(--text);
+  display: flex;
+  flex-direction: column;
+}
+body.file-viewer-open {
+  overflow: hidden;
+}
+.file-viewer-header {
+  min-height: 41px;
+  padding: 6px 16px;
+  background: var(--surface);
+  border-bottom: 1px solid var(--border);
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  font-size: 15px;
+}
+#file-viewer-path {
+  min-width: 0;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  direction: ltr;
+  text-align: left;
+  color: var(--text-dim);
+  font-size: inherit;
+}
+#file-viewer-close {
+  flex: 0 0 auto;
+}
+#file-viewer-notice {
+  flex: 0 0 auto;
+  padding: 6px 14px;
+  border-bottom: 1px solid var(--border);
+  color: var(--yellow);
+  font-size: 13px;
+}
+#file-viewer-notice[hidden] {
+  display: none;
+}
+#file-viewer-content {
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow: auto;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+.file-viewer-markdown {
+  width: 100%;
+  min-height: 100%;
+}
+.file-viewer-image {
+  display: block;
+  max-width: 100%;
+  max-height: 100%;
+  margin: auto;
+  padding: 12px;
+  object-fit: contain;
+}
+.file-viewer-code-scroll {
+  min-height: 100%;
+  min-width: max-content;
+}
+.file-viewer-code-grid {
+  display: grid;
+  grid-template-columns: max-content minmax(max-content, 1fr);
+  width: max-content;
+  min-width: 100%;
+  min-height: 100%;
+}
+.file-viewer-line-numbers,
+.file-viewer-code {
+  margin: 0;
+  padding: 10px 12px;
+  border: 0;
+  border-radius: 0;
+  background: var(--bg);
+  color: var(--text);
+  font:
+    14px/1.55 "SF Mono",
+    "Fira Code",
+    monospace;
+  white-space: pre;
+}
+.file-viewer-line-numbers {
+  position: sticky;
+  left: 0;
+  z-index: 1;
+  padding-right: 8px;
+  background: var(--surface);
+  border-right: 1px solid var(--border);
+  color: var(--text-dim);
+  text-align: right;
+  user-select: none;
+}
+.file-viewer-code {
+  padding-left: 12px;
+}
+.file-viewer-code code,
+.file-viewer-code code.hljs {
+  padding: 0;
+  background: transparent;
+  font: inherit;
+}
+.file-viewer-binary-meta {
+  padding: 18px 14px 10px;
+  color: var(--text-dim);
+  overflow-wrap: anywhere;
+}
+.file-viewer-download {
+  display: inline-flex;
+  min-height: 44px;
+  margin: 0 14px;
+  padding: 8px 12px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius);
+  align-items: center;
+  color: var(--accent);
+  text-decoration: none;
+}
+.file-viewer-download:hover,
+.file-viewer-download:focus-visible {
+  border-color: var(--accent);
+}
+@media (min-width: 1024px) {
+  body.file-viewer-open {
+    padding-right: min(55vw, 800px);
+  }
+  #file-viewer {
+    left: auto;
+    width: min(55vw, 800px);
+    border-left: 1px solid var(--border);
+  }
+}
+
 /* Image attach */
 #attach-preview {
   display: none;

package/lib/agent-key.js

@@ -0,0 +1,6 @@
+export function agentKeyFromCommand(agentCmd) {
+    const key = agentCmd.trim().split(/\s+/, 1)[0];
+    if (!key)
+        throw new Error("ACP agent command is empty");
+    return key;
+}

package/lib/attachments.js

@@ -70,14 +70,51 @@ function looksLikeUtf8Text(buf) {
         if (byte === 0)
             return false;
     }
-    try {
-        const decoder = new TextDecoder("utf-8", { fatal: true });
-        decoder.decode(buf);
-        return true;
-    }
-    catch {
-        return false;
+    return decodesAsUtf8ToleratingTailTruncation(buf);
+}
+/**
+ * Maximum bytes one UTF-8 code point can occupy. A TRAILING code point that
+ * was cut off by the sampling window contributes at most one byte less than
+ * a full character (a complete 4-byte character would decode), so backing up
+ * `MAX_UTF8_CHAR_BYTES - 1` bytes always reaches the preceding boundary.
+ */
+const MAX_UTF8_CHAR_BYTES = 4;
+/**
+ * Whether `buf` decodes cleanly as UTF-8, allowing its FINAL multi-byte
+ * character to be cut off at the buffer end.
+ *
+ * Why the tolerance: sniffMime only receives the first 4096 bytes of a
+ * larger file (the viewer's `SNIFF_BYTES` window in src/files/routes.ts and
+ * the upload-pipeline head). Content dense in multi-byte characters —
+ * Chinese, Japanese, emoji, ... — regularly leaves that window slicing
+ * clean through a character. A strict whole-buffer fatal decode then
+ * misclassifies perfectly valid UTF-8 text as binary, so the viewer
+ * force-downloads it instead of previewing it (real-world regression:
+ * ~100 of the markdown notes under ~/mine/space downloaded instead of
+ * rendering, even though every one of them was valid UTF-8).
+ *
+ * This relaxes ONLY the tail: a truncated trailing code point occupies at
+ * most 3 bytes of the buffer, so backing up at most 3 bytes reaches a
+ * character boundary — and the loop never trims the whole buffer, because an
+ * empty prefix would trivially "decode" and would turn short garbage buffers
+ * into text. NUL bytes and genuinely invalid sequences elsewhere fail every
+ * prefix attempt and still fall through to application/octet-stream — the
+ * "binary stays binary" security posture of the sniff is unchanged.
+ */
+function decodesAsUtf8ToleratingTailTruncation(buf) {
+    for (let end = buf.length; end >= Math.max(1, buf.length - (MAX_UTF8_CHAR_BYTES - 1)); end--) {
+        try {
+            // Fresh decoder per attempt: reuse-after-throw is not part of the
+            // TextDecoder contract across implementations.
+            new TextDecoder("utf-8", { fatal: true }).decode(buf.subarray(0, end));
+            return true;
+        }
+        catch {
+            // Cut deeper into the tail. Only a trailing truncated character can
+            // make a later attempt succeed — real corruption fails all of them.
+        }
     }
+    return false;
 }
 /**
  * Mimes we are willing to render inline in <img>. Everything else is forced

package/lib/auth-middleware.js

@@ -1,5 +1,6 @@
-// All whitelisted paths must be GETs that read non-sensitive data, or static
-// assets needed before the user can present a token.
+// All whitelisted paths must be GETs that either read non-sensitive data,
+// serve static assets needed before the user can present a token, or enforce
+// independent ticket/HMAC authentication inside their route handler.
 const WHITELIST = [
     // Public probes
     { method: "GET", test: (p) => p === "/api/v1/version" },
@@ -35,6 +36,12 @@ const WHITELIST = [
         method: "GET",
         test: (p) => /^\/api\/v1\/sessions\/[A-Za-z0-9_-]+\/attachments\/[A-Za-z0-9._-]+$/.test(p),
     },
+    // File viewer content — read-only bytes for one confirmed path,
+    // authenticated via HMAC sig+exp query string for the same reason as
+    // image GETs above (media tags / downloads cannot send Authorization
+    // headers). The content handler verifies the signature before serving:
+    // without a valid sig+exp it returns 401, never bytes.
+    { method: "GET", test: (p) => p === "/api/v1/files/content" },
     // --- Share viewer (public read-only snapshots) ---
     // Viewer HTML shell + image proxy + viewer-namespaced static assets
     // (CSS/JS) all live under /s/* — see src/share/routes.ts. The auth gate

package/lib/bridge.js

@@ -3,6 +3,7 @@ import { Writable, Readable } from "node:stream";
 import { EventEmitter } from "node:events";
 import * as acp from "@agentclientprotocol/sdk";
 import { interruptBashProc } from "./session-manager.js";
+import { abbreviateHomePath } from "./home-path.js";
 import { log } from "./log.js";
 const blog = log.scope("bridge");
 export class AgentBridge extends EventEmitter {
@@ -12,16 +13,27 @@ export class AgentBridge extends EventEmitter {
     permissionRequestSessions = new Map();
     silentSessions = new Set(); // Sessions that don't emit events
     silentBuffers = new Map(); // Text buffers for silent sessions
+    pendingNewSessions = 0;
+    unboundNewSessionIds = new Set();
+    pendingSessionUpdates = new Map();
     pendingAborts = new Map();
     deadReason = null;
     stderrTail = "";
     closedProcesses = new WeakSet();
     agentCmd;
+    sessionIds;
     reloading = false;
     attachmentDispatcher = null;
-    constructor(agentCmd) {
+    constructor(agentCmd, sessionIds) {
         super();
         this.agentCmd = agentCmd;
+        this.sessionIds = sessionIds;
+    }
+    agentSessionId(webSessionId) {
+        const id = this.sessionIds.getAgentSessionId(webSessionId);
+        if (!id)
+            throw new Error(`Session is not available for the current agent: ${webSessionId}`);
+        return id;
     }
     /**
      * Inject the dispatcher used to translate client attachment refs into
@@ -99,29 +111,57 @@ export class AgentBridge extends EventEmitter {
     async newSession(cwd, opts) {
         if (!this.conn)
             throw new Error("Not connected");
-        const session = await this.conn.newSession({
-            cwd,
-            mcpServers: [],
-        });
-        const configOptions = (session.configOptions ??
-            []);
-        if (!opts?.silent) {
-            this.emit("event", {
-                type: "session_created",
-                sessionId: session.sessionId,
+        this.pendingNewSessions++;
+        try {
+            const session = await this.conn.newSession({
                 cwd,
-                configOptions,
+                mcpServers: [],
             });
+            if (opts?.silent) {
+                this.pendingSessionUpdates.delete(session.sessionId);
+                this.silentSessions.add(session.sessionId);
+            }
+            else {
+                this.unboundNewSessionIds.add(session.sessionId);
+            }
+            const configOptions = (session.configOptions ??
+                []);
+            return { sessionId: session.sessionId, configOptions };
         }
-        return { sessionId: session.sessionId, configOptions };
+        finally {
+            this.pendingNewSessions--;
+            if (this.pendingNewSessions === 0) {
+                for (const sessionId of this.pendingSessionUpdates.keys()) {
+                    if (!this.unboundNewSessionIds.has(sessionId)) {
+                        this.pendingSessionUpdates.delete(sessionId);
+                        blog.warn("discarded update for unrelated unmapped ACP session", {
+                            sessionId,
+                        });
+                    }
+                }
+            }
+        }
+    }
+    sessionMapped(agentSessionId) {
+        this.unboundNewSessionIds.delete(agentSessionId);
+        const updates = this.pendingSessionUpdates.get(agentSessionId) ?? [];
+        this.pendingSessionUpdates.delete(agentSessionId);
+        for (const update of updates) {
+            void this.handleSessionUpdate({ sessionId: agentSessionId, update });
+        }
+    }
+    discardUnboundSession(agentSessionId) {
+        this.unboundNewSessionIds.delete(agentSessionId);
+        this.pendingSessionUpdates.delete(agentSessionId);
     }
     async loadSession(sessionId, cwd) {
         if (!this.conn)
             throw new Error("Not connected");
+        const agentSessionId = this.agentSessionId(sessionId);
         let session;
         try {
             session = await this.conn.loadSession({
-                sessionId,
+                sessionId: agentSessionId,
                 cwd,
                 mcpServers: [],
             });
@@ -144,6 +184,7 @@ export class AgentBridge extends EventEmitter {
             type: "session_created",
             sessionId,
             cwd,
+            cwdDisplay: abbreviateHomePath(cwd),
             configOptions,
         });
         return { sessionId, configOptions };
@@ -152,7 +193,19 @@ export class AgentBridge extends EventEmitter {
         if (!this.conn)
             throw new Error("Not connected");
         const result = await this.conn.setSessionConfigOption({
-            sessionId,
+            sessionId: this.agentSessionId(sessionId),
+            configId,
+            ...(typeof value === "boolean"
+                ? { type: "boolean", value }
+                : { value }),
+        });
+        return result.configOptions;
+    }
+    async setAgentConfigOption(agentSessionId, configId, value) {
+        if (!this.conn)
+            throw new Error("Not connected");
+        const result = await this.conn.setSessionConfigOption({
+            sessionId: agentSessionId,
             configId,
             ...(typeof value === "boolean"
                 ? { type: "boolean", value }
@@ -196,7 +249,7 @@ export class AgentBridge extends EventEmitter {
             promptParts.push({ type: "text", text });
             const result = (await Promise.race([
                 this.conn.prompt({
-                    sessionId,
+                    sessionId: this.agentSessionId(sessionId),
                     prompt: promptParts,
                 }),
                 abortPromise,
@@ -241,7 +294,10 @@ export class AgentBridge extends EventEmitter {
                 this.denyPermission(requestId);
             }
         }
-        await this.conn?.cancel({ sessionId });
+        await this.conn?.cancel({ sessionId: this.agentSessionId(sessionId) });
+    }
+    async cancelAgentSession(agentSessionId) {
+        await this.conn?.cancel({ sessionId: agentSessionId });
     }
     /**
      * Mark the agent subprocess as dead. Rejects in-flight prompts and emits
@@ -374,6 +430,8 @@ export class AgentBridge extends EventEmitter {
             // 4. Clean up bridge-side silent session state
             this.silentSessions.clear();
             this.silentBuffers.clear();
+            this.unboundNewSessionIds.clear();
+            this.pendingSessionUpdates.clear();
             // 5. Invalidate title service session
             titleService.invalidate();
             // 5. Clear liveSessions so ensureResumed() will re-register on next access
@@ -457,6 +515,10 @@ export class AgentBridge extends EventEmitter {
     }
     // --- ACP Client callbacks ---
     handlePermission(params) {
+        const webSessionId = this.sessionIds.getWebSessionId(params.sessionId);
+        if (!webSessionId) {
+            return Promise.resolve({ outcome: { outcome: "cancelled" } });
+        }
         const requestId = crypto.randomUUID();
         const toolCall = params.toolCall;
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- toolCall may be undefined in practice
@@ -467,11 +529,11 @@ export class AgentBridge extends EventEmitter {
         return new Promise((resolve) => {
             // Register resolver BEFORE emitting, so synchronous auto-approve can find it
             this.permissionResolvers.set(requestId, resolve);
-            this.permissionRequestSessions.set(requestId, params.sessionId);
+            this.permissionRequestSessions.set(requestId, webSessionId);
             this.emit("event", {
                 type: "permission_request",
                 requestId,
-                sessionId: params.sessionId,
+                sessionId: webSessionId,
                 title,
                 toolCallId,
                 options: params.options,
@@ -484,9 +546,23 @@ export class AgentBridge extends EventEmitter {
     }
     handleSessionUpdate(params) {
         const update = params.update;
-        const sessionId = params.sessionId;
-        if (this.silentSessions.has(sessionId)) {
-            this.captureSilentText(sessionId, update);
+        const agentSessionId = params.sessionId;
+        if (this.silentSessions.has(agentSessionId)) {
+            this.captureSilentText(agentSessionId, update);
+            return Promise.resolve();
+        }
+        const sessionId = this.sessionIds.getWebSessionId(agentSessionId);
+        if (!sessionId) {
+            if (this.pendingNewSessions > 0 ||
+                this.unboundNewSessionIds.has(agentSessionId)) {
+                const updates = this.pendingSessionUpdates.get(agentSessionId) ?? [];
+                updates.push(update);
+                this.pendingSessionUpdates.set(agentSessionId, updates);
+                return Promise.resolve();
+            }
+            blog.warn("ignored event for unmapped ACP session", {
+                sessionId: agentSessionId,
+            });
             return Promise.resolve();
         }
         const event = this.sessionUpdateToEvent(sessionId, update);
@@ -528,9 +604,26 @@ export class AgentBridge extends EventEmitter {
                     id: update.toolCallId,
                     status: update.status ?? "",
                     content: (update.content ?? undefined),
+                    ...(typeof update.title === "string" ? { title: update.title } : {}),
+                    ...(typeof update.kind === "string" ? { kind: update.kind } : {}),
+                    ...(update.rawInput ? { rawInput: update.rawInput } : {}),
+                    ...(Object.hasOwn(update, "rawOutput")
+                        ? { rawOutput: update.rawOutput }
+                        : {}),
+                    ...(Array.isArray(update.locations)
+                        ? { locations: update.locations }
+                        : {}),
                 };
             case "plan":
                 return { type: "plan", sessionId, entries: update.entries };
+            case "usage_update":
+                return {
+                    type: "usage_update",
+                    sessionId,
+                    used: update.used,
+                    size: update.size,
+                    cost: update.cost,
+                };
             case "config_option_update":
                 return {
                     type: "config_option_update",

package/lib/event-handler.js

@@ -40,6 +40,17 @@ function handleToolCall(event, sessions, store) {
         rawInput: event.rawInput,
     }, { from_ref: "agent" });
 }
+function handleUsageUpdate(event, sessions) {
+    sessions.state.patch(event.sessionId, {
+        runtime: {
+            contextUsage: {
+                used: event.used,
+                size: event.size,
+                ...(event.cost !== undefined ? { cost: event.cost } : {}),
+            },
+        },
+    });
+}
 function handlePlan(event, sessions, store) {
     sessions.flushBuffers(event.sessionId);
     sessions.state.patch(event.sessionId, {
@@ -177,7 +188,7 @@ function handlePromptDone(event, sessions, store) {
         ...(event.promptId ? { promptId: event.promptId } : {}),
     }, { from_ref: "agent" });
 }
-function handleError(event, sessions) {
+function handleError(event, sessions, store) {
     if (event.sessionId) {
         // Same attribution as a completion: a superseded turn failing late must
         // not end the turn that replaced it. The buffered tail still flushes.
@@ -196,6 +207,10 @@ function handleError(event, sessions) {
         sessions.state.patch(event.sessionId, {
             runtime: { streaming: { assistant: false, thinking: false } },
         });
+        store.saveEvent(event.sessionId, event.type, {
+            message: event.message,
+            ...(event.promptId ? { promptId: event.promptId } : {}),
+        }, { from_ref: "agent" });
     }
 }
 function dispatchAgentEvent(event, sessions, store, bridge, config, sseManager) {
@@ -218,7 +233,15 @@ function dispatchAgentEvent(event, sessions, store, bridge, config, sseManager)
             handleToolCall(event, sessions, store);
             return false;
         case "tool_call_update":
-            store.saveEvent(event.sessionId, event.type, { id: event.id, status: event.status, content: event.content }, { from_ref: "agent" });
+            store.saveEvent(event.sessionId, event.type, {
+                id: event.id,
+                status: event.status,
+                content: event.content,
+                title: event.title,
+                kind: event.kind,
+                rawInput: event.rawInput,
+                locations: event.locations,
+            }, { from_ref: "agent" });
             return false;
         case "plan":
             handlePlan(event, sessions, store);
@@ -229,7 +252,7 @@ function dispatchAgentEvent(event, sessions, store, bridge, config, sseManager)
             handlePromptDone(event, sessions, store);
             return false;
         case "error":
-            handleError(event, sessions);
+            handleError(event, sessions, store);
             return false;
     }
     return false;
@@ -253,6 +276,10 @@ function maybePushNotify(event, pushService) {
     });
 }
 export function handleAgentEvent(event, sessions, store, bridge, config, sseManager, pushService, _clientRegistry) {
+    if (event.type === "usage_update") {
+        handleUsageUpdate(event, sessions);
+        return;
+    }
     if (event.type === "available_commands_update") {
         const snapshot = sessions.updateAgentCommands(event.sessionId, event.commands);
         if (sessions.restoringSessions.has(event.sessionId))
@@ -266,6 +293,7 @@ export function handleAgentEvent(event, sessions, store, bridge, config, sseMana
         }
         sessions.state.clearStreaming();
         sessions.state.clearPlans();
+        sessions.state.clearContextUsage();
         for (const snapshot of sessions.clearAgentCommands()) {
             sseManager.broadcast({
                 type: "available_commands_update",