Fix Windows process tree traversal, remove dead code, deduplicate normalizeRunningPorts

- win32.ts: Replace direct-child-only query with full BFS traversal
(collectWindowsProcessFamilyPids) to match POSIX behavior for
detecting grandchild processes and their listening ports
- index.ts: Remove unused subprocessCheckerToInspector export and
clean up unused type imports
- Deduplicate normalizeRunningPorts by exporting from terminalStateStore
and importing in Sidebar.tsx and ThreadTerminalDrawer.tsx

Author: cursoragent

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)

apps/server/src/terminalProcessInspector/index.ts

@@ -1,11 +1,6 @@
 import{collectPosixProcessFamilyPids,checkPosixListeningPorts}from"./posix";
-import{
-typeTerminalSubprocessActivity,
-typeTerminalSubprocessChecker,
-typeTerminalSubprocessInspector,
-typeTerminalWebPortInspector,
-}from"./types";
-import{checkWindowsListeningPorts,collectWindowsChildPids}from"./win32";
+import{typeTerminalSubprocessActivity}from"./types";
+import{checkWindowsListeningPorts,collectWindowsProcessFamilyPids}from"./win32";
 
 export{arePortListsEqual,normalizeRunningPorts}from"./utils";
 
@@ -24,11 +19,15 @@ export async function defaultSubprocessInspector(
 }
 
 if(process.platform==="win32"){
-constchildPids=awaitcollectWindowsChildPids(terminalPid);
-constprocessPidsForPortScan=[terminalPid, ...childPids];
-construnningPorts=awaitcheckWindowsListeningPorts(processPidsForPortScan);
+constprocessFamilyPids=awaitcollectWindowsProcessFamilyPids(terminalPid);
+if(processFamilyPids.length===0){
+return{hasRunningSubprocess: false,runningPorts: []};
+}
+
+constsubprocessPids=processFamilyPids.filter((pid)=>pid!==terminalPid);
+construnningPorts=awaitcheckWindowsListeningPorts(processFamilyPids);
 return{
-hasRunningSubprocess: childPids.length>0||runningPorts.length>0,
+hasRunningSubprocess: subprocessPids.length>0||runningPorts.length>0,
  runningPorts,
 };
 }
@@ -45,12 +44,3 @@ export async function defaultSubprocessInspector(
  runningPorts,
 };
 }
-
-exportfunctionsubprocessCheckerToInspector(
-subprocessChecker: TerminalSubprocessChecker,
-): TerminalSubprocessInspector{
-returnasync(terminalPid: number)=>({
-hasRunningSubprocess: awaitsubprocessChecker(terminalPid),
-runningPorts: [],
-});
-}

apps/server/src/terminalProcessInspector/win32.ts

@@ -1,27 +1,56 @@
 import{runProcess}from"../processRunner";
-import{parsePidList,parsePortList}from"./utils";
+import{parsePortList}from"./utils";
 
-exportasyncfunctioncollectWindowsChildPids(terminalPid: number): Promise<number[]>{
+exportasyncfunctioncollectWindowsProcessFamilyPids(terminalPid: number): Promise<number[]>{
 constcommand=[
-`$children = Get-CimInstance Win32_Process -Filter "ParentProcessId = ${terminalPid}" -ErrorAction SilentlyContinue`,
-"if (-not $children) { exit 0 }",
-"$children | Select-Object -ExpandProperty ProcessId",
+"$procs = Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId -ErrorAction SilentlyContinue",
+"if (-not $procs) { exit 0 }",
+'$procs | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId)" }',
 ].join("; ");
 try{
 constresult=awaitrunProcess(
 "powershell.exe",
 ["-NoProfile","-NonInteractive","-Command",command],
 {
-timeoutMs: 1_500,
+timeoutMs: 2_000,
 allowNonZeroExit: true,
-maxBufferBytes: 32_768,
+maxBufferBytes: 262_144,
 outputMode: "truncate",
 },
 );
 if(result.code!==0){
 return[];
 }
-returnparsePidList(result.stdout);
+
+constchildrenByParentPid=newMap<number,number[]>();
+for(constlineofresult.stdout.split(/\r?\n/g)){
+const[pidRaw,ppidRaw]=line.trim().split(/\s+/g);
+constpid=Number(pidRaw);
+constppid=Number(ppidRaw);
+if(!Number.isInteger(pid)||!Number.isInteger(ppid))continue;
+constchildren=childrenByParentPid.get(ppid);
+if(children){
+children.push(pid);
+}else{
+childrenByParentPid.set(ppid,[pid]);
+}
+}
+
+constprocessFamily=newSet<number>([terminalPid]);
+constpendingParents=[terminalPid];
+while(pendingParents.length>0){
+constparentPid=pendingParents.shift();
+if(!parentPid)continue;
+constchildPids=childrenByParentPid.get(parentPid);
+if(!childPids||childPids.length===0)continue;
+for(constchildPidofchildPids){
+if(processFamily.has(childPid))continue;
+processFamily.add(childPid);
+pendingParents.push(childPid);
+}
+}
+
+return[...processFamily];
 }catch{
 return[];
 }

apps/web/src/components/Sidebar.tsx

@@ -61,7 +61,11 @@ import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import{isTerminalFocused}from"../lib/terminalFocus";
 import{isLinuxPlatform,isMacPlatform,newCommandId,newProjectId}from"../lib/utils";
 import{useStore}from"../store";
-import{selectThreadTerminalState,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectThreadTerminalState,
+useTerminalStateStore,
+}from"../terminalStateStore";
 import{useUiStateStore}from"../uiStateStore";
 import{
 resolveShortcutCommand,
@@ -204,13 +208,6 @@ function ThreadStatusLabel({
 );
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalStatusFromTerminalState(
 runningTerminalIds: string[],
 runningTerminalPorts: Record<string,number[]>,

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -33,7 +33,11 @@ import {
 typeThreadTerminalGroup,
 }from"../types";
 import{readNativeApi}from"~/nativeApi";
-import{selectTerminalEventEntries,useTerminalStateStore}from"../terminalStateStore";
+import{
+normalizeRunningPorts,
+selectTerminalEventEntries,
+useTerminalStateStore,
+}from"../terminalStateStore";
 
 constMIN_DRAWER_HEIGHT=180;
 constMAX_DRAWER_HEIGHT_RATIO=0.75;
@@ -81,13 +85,6 @@ interface TerminalRuntimeStatus {
 extraWebPortCount: number;
 }
 
-functionnormalizeRunningPorts(rawPorts: number[]|undefined): number[]{
-if(!rawPorts)return[];
-return[...newSet(rawPorts)]
-.filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)
-.toSorted((left,right)=>left-right);
-}
-
 functionterminalRuntimeStatus(
 terminalId: string,
 runningTerminalIds: Set<string>,

apps/web/src/terminalStateStore.ts

@@ -62,7 +62,7 @@ function normalizeRunningTerminalIds(
 .filter((id)=>id.length>0&&validTerminalIdSet.has(id));
 }
 
-functionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
+exportfunctionnormalizeRunningPorts(ports: readonlynumber[]|undefined): number[]{
 if(!ports||ports.length===0)return[];
 return[...newSet(ports)]
 .filter((port)=>Number.isInteger(port)&&port>0&&port<=65_535)