pi-web-ui 0.13.0 → 0.14.0

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);

package/dist/server/index.js

@@ -9,7 +9,11 @@
  * Env:
  *   PORT            HTTP port (default 8787)
  *   PI_WEB_CWD      workspace the agent operates in (default: process.cwd())
- *   PI_WEB_DATA_DIR where per-client session dirs are stored (default: <cwd>/.pi-web)
+ *   PI_WEB_DATA_DIR where per-client UI state is stored (client-state.json,
+ *   default: <home>/.pi-web). Chat sessions are NOT stored here — they live
+ *   in the pi agent's global TUI session dir (~/.pi/agent/sessions/--<cwd>--/)
+ *   via the SDK default, so this web UI, the dev instance, and the pi CLI/TUI
+ *   all share one conversation list per project.
  *   PI_CODING_AGENT_DIR  pi config dir (auth/models/skills) — passed to the SDK
  */
 import { existsSync } from "node:fs";
@@ -18,16 +22,20 @@ import { createServer } from "node:http";
 import { createConnection } from "node:net";
 import { spawn } from "node:child_process";
 import { basename, dirname, join, resolve } from "node:path";
+import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { randomUUID } from "node:crypto";
 import express from "express";
 import { WebSocket, WebSocketServer } from "ws";
-import { VERSION } from "@earendil-works/pi-coding-agent";
+import { VERSION, getAgentDir } from "@earendil-works/pi-coding-agent";
 import { AgentService, previewKind, workspacePath } from "./agent-service.js";
 const PORT = Number(process.env.PORT ?? 8787);
 const CWD = resolve(process.env.PI_WEB_CWD ?? process.cwd());
-const DATA_DIR = resolve(process.env.PI_WEB_DATA_DIR ?? join(CWD, ".pi-web"));
-const SESSION_DIR_ROOT = join(DATA_DIR, "sessions");
+const DATA_DIR = resolve(process.env.PI_WEB_DATA_DIR ?? join(homedir(), ".pi-web"));
+// Root of the SDK default per-project session dirs — chat transcripts live in
+// <SESSION_DIR_ROOT>/--<cwd>--/, shared with the pi CLI/TUI (getAgentDir
+// honors PI_CODING_AGENT_DIR).
+const SESSION_DIR_ROOT = join(getAgentDir(), "sessions");
 const app = express();
 app.use(express.json({ limit: "10mb" }));
 app.get("/api/health", (_req, res) => {
@@ -126,7 +134,7 @@ const heartbeatTimer = setInterval(() => {
         }
     }
 }, 10_000);
-const service = new AgentService(CWD, SESSION_DIR_ROOT, 
+const service = new AgentService(CWD, 
 // Per-client persisted UI state: last-used workspace + recent projects.
 join(DATA_DIR, "client-state.json"));
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-web-ui",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Web chat interface for the pi coding agent, powered by the pi SDK (@earendil-works/pi-coding-agent) — one-command run, Docker/systemd/launchd deployable",
   "license": "MIT",
   "type": "module",