@cryptiklemur/lattice 1.41.0 → 1.41.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cryptiklemur/lattice",
-  "version": "1.41.0",
+  "version": "1.41.2",
   "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/project/sdk-bridge.ts

@@ -4,7 +4,7 @@ import type { SDKMessage, SDKPartialAssistantMessage, SDKResultMessage, SDKUserM
 import type { CanUseTool, PermissionMode, PermissionResult, PermissionUpdate } from "@anthropic-ai/claude-agent-sdk";
 type MessageParam = SDKUserMessage["message"];
 import type { Attachment } from "@lattice/shared";
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync, mkdirSync, statSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { homedir } from "node:os";
 import { sendTo, broadcast } from "../ws/broadcast";
@@ -96,22 +96,21 @@ export function addRemoteSessionWatcher(sessionId: string, nodeId: string): void
 }
 
 export function getBusyOwner(sessionId: string): "cli" | "lattice" | undefined {
-  if (!isSessionLockedByExternal(sessionId)) return undefined;
-  return "cli";
+  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) {
-    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);
-      var owner = locked ? getBusyOwner(sessionId) : undefined;
-      broadcast({ type: "session:busy", sessionId, busy: locked, busyOwner: owner });
+    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) {
@@ -123,7 +122,7 @@ setInterval(function () {
               type: "mesh:proxy_response",
               projectSlug: "",
               requestId: "busy-" + sessionId,
-              payload: { type: "session:busy", sessionId, busy: locked, busyOwner: owner },
+              payload: { type: "session:busy", sessionId, busy: busy, busyOwner: owner },
             }));
           }
         }
@@ -219,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);
 }
 
@@ -227,77 +227,48 @@ export function isSessionBusy(sessionId: string): boolean {
  * The SDK spawns child processes (e.g. claude-agent-sdk/cli.js) that hold
  * lock files — those are NOT external.
  */
-function isOwnProcess(pid: number): boolean {
-  var myPid = process.pid;
-  if (pid === myPid) return true;
-  // Walk up the process tree to see if pid is a descendant of us
-  var current = pid;
-  for (var i = 0; i < 10; i++) {
-    try {
-      var stat = readFileSync("/proc/" + current + "/stat", "utf-8");
-      // Format: pid (comm) state ppid ...
-      var match = stat.match(/^\d+\s+\([^)]*\)\s+\S+\s+(\d+)/);
-      if (!match) return false;
-      var ppid = parseInt(match[1], 10);
-      if (ppid === myPid) return true;
-      if (ppid <= 1) return false;
-      current = ppid;
-    } catch {
-      return false;
+function isSessionLockedByExternal(sessionId: string): boolean {
+  if (activeStreams.has(sessionId)) return false;
+
+  var config = loadConfig();
+  for (var i = 0; i < config.projects.length; i++) {
+    var projectPath = config.projects[i].path;
+    var hash = projectPath.replace(/\//g, "-");
+    var jsonlPath = join(homedir(), ".claude", "projects", hash, sessionId + ".jsonl");
+    if (existsSync(jsonlPath)) {
+      try {
+        var stat = statSync(jsonlPath);
+        var mtime = stat.mtimeMs;
+        if (Date.now() - mtime < 10000) {
+          return true;
+        }
+      } catch {}
     }
   }
-  return false;
-}
-
-/**
- * Get PIDs holding the session lock file, excluding Lattice's own process tree.
- * Returns the list of truly external PIDs.
- */
-function getExternalLockPids(sessionId: string): number[] {
-  var lockPath = join(homedir(), ".claude", "tasks", sessionId, ".lock");
-  if (!existsSync(lockPath)) return [];
-  try {
-    var result = Bun.spawnSync(["fuser", lockPath], {
-      stderr: "ignore",
-    });
-    if (result.exitCode !== 0) return [];
-    var output = result.stdout.toString().trim();
-    var pids = output.split(/\s+/)
-      .map(function (s) { return parseInt(s, 10); })
-      .filter(function (p) { return !isNaN(p) && !isOwnProcess(p); });
-    return pids;
-  } catch {
-    return [];
-  }
-}
 
-function isSessionLockedByExternal(sessionId: string): boolean {
-  return getExternalLockPids(sessionId).length > 0;
-}
-
-/**
- * Get the first external PID holding the session lock file.
- * Used to send SIGINT to stop the external process.
- */
-function getExternalLockPid(sessionId: string): number | null {
-  var pids = getExternalLockPids(sessionId);
-  return pids.length > 0 ? pids[0] : null;
+  return false;
 }
 
-/**
- * Gracefully stop an external Claude Code CLI process controlling a session.
- * Sends SIGINT which triggers Claude Code's graceful shutdown.
- * Returns true if a signal was sent.
- */
 export function stopExternalSession(sessionId: string): boolean {
-  var pid = getExternalLockPid(sessionId);
-  if (pid === null) return false;
   try {
-    process.kill(pid, "SIGINT");
-    return true;
-  } catch {
-    return false;
-  }
+    var config = loadConfig();
+    for (var i = 0; i < config.projects.length; i++) {
+      var hash = config.projects[i].path.replace(/\//g, "-");
+      var jsonlPath = join(homedir(), ".claude", "projects", hash, sessionId + ".jsonl");
+      if (existsSync(jsonlPath)) {
+        var result = Bun.spawnSync(["fuser", jsonlPath], { stderr: "ignore" });
+        if (result.exitCode === 0) {
+          var output = result.stdout.toString().trim();
+          var pids = output.split(/\s+/).map(Number).filter(function (p) { return !isNaN(p) && p !== process.pid; });
+          if (pids.length > 0) {
+            process.kill(pids[0], "SIGINT");
+            return true;
+          }
+        }
+      }
+    }
+  } catch {}
+  return false;
 }
 
 export function getSessionStreamClientId(sessionId: string): string | undefined {