@cryptiklemur/lattice 1.46.6 → 1.47.0

package/client/src/components/ui/SaveFooter.tsx

@@ -1,4 +1,7 @@
+import { useEffect, useRef } from "react";
+import { Loader2, Check, X } from "lucide-react";
 import type { SaveState } from "../../hooks/useSaveState";
+import { showToast } from "./Toast";
 
 interface SaveFooterProps {
   dirty: boolean;
@@ -10,6 +13,18 @@ interface SaveFooterProps {
 
 export function SaveFooter({ dirty, saving, saveState, onSave, extraStatus }: SaveFooterProps) {
   var disabled = saving || (!dirty && saveState !== "error");
+  var prevStateRef = useRef<SaveState>("idle");
+
+  useEffect(function () {
+    if (prevStateRef.current !== saveState) {
+      if (saveState === "saved") {
+        showToast("Settings saved", "success");
+      } else if (saveState === "error") {
+        showToast("Failed to save settings — server did not respond within 5 seconds", "error");
+      }
+      prevStateRef.current = saveState;
+    }
+  }, [saveState]);
 
   return (
     <div className="flex items-center justify-end gap-3">
@@ -20,18 +35,28 @@ export function SaveFooter({ dirty, saving, saveState, onSave, extraStatus }: Sa
         <div className="text-[11px] text-warning/70">Unsaved changes</div>
       )}
       {saveState === "error" && (
-        <div className="text-[11px] text-error">Save failed — try again</div>
+        <div className="flex items-center gap-1.5 text-[11px] text-error">
+          <X size={11} />
+          Save failed — server did not respond
+        </div>
+      )}
+      {saveState === "saved" && (
+        <div className="flex items-center gap-1.5 text-[11px] text-success/70">
+          <Check size={11} />
+          Saved
+        </div>
       )}
       <button
         onClick={onSave}
         disabled={disabled}
         className={
-          "btn btn-sm " +
+          "btn btn-sm gap-1.5 " +
           (saveState === "saved" ? "btn-success" : saveState === "error" ? "btn-error" : "btn-primary") +
           (disabled ? " opacity-50 cursor-not-allowed" : "")
         }
       >
-        {saving ? "Saving..." : saveState === "saved" ? "Saved" : saveState === "error" ? "Retry" : "Save Changes"}
+        {saving && <Loader2 size={13} className="animate-spin" />}
+        {saving ? "Saving..." : saveState === "error" ? "Retry" : "Save Changes"}
       </button>
     </div>
   );

package/client/src/hooks/useSession.ts

@@ -13,6 +13,7 @@ import type {
   ChatContextUsageMessage,
   ChatContextBreakdownMessage,
   ChatPromptSuggestionMessage,
+  ChatElicitationRequestMessage,
   SessionHistoryMessage,
   ServerMessage,
 } from "@lattice/shared";
@@ -49,12 +50,12 @@ import {
   removeQueuedMessage,
   updateQueuedMessage,
   clearMessageQueue,
-  setSessionBusy,
   addPromptQuestion,
   addTodoUpdate,
   setIsPlanMode,
   setBudgetStatus,
   setBudgetExceeded,
+  updateRateLimit,
 } from "../stores/session";
 import type { SessionState, BudgetStatus } from "../stores/session";
 
@@ -119,7 +120,12 @@ export function useSession(): UseSessionReturn {
     setFailedInput(null);
     setPromptSuggestion(null);
     setIsProcessing(true);
-    setSessionBusy(false);
+    addSessionMessage({
+      type: "user",
+      uuid: "optimistic-" + Date.now(),
+      text: text,
+      timestamp: Date.now(),
+    } as HistoryMessage);
     pinTab("chat-" + currentSessionId);
     sendRef.current(msg as ChatSendMessage);
   }
@@ -143,6 +149,16 @@ export function useSession(): UseSessionReturn {
       if (isStaleStream()) return;
       var m = msg as ChatUserMessage;
       setCurrentAssistantUuid(null);
+      var messages = getSessionStore().state.messages;
+      var last = messages.length > 0 ? messages[messages.length - 1] : null;
+      if (last && last.type === "user" && last.uuid && last.uuid.startsWith("optimistic-") && last.text === m.text) {
+        getSessionStore().setState(function (s) {
+          var updated = s.messages.slice();
+          updated[updated.length - 1] = { ...updated[updated.length - 1], uuid: m.uuid };
+          return { ...s, messages: updated };
+        });
+        return;
+      }
       addSessionMessage({
         type: "user",
         uuid: m.uuid,
@@ -279,6 +295,22 @@ export function useSession(): UseSessionReturn {
       updatePermissionStatus(m.requestId, m.status);
     }
 
+    function handleElicitationRequest(msg: ServerMessage) {
+      var m = msg as ChatElicitationRequestMessage;
+      setCurrentAssistantUuid(null);
+      addSessionMessage({
+        type: "elicitation",
+        toolId: m.requestId,
+        elicitationMode: m.mode,
+        elicitationServerName: m.serverName,
+        elicitationMessage: m.message,
+        elicitationUrl: m.url,
+        elicitationSchema: m.requestedSchema,
+        elicitationStatus: "pending",
+        timestamp: Date.now(),
+      } as HistoryMessage);
+    }
+
     function handleHistoryPage(msg: ServerMessage) {
       var m = msg as { type: string; sessionId: string; messages: HistoryMessage[]; hasMore: boolean };
       var state = getSessionStore().state;
@@ -306,34 +338,46 @@ export function useSession(): UseSessionReturn {
         var projectSlug = m.projectSlug || getSessionStore().state.activeProjectSlug;
         setSidebarSessionId(m.sessionId);
         streamSessionId = m.sessionId;
-        if (m.busy) {
-          activeStreamGeneration = getStreamGeneration();
-        }
         if (m.title) {
           updateSessionTabTitle(m.sessionId, m.title);
         }
-        getSessionStore().setState(function (state) {
-          return {
-            ...state,
-            activeProjectSlug: projectSlug,
-            activeSessionId: m.sessionId,
-            activeSessionTitle: m.title ?? null,
-            messages: mergeToolResults(m.messages),
-            isProcessing: false,
-            currentStatus: null,
-            pendingPermissionCount: 0,
-            lastResponseCost: null,
-            lastResponseDuration: null,
-            lastReadIndex: null,
-            historyLoading: false,
-            historyHasMore: m.hasMore || false,
-            historyTotalMessages: m.totalMessages || m.messages.length,
-            wasInterrupted: m.interrupted || false,
-            isBusy: m.busy || false,
-            busyOwner: m.busyOwner ?? null,
-            isPlanMode: false,
-          };
-        });
+        var currentState = getSessionStore().state;
+        var alreadyCached = currentState.activeSessionId === m.sessionId
+          && !currentState.historyLoading
+          && currentState.messages.length > 0;
+
+        if (alreadyCached) {
+          getSessionStore().setState(function (state) {
+            return {
+              ...state,
+              activeSessionTitle: m.title ?? state.activeSessionTitle,
+              historyHasMore: m.hasMore || state.historyHasMore,
+              historyTotalMessages: m.totalMessages || state.historyTotalMessages,
+              wasInterrupted: m.interrupted || false,
+            };
+          });
+        } else {
+          getSessionStore().setState(function (state) {
+            return {
+              ...state,
+              activeProjectSlug: projectSlug,
+              activeSessionId: m.sessionId,
+              activeSessionTitle: m.title ?? null,
+              messages: mergeToolResults(m.messages),
+              isProcessing: false,
+              currentStatus: null,
+              pendingPermissionCount: 0,
+              lastResponseCost: null,
+              lastResponseDuration: null,
+              lastReadIndex: null,
+              historyLoading: false,
+              historyHasMore: m.hasMore || false,
+              historyTotalMessages: m.totalMessages || m.messages.length,
+              wasInterrupted: m.interrupted || false,
+              isPlanMode: false,
+            };
+          });
+        }
         var storedIndex = getLastReadIndex(m.sessionId);
         if (storedIndex >= 0 && storedIndex < m.messages.length) {
           setLastReadIndex(storedIndex);
@@ -360,17 +404,6 @@ export function useSession(): UseSessionReturn {
       setPromptSuggestion(m.suggestion);
     }
 
-    function handleSessionBusy(msg: ServerMessage) {
-      var m = msg as { type: string; sessionId: string; busy: boolean; busyOwner?: "cli" | "lattice" };
-      var sessionState = getSessionStore().state;
-      if (m.sessionId === sessionState.activeSessionId) {
-        if (m.busy && sessionState.isProcessing) {
-          return;
-        }
-        setSessionBusy(m.busy, m.busyOwner);
-      }
-    }
-
     function handlePromptRequest(msg: ServerMessage) {
       if (isStaleStream()) return;
       var m = msg as { type: string; requestId: string; questions: Array<{ question: string; header: string; options: Array<{ label: string; description: string; preview?: string }>; multiSelect: boolean }> };
@@ -397,6 +430,20 @@ export function useSession(): UseSessionReturn {
       setBudgetStatus({ dailySpend: m.dailySpend, dailyLimit: m.dailyLimit, enforcement: m.enforcement });
     }
 
+    function handleRateLimit(msg: ServerMessage) {
+      var m = msg as { type: string; status: "allowed" | "allowed_warning" | "rejected"; utilization?: number; resetsAt?: number; rateLimitType?: string; overageStatus?: string; overageResetsAt?: number; isUsingOverage?: boolean };
+      updateRateLimit({
+        status: m.status,
+        utilization: m.utilization,
+        resetsAt: m.resetsAt,
+        rateLimitType: m.rateLimitType || "unknown",
+        overageStatus: m.overageStatus,
+        overageResetsAt: m.overageResetsAt,
+        isUsingOverage: m.isUsingOverage,
+        updatedAt: Date.now(),
+      });
+    }
+
     function handleBudgetExceeded(msg: ServerMessage) {
       setBudgetExceeded(true);
       setIsProcessing(false);
@@ -417,13 +464,14 @@ export function useSession(): UseSessionReturn {
     subscribe("session:history", handleHistory);
     subscribe("session:history_page_result", handleHistoryPage);
     subscribe("chat:prompt_suggestion", handlePromptSuggestion);
-    subscribe("session:busy", handleSessionBusy);
     subscribe("chat:prompt_request", handlePromptRequest);
     subscribe("chat:prompt_resolved", handlePromptResolved);
     subscribe("chat:todo_update", handleTodoUpdate);
     subscribe("chat:plan_mode", handlePlanMode);
     subscribe("budget:status", handleBudgetStatus);
     subscribe("budget:exceeded", handleBudgetExceeded);
+    subscribe("chat:elicitation_request", handleElicitationRequest);
+    subscribe("chat:rate_limit", handleRateLimit);
 
     return function () {
       subscriptionsActive--;
@@ -441,13 +489,14 @@ export function useSession(): UseSessionReturn {
       unsubscribe("session:history", handleHistory);
       unsubscribe("session:history_page_result", handleHistoryPage);
       unsubscribe("chat:prompt_suggestion", handlePromptSuggestion);
-      unsubscribe("session:busy", handleSessionBusy);
       unsubscribe("chat:prompt_request", handlePromptRequest);
       unsubscribe("chat:prompt_resolved", handlePromptResolved);
       unsubscribe("chat:todo_update", handleTodoUpdate);
       unsubscribe("chat:plan_mode", handlePlanMode);
       unsubscribe("budget:status", handleBudgetStatus);
       unsubscribe("budget:exceeded", handleBudgetExceeded);
+      unsubscribe("chat:elicitation_request", handleElicitationRequest);
+      unsubscribe("chat:rate_limit", handleRateLimit);
     };
   }, [subscribe, unsubscribe]);
 
@@ -481,8 +530,6 @@ export function useSession(): UseSessionReturn {
     promptSuggestion: state.promptSuggestion,
     failedInput: state.failedInput,
     messageQueue: state.messageQueue,
-    isBusy: state.isBusy,
-    busyOwner: state.busyOwner,
     isPlanMode: state.isPlanMode,
     pendingPrefill: state.pendingPrefill,
     budgetStatus: state.budgetStatus,

package/client/src/hooks/useWebSocket.ts

@@ -23,7 +23,7 @@ export function useWebSocket(): WebSocketContextValue {
 
 export function getWebSocketUrl(): string {
   if (import.meta.env.DEV) {
-    return "ws://" + window.location.hostname + ":7654/ws";
+    return "ws://" + window.location.hostname + ":17654/ws";
   }
   var protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
   return protocol + "//" + window.location.host + "/ws";

package/client/src/stores/session.ts

@@ -28,6 +28,17 @@ export interface BudgetStatus {
   enforcement: "warning" | "soft-block" | "hard-block";
 }
 
+export interface RateLimitEntry {
+  status: "allowed" | "allowed_warning" | "rejected";
+  utilization?: number;
+  resetsAt?: number;
+  rateLimitType: string;
+  overageStatus?: string;
+  overageResetsAt?: number;
+  isUsingOverage?: boolean;
+  updatedAt: number;
+}
+
 export interface SessionState {
   messages: HistoryMessage[];
   isProcessing: boolean;
@@ -48,12 +59,11 @@ export interface SessionState {
   promptSuggestion: string | null;
   failedInput: string | null;
   messageQueue: string[];
-  isBusy: boolean;
-  busyOwner: "cli" | "lattice" | null;
   isPlanMode: boolean;
   pendingPrefill: string | null;
   budgetStatus: BudgetStatus | null;
   budgetExceeded: boolean;
+  rateLimits: Record<string, RateLimitEntry>;
 }
 
 var sessionStore = new Store<SessionState>({
@@ -76,12 +86,11 @@ var sessionStore = new Store<SessionState>({
   promptSuggestion: null,
   failedInput: null,
   messageQueue: [],
-  isBusy: false,
-  busyOwner: null,
   isPlanMode: false,
   pendingPrefill: null,
   budgetStatus: null,
   budgetExceeded: false,
+  rateLimits: {},
 });
 
 var streamGeneration = 0;
@@ -212,20 +221,47 @@ export function setIsProcessing(processing: boolean): void {
   });
 }
 
+var sessionMessageCache = new Map<string, { messages: HistoryMessage[]; title: string | null; hasMore: boolean; totalMessages: number }>();
+var MAX_CACHED_SESSIONS = 10;
+
+export function cacheCurrentSession(): void {
+  var state = sessionStore.state;
+  if (state.activeSessionId && state.messages.length > 0) {
+    sessionMessageCache.set(state.activeSessionId, {
+      messages: state.messages,
+      title: state.activeSessionTitle,
+      hasMore: state.historyHasMore,
+      totalMessages: state.historyTotalMessages,
+    });
+    if (sessionMessageCache.size > MAX_CACHED_SESSIONS) {
+      var firstKey = sessionMessageCache.keys().next().value;
+      if (firstKey) sessionMessageCache.delete(firstKey);
+    }
+  }
+}
+
+export function getCachedSession(sessionId: string): { messages: HistoryMessage[]; title: string | null; hasMore: boolean; totalMessages: number } | undefined {
+  return sessionMessageCache.get(sessionId);
+}
+
 export function setActiveSession(projectSlug: string | null, sessionId: string | null, title?: string | null): void {
   var prevSessionId = sessionStore.state.activeSessionId;
   if (prevSessionId) {
     markSessionRead(prevSessionId, sessionStore.state.messages.length);
+    cacheCurrentSession();
   }
   currentAssistantUuid = null;
   incrementStreamGeneration();
+
+  var cached = sessionId ? sessionMessageCache.get(sessionId) : undefined;
+
   sessionStore.setState(function (state) {
     return {
       ...state,
       activeProjectSlug: projectSlug,
       activeSessionId: sessionId,
-      activeSessionTitle: title ?? null,
-      messages: [],
+      activeSessionTitle: cached?.title ?? title ?? null,
+      messages: cached?.messages ?? [],
       isProcessing: false,
       currentStatus: null,
       contextUsage: null,
@@ -234,12 +270,13 @@ export function setActiveSession(projectSlug: string | null, sessionId: string |
       lastResponseCost: null,
       lastResponseDuration: null,
       lastReadIndex: null,
-      historyLoading: true,
+      historyLoading: !cached,
+      historyHasMore: cached?.hasMore ?? false,
+      historyTotalMessages: cached?.totalMessages ?? 0,
       wasInterrupted: false,
       promptSuggestion: null,
       failedInput: null,
       messageQueue: [],
-      isBusy: false,
       isPlanMode: false,
       pendingPrefill: state.pendingPrefill,
     };
@@ -303,8 +340,6 @@ export function clearSession(): void {
       promptSuggestion: null,
       failedInput: null,
       messageQueue: [],
-      isBusy: false,
-      busyOwner: null,
       isPlanMode: false,
       pendingPrefill: null,
       budgetStatus: null,
@@ -337,12 +372,6 @@ export function setFailedInput(text: string | null): void {
   });
 }
 
-export function setSessionBusy(busy: boolean, owner?: "cli" | "lattice" | null): void {
-  sessionStore.setState(function (state) {
-    return { ...state, isBusy: busy, busyOwner: busy ? (owner ?? null) : null };
-  });
-}
-
 export function setIsPlanMode(active: boolean): void {
   sessionStore.setState(function (state) {
     return { ...state, isPlanMode: active };
@@ -355,6 +384,25 @@ export function setBudgetStatus(status: BudgetStatus | null): void {
   });
 }
 
+export function updateRateLimit(entry: RateLimitEntry): void {
+  sessionStore.setState(function (state) {
+    var updated = { ...state.rateLimits };
+    updated[entry.rateLimitType] = entry;
+    try { localStorage.setItem("lattice:rateLimits", JSON.stringify(updated)); } catch {}
+    return { ...state, rateLimits: updated };
+  });
+}
+
+export function loadCachedRateLimits(): void {
+  try {
+    var raw = localStorage.getItem("lattice:rateLimits");
+    if (raw) {
+      var parsed = JSON.parse(raw) as Record<string, RateLimitEntry>;
+      sessionStore.setState(function (state) { return { ...state, rateLimits: parsed }; });
+    }
+  } catch {}
+}
+
 export function setBudgetExceeded(exceeded: boolean): void {
   sessionStore.setState(function (state) {
     return { ...state, budgetExceeded: exceeded };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cryptiklemur/lattice",
-  "version": "1.46.6",
+  "version": "1.47.0",
   "description": "Multi-machine agentic dashboard for Claude Code. Monitor sessions, manage MCP servers and skills, orchestrate across mesh-networked nodes.",
   "license": "MIT",
   "author": "Aaron Scherer <me@aaronscherer.me>",

package/server/src/daemon.ts

@@ -18,8 +18,9 @@ import { detectIdeProjectName } from "./handlers/settings";
 import "./handlers/session";
 import "./handlers/chat";
 import "./handlers/attachment";
-import { loadInterruptedSessions, unwatchSessionLock, cleanupClientPermissions, getActiveSessionCountForProject } from "./project/sdk-bridge";
-import { clearActiveSession, getActiveSession } from "./handlers/chat";
+import { loadInterruptedSessions, cleanupClientPermissions, cleanupClientElicitations, getActiveStreamCountForProject } from "./project/sdk-bridge";
+import { runWarmup, isWarmupComplete, getWarmupModels, getWarmupAccountInfo } from "./project/warmup";
+import { clearActiveSession } from "./handlers/chat";
 import { clearActiveProject } from "./handlers/fs";
 import { clearClientRemoteNode } from "./ws/router";
 import "./handlers/fs";
@@ -324,13 +325,27 @@ export async function startDaemon(portOverride?: number | null): Promise<void> {
         var connectConfig = loadConfig();
         var connectIdentity = loadOrCreateIdentity();
         var localProjects = connectConfig.projects.map(function (p: typeof connectConfig.projects[number]) {
-          return { slug: p.slug, path: p.path, title: p.title, nodeId: connectIdentity.id, nodeName: connectConfig.name, isRemote: false, ideProjectName: detectIdeProjectName(p.path), activeSessions: getActiveSessionCountForProject(p.path) };
+          return { slug: p.slug, path: p.path, title: p.title, nodeId: connectIdentity.id, nodeName: connectConfig.name, isRemote: false, ideProjectName: detectIdeProjectName(p.path), activeSessions: getActiveStreamCountForProject(p.slug) };
         });
         var connectRemoteProjects = getAllRemoteProjects(connectIdentity.id);
         sendTo(ws.data.id, {
           type: "projects:list",
           projects: localProjects.concat(connectRemoteProjects as unknown as typeof localProjects),
         });
+        if (isWarmupComplete()) {
+          sendTo(ws.data.id, { type: "warmup:models", models: getWarmupModels() } as any);
+          var accountInfo = getWarmupAccountInfo();
+          if (accountInfo) {
+            sendTo(ws.data.id, {
+              type: "warmup:account",
+              email: accountInfo.email,
+              organization: accountInfo.organization,
+              subscriptionType: accountInfo.subscriptionType,
+              apiKeySource: accountInfo.apiKeySource,
+              apiProvider: accountInfo.apiProvider,
+            } as any);
+          }
+        }
       },
       message(ws: ServerWebSocket<WsData>, message: string | Buffer) {
         var now = Date.now();
@@ -354,10 +369,6 @@ export async function startDaemon(portOverride?: number | null): Promise<void> {
         }
       },
       close(ws: ServerWebSocket<WsData>) {
-        var activeSession = getActiveSession(ws.data.id);
-        if (activeSession) {
-          unwatchSessionLock(activeSession.sessionId);
-        }
         clearActiveSession(ws.data.id);
         clearActiveProject(ws.data.id);
         clearClientRemoteNode(ws.data.id);
@@ -365,6 +376,7 @@ export async function startDaemon(portOverride?: number | null): Promise<void> {
         cleanupClientTerminals(ws.data.id);
         cleanupClientAttachments(ws.data.id);
         cleanupClientPermissions(ws.data.id);
+        cleanupClientElicitations(ws.data.id);
         clientRateLimits.delete(ws.data.id);
         log.ws("Client disconnected: %s", ws.data.id);
       },
@@ -396,6 +408,11 @@ export async function startDaemon(portOverride?: number | null): Promise<void> {
 
   loadInterruptedSessions();
 
+  var firstProject = config.projects[0];
+  if (firstProject) {
+    void runWarmup(firstProject.path);
+  }
+
   onPeerConnected(function (nodeId: string) {
     broadcast({ type: "mesh:node_online", nodeId: nodeId });
   });
@@ -420,7 +437,7 @@ export async function startDaemon(portOverride?: number | null): Promise<void> {
     var currentIdentity = loadOrCreateIdentity();
     broadcast({ type: "mesh:nodes", nodes: buildNodesMessage() });
     var localProjects = currentConfig.projects.map(function (p: typeof currentConfig.projects[number]) {
-      return { slug: p.slug, path: p.path, title: p.title, nodeId: currentIdentity.id, nodeName: currentConfig.name, isRemote: false, ideProjectName: detectIdeProjectName(p.path), activeSessions: getActiveSessionCountForProject(p.path) };
+      return { slug: p.slug, path: p.path, title: p.title, nodeId: currentIdentity.id, nodeName: currentConfig.name, isRemote: false, ideProjectName: detectIdeProjectName(p.path), activeSessions: getActiveStreamCountForProject(p.slug) };
     });
     var remoteProjects = getAllRemoteProjects(currentIdentity.id);
     broadcast({

package/server/src/handlers/chat.ts

@@ -3,7 +3,7 @@ import { registerHandler } from "../ws/router";
 import { sendTo } from "../ws/broadcast";
 import { getProjectBySlug } from "../project/registry";
 import { loadConfig } from "../config";
-import { startChatStream, getPendingPermission, deletePendingPermission, addAutoApprovedTool, setSessionPermissionOverride, getActiveStream, buildPermissionRule } from "../project/sdk-bridge";
+import { startChatStream, getPendingPermission, deletePendingPermission, addAutoApprovedTool, setSessionPermissionOverride, getActiveStream, buildPermissionRule, getPendingElicitation, resolveElicitation } from "../project/sdk-bridge";
 import { getAttachments } from "./attachment";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
@@ -281,6 +281,17 @@ registerHandler("chat", function (clientId: string, message: ClientMessage) {
     return;
   }
 
+  if (message.type === "chat:elicitation_response") {
+    var elicitMsg = message as { type: string; requestId: string; action: "accept" | "decline"; content?: Record<string, unknown> };
+    var pendingElicit = getPendingElicitation(elicitMsg.requestId);
+    if (!pendingElicit) return;
+    resolveElicitation(elicitMsg.requestId, {
+      action: elicitMsg.action,
+      content: elicitMsg.content || {},
+    });
+    return;
+  }
+
   if (message.type === "chat:set_permission_mode") {
     var modeMsg = message as ChatSetPermissionModeMessage;
     var activeSession = activeSessionByClient.get(clientId);

package/server/src/handlers/session.ts

@@ -27,7 +27,7 @@ import {
 import { getContextBreakdown } from "../project/context-breakdown";
 import { setActiveSession, getActiveSession } from "./chat";
 import { setActiveProject } from "./fs";
-import { wasSessionInterrupted, clearInterruptedFlag, isSessionBusy, watchSessionLock, stopExternalSession, getBusyOwner } from "../project/sdk-bridge";
+import { wasSessionInterrupted, clearInterruptedFlag } from "../project/sdk-bridge";
 import { log } from "../logger";
 
 registerHandler("session", function (clientId: string, message: ClientMessage) {
@@ -105,7 +105,6 @@ registerHandler("session", function (clientId: string, message: ClientMessage) {
     var activateMsg = message as SessionActivateMessage;
     setActiveSession(clientId, activateMsg.projectSlug, activateMsg.sessionId);
     setActiveProject(clientId, activateMsg.projectSlug);
-    watchSessionLock(activateMsg.sessionId);
     var activateT0 = Date.now();
     void loadSessionHistory(activateMsg.projectSlug, activateMsg.sessionId).then(function (historyResult) {
       log.session("session:activate history: %dms", Date.now() - activateT0);
@@ -114,8 +113,6 @@ registerHandler("session", function (clientId: string, message: ClientMessage) {
       if (interrupted) {
         clearInterruptedFlag(activateMsg.sessionId);
       }
-      var busy = isSessionBusy(activateMsg.sessionId);
-      var busyOwner = busy ? getBusyOwner(activateMsg.sessionId) : undefined;
       sendTo(clientId, {
         type: "session:history",
         projectSlug: activateMsg.projectSlug,
@@ -123,8 +120,6 @@ registerHandler("session", function (clientId: string, message: ClientMessage) {
         messages: historyResult.messages,
         title: title,
         interrupted: interrupted || undefined,
-        busy: busy || undefined,
-        busyOwner: busyOwner,
         totalMessages: historyResult.totalMessages,
         hasMore: historyResult.hasMore,
       });
@@ -222,13 +217,4 @@ registerHandler("session", function (clientId: string, message: ClientMessage) {
     });
   }
 
-  if (message.type === "session:stop_external") {
-    var stopMsg = message as { type: string; sessionId: string };
-    var stopped = stopExternalSession(stopMsg.sessionId);
-    if (stopped) {
-      log.session("Sent SIGINT to external CLI process for session %s", stopMsg.sessionId);
-    } else {
-      sendTo(clientId, { type: "chat:error", message: "No external process found for this session." });
-    }
-  }
 });

package/server/src/handlers/settings.ts

@@ -122,6 +122,9 @@ registerHandler("settings", function (clientId: string, message: ClientMessage)
       },
       projects: refreshed.projects,
     };
+    if ("costBudget" in incoming && incoming.costBudget == null) {
+      delete (updated as Record<string, unknown>).costBudget;
+    }
     saveConfig(updated);
     var updatedWithClaudeMd = { ...updated, claudeMd: loadGlobalClaudeMd() };
     sendTo(clientId, {

package/server/src/index.ts

@@ -1,4 +1,7 @@
 #!/usr/bin/env bun
+delete process.env.CLAUDECODE;
+delete process.env.CLAUDE_CODE_ENTRYPOINT;
+
 import { existsSync, readFileSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { DAEMON_PID_FILE } from "@lattice/shared";