pi-teams 0.9.2 → 0.9.5

package/extensions/index.ts

@@ -142,10 +142,134 @@ function resolveModelWithProvider(modelName: string): string | null {
   return null;
 }
 
+/**
+ * Find the team this session is the lead for (if any).
+ * Checks the lead-session.json file to match PID.
+ */
+function findLeadTeamForSession(): string | null {
+  try {
+    const teamsDir = paths.TEAMS_DIR;
+    if (!fs.existsSync(teamsDir)) return null;
+
+    for (const teamDir of fs.readdirSync(teamsDir)) {
+      const sessionFile = paths.leadSessionPath(teamDir);
+      if (fs.existsSync(sessionFile)) {
+        try {
+          const session = JSON.parse(fs.readFileSync(sessionFile, "utf-8"));
+          if (session.pid === process.pid) {
+            return teamDir;
+          }
+        } catch {
+          // Ignore corrupted session files
+        }
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Register this session as the lead for a team.
+ */
+function registerLeadSession(teamName: string) {
+  const sessionFile = paths.leadSessionPath(teamName);
+  const dir = path.dirname(sessionFile);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(sessionFile, JSON.stringify({
+    pid: process.pid,
+    startedAt: Date.now(),
+  }));
+}
+
+/**
+ * Check if a process with the given PID is still alive.
+ */
+function isPidAlive(pid: number): boolean {
+  try {
+    process.kill(pid, 0); // Signal 0 = check if process exists
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Clean up a stale team if the lead process is dead.
+ * Kills all teammate panes/windows and removes all state files.
+ * Returns true if cleanup was performed, false otherwise.
+ */
+function cleanupStaleTeam(teamName: string, terminal: any): boolean {
+  const sessionFile = paths.leadSessionPath(teamName);
+  const configFile = paths.configPath(teamName);
+  
+  if (!fs.existsSync(sessionFile) || !fs.existsSync(configFile)) {
+    return false;
+  }
+  
+  try {
+    const session = JSON.parse(fs.readFileSync(sessionFile, "utf-8"));
+    
+    // Only cleanup if the lead PID is actually dead
+    if (session.pid && !isPidAlive(session.pid)) {
+      // Read config to get member info for cleanup
+      try {
+        const config = JSON.parse(fs.readFileSync(configFile, "utf-8"));
+        
+        // Kill all teammate panes/windows
+        for (const member of config.members || []) {
+          if (member.name === "team-lead") continue;
+          
+          // Kill via PID file
+          const pidFile = path.join(paths.teamDir(teamName), `${member.name}.pid`);
+          if (fs.existsSync(pidFile)) {
+            try {
+              const pid = fs.readFileSync(pidFile, "utf-8").trim();
+              process.kill(parseInt(pid), "SIGKILL");
+              fs.unlinkSync(pidFile);
+            } catch {}
+          }
+          
+          // Kill via terminal adapter
+          if (terminal) {
+            if (member.windowId) {
+              try { terminal.killWindow(member.windowId); } catch {}
+            }
+            if (member.tmuxPaneId) {
+              try { terminal.kill(member.tmuxPaneId); } catch {}
+            }
+          }
+        }
+      } catch {}
+      
+      // Delete entire team directory
+      const teamDirectory = paths.teamDir(teamName);
+      if (fs.existsSync(teamDirectory)) {
+        fs.rmSync(teamDirectory, { recursive: true });
+      }
+      
+      // Delete tasks directory
+      const tasksDirectory = paths.taskDir(teamName);
+      if (fs.existsSync(tasksDirectory)) {
+        fs.rmSync(tasksDirectory, { recursive: true });
+      }
+      
+      return true;
+    }
+  } catch {}
+  
+  return false;
+}
+
 export default function (pi: ExtensionAPI) {
   const isTeammate = !!process.env.PI_AGENT_NAME;
   const agentName = process.env.PI_AGENT_NAME || "team-lead";
-  const teamName = process.env.PI_TEAM_NAME;
+  const envTeamName = process.env.PI_TEAM_NAME;
+
+  // For leads without PI_TEAM_NAME, check if we're registered as lead for a team
+  const detectedTeamName = envTeamName || findLeadTeamForSession();
+  const teamName = detectedTeamName;
 
   const terminal = getTerminalAdapter();
 
@@ -181,27 +305,34 @@ export default function (pi: ExtensionAPI) {
       setTimeout(() => {
         pi.sendUserMessage(`I am starting my work as '${agentName}' on team '${teamName}'. Checking my inbox for instructions...`);
       }, 1000);
+    } else if (teamName) {
+      ctx.ui.setStatus("pi-teams", `Lead @ ${teamName}`);
+    }
 
+    // Inbox polling for BOTH teammates AND team-leads (anyone with teamName)
+    if (teamName) {
       setInterval(async () => {
-        if (ctx.isIdle() && teamName) {
+        if (ctx.isIdle()) {
           try {
             const unread = await messaging.readInbox(teamName, agentName, true, false);
-            await runtime.writeRuntimeStatus(teamName, agentName, {
-              lastHeartbeatAt: Date.now(),
-            });
+            if (isTeammate) {
+              await runtime.writeRuntimeStatus(teamName, agentName, {
+                lastHeartbeatAt: Date.now(),
+              });
+            }
             if (unread.length > 0) {
               pi.sendUserMessage(`I have ${unread.length} new message(s) in my inbox. Reading them now...`);
             }
           } catch (e) {
-            await runtime.writeRuntimeStatus(teamName, agentName, {
-              lastHeartbeatAt: Date.now(),
-              lastError: runtime.createRuntimeError(e),
-            });
+            if (isTeammate) {
+              await runtime.writeRuntimeStatus(teamName, agentName, {
+                lastHeartbeatAt: Date.now(),
+                lastError: runtime.createRuntimeError(e),
+              });
+            }
           }
         }
       }, 30000);
-    } else if (teamName) {
-      ctx.ui.setStatus("pi-teams", `Lead @ ${teamName}`);
     }
   });
 
@@ -289,7 +420,15 @@ export default function (pi: ExtensionAPI) {
       separate_windows: Type.Optional(Type.Boolean({ default: false, description: "Open teammates in separate OS windows instead of panes" })),
     }),
     async execute(toolCallId, params: any, signal, onUpdate, ctx) {
+      // Auto-cleanup stale team if the previous lead process is dead
+      // This handles the case where a session was aborted and restarted
+      if (teams.teamExists(params.team_name)) {
+        cleanupStaleTeam(params.team_name, terminal);
+      }
+      
       const config = teams.createTeam(params.team_name, "local-session", "lead-agent", params.description, params.default_model, params.separate_windows);
+      // Register this session as the lead so it can receive inbox messages
+      registerLeadSession(params.team_name);
       return {
         content: [{ type: "text", text: `Team ${params.team_name} created.` }],
         details: { config },
@@ -324,6 +463,15 @@ export default function (pi: ExtensionAPI) {
       }
 
       const teamConfig = await teams.readConfig(safeTeamName);
+      
+      // Check if a teammate with this name already exists - kill them first
+      // This handles the case where the user aborts mid-execution and restarts
+      const existingMember = teamConfig.members.find(m => m.name === safeName && m.agentType === "teammate");
+      if (existingMember) {
+        await killTeammate(safeTeamName, existingMember);
+        await teams.removeMember(safeTeamName, safeName);
+      }
+      
       let chosenModel = params.model || teamConfig.defaultModel;
 
       // Resolve model to provider/model format

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-teams",
-  "version": "0.9.2",
+  "version": "0.9.5",
   "description": "Agent teams for pi, ported from claude-code-teams-mcp",
   "repository": {
     "type": "git",

package/src/utils/paths.ts

@@ -39,3 +39,7 @@ export function runtimeStatusPath(teamName: string, agentName: string) {
 export function configPath(teamName: string) {
   return path.join(teamDir(teamName), "config.json");
 }
+
+export function leadSessionPath(teamName: string) {
+  return path.join(teamDir(teamName), "lead-session.json");
+}