@cryptiklemur/lattice 1.40.8 → 1.41.1

package/client/src/components/chat/ChatView.tsx

@@ -23,7 +23,7 @@ import { useBookmarks } from "../../hooks/useBookmarks";
 import { formatSessionTitle } from "../../utils/formatSessionTitle";
 
 export function ChatView({ sessionId: tabSessionId, projectSlug: tabProjectSlug }: { sessionId?: string; projectSlug?: string } = {}) {
-  var { messages, isProcessing, sendMessage, activeSessionId, activeSessionTitle, currentStatus, contextUsage, contextBreakdown, lastResponseCost, lastResponseDuration, historyLoading, wasInterrupted, promptSuggestion, failedInput, clearFailedInput, messageQueue, enqueueMessage, removeQueuedMessage, updateQueuedMessage, isBusy, isPlanMode, pendingPrefill, activateSession, budgetStatus, budgetExceeded, sendBudgetOverride, dismissBudgetExceeded } = useSession();
+  var { messages, isProcessing, sendMessage, activeSessionId, activeSessionTitle, currentStatus, contextUsage, contextBreakdown, lastResponseCost, lastResponseDuration, historyLoading, wasInterrupted, promptSuggestion, failedInput, clearFailedInput, messageQueue, enqueueMessage, removeQueuedMessage, updateQueuedMessage, isBusy, busyOwner, isPlanMode, pendingPrefill, activateSession, budgetStatus, budgetExceeded, sendBudgetOverride, dismissBudgetExceeded } = useSession();
   var { activeProject } = useProjects();
   var { toggleDrawer } = useSidebar();
 
@@ -955,7 +955,11 @@ export function ChatView({ sessionId: tabSessionId, projectSlug: tabProjectSlug
       {isBusy && !isProcessing && (
         <div className="flex items-center gap-2 px-3 sm:px-5 py-2 bg-info/10 border-t border-info/20">
           <Terminal size={13} className="text-info flex-shrink-0" />
-          <span className="text-[12px] text-info flex-1">This session is being used by another client — input is disabled</span>
+          <span className="text-[12px] text-info flex-1">
+            {busyOwner === "cli"
+              ? "This session is controlled by Claude Code CLI — input is disabled"
+              : "This session is in use by another Lattice client — input is disabled"}
+          </span>
           <button
             onClick={function () { setConfirmStopExternal(true); }}
             className="btn btn-ghost btn-xs text-error/70 hover:text-error gap-1 flex-shrink-0"
@@ -1063,7 +1067,9 @@ export function ChatView({ sessionId: tabSessionId, projectSlug: tabProjectSlug
           disabled={!activeSessionId || !online || isBusy || (budgetStatus !== null && budgetStatus.enforcement === "hard-block" && budgetStatus.dailySpend >= budgetStatus.dailyLimit)}
           disabledPlaceholder={
             isBusy
-              ? "Session in use by another client..."
+              ? (busyOwner === "cli"
+                ? "Controlled by Claude Code CLI"
+                : "Session in use by another Lattice client")
               : (budgetStatus !== null && budgetStatus.enforcement === "hard-block" && budgetStatus.dailySpend >= budgetStatus.dailyLimit)
                 ? "Daily budget exceeded ($" + budgetStatus.dailySpend.toFixed(2) + " / $" + budgetStatus.dailyLimit.toFixed(2) + ")"
                 : undefined

package/client/src/hooks/useSession.ts

@@ -305,6 +305,7 @@ export function useSession(): UseSessionReturn {
             historyLoading: false,
             wasInterrupted: m.interrupted || false,
             isBusy: m.busy || false,
+            busyOwner: m.busyOwner ?? null,
             isPlanMode: false,
           };
         });
@@ -335,13 +336,13 @@ export function useSession(): UseSessionReturn {
     }
 
     function handleSessionBusy(msg: ServerMessage) {
-      var m = msg as { type: string; sessionId: string; busy: boolean };
+      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);
+        setSessionBusy(m.busy, m.busyOwner);
       }
     }
 
@@ -445,6 +446,7 @@ export function useSession(): UseSessionReturn {
     failedInput: state.failedInput,
     messageQueue: state.messageQueue,
     isBusy: state.isBusy,
+    busyOwner: state.busyOwner,
     isPlanMode: state.isPlanMode,
     pendingPrefill: state.pendingPrefill,
     budgetStatus: state.budgetStatus,

package/client/src/stores/session.ts

@@ -47,6 +47,7 @@ export interface SessionState {
   failedInput: string | null;
   messageQueue: string[];
   isBusy: boolean;
+  busyOwner: "cli" | "lattice" | null;
   isPlanMode: boolean;
   pendingPrefill: string | null;
   budgetStatus: BudgetStatus | null;
@@ -72,6 +73,7 @@ var sessionStore = new Store<SessionState>({
   failedInput: null,
   messageQueue: [],
   isBusy: false,
+  busyOwner: null,
   isPlanMode: false,
   pendingPrefill: null,
   budgetStatus: null,
@@ -296,6 +298,7 @@ export function clearSession(): void {
       failedInput: null,
       messageQueue: [],
       isBusy: false,
+      busyOwner: null,
       isPlanMode: false,
       pendingPrefill: null,
       budgetStatus: null,
@@ -328,9 +331,9 @@ export function setFailedInput(text: string | null): void {
   });
 }
 
-export function setSessionBusy(busy: boolean): void {
+export function setSessionBusy(busy: boolean, owner?: "cli" | "lattice" | null): void {
   sessionStore.setState(function (state) {
-    return { ...state, isBusy: busy };
+    return { ...state, isBusy: busy, busyOwner: busy ? (owner ?? null) : null };
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cryptiklemur/lattice",
-  "version": "1.40.8",
+  "version": "1.41.1",
   "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/handlers/session.ts

@@ -24,7 +24,7 @@ import {
 import { getContextBreakdown } from "../project/context-breakdown";
 import { setActiveSession } from "./chat";
 import { setActiveProject } from "./fs";
-import { wasSessionInterrupted, clearInterruptedFlag, isSessionBusy, watchSessionLock, stopExternalSession } from "../project/sdk-bridge";
+import { wasSessionInterrupted, clearInterruptedFlag, isSessionBusy, watchSessionLock, stopExternalSession, getBusyOwner } from "../project/sdk-bridge";
 import { log } from "../logger";
 
 registerHandler("session", function (clientId: string, message: ClientMessage) {
@@ -113,6 +113,7 @@ registerHandler("session", function (clientId: string, message: ClientMessage) {
           clearInterruptedFlag(activateMsg.sessionId);
         }
         var busy = isSessionBusy(activateMsg.sessionId);
+        var busyOwner = busy ? getBusyOwner(activateMsg.sessionId) : undefined;
         sendTo(clientId, {
           type: "session:history",
           projectSlug: activateMsg.projectSlug,
@@ -121,6 +122,7 @@ registerHandler("session", function (clientId: string, message: ClientMessage) {
           title: results[1],
           interrupted: interrupted || undefined,
           busy: busy || undefined,
+          busyOwner: busyOwner,
         });
       } catch (err) {
         log.session("Error sending session history: %O", err);

package/server/src/project/sdk-bridge.ts

@@ -68,6 +68,7 @@ var interruptedSessions = new Set<string>();
 // Track external lock state so we only broadcast on changes
 var externalLockState = new Map<string, boolean>();
 var watchedSessions = new Set<string>();
+var remoteSessionWatchers = new Map<string, Set<string>>();
 
 /**
  * Start polling a session's lock file for external CLI usage.
@@ -85,18 +86,47 @@ export function unwatchSessionLock(sessionId: string): void {
   externalLockState.delete(sessionId);
 }
 
+export function addRemoteSessionWatcher(sessionId: string, nodeId: string): void {
+  var watchers = remoteSessionWatchers.get(sessionId);
+  if (!watchers) {
+    watchers = new Set();
+    remoteSessionWatchers.set(sessionId, watchers);
+  }
+  watchers.add(nodeId);
+}
+
+export function getBusyOwner(sessionId: string): "cli" | "lattice" | undefined {
+  if (activeStreams.has(sessionId)) return "lattice";
+  if (isSessionLockedByExternal(sessionId)) return "cli";
+  return undefined;
+}
+
 // Poll every 3 seconds for external lock changes
 setInterval(function () {
   for (var sessionId of watchedSessions) {
-    // Skip sessions with active Lattice streams — those are already tracked
-    if (activeStreams.has(sessionId)) continue;
-
-    var locked = isSessionLockedByExternal(sessionId);
+    var busy = isSessionBusy(sessionId);
     var prev = externalLockState.get(sessionId) ?? false;
 
-    if (locked !== prev) {
-      externalLockState.set(sessionId, locked);
-      broadcast({ type: "session:busy", sessionId, busy: locked });
+    if (busy !== prev) {
+      externalLockState.set(sessionId, busy);
+      var owner = busy ? getBusyOwner(sessionId) : undefined;
+      broadcast({ type: "session:busy", sessionId, busy: busy, busyOwner: owner });
+
+      var watchers = remoteSessionWatchers.get(sessionId);
+      if (watchers) {
+        var { getPeerConnection } = require("../mesh/connector") as typeof import("../mesh/connector");
+        for (var nodeId of watchers) {
+          var peerWs = getPeerConnection(nodeId);
+          if (peerWs) {
+            peerWs.send(JSON.stringify({
+              type: "mesh:proxy_response",
+              projectSlug: "",
+              requestId: "busy-" + sessionId,
+              payload: { type: "session:busy", sessionId, busy: busy, busyOwner: owner },
+            }));
+          }
+        }
+      }
     }
   }
 }, 3000);
@@ -188,6 +218,7 @@ export function getActiveStreamCount(): number {
  * so this ONLY returns true for external CLI instances.
  */
 export function isSessionBusy(sessionId: string): boolean {
+  if (activeStreams.has(sessionId)) return true;
   return isSessionLockedByExternal(sessionId);
 }
 

package/shared/src/messages.ts

@@ -622,12 +622,14 @@ export interface SessionHistoryMessage {
   title?: string;
   interrupted?: boolean;
   busy?: boolean;
+  busyOwner?: "cli" | "lattice";
 }
 
 export interface SessionBusyMessage {
   type: "session:busy";
   sessionId: string;
   busy: boolean;
+  busyOwner?: "cli" | "lattice";
 }
 
 export interface ChatUserMessage {