oira666_pi-subagent 0.3.16 → 0.3.18

package/README.md

@@ -235,7 +235,7 @@ Note: crash-resume covers `subagents` calls only. An interrupted `resume_subagen
 ## Resumable Subagents by Name (`resume_subagents`)
 
 Every subagent run is assigned a random, durable human first name from a bundled
-list of 500 popular American names — for example `John`, `Maria`, or `Elena`.
+list of 1000 culturally diverse names — for example `John`, `Octavian`, or `Vishnu`.
 Names are never reused anywhere in the same delegation tree. The name is
 returned together with the agent type and shown in every TUI view.
 

package/agent-names.ts

@@ -0,0 +1,126 @@
+/** 1000 culturally diverse given names used for human-friendly subagent identities. */
+export const AGENT_NAMES = [
+  // Common masculine names
+  "James", "John", "Robert", "Michael", "William", "David", "Richard", "Joseph", "Thomas", "Christopher",
+  "Charles", "Daniel", "Matthew", "Anthony", "Mark", "Donald", "Steven", "Andrew", "Paul", "Joshua",
+  "Kenneth", "Kevin", "Brian", "George", "Timothy", "Ronald", "Edward", "Jason", "Jeffrey", "Ryan",
+  "Jacob", "Gary", "Nicholas", "Eric", "Jonathan", "Stephen", "Larry", "Justin", "Scott", "Brandon",
+  "Benjamin", "Samuel", "Gregory", "Alexander", "Patrick", "Frank", "Raymond", "Jack", "Dennis", "Jerry",
+  "Tyler", "Aaron", "Jose", "Adam", "Nathan", "Henry", "Douglas", "Zachary", "Peter", "Kyle",
+  "Walter", "Ethan", "Jeremy", "Harold", "Keith", "Christian", "Roger", "Noah", "Gerald", "Carl",
+  "Terry", "Sean", "Austin", "Arthur", "Lawrence", "Jesse", "Dylan", "Bryan", "Joe", "Jordan",
+  "Billy", "Bruce", "Albert", "Willie", "Gabriel", "Logan", "Alan", "Juan", "Wayne", "Roy",
+  "Ralph", "Randy", "Eugene", "Vincent", "Russell", "Elijah", "Louis", "Bobby", "Philip", "Johnny",
+  "Howard", "Isaac", "Harry", "Victor", "Martin", "Ernest", "Phillip", "Todd", "Craig", "Shawn",
+  "Clarence", "Carlos", "Caleb", "Blake", "Mason", "Luke", "Liam", "Owen", "Nathaniel", "Cameron",
+  "Hunter", "Connor", "Adrian", "Julian", "Jeremiah", "Angel", "Isaiah", "Evan", "Colton", "Gavin",
+  "Dominic", "Cooper", "Ian", "Carson", "Jaxon", "Theodore", "Hudson", "Lincoln", "Asher", "Wyatt",
+  "Leo", "Ezra", "Miles", "Micah", "Silas", "Roman", "Wesley", "Brooks", "Bennett", "Parker",
+  "Beau", "Weston", "Damian", "Sawyer", "Emmett", "Harrison", "Cole", "Maxwell", "Holden", "Antonio",
+  "Miguel", "Oscar", "Diego", "Alejandro", "Marco", "Luis", "Javier", "Sergio", "Ricardo", "Manuel",
+  "Roberto", "Francisco", "Eduardo", "Fernando", "Ruben", "Raul", "Andres", "Hector", "Edgar", "Mario",
+  "Derek", "Trevor", "Travis", "Cody", "Dustin", "Corey", "Brett", "Chad", "Bradley", "Spencer",
+  "Grant", "Joel", "Dean", "Dale", "Glenn", "Stanley", "Leonard", "Francis", "Herbert", "Frederick",
+  "Norman", "Melvin", "Marvin", "Gordon", "Allen", "Bernard", "Clifford", "Warren", "Curtis", "Darren",
+  "Troy", "Marcus", "Derrick", "Andre", "Terrence", "Maurice", "Darius", "Malcolm", "Xavier", "Preston",
+  "Grayson", "Easton", "Nolan", "Everett", "Axel", "Emmanuel", "Kingston", "Elliot", "Tim", "Simon",
+  "Riley", "Finn", "Jasper", "Milo", "Rowan", "Declan", "Graham", "Max", "Nash", "Reid",
+  "Lane", "Tucker", "Carter", "Chase", "Coleman", "Bryce", "Hayden", "Aidan", "Jonah", "Jonas",
+
+  // Common feminine names
+  "Mary", "Patricia", "Jennifer", "Linda", "Elizabeth", "Barbara", "Susan", "Jessica", "Sarah", "Karen",
+  "Lisa", "Nancy", "Betty", "Margaret", "Sandra", "Ashley", "Kimberly", "Emily", "Donna", "Michelle",
+  "Carol", "Amanda", "Melissa", "Deborah", "Stephanie", "Dorothy", "Rebecca", "Sharon", "Laura", "Cynthia",
+  "Amy", "Kathleen", "Angela", "Shirley", "Brenda", "Emma", "Anna", "Pamela", "Nicole", "Samantha",
+  "Katherine", "Christine", "Debra", "Rachel", "Carolyn", "Janet", "Maria", "Heather", "Diane", "Julie",
+  "Joyce", "Victoria", "Kelly", "Christina", "Lauren", "Joan", "Evelyn", "Olivia", "Judith", "Megan",
+  "Cheryl", "Martha", "Andrea", "Frances", "Hannah", "Jacqueline", "Ann", "Gloria", "Jean", "Kathryn",
+  "Alice", "Teresa", "Sara", "Janice", "Doris", "Madison", "Julia", "Grace", "Judy", "Abigail",
+  "Marie", "Denise", "Beverly", "Amber", "Theresa", "Marilyn", "Danielle", "Diana", "Brittany", "Natalie",
+  "Sophia", "Rose", "Isabella", "Alexis", "Kayla", "Charlotte", "Lori", "Alexandra", "Savannah", "Brooklyn",
+  "Bella", "Claire", "Skylar", "Lucy", "Paisley", "Everly", "Caroline", "Nova", "Genesis", "Emilia",
+  "Kennedy", "Maya", "Willow", "Kinsley", "Naomi", "Aaliyah", "Elena", "Mckenna", "Ariana", "Allison",
+  "Gabriella", "Margot", "Madelyn", "Cora", "Ruby", "Eva", "Serenity", "Autumn", "Adeline", "Hailey",
+  "Gianna", "Valentina", "Isla", "Eliana", "Quinn", "Nevaeh", "Ivy", "Sadie", "Piper", "Lydia",
+  "Alexa", "Josephine", "Emery", "Phoebe", "Delilah", "Arianna", "Vivian", "Kaylee", "Sophie", "Brielle",
+  "Madeline", "Peyton", "Rylee", "Clara", "Hadley", "Melanie", "Mackenzie", "Reagan", "Adalynn", "Liliana",
+  "Aubree", "Jade", "Miranda", "Isabelle", "Natalia", "Raelynn", "Dakota", "Athena", "Ximena", "Arya",
+  "Leilani", "Taylor", "Faith", "Lena", "Kylie", "Miriam", "Kate", "Summer", "Lyla", "Brooke",
+  "Amaya", "Eliza", "Brianna", "Bailey", "Nina", "Khloe", "Jasmine", "Melody", "Isabel", "Norah",
+  "Annabelle", "Valeria", "Emerson", "Cecilia", "Valerie", "Molly", "Reese", "Aliyah", "Lilly", "Blair",
+  "Finley", "Morgan", "Sydney", "Jordyn", "Eloise", "Trinity", "Daisy", "Catherine", "Lola", "Genevieve",
+  "Marley", "Arabella", "Harmony", "Elise", "Remi", "Teagan", "Evie", "London", "Sloane", "Laila",
+  "Lucia", "Willa", "Juliana", "Gracie", "June", "Tessa", "Ada", "Camille", "Hope", "Samara",
+  "Rosalie", "Ruth", "Fiona", "Georgia", "Noelle", "Vanessa", "Daniela", "Paige", "Violet", "Presley",
+  "Adriana", "Joanna", "Giselle", "Harper", "Avery", "Scarlett", "Aria", "Ellie", "Chloe", "Layla",
+
+  // Ancient Greek, Roman, and Mediterranean names
+  "Achilles", "Aeschylus", "Agamemnon", "Alcibiades", "Andromache", "Antigone", "Apollonia", "Archimedes", "Aristides", "Aspasia",
+  "Berenice", "Briseis", "Calliope", "Cassander", "Cassia", "Cato", "Cicero", "Cleisthenes", "Clio", "Cornelia",
+  "Cyprian", "Damaris", "Demetrius", "Diogenes", "Electra", "Epictetus", "Eudora", "Euripides", "Galen", "Hecuba",
+  "Herodotus", "Hippolyta", "Horatia", "Hypatia", "Ianthe", "Isocrates", "Laodamia", "Leander", "Livia", "Lysander",
+  "Octavia", "Octavian", "Orestes", "Pericles", "Petronilla", "Plutarch", "Priam", "Sappho", "Seneca", "Themistocles",
+
+  // Norse, Celtic, and early Germanic names
+  "Aethelred", "Alaric", "Alfhild", "Ansgar", "Arnfinn", "Audhild", "Beowulf", "Boudica", "Branwen", "Brennus",
+  "Brynhild", "Cadwaladr", "Caradoc", "Cerdic", "Cormac", "Cunegunda", "Dagmar", "Eadric", "Eir", "Eirik",
+  "Embla", "Faramund", "Fergus", "Freydis", "Gudrun", "Gunnar", "Guthrum", "Gwendolen", "Halfdan", "Hildegard",
+  "Hrolf", "Iseult", "Ivar", "Leif", "Maeve", "Niamh", "Olwen", "Orlaith", "Ragnhild", "Ragnar",
+  "Rhiannon", "Sigfrid", "Sigrid", "Sigrun", "Somerled", "Svanhild", "Taliesin", "Theodelinda", "Torsten", "Yseult",
+
+  // Medieval, Byzantine, Slavic, and Baltic names
+  "Aldona", "Basilissa", "Boleslav", "Borivoj", "Bozena", "Bronislava", "Casimir", "Cyrilla", "Dobrawa", "Dragomir",
+  "Drazan", "Eudokia", "Euphemia", "Fevronia", "Gavrila", "Gleb", "Jaromir", "Jelena", "Kaloyan", "Kresimir",
+  "Ladislav", "Ljubica", "Ludmila", "Mieszko", "Milica", "Milos", "Miroslav", "Mstislav", "Nadezhda", "Niketas",
+  "Perun", "Pribislav", "Radoslav", "Rostislav", "Simeon", "Slavomir", "Sviatoslav", "Theodora", "Tomislav", "Vaclava",
+  "Vasilisa", "Vesna", "Viesturs", "Vladimir", "Vseslav", "Vytautas", "Yaroslav", "Zbigniew", "Zdislava", "Zvonimir",
+
+  // Ancient Egyptian, Mesopotamian, Persian, Armenian, and Georgian names
+  "Ahmose", "Amasis", "Amenemhat", "Ankhesenamun", "Ardashir", "Arsinoe", "Artabanus", "Artaxerxes", "Ashurbanipal", "Atossa",
+  "Bardiya", "Cambyses", "Cyrus", "Enheduanna", "Esarhaddon", "Gilgamesh", "Hatshepsut", "Horemheb", "Imhotep", "Ishtar",
+  "Kassandane", "Khafre", "Khufu", "Mandane", "Marduk", "Meritamen", "Mithridates", "Nabonidus", "Naram-Sin", "Nebuchadnezzar",
+  "Nefertari", "Nefertiti", "Neithhotep", "Nitocris", "Parmys", "Parysatis", "Pharnaces", "Psamtik", "Roxana", "Sargon",
+  "Semiramis", "Shapur", "Sinsharishkun", "Tahmasp", "Tamar", "Tigran", "Tiridates", "Tomyris", "Xerxes", "Zenobia",
+
+  // South Asian historical, literary, and traditional names
+  "Abhimanyu", "Agastya", "Amrapali", "Anasuya", "Arjuna", "Ashoka", "Bharata", "Bhaskara", "Bimbisara", "Chanakya",
+  "Chandragupta", "Charulata", "Damayanti", "Dhanvantari", "Draupadi", "Gargi", "Harsha", "Hemachandra", "Ila", "Indrajit",
+  "Jambavati", "Janaka", "Kalidasa", "Kanishka", "Karna", "Kausalya", "Krishna", "Lalitaditya", "Lopamudra", "Maitreyi",
+  "Mandodari", "Mirabai", "Nachiketa", "Narasimha", "Padmini", "Panini", "Parvati", "Prithviraj", "Razia", "Samudragupta",
+  "Savitri", "Shakuntala", "Shivaji", "Sita", "Subhadra", "Tansen", "Udayana", "Vashti", "Vikramaditya", "Vishnu",
+
+  // East Asian historical and legendary names
+  "Akiko", "Amaterasu", "Benkei", "Chiyome", "Okinagatarashi", "Himiko", "Tokimune", "Izumi", "Kaguya", "Kanetsugu",
+  "Kiyomori", "Masako", "Masamune", "Murasaki", "Nobunaga", "Raikou", "Sei", "Shingen", "Tadakatsu", "Tomoe",
+  "Hideyoshi", "Yamato", "Yoritomo", "Yoshitsune", "Yukimura", "Baochai", "Zhao", "Cao", "Chang'e", "Diaochan",
+  "Fuxi", "Guanyu", "Zhu", "Mulan", "Bai", "Bei", "Nuwa", "Zheng", "Ping", "Quan",
+  "Shimin", "Qiang", "Meiniang", "Ji", "Xishi", "Xuanzang", "Sun-sin", "Gwan-sun", "He", "Liang",
+
+  // Southeast Asian, Central Asian, and steppe names
+  "Airlangga", "Anawrahta", "Bayinnaung", "Borommatrailokkanat", "Champa", "Chulalongkorn", "Diponegoro", "Mada", "Tuah", "Rajasanagara",
+  "Jayavarman", "Kartini", "Arok", "Kertanegara", "Lakshmana", "Mahendravarman", "Parameswara", "Mulavarman", "Srikandi", "Suryavarman",
+  "Tribhuwana", "TrưngTrắc", "TrưngNhị", "Udayadityavarman", "Visay", "Arslan", "Babur", "Batu", "Bumin", "Chagatai",
+  "Genghis", "Hulagu", "Jebe", "Kublai", "Manas", "Möngke", "Nader", "Ogedei", "Roxelana", "Seljuk",
+  "Subutai", "Tokhtamysh", "Temujin", "Timur", "Tomris", "Tughril", "Taraghay", "Yesugei", "Zahiruddin", "Zebunissa",
+
+  // African historical, royal, and traditional names
+  "Amina", "Amanirenas", "Amanishakheto", "Askia", "Behanzin", "Bilqis", "Candace", "Cetshwayo", "Chaka", "Dihya",
+  "Efunroye", "Ezana", "Gudit", "Hannibal", "Hanno", "Amanitore", "Idia", "Orompoto", "Jaja", "Taharqa",
+  "Shanakhdakheto", "Kassa", "Khama", "Lalibela", "LatDior", "Liholiho", "Lukeni", "Makeda", "Sakura", "Mantatisi",
+  "Menen", "Menelik", "Mkabayi", "Moremi", "Moshoeshoe", "Mpande", "Mzilikazi", "Nandi", "YaaAsantewaa", "Njoya",
+  "Njinga", "Ewuare", "Osei", "Piankhi", "Prempeh", "Ranavalona", "Sarraounia", "Sekhukhune", "Shaka", "Sundiata",
+
+  // Indigenous American and Pacific historical and traditional names
+  "Ahuizotl", "Anacaona", "Atahualpa", "Caupolicán", "Cuitlahuac", "Cuauhtemoc", "Guarocuya", "Huascar", "Itzcoatl", "Lautaro",
+  "Malinalli", "Manco", "Moctezuma", "Nezahualcoyotl", "Ollantay", "Pachacuti", "Quispe", "Rumiñahui", "Sayri", "Sinchi",
+  "Tecuichpo", "Tlahuicole", "Tupac", "Xicotencatl", "Yma", "Hine-nui-te-pō", "Hongi", "Kamehameha", "Kaʻahumanu", "Keōpūolani",
+  "Kupe", "Liliʻuokalani", "Makea", "Maui", "Olomu", "Ngarimu", "Pakalitha", "Pele", "Pōmare", "Ruatara",
+  "Salamasina", "Tāwhiao", "Te Puea", "Tupaia", "Tūtānekai", "Uenuku", "Vaiola", "Whina", "Wherowhero", "Yosihiko",
+
+  // Middle Eastern, North African, Iberian, and Jewish historical names
+  "AbdAl-Rahman", "Aisha", "Hasan", "Ja'far", "Pelayo", "Walid", "Husayn", "Badr", "Bintou", "Abdallah",
+  "Bohemond", "Rodrigo", "Fadila", "Fatima", "Qasim", "Ghazala", "Hafsa", "Harun", "Hasdrubal", "Muhammad",
+  "Idris", "Ishaq", "Jahanara", "Khadija", "Khayzuran", "Leovigild", "Lubna", "Moshe", "Marwan", "Maslama",
+  "Musa", "Nasir", "Rabi'a", "Rashid", "Saadia", "Salahuddin", "Shajar", "Shirin", "Suhaila", "Tariq",
+  "Theodoric", "Urraca", "Wallada", "Yehuda", "Yusuf", "Zaynab", "Ziryab", "Zipporah", "Zubaida", "Zuleika",
+] as const;

package/index.ts

@@ -41,6 +41,7 @@ import {
   SUBAGENT_NAMES_CUSTOM_TYPE,
 } from "./names.js";
 import {
+  clearRenderCaches,
   recordToolCallStart,
   renderCall,
   renderResult,
@@ -73,6 +74,7 @@ import {
   type SingleResult,
   type SubagentDetails,
   type SubagentUsageSummary,
+  type UsageStats,
   DEFAULT_DELEGATION_MODE,
   buildLiveSubagentDetails,
   buildSubagentDetails,
@@ -507,44 +509,63 @@ function collectLiveUsageSummary(details: SubagentDetails): SubagentUsageSummary
   return summary;
 }
 
+type PersistedUsageTotals = {
+  leafId: unknown;
+  hasEntries: boolean;
+  parentUsage: UsageStats;
+  subagents: SubagentUsageSummary;
+};
+
+// SessionManager owns the history; a WeakMap lets its one current aggregate be
+// reclaimed with the manager. Repeated progress/heartbeat updates no longer
+// rescan a week-long branch when its leaf has not changed.
+const persistedUsageCache = new WeakMap<object, PersistedUsageTotals>();
+
 function collectCombinedUsageStatusLine(
   ctx: any,
   liveSummaries: SubagentUsageSummary[] = [],
 ): string | undefined {
-  const entries = typeof ctx?.sessionManager?.getEntries === "function" || typeof ctx?.sessionManager?.getBranch === "function"
-    ? branchEntries(ctx)
-    : [];
-  if (entries.length === 0 && liveSummaries.length === 0) return undefined;
-
-  const parentUsage = emptyUsage();
-  const subagents = emptyUsageSummary();
-  for (const entry of entries as any[]) {
-    if (entry?.type !== "message") continue;
-    const msg = entry.message;
-    if (!msg) continue;
-    if (msg.role === "assistant" && msg.provider !== RESUME_PROVIDER) {
-      const usage = msg.usage;
-      if (usage) {
-        parentUsage.input += usage.input || 0;
-        parentUsage.output += usage.output || 0;
-        parentUsage.cacheRead += usage.cacheRead || 0;
-        parentUsage.cacheWrite += usage.cacheWrite || 0;
-        parentUsage.cost += typeof usage.cost === "number" ? usage.cost : usage.cost?.total || 0;
-        parentUsage.turns += 1;
+  const manager = ctx?.sessionManager;
+  const canReadEntries = typeof manager?.getEntries === "function" || typeof manager?.getBranch === "function";
+  const leafId = typeof manager?.getLeafId === "function" ? manager.getLeafId() : undefined;
+  const cacheKey = manager !== null && typeof manager === "object" ? manager as object : undefined;
+  let persisted = cacheKey && leafId !== undefined ? persistedUsageCache.get(cacheKey) : undefined;
+
+  if (!persisted || persisted.leafId !== leafId) {
+    const entries = canReadEntries ? branchEntries(ctx) : [];
+    const parentUsage = emptyUsage();
+    const subagents = emptyUsageSummary();
+    for (const entry of entries as any[]) {
+      if (entry?.type !== "message") continue;
+      const msg = entry.message;
+      if (!msg) continue;
+      if (msg.role === "assistant" && msg.provider !== RESUME_PROVIDER) {
+        const usage = msg.usage;
+        if (usage) {
+          parentUsage.input += usage.input || 0;
+          parentUsage.output += usage.output || 0;
+          parentUsage.cacheRead += usage.cacheRead || 0;
+          parentUsage.cacheWrite += usage.cacheWrite || 0;
+          parentUsage.cost += typeof usage.cost === "number" ? usage.cost : usage.cost?.total || 0;
+          parentUsage.turns += 1;
+        }
+      }
+      if (msg.role === "toolResult" && isSubagentToolName(msg.toolName) && isSubagentDetails(msg.details)) {
+        addUsageSummary(
+          subagents,
+          msg.details.usageSummary ?? usageSummaryFromUsage(msg.details.aggregatedUsage),
+        );
       }
     }
-    if (msg.role === "toolResult" && isSubagentToolName(msg.toolName) && isSubagentDetails(msg.details)) {
-      addUsageSummary(
-        subagents,
-        msg.details.usageSummary ?? usageSummaryFromUsage(msg.details.aggregatedUsage),
-      );
-    }
-  }
-  for (const liveSummary of liveSummaries) {
-    addUsageSummary(subagents, liveSummary);
+    persisted = { leafId, hasEntries: entries.length > 0, parentUsage, subagents };
+    if (cacheKey && leafId !== undefined) persistedUsageCache.set(cacheKey, persisted);
   }
-  const subagentUsage = usageSummaryToUsageStats(subagents) ?? emptyUsage();
-  addUsage(parentUsage, subagentUsage);
+
+  if (!persisted.hasEntries && liveSummaries.length === 0) return undefined;
+  const parentUsage = { ...persisted.parentUsage };
+  const subagents = { ...persisted.subagents };
+  for (const liveSummary of liveSummaries) addUsageSummary(subagents, liveSummary);
+  addUsage(parentUsage, usageSummaryToUsageStats(subagents) ?? emptyUsage());
   return formatCombinedUsageStatusLine(parentUsage, subagents.subagentCount);
 }
 
@@ -1464,6 +1485,11 @@ export default function (pi: ExtensionAPI) {
     activeSubagentUsageSummaries.clear();
     forcedErrorToolCallIds.clear();
     activeSubagents.clear();
+    activeResumeNames.clear();
+    approvedProjectAgentDirsForSession.clear();
+    latestBroadcastTargets.all = [];
+    latestBroadcastTargets.youngest = [];
+    clearRenderCaches();
   });
 
   /**
@@ -1942,8 +1968,8 @@ ${agentList}\n\n${subagentsGuidance}\n\n${delegationGuardGuidance}${resumeGuidan
       },
 
       renderCall: (args, theme, context) => renderCall(args, theme, context),
-      renderResult: (result, { expanded }, theme) =>
-        renderResult(result, expanded, theme),
+      renderResult: (result, { expanded }, theme, context) =>
+        renderResult(result, expanded, theme, context),
       });
     };
 
@@ -2158,8 +2184,8 @@ ${agentList}\n\n${subagentsGuidance}\n\n${delegationGuardGuidance}${resumeGuidan
       },
 
       renderCall: (args, theme, context) => renderResumeCall(args, theme, context),
-      renderResult: (result, { expanded }, theme) =>
-        renderResult(result, expanded, theme),
+      renderResult: (result, { expanded }, theme, context) =>
+        renderResult(result, expanded, theme, context),
       });
     };
 
@@ -2225,34 +2251,38 @@ ${agentList}\n\n${subagentsGuidance}\n\n${delegationGuardGuidance}${resumeGuidan
     }
 
     let activeId: number | undefined;
-    const result = await runAgentSubprocess({
-      cwd: defaultCwd,
-      agents,
-      agentName,
-      task,
-      subagentName,
-      parentDepth: currentDepth,
-      parentAgentStack: ancestorAgentStack,
-      maxDepth,
-      preventCycles,
-      signal,
-      onUpdate,
-      makeDetails: makeDetails("single"),
-      sessionDir: previousResult?.sessionDir ?? sessionDir,
-      sessionRoot: currentSubagentSessionRoot,
-      namesFile: currentNamesFile || undefined,
-      resumeSession: resumeExistingSession,
-      initialResult: previousResult,
-      fallbackModel,
-      onHandle: (handle) => {
-        activeId = topLevelBaseId;
-        activeSubagents.set(activeId, { agent: agentName, task, handle, name: subagentName });
+    let result: SingleResult;
+    try {
+      result = await runAgentSubprocess({
+        cwd: defaultCwd,
+        agents,
+        agentName,
+        task,
+        subagentName,
+        parentDepth: currentDepth,
+        parentAgentStack: ancestorAgentStack,
+        maxDepth,
+        preventCycles,
+        signal,
+        onUpdate,
+        makeDetails: makeDetails("single"),
+        sessionDir: previousResult?.sessionDir ?? sessionDir,
+        sessionRoot: currentSubagentSessionRoot,
+        namesFile: currentNamesFile || undefined,
+        resumeSession: resumeExistingSession,
+        initialResult: previousResult,
+        fallbackModel,
+        onHandle: (handle) => {
+          activeId = topLevelBaseId;
+          activeSubagents.set(activeId, { agent: agentName, task, handle, name: subagentName });
+          updateLatestBroadcastTargets(undefined);
+        },
+      });
+    } finally {
+      if (activeId !== undefined) {
+        activeSubagents.delete(activeId);
         updateLatestBroadcastTargets(undefined);
-      },
-    });
-    if (activeId !== undefined) {
-      activeSubagents.delete(activeId);
-      updateLatestBroadcastTargets(undefined);
+      }
     }
 
     if (isResultError(result)) {
@@ -2332,6 +2362,7 @@ ${agentList}\n\n${subagentsGuidance}\n\n${delegationGuardGuidance}${resumeGuidan
       );
     } finally {
       for (const id of taskIds.values()) activeSubagents.delete(id);
+      updateLatestBroadcastTargets(undefined);
     }
   }
 }

package/names.ts

@@ -2,7 +2,7 @@
  * Durable subagent name registry.
  *
  * Every spawned subagent gets a random human first name from the bundled
- * 500-name pool (e.g. `John`, `Maria`, `Elena`). Names are unique within one
+ * 1000-name culturally diverse pool (e.g. `John`, `Octavian`, `Vishnu`). Names are unique within one
  * delegation tree (the tree
  * rooted at the top-level pi session) and are persisted in a JSON registry
  * file under the subagent session root, so they survive process restarts.
@@ -21,7 +21,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { randomInt } from "node:crypto";
-import { AMERICAN_NAMES } from "./american-names.js";
+import { AGENT_NAMES } from "./agent-names.js";
 
 export const SUBAGENT_NAMES_FILE_ENV = "PI_SUBAGENT_NAMES_FILE";
 
@@ -351,7 +351,7 @@ export async function updateNamesRegistry<T>(
 
 export function getAvailableSubagentNames(registry: NamesRegistry): string[] {
   const used = new Set(Object.keys(registry.agents).map((name) => name.toLowerCase()));
-  return AMERICAN_NAMES.filter((name) => !used.has(name.toLowerCase()));
+  return AGENT_NAMES.filter((name) => !used.has(name.toLowerCase()));
 }
 
 export interface AllocateNameRequest {
@@ -377,7 +377,7 @@ export async function allocateSubagentNames(
     const available = getAvailableSubagentNames(registry);
     if (available.length < requests.length) {
       throw new Error(
-        `The 500-name subagent pool is exhausted (${available.length} available, ${requests.length} requested).`,
+        `The ${AGENT_NAMES.length}-name subagent pool is exhausted (${available.length} available, ${requests.length} requested).`,
       );
     }
     for (const request of requests) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-subagent",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Subagent extension for Pi coding agent. Delegate tasks to specialized agents.",
   "type": "module",
   "main": "index.ts",
@@ -11,7 +11,7 @@
     "runner.ts",
     "resume.ts",
     "names.ts",
-    "american-names.ts",
+    "agent-names.ts",
     "shared.ts",
     "render.ts",
     "tree.ts",