kimi-plugin-cc 2.4.0 → 2.4.1

package/plugins/kimi-codex/dist/process-tree.js

@@ -6,7 +6,7 @@ const MAX_DESCENDANT_DEPTH = 8;
 const MAX_DESCENDANT_PIDS = 512;
 const PROCESS_EXIT_POLL_MS = 10;
 const PROCESS_SNAPSHOT_TIMEOUT_MS = 1_000;
-const PROCESS_IDENTITY_PROBE_TIMEOUT_MS = 250;
+const PROCESS_IDENTITY_PROBE_TIMEOUT_MS = 1_000;
 const PROBE_TIMEOUT = Symbol("process-probe-timeout");
 /**
  * Capture descendant ancestry and reusable identities in the same bounded
@@ -23,6 +23,18 @@ export async function collectDescendantIdentities(rootPid) {
     }
     return snapshot;
 }
+/** Return current members of the selected process groups, or undefined when unreadable. */
+export async function collectProcessGroupsIdentities(processGroupIds) {
+    if (process.platform === "win32")
+        return undefined;
+    const groups = new Set(processGroupIds.filter((id) => Number.isInteger(id) && id > 0));
+    if (groups.size === 0)
+        return [];
+    const rows = await raceValueWithTimeout(collectProcessSnapshotRows(), PROCESS_SNAPSHOT_TIMEOUT_MS);
+    if (rows === PROBE_TIMEOUT || rows === undefined)
+        return undefined;
+    return rows.filter((row) => groups.has(row.processGroupId)).map(toProcessIdentity);
+}
 /**
  * Compatibility surface for callers that only need numeric process listings.
  * Cancellation must use collectDescendantIdentities so ancestry and identity
@@ -36,15 +48,21 @@ export async function collectDescendants(rootPid) {
         return [];
     }
 }
-/** Read one reusable process identity. PID alone is not stable across teardown. */
-export async function readProcessIdentity(pid) {
+/** Distinguish a missing process from a failed or timed-out identity probe. */
+export async function probeProcessIdentity(pid) {
     if (!Number.isInteger(pid) || pid <= 0 || process.platform === "win32")
-        return undefined;
+        return { complete: true };
     const read = process.platform === "linux"
         ? readProcessIdentityBatchFromProc([pid])
         : readProcessIdentityBatchWithPs([pid]);
     const batch = await raceValueWithTimeout(read, PROCESS_IDENTITY_PROBE_TIMEOUT_MS);
-    return batch === PROBE_TIMEOUT ? undefined : batch.identities.get(pid);
+    if (batch === PROBE_TIMEOUT)
+        return { complete: false };
+    return { identity: batch.identities.get(pid), complete: batch.complete };
+}
+/** Read one reusable process identity. PID alone is not stable across teardown. */
+export async function readProcessIdentity(pid) {
+    return (await probeProcessIdentity(pid)).identity;
 }
 /**
  * Revalidate all captured identities concurrently under one deadline. The
@@ -63,16 +81,26 @@ export async function revalidateProcessIdentities(expectedIdentities, options =
     if (batch === PROBE_TIMEOUT)
         return { identities: [], complete: false };
     const identities = [];
+    const groupChanged = [];
     for (const expectedIdentity of expected) {
         const current = batch.identities.get(expectedIdentity.pid);
-        if (current !== undefined &&
-            current.startToken === expectedIdentity.startToken &&
-            current.processGroupId === expectedIdentity.processGroupId &&
-            !isQuiescentState(current.state)) {
+        if (current === undefined ||
+            current.startToken !== expectedIdentity.startToken ||
+            isQuiescentState(current.state)) {
+            continue;
+        }
+        if (current.processGroupId !== expectedIdentity.processGroupId) {
+            groupChanged.push(current);
+        }
+        else {
             identities.push(current);
         }
     }
-    return { identities, complete: batch.complete };
+    return {
+        identities,
+        complete: batch.complete,
+        ...(groupChanged.length > 0 ? { groupChanged } : {}),
+    };
 }
 /** Return the current identity only when pid, start token, and PGID still match. */
 export async function revalidateProcessIdentity(expected, identityReader) {
@@ -104,7 +132,7 @@ export async function waitForProcessTreeExit(identities, timeoutMs, options = {}
                 identityReader: options.identityReader,
                 timeoutMs: probeTimeoutMs,
             });
-            active = !validation.complete || validation.identities.length > 0;
+            active = !validation.complete || validation.identities.length > 0 || (validation.groupChanged?.length ?? 0) > 0;
         }
         if (!active)
             return true;
@@ -117,13 +145,13 @@ export async function waitForProcessTreeExit(identities, timeoutMs, options = {}
 async function collectVerifiedDescendantIdentities(rootPid) {
     const initialRows = await collectProcessSnapshotRows();
     if (initialRows === undefined)
-        return [];
+        throw new Error("process snapshot unavailable");
     const candidateRows = descendantRowsFromSnapshot(rootPid, initialRows);
     const initialRoot = initialRows.find((row) => row.pid === rootPid);
     if (initialRoot === undefined || candidateRows.length === 0)
         return [];
-    // A second, targeted snapshot closes the cross-row /proc race: every child
-    // identity and every numeric parent edge must still match before acceptance.
+    // A second, targeted snapshot closes the cross-row /proc race: each child
+    // must retain its PID and start token. Reparenting and PGID changes are not exit.
     const expectedRows = [initialRoot, ...candidateRows];
     const expectedByPid = new Map(expectedRows.map((row) => [row.pid, row]));
     const verificationRows = await readCurrentSnapshotRows(expectedRows);
@@ -131,11 +159,9 @@ async function collectVerifiedDescendantIdentities(rootPid) {
         const expected = expectedByPid.get(current.pid);
         return (expected !== undefined &&
             current.startToken === expected.startToken &&
-            current.processGroupId === expected.processGroupId &&
-            current.parentPid === expected.parentPid &&
             !isQuiescentState(current.state));
     });
-    return descendantRowsFromSnapshot(rootPid, stableRows).map(toProcessIdentity);
+    return stableRows.map(toProcessIdentity);
 }
 function descendantRowsFromSnapshot(rootPid, rows) {
     const root = rows.find((row) => row.pid === rootPid);
@@ -186,6 +212,9 @@ async function readCurrentSnapshotRows(expectedRows) {
         Promise.all(procPids.map((pid) => readProcRow(pid))),
         collectProcessSnapshotRowsFromPs(psPids),
     ]);
+    if (procOutcomes.some((outcome) => outcome.status === "error") || (psPids.length > 0 && psRows === undefined)) {
+        throw new Error("process identity verification failed");
+    }
     return [
         ...procOutcomes.flatMap((outcome) => outcome.status === "found" ? [outcome.row] : []),
         ...(psRows ?? []),
@@ -212,6 +241,8 @@ async function collectProcessSnapshotRowsFromProc() {
     const outcomes = await Promise.all(entries
         .filter((entry) => /^\d+$/.test(entry))
         .map((entry) => readProcRow(Number.parseInt(entry, 10))));
+    if (outcomes.some((outcome) => outcome.status === "error"))
+        return undefined;
     return outcomes.flatMap((outcome) => outcome.status === "found" ? [outcome.row] : []);
 }
 async function collectProcessSnapshotRowsFromPs(pids) {