pi-web-ui 0.13.1 → 0.14.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 xing-shuyin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 xing-shuyin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.zh-CN.md

@@ -157,13 +157,13 @@ pi-web-ui server uninstall             # 彻底移除服务
 
 ## 配置
 
-| 环境变量 | 默认值 | 说明 |
-| --- | --- | --- |
-| `PORT` | `8787` | HTTP/WebSocket 端口 |
-| `PI_WEB_CWD` | 服务端 cwd | 智能体操作的工作区目录（读/编辑/bash/写） |
-| `PI_WEB_DATA_DIR` | `<cwd>/.pi-web` | 每客户端会话目录的存放位置 |
-| `PI_WEB_INLINE_FILE_MAX` | `12288` (12KB) | 小于等于该大小的文本附件直接内联进模型上下文；更大的文件以路径引用方式传入，模型按需用 read 工具读取（小改动省 token） |
-| `PI_CODING_AGENT_DIR` | `~/.pi/agent` | pi 配置目录（auth.json、models.json、skills、extensions） |
+| 环境变量                   | 默认值            | 说明                                                                                                                   |
+| -------------------------- | ----------------- | ---------------------------------------------------------------------------------------------------------------------- |
+| `PORT`                   | `8787`          | HTTP/WebSocket 端口                                                                                                    |
+| `PI_WEB_CWD`             | 服务端 cwd        | 智能体操作的工作区目录（读/编辑/bash/写）                                                                              |
+| `PI_WEB_DATA_DIR`        | `<cwd>/.pi-web` | 每客户端会话目录的存放位置                                                                                             |
+| `PI_WEB_INLINE_FILE_MAX` | `12288` (12KB)  | 小于等于该大小的文本附件直接内联进模型上下文；更大的文件以路径引用方式传入，模型按需用 read 工具读取（小改动省 token） |
+| `PI_CODING_AGENT_DIR`    | `~/.pi/agent`   | pi 配置目录（auth.json、models.json、skills、extensions）                                                              |
 
 示例——让智能体面向某个项目：
 
@@ -265,14 +265,14 @@ server/agent-service.ts   每客户端 ClientSession:
 
 ## 脚本
 
-| 脚本 | 作用 |
-| --- | --- |
-| `npm run dev` | 服务端（tsx watch）+ Vite dev server + WS 代理 |
-| `npm run build` | 类型检查 + 构建前端和服务端 |
-| `npm start` | 运行生产服务端（提供 `web/dist`） |
-| `npm run typecheck` | 双端 `tsc --noEmit` |
-| `node terminal-smoke-test.mjs` | WS 层终端/命令协议测试（先 build） |
-| `node terminal-browser-test.mjs` | 终端视图的无头浏览器 E2E（先 build） |
+| 脚本                               | 作用                                           |
+| ---------------------------------- | ---------------------------------------------- |
+| `npm run dev`                    | 服务端（tsx watch）+ Vite dev server + WS 代理 |
+| `npm run build`                  | 类型检查 + 构建前端和服务端                    |
+| `npm start`                      | 运行生产服务端（提供`web/dist`）             |
+| `npm run typecheck`              | 双端`tsc --noEmit`                           |
+| `node terminal-smoke-test.mjs`   | WS 层终端/命令协议测试（先 build）             |
+| `node terminal-browser-test.mjs` | 终端视图的无头浏览器 E2E（先 build）           |
 
 ## 部署与开机自启
 

package/deploy/com.xingshuyin.pi-web-ui.plist

@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!--
-  pi-web-ui launchd agent — macOS auto-start at login.
-
-  Install:
-    npm i -g pi-web-ui
-    cp deploy/com.xingshuyin.pi-web-ui.plist ~/Library/LaunchAgents/
-    # edit ProgramArguments / WorkingDirectory / PI_WEB_CWD for your setup
-    launchctl load ~/Library/LaunchAgents/com.xingshuyin.pi-web-ui.plist
-    # (or: launchctl bootstrap gui/$(id -u) ~/Library/LaunchAgents/com.xingshuyin.pi-web-ui.plist)
-
-  Find the pi-web-ui binary path with: which pi-web-ui
--->
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>com.xingshuyin.pi-web-ui</string>
-
-  <key>ProgramArguments</key>
-  <array>
-    <string>/usr/local/bin/pi-web-ui</string>
-  </array>
-
-  <key>RunAtLoad</key>
-  <true/>
-
-  <!-- Restart if it crashes -->
-  <key>KeepAlive</key>
-  <true/>
-
-  <key>WorkingDirectory</key>
-  <string>/Users/YOUR_USER</string>
-
-  <key>EnvironmentVariables</key>
-  <dict>
-    <key>PORT</key>
-    <string>8787</string>
-    <key>PI_WEB_CWD</key>
-    <string>/Users/YOUR_USER</string>
-  </dict>
-
-  <key>StandardOutPath</key>
-  <string>/tmp/pi-web-ui.log</string>
-  <key>StandardErrorPath</key>
-  <string>/tmp/pi-web-ui.err</string>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+  pi-web-ui launchd agent — macOS auto-start at login.
+
+  Install:
+    npm i -g pi-web-ui
+    cp deploy/com.xingshuyin.pi-web-ui.plist ~/Library/LaunchAgents/
+    # edit ProgramArguments / WorkingDirectory / PI_WEB_CWD for your setup
+    launchctl load ~/Library/LaunchAgents/com.xingshuyin.pi-web-ui.plist
+    # (or: launchctl bootstrap gui/$(id -u) ~/Library/LaunchAgents/com.xingshuyin.pi-web-ui.plist)
+
+  Find the pi-web-ui binary path with: which pi-web-ui
+-->
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>com.xingshuyin.pi-web-ui</string>
+
+  <key>ProgramArguments</key>
+  <array>
+    <string>/usr/local/bin/pi-web-ui</string>
+  </array>
+
+  <key>RunAtLoad</key>
+  <true/>
+
+  <!-- Restart if it crashes -->
+  <key>KeepAlive</key>
+  <true/>
+
+  <key>WorkingDirectory</key>
+  <string>/Users/YOUR_USER</string>
+
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PORT</key>
+    <string>8787</string>
+    <key>PI_WEB_CWD</key>
+    <string>/Users/YOUR_USER</string>
+  </dict>
+
+  <key>StandardOutPath</key>
+  <string>/tmp/pi-web-ui.log</string>
+  <key>StandardErrorPath</key>
+  <string>/tmp/pi-web-ui.err</string>
+</dict>
+</plist>

package/deploy/pi-web-ui-task.xml

@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-16"?>
-<!--
-  pi-web-ui Task Scheduler task — Windows auto-start at logon.
-
-  The easy way (no admin needed, generates everything for you):
-    npm i -g pi-web-ui
-    pi-web-ui server install --port 8787 --cwd C:\path\to\project
-    pi-web-ui server status | restart | stop | uninstall
-
-  Manual install with this template (edit the paths below first):
-    schtasks /Create /TN "pi-web-ui" /XML pi-web-ui-task.xml /F
-    schtasks /Run /TN "pi-web-ui"
-
-  Notes:
-    - The task runs the PowerShell launcher the CLI generates at
-      %APPDATA%\pi-web-ui\pi-web-ui.ps1 with -WindowStyle Hidden, so the
-      server runs with no black console window (nothing to accidentally
-      close/kill). The ps1 sets PORT/PI_WEB_CWD, cd's to the workspace,
-      launches node, and appends output to %USERPROFILE%\pi-web-ui.log.
-      Preview both generated files with: pi-web-ui server install --print
-    - Save this file as UTF-16 LE (schtasks requires it; the CLI does this
-      automatically when it writes the task XML).
-    - LogonTrigger = starts when you log in, same as a launchd user agent.
-      For boot-start without login, use Docker instead (see README).
--->
-<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
-  <RegistrationInfo>
-    <Description>pi-web-ui — web chat for the pi coding agent (auto-start at logon)</Description>
-  </RegistrationInfo>
-  <Triggers>
-    <LogonTrigger>
-      <Enabled>true</Enabled>
-    </LogonTrigger>
-  </Triggers>
-  <Principals>
-    <Principal id="Author">
-      <LogonType>InteractiveToken</LogonType>
-      <RunLevel>LeastPrivilege</RunLevel>
-    </Principal>
-  </Principals>
-  <Settings>
-    <MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>
-    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
-    <StopIfGoingOnBatteries>false</StopIfGoingOnBatteries>
-    <AllowHardTerminate>true</AllowHardTerminate>
-    <StartWhenAvailable>false</StartWhenAvailable>
-    <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
-    <IdleSettings>
-      <StopOnIdleEnd>false</StopOnIdleEnd>
-      <RestartOnIdle>false</RestartOnIdle>
-    </IdleSettings>
-    <AllowStartOnDemand>true</AllowStartOnDemand>
-    <Enabled>true</Enabled>
-    <Hidden>false</Hidden>
-    <RunOnlyIfIdle>false</RunOnlyIfIdle>
-    <WakeToRun>false</WakeToRun>
-    <ExecutionTimeLimit>PT0S</ExecutionTimeLimit>
-    <Priority>7</Priority>
-    <RestartOnFailure>
-      <Interval>PT1M</Interval>
-      <Count>3</Count>
-    </RestartOnFailure>
-  </Settings>
-  <Actions Context="Author">
-    <Exec>
-      <Command>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</Command>
-      <Arguments>-NoProfile -NonInteractive -ExecutionPolicy Bypass -WindowStyle Hidden -File "%APPDATA%\pi-web-ui\pi-web-ui.ps1"</Arguments>
-      <WorkingDirectory>%USERPROFILE%</WorkingDirectory>
-    </Exec>
-  </Actions>
-</Task>
+<?xml version="1.0" encoding="UTF-16"?>
+<!--
+  pi-web-ui Task Scheduler task — Windows auto-start at logon.
+
+  The easy way (no admin needed, generates everything for you):
+    npm i -g pi-web-ui
+    pi-web-ui server install --port 8787 --cwd C:\path\to\project
+    pi-web-ui server status | restart | stop | uninstall
+
+  Manual install with this template (edit the paths below first):
+    schtasks /Create /TN "pi-web-ui" /XML pi-web-ui-task.xml /F
+    schtasks /Run /TN "pi-web-ui"
+
+  Notes:
+    - The task runs the PowerShell launcher the CLI generates at
+      %APPDATA%\pi-web-ui\pi-web-ui.ps1 with -WindowStyle Hidden, so the
+      server runs with no black console window (nothing to accidentally
+      close/kill). The ps1 sets PORT/PI_WEB_CWD, cd's to the workspace,
+      launches node, and appends output to %USERPROFILE%\pi-web-ui.log.
+      Preview both generated files with: pi-web-ui server install --print
+    - Save this file as UTF-16 LE (schtasks requires it; the CLI does this
+      automatically when it writes the task XML).
+    - LogonTrigger = starts when you log in, same as a launchd user agent.
+      For boot-start without login, use Docker instead (see README).
+-->
+<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
+  <RegistrationInfo>
+    <Description>pi-web-ui — web chat for the pi coding agent (auto-start at logon)</Description>
+  </RegistrationInfo>
+  <Triggers>
+    <LogonTrigger>
+      <Enabled>true</Enabled>
+    </LogonTrigger>
+  </Triggers>
+  <Principals>
+    <Principal id="Author">
+      <LogonType>InteractiveToken</LogonType>
+      <RunLevel>LeastPrivilege</RunLevel>
+    </Principal>
+  </Principals>
+  <Settings>
+    <MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>
+    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
+    <StopIfGoingOnBatteries>false</StopIfGoingOnBatteries>
+    <AllowHardTerminate>true</AllowHardTerminate>
+    <StartWhenAvailable>false</StartWhenAvailable>
+    <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
+    <IdleSettings>
+      <StopOnIdleEnd>false</StopOnIdleEnd>
+      <RestartOnIdle>false</RestartOnIdle>
+    </IdleSettings>
+    <AllowStartOnDemand>true</AllowStartOnDemand>
+    <Enabled>true</Enabled>
+    <Hidden>false</Hidden>
+    <RunOnlyIfIdle>false</RunOnlyIfIdle>
+    <WakeToRun>false</WakeToRun>
+    <ExecutionTimeLimit>PT0S</ExecutionTimeLimit>
+    <Priority>7</Priority>
+    <RestartOnFailure>
+      <Interval>PT1M</Interval>
+      <Count>3</Count>
+    </RestartOnFailure>
+  </Settings>
+  <Actions Context="Author">
+    <Exec>
+      <Command>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</Command>
+      <Arguments>-NoProfile -NonInteractive -ExecutionPolicy Bypass -WindowStyle Hidden -File "%APPDATA%\pi-web-ui\pi-web-ui.ps1"</Arguments>
+      <WorkingDirectory>%USERPROFILE%</WorkingDirectory>
+    </Exec>
+  </Actions>
+</Task>

package/deploy/pi-web-ui.service

@@ -1,31 +1,31 @@
-# pi-web-ui systemd unit — Linux auto-start on boot.
-#
-# Install (adjust User/WorkingDirectory/Environment to taste):
-#   sudo npm i -g pi-web-ui
-#   sudo cp deploy/pi-web-ui.service /etc/systemd/system/
-#   sudo systemctl daemon-reload
-#   sudo systemctl enable --now pi-web-ui
-#   sudo systemctl status pi-web-ui
-#
-# Logs: journalctl -u pi-web-ui -f
-
-[Unit]
-Description=pi-web-ui — web chat for the pi coding agent
-After=network.target
-
-[Service]
-Type=simple
-# Run as an unprivileged user (change to your user, e.g. yourname)
-User=YOUR_USER
-# The workspace the agent operates in (read/edit/bash/write)
-WorkingDirectory=/home/YOUR_USER
-Environment=PORT=8787
-# Point at your pi config dir if it's not the default ~/.pi/agent
-#Environment=PI_CODING_AGENT_DIR=/home/YOUR_USER/.pi/agent
-ExecStart=/usr/bin/pi-web-ui
-Restart=on-failure
-RestartSec=5
-# npm global bin may live elsewhere (nvm, etc.) — find with: which pi-web-ui
-
-[Install]
-WantedBy=multi-user.target
+# pi-web-ui systemd unit — Linux auto-start on boot.
+#
+# Install (adjust User/WorkingDirectory/Environment to taste):
+#   sudo npm i -g pi-web-ui
+#   sudo cp deploy/pi-web-ui.service /etc/systemd/system/
+#   sudo systemctl daemon-reload
+#   sudo systemctl enable --now pi-web-ui
+#   sudo systemctl status pi-web-ui
+#
+# Logs: journalctl -u pi-web-ui -f
+
+[Unit]
+Description=pi-web-ui — web chat for the pi coding agent
+After=network.target
+
+[Service]
+Type=simple
+# Run as an unprivileged user (change to your user, e.g. yourname)
+User=YOUR_USER
+# The workspace the agent operates in (read/edit/bash/write)
+WorkingDirectory=/home/YOUR_USER
+Environment=PORT=8787
+# Point at your pi config dir if it's not the default ~/.pi/agent
+#Environment=PI_CODING_AGENT_DIR=/home/YOUR_USER/.pi/agent
+ExecStart=/usr/bin/pi-web-ui
+Restart=on-failure
+RestartSec=5
+# npm global bin may live elsewhere (nvm, etc.) — find with: which pi-web-ui
+
+[Install]
+WantedBy=multi-user.target

package/dist/server/agent-service.js

@@ -1,8 +1,9 @@
 /**
  * AgentService — wraps the pi SDK (@earendil-works/pi-coding-agent) for the web
  * frontend. Each browser client (identified by a persistent clientId) gets its
- * own AgentSessionRuntime with a private session directory, so multiple users /
- * tabs never share a transcript file.
+ * own AgentSessionRuntime, but sessions live in the SDK default per-project
+ * directory (<agentDir>/sessions/--<cwd>--/) — the same transcript files the
+ * pi CLI/TUI use — so every conversation of a folder shows up everywhere.
  *
  * Streaming model: the SDK emits AgentSessionEvents; we forward lightweight
  * `tool_delta` messages for live tool output and schedule throttled full-state
@@ -446,10 +447,6 @@ export class WebUIContext {
         this.pendingDialogs.clear();
     }
 }
-/** Sanitize a clientId (UUID) for use as a directory name. */
-function sanitizeId(id) {
-    return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 80) || "anon";
-}
 const IS_WIN32 = process.platform === "win32";
 // mac/linux: hide build & dependency noise (original behavior).
 const IGNORED_ENTRIES = new Set([
@@ -683,9 +680,6 @@ function conversationTitle(session) {
 export class ClientSession {
     clientId;
     cwd;
-    /** Absolute per-client session directory.
-    /** Absolute per-client session directory. */
-    sessionDir;
     /** pi config dir (auth/models/skills). */
     agentDir;
     /** Persisted per-client UI state (last workspace + recent projects). */
@@ -734,22 +728,22 @@ export class ClientSession {
     disposed = false;
     /** pi-config readiness check, cached briefly so 60ms snapshots don't hit disk. */
     piCheckCache = null;
-    constructor(clientId, cwd, sessionDir, agentDir, stateStore) {
+    constructor(clientId, cwd, agentDir, stateStore) {
         this.clientId = clientId;
         this.cwd = cwd;
-        this.sessionDir = sessionDir;
         this.agentDir = agentDir;
         this.stateStore = stateStore;
     }
-    static async create(clientId, cwd, sessionDir, stateStore) {
+    static async create(clientId, cwd, stateStore) {
         const agentDir = process.env.PI_CODING_AGENT_DIR ?? getAgentDir();
-        const cs = new ClientSession(clientId, cwd, sessionDir, agentDir, stateStore);
+        const cs = new ClientSession(clientId, cwd, agentDir, stateStore);
         const runtime = await createAgentSessionRuntime(cs.makeRuntimeFactory(), {
             cwd,
             agentDir,
-            // Resume the most recent session for this client's private session dir,
-            // or start a fresh one on first visit.
-            sessionManager: SessionManager.continueRecent(cwd, sessionDir),
+            // Resume the most recent session for this project — the SDK default
+            // per-project dir (<agentDir>/sessions/--<cwd>--/, shared with the
+            // pi CLI/TUI) — or start a fresh one on first visit.
+            sessionManager: SessionManager.continueRecent(cwd),
         });
         // First conversation = the resumed session; it also seeds the shared
         // ModelRuntime that every later conversation reuses.
@@ -809,6 +803,7 @@ export class ClientSession {
             lastMessagesArray: [],
             queueSteering: 0,
             queueFollowUp: 0,
+            toolStartTimes: new Map(),
         };
     }
     /** Add a socket to this client's broadcast set; flushes buffered startup notices. */
@@ -883,6 +878,52 @@ export class ClientSession {
                 }
                 break;
             }
+            case "tool_execution_start": {
+                // Record the moment the tool actually starts so tool_status can
+                // report real execution time (vs. time spent waiting on the model).
+                conv.toolStartTimes.set(event.toolCallId, Date.now());
+                break;
+            }
+            case "tool_execution_end": {
+                const startedAt = conv.toolStartTimes.get(event.toolCallId);
+                conv.toolStartTimes.delete(event.toolCallId);
+                const durationMs = startedAt !== undefined ? Date.now() - startedAt : undefined;
+                // The bash tool does not put its exit code in result.details — on
+                // failure it throws "Command exited with code N" and the agent
+                // wraps that into the error result text. Try details first (future
+                // tools / SDK changes), then parse the error text.
+                const details = event.result?.details;
+                let exitCode;
+                if (typeof details === "object" &&
+                    details !== null &&
+                    typeof details.exitCode === "number") {
+                    exitCode = details.exitCode;
+                }
+                else if (event.isError) {
+                    const content = event.result?.content;
+                    const text = Array.isArray(content)
+                        ? content
+                            .map((c) => (typeof c === "object" &&
+                            c !== null &&
+                            c.type === "text")
+                            ? (c.text ?? "")
+                            : "")
+                            .join("\n")
+                        : "";
+                    const m = text.match(/exited with code (\d+)/);
+                    if (m)
+                        exitCode = Number(m[1]);
+                }
+                this.emit({
+                    type: "tool_status",
+                    toolCallId: event.toolCallId,
+                    toolName: event.toolName,
+                    isError: event.isError,
+                    exitCode,
+                    durationMs,
+                });
+                break;
+            }
             case "tool_execution_update": {
                 const text = extractPartialText(event.partialResult);
                 if (text) {
@@ -2100,7 +2141,7 @@ export class ClientSession {
             const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(), {
                 cwd: this.cwd,
                 agentDir: this.agentDir,
-                sessionManager: SessionManager.create(this.cwd, this.sessionDir),
+                sessionManager: SessionManager.create(this.cwd),
             });
             const conv = this.makeConversation(runtime);
             this.convs.set(conv.id, conv);
@@ -2206,23 +2247,12 @@ export class ClientSession {
     }
     async pushSessions() {
         try {
-            const { resolve } = await import("node:path");
-            // The pi CLI/TUI keeps sessions in <agentDir>/sessions/--<cwd-sanitized>--
-            // (encoded per working directory). List those too, so the conversation
-            // panel shows every conversation of the current folder — not just the
-            // ones created in this web UI.
-            const safePath = `--${resolve(this.cwd)
-                .replace(/^[/\\]/, "")
-                .replace(/[/\\:]/g, "-")}--`;
-            const tuiSessionDir = join(this.agentDir, "sessions", safePath);
-            const [webInfos, tuiInfos] = await Promise.all([
-                SessionManager.list(this.cwd, this.sessionDir),
-                existsSync(tuiSessionDir)
-                    ? SessionManager.list(this.cwd, tuiSessionDir).catch(() => [])
-                    : Promise.resolve([]),
-            ]);
+            // Sessions live in the SDK default per-project dir
+            // (<agentDir>/sessions/--<cwd>--/), the same files the pi CLI/TUI
+            // use — one listing covers every conversation of the current folder.
+            const infos = await SessionManager.list(this.cwd);
             const sessions = new Map();
-            for (const s of webInfos) {
+            for (const s of infos) {
                 sessions.set(s.path, {
                     path: s.path,
                     name: s.name,
@@ -2232,16 +2262,6 @@ export class ClientSession {
                     source: "web",
                 });
             }
-            for (const s of tuiInfos) {
-                sessions.set(s.path, {
-                    path: s.path,
-                    name: s.name,
-                    firstMessage: s.firstMessage,
-                    messageCount: s.messageCount,
-                    modified: s.modified.getTime(),
-                    source: "tui",
-                });
-            }
             const sorted = [...sessions.values()].sort((a, b) => b.modified - a.modified);
             this.emit({ type: "sessions", sessions: sorted });
         }
@@ -2366,7 +2386,7 @@ export class ClientSession {
             const map = new Map();
             for (const p of saved.projects)
                 map.set(p.path, p.lastUsed);
-            const all = await SessionManager.listAll(this.sessionDir);
+            const all = await SessionManager.listAll();
             for (const s of all) {
                 if (s.cwd) {
                     const t = s.modified.getTime();
@@ -2655,7 +2675,7 @@ export class ClientSession {
                 const newRuntime = await createAgentSessionRuntime(this.makeRuntimeFactory(), {
                     cwd: abs,
                     agentDir: this.agentDir,
-                    sessionManager: SessionManager.continueRecent(abs, this.sessionDir),
+                    sessionManager: SessionManager.continueRecent(abs),
                 });
                 const conv = this.makeConversation(newRuntime);
                 this.convs.set(conv.id, conv);
@@ -2816,7 +2836,6 @@ export class ClientSession {
 }
 export class AgentService {
     cwd;
-    sessionDirRoot;
     clients = new Map();
     pending = new Map();
     stateStore;
@@ -2825,9 +2844,8 @@ export class AgentService {
      * self-update; returns whether the process will restart itself.
      */
     onUpdateReady = undefined;
-    constructor(cwd, sessionDirRoot, stateFile) {
+    constructor(cwd, stateFile) {
         this.cwd = cwd;
-        this.sessionDirRoot = sessionDirRoot;
         this.stateStore = new ClientStateStore(stateFile);
     }
     /** Get or create the session for a client, racing attach calls safely. */
@@ -2852,7 +2870,8 @@ export class AgentService {
                         // gone (unmounted drive / deleted) — fall back to the default
                     }
                 }
-                const creating = ClientSession.create(clientId, cwd, join(this.sessionDirRoot, sanitizeId(clientId)), this.stateStore).finally(() => {
+                // Sessions use the SDK default per-project dir — no per-client dir.
+                const creating = ClientSession.create(clientId, cwd, this.stateStore).finally(() => {
                     this.pending.delete(clientId);
                 });
                 this.pending.set(clientId, creating);