@pimote/pimote 0.1.0 → 0.2.0

package/client/build/index.html

@@ -12,12 +12,12 @@
     <link rel="icon" type="image/png" sizes="192x192" href="/pwa/icon-192.png" />
     <link rel="icon" type="image/png" sizes="512x512" href="/pwa/icon-512.png" />
     <link rel="apple-touch-icon" href="/pwa/icon-192.png" />
-    <link href="/_app/immutable/entry/start.CZeUhs5D.js" rel="modulepreload">
-		<link href="/_app/immutable/chunks/BN18Mjoo.js" rel="modulepreload">
-		<link href="/_app/immutable/chunks/CnuZs6QA.js" rel="modulepreload">
-		<link href="/_app/immutable/chunks/BTSGQ0LP.js" rel="modulepreload">
+    <link href="/_app/immutable/entry/start.DYkTAHh1.js" rel="modulepreload">
+		<link href="/_app/immutable/chunks/CT6ckxpD.js" rel="modulepreload">
+		<link href="/_app/immutable/chunks/DlJOVoUQ.js" rel="modulepreload">
+		<link href="/_app/immutable/chunks/B8lQCytv.js" rel="modulepreload">
 		<link href="/_app/immutable/chunks/5FogVG_p.js" rel="modulepreload">
-		<link href="/_app/immutable/entry/app.BjHwmkZK.js" rel="modulepreload">
+		<link href="/_app/immutable/entry/app.CNzpBgAg.js" rel="modulepreload">
 		<link href="/_app/immutable/chunks/CHncfsjL.js" rel="modulepreload">
 		<link href="/_app/immutable/chunks/D1hYfEew.js" rel="modulepreload">
 		
@@ -26,15 +26,15 @@
     <div style="display: contents">
 			<script>
 				{
-					__sveltekit_1otbek3 = {
+					__sveltekit_brd6po = {
 						base: ""
 					};
 
 					const element = document.currentScript.parentElement;
 
 					Promise.all([
-						import("/_app/immutable/entry/start.CZeUhs5D.js"),
-						import("/_app/immutable/entry/app.BjHwmkZK.js")
+						import("/_app/immutable/entry/start.DYkTAHh1.js"),
+						import("/_app/immutable/entry/app.CNzpBgAg.js")
 					]).then(([kit, app]) => {
 						kit.start(app, element);
 					});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pimote/pimote",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Web client and embedded server for pi with multi-session browser access, streaming, and extension UI support",
   "type": "module",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "client/build/**",
     "server/dist/**/*.js",
     "scripts/postinstall-patches.mjs",
-    "patches/@mariozechner+pi-coding-agent+0.65.0.patch",
+    "patches/@mariozechner+pi-coding-agent+0.67.6.patch",
     "README.md",
     "LICENSE"
   ],
@@ -73,7 +73,7 @@
   },
   "dependencies": {
     "@fontsource-variable/jetbrains-mono": "^5.2.8",
-    "@mariozechner/pi-coding-agent": "0.65.0",
+    "@mariozechner/pi-coding-agent": "0.67.6",
     "patch-package": "^8.0.1",
     "web-push": "^3.6.7",
     "ws": "^8.20.0"

package/patches/{@mariozechner+pi-coding-agent+0.65.0.patch → @mariozechner+pi-coding-agent+0.67.6.patch}

@@ -1,8 +1,8 @@
 diff --git a/node_modules/@mariozechner/pi-coding-agent/dist/core/agent-session-runtime.js b/node_modules/@mariozechner/pi-coding-agent/dist/core/agent-session-runtime.js
-index 9ab786e..6f89829 100644
+index fcb3466..20ee304 100644
 --- a/node_modules/@mariozechner/pi-coding-agent/dist/core/agent-session-runtime.js
 +++ b/node_modules/@mariozechner/pi-coding-agent/dist/core/agent-session-runtime.js
-@@ -74,9 +74,6 @@ export class AgentSessionRuntime {
+@@ -75,9 +75,6 @@ export class AgentSessionRuntime {
          this.session.dispose();
      }
      apply(result) {
@@ -12,9 +12,9 @@ index 9ab786e..6f89829 100644
          this._session = result.session;
          this._services = result.services;
          this._diagnostics = result.diagnostics;
-@@ -223,9 +220,6 @@ export class AgentSessionRuntime {
-  */
+@@ -227,9 +224,6 @@ export class AgentSessionRuntime {
  export async function createAgentSessionRuntime(createRuntime, options) {
+     assertSessionCwdExists(options.sessionManager, options.cwd);
      const result = await createRuntime(options);
 -    if (process.cwd() !== result.services.cwd) {
 -        process.chdir(result.services.cwd);

package/server/dist/folder-index.js

@@ -7,9 +7,13 @@ const PROJECT_MARKERS = ['.git', 'package.json'];
  * Scans configured root directories for project folders and lists their sessions.
  */
 export class FolderIndex {
-    roots;
-    constructor(roots) {
-        this.roots = roots;
+    _roots;
+    constructor(_roots) {
+        this._roots = _roots;
+    }
+    /** Returns the configured root directories. */
+    get roots() {
+        return this._roots;
     }
     /**
      * Scan all roots one level deep for project directories.
@@ -17,7 +21,7 @@ export class FolderIndex {
      */
     async scan() {
         const folders = [];
-        for (const root of this.roots) {
+        for (const root of this._roots) {
             let entries;
             try {
                 entries = await readdir(root);

package/server/dist/git-branch.js

@@ -0,0 +1,32 @@
+import { execFileSync } from 'node:child_process';
+/** Resolve the current git branch for a directory. Returns null if not a git repo or detached. */
+export function getGitBranch(cwd) {
+    // Guard against inherited Git env vars forcing resolution to another repo.
+    const env = { ...process.env };
+    delete env.GIT_DIR;
+    delete env.GIT_WORK_TREE;
+    const runGit = (args) => {
+        try {
+            const value = execFileSync('git', args, {
+                cwd,
+                env,
+                encoding: 'utf-8',
+                timeout: 2000,
+                stdio: ['ignore', 'pipe', 'ignore'],
+            }).trim();
+            return value || null;
+        }
+        catch {
+            return null;
+        }
+    };
+    // Best signal for the checked-out branch (works with linked worktrees).
+    const current = runGit(['branch', '--show-current']);
+    if (current)
+        return current;
+    // Fallback for older Git versions / unusual setups.
+    const abbrevRef = runGit(['rev-parse', '--abbrev-ref', 'HEAD']);
+    if (!abbrevRef || abbrevRef === 'HEAD')
+        return null;
+    return abbrevRef;
+}

package/server/dist/message-mapper.js

@@ -6,6 +6,64 @@
 export function mapAgentMessages(messages) {
     return messages.map(mapAgentMessage);
 }
+/**
+ * Extract entry IDs from branch entries in the same order that
+ * buildSessionContext produces messages.  This mirrors the SDK's
+ * compaction/branch-summary logic so IDs can be zipped 1:1 with
+ * the mapped PimoteAgentMessage array.
+ */
+export function extractMessageEntryIds(branch) {
+    // Find the last compaction entry on the path
+    let compaction = null;
+    for (const entry of branch) {
+        if (entry.type === 'compaction')
+            compaction = entry;
+    }
+    const ids = [];
+    const appendId = (entry) => {
+        if (entry.type === 'message') {
+            ids.push(entry.id);
+        }
+        else if (entry.type === 'custom_message') {
+            ids.push(entry.id);
+        }
+        else if (entry.type === 'branch_summary' && entry.summary) {
+            ids.push(entry.id);
+        }
+    };
+    if (compaction) {
+        // Compaction summary message maps to the compaction entry
+        ids.push(compaction.id);
+        const compactionIdx = branch.findIndex((e) => e.type === 'compaction' && e.id === compaction.id);
+        // Kept messages before the compaction entry
+        let foundFirstKept = false;
+        for (let i = 0; i < compactionIdx; i++) {
+            if (branch[i].id === compaction.firstKeptEntryId)
+                foundFirstKept = true;
+            if (foundFirstKept)
+                appendId(branch[i]);
+        }
+        // Messages after the compaction entry
+        for (let i = compactionIdx + 1; i < branch.length; i++) {
+            appendId(branch[i]);
+        }
+    }
+    else {
+        for (const entry of branch) {
+            appendId(entry);
+        }
+    }
+    return ids;
+}
+/**
+ * Apply entry IDs from the session manager onto mapped messages.
+ * Zips by index — both arrays must correspond 1:1.
+ */
+export function applyEntryIds(messages, entryIds) {
+    for (let i = 0; i < messages.length && i < entryIds.length; i++) {
+        messages[i].entryId = entryIds[i];
+    }
+}
 export function mapAgentMessage(msg) {
     const role = msg.role ?? 'unknown';
     const content = [];
@@ -52,7 +110,7 @@ export function mapAgentMessage(msg) {
     }
     // Handle custom messages — preserve customType and display flag for the client
     if (role === 'custom') {
-        return { role, content, customType: msg.customType, display: msg.display ?? true };
+        return { role, content, entryId: msg.id, customType: msg.customType, display: msg.display ?? true };
     }
     // Handle tool result messages
     if (role === 'toolResult') {
@@ -72,9 +130,14 @@ export function mapAgentMessage(msg) {
                     toolCallId: msg.toolCallId,
                     toolName: msg.toolName,
                     result: resultContent.length > 0 ? resultContent[0].text : undefined,
+                    isError: msg.isError || undefined,
                 },
             ],
+            entryId: msg.id,
         };
     }
-    return { role, content };
+    // Note: msg.id is typically undefined for standard SDK messages (UserMessage,
+    // AssistantMessage, ToolResultMessage).  Entry IDs are applied separately via
+    // applyEntryIds() using the session manager's branch entries.
+    return { role, content, ...(msg.id ? { entryId: msg.id } : {}) };
 }

package/server/dist/server.js

@@ -121,6 +121,9 @@ export async function createServer(config, sessionManager, folderIndex, pushNoti
     sessionManager.onSessionClosed = (sessionId, folderPath) => {
         WsHandler.broadcastSidebarUpdate(sessionId, folderPath, sessionManager, clientRegistry);
     };
+    sessionManager.onGitBranchChange = (sessionId, folderPath) => {
+        WsHandler.broadcastSidebarUpdate(sessionId, folderPath, sessionManager, clientRegistry);
+    };
     const wss = new WebSocketServer({ noServer: true });
     const clientRegistry = new Map();
     httpServer.on('upgrade', (req, socket, head) => {

package/server/dist/session-manager.js

@@ -1,6 +1,7 @@
 import { createAgentSessionRuntime, createAgentSessionServices, createAgentSessionFromServices, createEventBus, AuthStorage, ModelRegistry, getAgentDir, SessionManager as PiSessionManager, } from '@mariozechner/pi-coding-agent';
 import { EventBuffer } from './event-buffer.js';
 import { applyPanelMessage, getMergedPanelCards } from './panel-state.js';
+import { getGitBranch } from './git-branch.js';
 // ---- Slot-based helpers (operate on ManagedSlot) ----
 /** Send an event to the client connected to this slot. No-op if disconnected. */
 export function sendSlotEvent(slot, event) {
@@ -59,6 +60,7 @@ function createSessionState(session, eventBus, config, callbacks, slotRef, folde
         panelState: new Map(),
         panelListenerUnsubs: [],
         panelThrottleTimer: null,
+        treeNavigationInProgress: false,
     };
     // Subscribe to session events
     const unsubscribe = session.subscribe((event) => {
@@ -125,8 +127,11 @@ export class PimoteSessionManager {
     modelRegistry;
     sessions = new Map();
     idleCheckHandle = null;
+    gitBranchCheckHandle = null;
+    lastKnownGitBranchBySession = new Map();
     onStatusChange;
     onSessionClosed;
+    onGitBranchChange;
     constructor(config, pushNotificationService) {
         this.config = config;
         this.pushNotificationService = pushNotificationService;
@@ -137,6 +142,8 @@ export class PimoteSessionManager {
         const eventBusRef = { current: null };
         const sharedAuthStorage = this.authStorage;
         const sharedModelRegistry = this.modelRegistry;
+        const sessionManager = sessionFilePath ? PiSessionManager.open(sessionFilePath) : PiSessionManager.create(folderPath);
+        const effectiveFolderPath = sessionFilePath ? sessionManager.getCwd() : folderPath;
         const factory = async ({ cwd, agentDir, sessionManager, sessionStartEvent }) => {
             const eventBus = createEventBus();
             eventBusRef.current = eventBus;
@@ -154,9 +161,9 @@ export class PimoteSessionManager {
             };
         };
         const runtime = await createAgentSessionRuntime(factory, {
-            cwd: folderPath,
+            cwd: effectiveFolderPath,
             agentDir: getAgentDir(),
-            sessionManager: sessionFilePath ? PiSessionManager.open(sessionFilePath) : PiSessionManager.create(folderPath),
+            sessionManager,
         });
         const session = runtime.session;
         const sessionId = session.sessionId;
@@ -186,10 +193,10 @@ export class PimoteSessionManager {
             onStatusChange: (sid, fp) => this.onStatusChange?.(sid, fp),
             onAgentEnd: (sid, s) => this.handleAgentEnd(sid, s),
             sendEvent: (e) => sendSlotEvent(slot, e),
-        }, slotRef, folderPath);
+        }, slotRef, effectiveFolderPath);
         const slot = {
             runtime,
-            folderPath,
+            folderPath: effectiveFolderPath,
             eventBusRef,
             connection: null,
             sessionState,
@@ -199,6 +206,7 @@ export class PimoteSessionManager {
         };
         slotRef.slot = slot;
         this.sessions.set(sessionId, slot);
+        this.lastKnownGitBranchBySession.set(sessionId, getGitBranch(effectiveFolderPath));
         return sessionId;
     }
     handleAgentEnd(sessionId, slot) {
@@ -261,12 +269,16 @@ export class PimoteSessionManager {
         const folderPath = slot.folderPath;
         await slot.runtime.dispose();
         this.sessions.delete(sessionId);
+        this.lastKnownGitBranchBySession.delete(sessionId);
         this.onSessionClosed?.(sessionId, folderPath);
     }
     /** Re-key a slot in the session map after session replacement. */
     reKeySession(slot, oldId, newId) {
         this.sessions.delete(oldId);
         this.sessions.set(newId, slot);
+        const lastKnown = this.lastKnownGitBranchBySession.get(oldId) ?? null;
+        this.lastKnownGitBranchBySession.delete(oldId);
+        this.lastKnownGitBranchBySession.set(newId, lastKnown);
     }
     /** Rebuild a slot's SessionState after session replacement.
      *  Tears down the old state and creates a new one from the current runtime.session. */
@@ -289,6 +301,9 @@ export class PimoteSessionManager {
         this.stopIdleCheck();
         this.idleCheckHandle = setInterval(() => {
             for (const [sessionId, slot] of this.sessions) {
+                if (slot.sessionState.treeNavigationInProgress) {
+                    continue;
+                }
                 const clientId = slot.connection?.connectedClientId ?? null;
                 const hasConnectedClient = clientId !== null && (isClientConnected?.(clientId) ?? false);
                 if (!hasConnectedClient && Date.now() - slot.sessionState.lastActivity > idleTimeout) {
@@ -298,12 +313,28 @@ export class PimoteSessionManager {
                 }
             }
         }, 60_000);
+        this.gitBranchCheckHandle = setInterval(() => {
+            for (const [sessionId, slot] of this.sessions) {
+                if (!slot.connection?.connectedClientId)
+                    continue;
+                const next = getGitBranch(slot.folderPath);
+                const prev = this.lastKnownGitBranchBySession.get(sessionId) ?? null;
+                if (next !== prev) {
+                    this.lastKnownGitBranchBySession.set(sessionId, next);
+                    this.onGitBranchChange?.(sessionId, slot.folderPath);
+                }
+            }
+        }, 3000);
     }
     stopIdleCheck() {
         if (this.idleCheckHandle !== null) {
             clearInterval(this.idleCheckHandle);
             this.idleCheckHandle = null;
         }
+        if (this.gitBranchCheckHandle !== null) {
+            clearInterval(this.gitBranchCheckHandle);
+            this.gitBranchCheckHandle = null;
+        }
     }
     async dispose() {
         this.stopIdleCheck();