@code-yeongyu/senpi 2026.9.24-3 → 2026.9.25

package/dist/core/extensions/builtin/terminal/manifest-lease.js

@@ -1,10 +1,24 @@
-import { mkdir, open, readFile, unlink } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
+import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
-function errorCode(error) {
-    if (typeof error === "object" && error !== null && "code" in error && typeof error.code === "string") {
-        return error.code;
-    }
-    return undefined;
+import { errorCode, publishExclusive, publishReplace, readLeaseText, reclaimInspected, unlinkIfPresent, } from "./lease-file.js";
+import { ownProcessStartedAtMs, PROCESS_START_TOLERANCE_MS, processBootAtMs, sameProcessStart, } from "./process-identity.js";
+import { readProcessStartMs as defaultReadProcessStartMs } from "./process-start-probe.js";
+export const LEASE_RECORD_VERSION = 2;
+const generationTokens = new Map();
+/**
+ * Tokens held by generations of THIS process that are still running. A same-pid lease is a live
+ * holder only when its token is here (a sibling session generation, or a racing waiter that won);
+ * a token that is not here was minted by a generation that has shut down, even one whose
+ * shutdown never reached the release (the 10 s shutdown cap), so it is ours to re-enter.
+ */
+const liveTokens = new Set();
+export function currentLeaseToken(encodedSessionId) {
+    return generationTokens.get(encodedSessionId);
+}
+/** Mark a generation's token dead the moment its shutdown starts, before any slow flush. */
+export function retireLeaseToken(token) {
+    liveTokens.delete(token);
 }
 function probeAlive(pid, probe) {
     try {
@@ -22,84 +36,152 @@ function probeAlive(pid, probe) {
         throw error;
     }
 }
-async function readLease(path) {
-    let raw;
-    try {
-        raw = await readFile(path, "utf8");
-    }
-    catch (error) {
-        if (errorCode(error) === "ENOENT")
-            return "missing";
-        throw error;
-    }
+const isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
+export function readLeaseRecord(raw) {
     try {
         const parsed = JSON.parse(raw);
         if (typeof parsed !== "object" || parsed === null)
             return "unparseable";
-        const pid = parsed.pid;
-        const startedAtMs = parsed.startedAtMs;
-        if (typeof pid !== "number" ||
-            !Number.isFinite(pid) ||
-            typeof startedAtMs !== "number" ||
-            !Number.isFinite(startedAtMs)) {
+        const candidate = parsed;
+        if (!isFiniteNumber(candidate.pid) || !isFiniteNumber(candidate.startedAtMs))
             return "unparseable";
-        }
-        return { pid, startedAtMs };
+        return {
+            pid: candidate.pid,
+            startedAtMs: candidate.startedAtMs,
+            ...(isFiniteNumber(candidate.v) ? { v: candidate.v } : {}),
+            ...(typeof candidate.token === "string" ? { token: candidate.token } : {}),
+            ...(isFiniteNumber(candidate.bootAtMs) ? { bootAtMs: candidate.bootAtMs } : {}),
+            ...(isFiniteNumber(candidate.processStartedAtMs) ? { processStartedAtMs: candidate.processStartedAtMs } : {}),
+            ...(isFiniteNumber(candidate.acquiredAtMs) ? { acquiredAtMs: candidate.acquiredAtMs } : {}),
+        };
     }
     catch {
         return "unparseable";
     }
 }
-async function exclusiveCreate(path, record) {
-    const file = await open(path, "wx");
-    try {
-        await file.writeFile(JSON.stringify(record), "utf8");
-    }
-    finally {
-        await file.close();
-    }
+async function readLeaseFile(path) {
+    const raw = await readLeaseText(path);
+    return raw === undefined ? "missing" : readLeaseRecord(raw);
 }
-async function unlinkIfPresent(path) {
-    try {
-        await unlink(path);
-    }
-    catch (error) {
-        if (errorCode(error) !== "ENOENT")
-            throw error;
+/**
+ * Decide what an existing lease is. A pid alone is never trusted: the holder is alive only when
+ * its pid answers AND its recorded start instant matches the process now wearing that pid
+ * (probed on this cold path only). A boot mismatch alone never reclaims an alive pid. Our own
+ * pid is "self" only when the file carries the token this process minted for the session (or a
+ * legacy record without one): a multi-session host holds many sessions under one pid, and a
+ * lease another live generation in this process owns is a live holder, not a re-entry.
+ */
+export async function classifyLease(existing, self, probes) {
+    if (existing.pid === self.pid) {
+        if (existing.token !== undefined && (probes.liveTokens ?? liveTokens).has(existing.token))
+            return "live-foreign";
+        return "self";
     }
-}
-async function tryAcquire(path, record, isProcessAlive, retry) {
+    if (!probeAlive(existing.pid, probes.isProcessAlive))
+        return "dead";
+    let observedStart;
     try {
-        await exclusiveCreate(path, record);
-        return { acquired: true, path, pid: record.pid };
+        observedStart = await probes.readProcessStartMs(existing.pid);
     }
-    catch (error) {
-        if (errorCode(error) !== "EEXIST")
-            throw error;
-        const existing = await readLease(path);
-        const reclaimable = existing === "missing" || existing === "unparseable" || !probeAlive(existing.pid, isProcessAlive);
-        if (reclaimable && retry) {
-            await unlinkIfPresent(path);
-            return tryAcquire(path, record, isProcessAlive, false);
-        }
-        if (existing === "missing" || existing === "unparseable")
-            throw error;
-        return { acquired: false, holder: existing };
+    catch {
+        observedStart = undefined;
     }
+    if (observedStart === undefined)
+        return "live-foreign";
+    if (existing.processStartedAtMs === undefined) {
+        // A v1 record's startedAtMs is when the lease was taken, so its holder started no later
+        // than that; a process that started afterwards on the same pid is a reuse.
+        return observedStart <= existing.startedAtMs + PROCESS_START_TOLERANCE_MS ? "live-foreign" : "reused";
+    }
+    return sameProcessStart(existing.processStartedAtMs, observedStart) ? "live-foreign" : "reused";
+}
+function holderOf(record) {
+    return {
+        pid: record.pid,
+        startedAtMs: record.startedAtMs,
+        ...(record.bootAtMs !== undefined ? { bootAtMs: record.bootAtMs } : {}),
+    };
 }
 export async function acquireTerminalLease(options) {
-    const pid = options.pid ?? process.pid;
-    const startedAtMs = (options.now ?? Date.now)();
+    const now = (options.now ?? Date.now)();
+    const self = options.self ?? {
+        pid: options.pid ?? process.pid,
+        bootAtMs: processBootAtMs(),
+        processStartedAtMs: ownProcessStartedAtMs(),
+    };
+    const pid = options.pid ?? self.pid;
     const path = join(options.dir, `${options.encodedSessionId}.lease`);
     await mkdir(options.dir, { recursive: true });
-    return tryAcquire(path, { pid, startedAtMs }, options.isProcessAlive, true);
+    const token = randomUUID();
+    const record = {
+        v: LEASE_RECORD_VERSION,
+        token,
+        pid,
+        startedAtMs: now,
+        bootAtMs: self.bootAtMs,
+        processStartedAtMs: self.processStartedAtMs,
+        acquiredAtMs: now,
+    };
+    const acquired = () => {
+        generationTokens.set(options.encodedSessionId, token);
+        liveTokens.add(token);
+        return { acquired: true, path, pid, token };
+    };
+    const probes = {
+        isProcessAlive: options.isProcessAlive,
+        readProcessStartMs: options.readProcessStartMs ?? defaultReadProcessStartMs,
+    };
+    const content = JSON.stringify(record);
+    for (let attempt = 0; attempt < 3; attempt += 1) {
+        try {
+            await publishExclusive(path, content);
+            return acquired();
+        }
+        catch (error) {
+            if (errorCode(error) !== "EEXIST")
+                throw error;
+        }
+        const raw = await readLeaseText(path);
+        if (raw === undefined)
+            continue;
+        const existing = readLeaseRecord(raw);
+        const verdict = existing === "unparseable" ? "dead" : await classifyLease(existing, { ...self, pid }, probes);
+        if (verdict === "self") {
+            await publishReplace(path, content);
+            return acquired();
+        }
+        if (verdict === "live-foreign" && existing !== "unparseable")
+            return { acquired: false, holder: holderOf(existing) };
+        // Only the record judged stale is removed; a racer's fresh lease makes the next try lose cleanly.
+        const reclaim = await reclaimInspected(path, raw, probes);
+        // Someone is reclaiming right now: wait on that live process, never on the stale record.
+        if (reclaim.outcome === "busy" && reclaim.holder !== undefined) {
+            const { pid: holderPid, processStartedAtMs, bootAtMs } = reclaim.holder;
+            return { acquired: false, holder: { pid: holderPid, startedAtMs: processStartedAtMs, bootAtMs } };
+        }
+    }
+    const raw = await readLeaseText(path);
+    const last = raw === undefined ? "unparseable" : readLeaseRecord(raw);
+    if (last !== "unparseable" && (await classifyLease(last, { ...self, pid }, probes)) === "live-foreign") {
+        return { acquired: false, holder: holderOf(last) };
+    }
+    throw new Error(`terminal lease ${path} kept changing while it was being acquired`);
 }
+/** Release only the generation that acquired: a stale release from an earlier generation is a no-op. */
 export async function releaseTerminalLease(handle) {
-    const existing = await readLease(handle.path);
+    const existing = await readLeaseFile(handle.path);
     if (existing === "missing" || existing === "unparseable")
         return;
     if (existing.pid !== handle.pid)
         return;
+    if (handle.token !== undefined && existing.token !== undefined && existing.token !== handle.token)
+        return;
     await unlinkIfPresent(handle.path);
+    if (existing.token !== undefined) {
+        liveTokens.delete(existing.token);
+        for (const [sessionId, token] of generationTokens)
+            if (token === existing.token)
+                generationTokens.delete(sessionId);
+    }
 }
 //# sourceMappingURL=manifest-lease.js.map

package/dist/core/extensions/builtin/terminal/manifest-lease.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-lease.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/manifest-lease.ts"],"names":[],"mappings":"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","sourcesContent":["import { mkdir, open, readFile, unlink } from \"node:fs/promises\";\nimport { join } from \"node:path\";\n\nexport type AcquireTerminalLeaseOptions = {\n\tdir: string;\n\tencodedSessionId: string;\n\tpid?: number;\n\tnow?: () => number;\n\tisProcessAlive?: (pid: number) => boolean;\n};\n\nexport type AcquireTerminalLeaseResult =\n\t| { acquired: true; path: string; pid: number }\n\t| { acquired: false; holder: { pid: number; startedAtMs: number } };\n\ntype LeaseRecord = { pid: number; startedAtMs: number };\n\nfunction errorCode(error: unknown): string | undefined {\n\tif (typeof error === \"object\" && error !== null && \"code\" in error && typeof error.code === \"string\") {\n\t\treturn error.code;\n\t}\n\treturn undefined;\n}\n\nfunction probeAlive(pid: number, probe?: (pid: number) => boolean): boolean {\n\ttry {\n\t\tif (probe) return probe(pid);\n\t\tprocess.kill(pid, 0);\n\t\treturn true;\n\t} catch (error) {\n\t\tconst code = errorCode(error);\n\t\tif (code === \"EPERM\") return true;\n\t\tif (code === \"ESRCH\") return false;\n\t\tthrow error;\n\t}\n}\n\nasync function readLease(path: string): Promise<LeaseRecord | \"missing\" | \"unparseable\"> {\n\tlet raw: string;\n\ttry {\n\t\traw = await readFile(path, \"utf8\");\n\t} catch (error) {\n\t\tif (errorCode(error) === \"ENOENT\") return \"missing\";\n\t\tthrow error;\n\t}\n\ttry {\n\t\tconst parsed: unknown = JSON.parse(raw);\n\t\tif (typeof parsed !== \"object\" || parsed === null) return \"unparseable\";\n\t\tconst pid = (parsed as { pid?: unknown }).pid;\n\t\tconst startedAtMs = (parsed as { startedAtMs?: unknown }).startedAtMs;\n\t\tif (\n\t\t\ttypeof pid !== \"number\" ||\n\t\t\t!Number.isFinite(pid) ||\n\t\t\ttypeof startedAtMs !== \"number\" ||\n\t\t\t!Number.isFinite(startedAtMs)\n\t\t) {\n\t\t\treturn \"unparseable\";\n\t\t}\n\t\treturn { pid, startedAtMs };\n\t} catch {\n\t\treturn \"unparseable\";\n\t}\n}\n\nasync function exclusiveCreate(path: string, record: LeaseRecord): Promise<void> {\n\tconst file = await open(path, \"wx\");\n\ttry {\n\t\tawait file.writeFile(JSON.stringify(record), \"utf8\");\n\t} finally {\n\t\tawait file.close();\n\t}\n}\n\nasync function unlinkIfPresent(path: string): Promise<void> {\n\ttry {\n\t\tawait unlink(path);\n\t} catch (error) {\n\t\tif (errorCode(error) !== \"ENOENT\") throw error;\n\t}\n}\n\nasync function tryAcquire(\n\tpath: string,\n\trecord: LeaseRecord,\n\tisProcessAlive: ((pid: number) => boolean) | undefined,\n\tretry: boolean,\n): Promise<AcquireTerminalLeaseResult> {\n\ttry {\n\t\tawait exclusiveCreate(path, record);\n\t\treturn { acquired: true, path, pid: record.pid };\n\t} catch (error) {\n\t\tif (errorCode(error) !== \"EEXIST\") throw error;\n\t\tconst existing = await readLease(path);\n\t\tconst reclaimable =\n\t\t\texisting === \"missing\" || existing === \"unparseable\" || !probeAlive(existing.pid, isProcessAlive);\n\t\tif (reclaimable && retry) {\n\t\t\tawait unlinkIfPresent(path);\n\t\t\treturn tryAcquire(path, record, isProcessAlive, false);\n\t\t}\n\t\tif (existing === \"missing\" || existing === \"unparseable\") throw error;\n\t\treturn { acquired: false, holder: existing };\n\t}\n}\n\nexport async function acquireTerminalLease(options: AcquireTerminalLeaseOptions): Promise<AcquireTerminalLeaseResult> {\n\tconst pid = options.pid ?? process.pid;\n\tconst startedAtMs = (options.now ?? Date.now)();\n\tconst path = join(options.dir, `${options.encodedSessionId}.lease`);\n\tawait mkdir(options.dir, { recursive: true });\n\treturn tryAcquire(path, { pid, startedAtMs }, options.isProcessAlive, true);\n}\n\nexport async function releaseTerminalLease(handle: { path: string; pid: number }): Promise<void> {\n\tconst existing = await readLease(handle.path);\n\tif (existing === \"missing\" || existing === \"unparseable\") return;\n\tif (existing.pid !== handle.pid) return;\n\tawait unlinkIfPresent(handle.path);\n}\n"]}
+{"version":3,"file":"manifest-lease.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/manifest-lease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACN,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,eAAe,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACN,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,gBAAgB,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAE3F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AA4CtC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;AACnD;;;;;GAKG;AACH,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;AAErC,MAAM,UAAU,iBAAiB,CAAC,gBAAwB;IACzD,OAAO,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC/C,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC7C,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,KAAgC;IAChE,IAAI,CAAC;QACJ,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,IAAI,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,IAAI,KAAK,OAAO;YAAE,OAAO,KAAK,CAAC;QACnC,MAAM,KAAK,CAAC;IACb,CAAC;AACF,CAAC;AAED,MAAM,cAAc,GAAG,CAAC,KAAc,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAEhH,MAAM,UAAU,eAAe,CAAC,GAAW;IAC1C,IAAI,CAAC;QACJ,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,aAAa,CAAC;QACxE,MAAM,SAAS,GAAG,MAAiC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,WAAW,CAAC;YAAE,OAAO,aAAa,CAAC;QACnG,OAAO;YACN,GAAG,EAAE,SAAS,CAAC,GAAG;YAClB,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,GAAG,CAAC,OAAO,SAAS,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/E,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7G,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3F,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,aAAa,CAAC;IACtB,CAAC;AACF,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,IAAY;IACxC,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,QAAqB,EACrB,IAAuB,EACvB,MAIC;IAED,IAAI,QAAQ,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,cAAc,CAAC;QACjH,OAAO,MAAM,CAAC;IACf,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc,CAAC;QAAE,OAAO,MAAM,CAAC;IACpE,IAAI,aAAiC,CAAC;IACtC,IAAI,CAAC;QACJ,aAAa,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACR,aAAa,GAAG,SAAS,CAAC;IAC3B,CAAC;IACD,IAAI,aAAa,KAAK,SAAS;QAAE,OAAO,cAAc,CAAC;IACvD,IAAI,QAAQ,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC/C,wFAAwF;QACxF,2EAA2E;QAC3E,OAAO,aAAa,IAAI,QAAQ,CAAC,WAAW,GAAG,0BAA0B,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvG,CAAC;IACD,OAAO,gBAAgB,CAAC,QAAQ,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;AACjG,CAAC;AAED,SAAS,QAAQ,CAAC,MAAmB;IACpC,OAAO;QACN,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAoC;IAC9E,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,MAAM,IAAI,GAAsB,OAAO,CAAC,IAAI,IAAI;QAC/C,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG;QAC/B,QAAQ,EAAE,eAAe,EAAE;QAC3B,kBAAkB,EAAE,qBAAqB,EAAE;KAC3C,CAAC;IACF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,gBAAgB,QAAQ,CAAC,CAAC;IACpE,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAgB;QAC3B,CAAC,EAAE,oBAAoB;QACvB,KAAK;QACL,GAAG;QACH,WAAW,EAAE,GAAG;QAChB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,YAAY,EAAE,GAAG;KACjB,CAAC;IACF,MAAM,QAAQ,GAAG,GAA+B,EAAE;QACjD,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACtD,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAC7C,CAAC,CAAC;IACF,MAAM,MAAM,GAAG;QACd,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,IAAI,yBAAyB;KAC3E,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC;YACJ,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACtC,OAAO,QAAQ,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;QAChD,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,GAAG,KAAK,SAAS;YAAE,SAAS;QAChC,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9G,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACpC,OAAO,QAAQ,EAAE,CAAC;QACnB,CAAC;QACD,IAAI,OAAO,KAAK,cAAc,IAAI,QAAQ,KAAK,aAAa;YAC3D,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxD,kGAAkG;QAClG,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1D,yFAAyF;QACzF,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAChE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;YACxE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,QAAQ,EAAE,EAAE,CAAC;QACnG,CAAC;IACF,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IACtE,IAAI,IAAI,KAAK,aAAa,IAAI,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,KAAK,cAAc,EAAE,CAAC;QACxG,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,4CAA4C,CAAC,CAAC;AACrF,CAAC;AAED,wGAAwG;AACxG,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAAqD;IAC/F,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,aAAa;QAAE,OAAO;IACjE,IAAI,QAAQ,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG;QAAE,OAAO;IACxC,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK;QAAE,OAAO;IAC1G,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAClC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,gBAAgB;YAChD,IAAI,KAAK,KAAK,QAAQ,CAAC,KAAK;gBAAE,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC;AACF,CAAC","sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport { mkdir } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport {\n\terrorCode,\n\tpublishExclusive,\n\tpublishReplace,\n\treadLeaseText,\n\treclaimInspected,\n\tunlinkIfPresent,\n} from \"./lease-file.ts\";\nimport {\n\townProcessStartedAtMs,\n\tPROCESS_START_TOLERANCE_MS,\n\tprocessBootAtMs,\n\tsameProcessStart,\n} from \"./process-identity.ts\";\nimport { readProcessStartMs as defaultReadProcessStartMs } from \"./process-start-probe.ts\";\n\nexport const LEASE_RECORD_VERSION = 2;\n\nexport interface LeaseSelfIdentity {\n\treadonly pid: number;\n\treadonly bootAtMs: number;\n\treadonly processStartedAtMs: number;\n}\n\n/**\n * `startedAtMs` duplicates `acquiredAtMs` on purpose: a senpi build that still runs the v1 lease\n * reader parses `{pid, startedAtMs}` and must not see this file as unparseable (which it reclaims).\n */\nexport interface LeaseRecord {\n\treadonly v?: number;\n\treadonly token?: string;\n\treadonly pid: number;\n\treadonly startedAtMs: number;\n\treadonly bootAtMs?: number;\n\treadonly processStartedAtMs?: number;\n\treadonly acquiredAtMs?: number;\n}\n\nexport interface LeaseHolder {\n\treadonly pid: number;\n\treadonly startedAtMs: number;\n\treadonly bootAtMs?: number;\n}\n\nexport type AcquireTerminalLeaseOptions = {\n\tdir: string;\n\tencodedSessionId: string;\n\tpid?: number;\n\tnow?: () => number;\n\tself?: LeaseSelfIdentity;\n\tisProcessAlive?: (pid: number) => boolean;\n\treadProcessStartMs?: (pid: number) => Promise<number | undefined>;\n};\n\nexport type AcquireTerminalLeaseResult =\n\t| { acquired: true; path: string; pid: number; token: string }\n\t| { acquired: false; holder: LeaseHolder };\n\nexport type LeaseClassification = \"self\" | \"dead\" | \"reused\" | \"live-foreign\";\n\nconst generationTokens = new Map<string, string>();\n/**\n * Tokens held by generations of THIS process that are still running. A same-pid lease is a live\n * holder only when its token is here (a sibling session generation, or a racing waiter that won);\n * a token that is not here was minted by a generation that has shut down, even one whose\n * shutdown never reached the release (the 10 s shutdown cap), so it is ours to re-enter.\n */\nconst liveTokens = new Set<string>();\n\nexport function currentLeaseToken(encodedSessionId: string): string | undefined {\n\treturn generationTokens.get(encodedSessionId);\n}\n\n/** Mark a generation's token dead the moment its shutdown starts, before any slow flush. */\nexport function retireLeaseToken(token: string): void {\n\tliveTokens.delete(token);\n}\n\nfunction probeAlive(pid: number, probe?: (pid: number) => boolean): boolean {\n\ttry {\n\t\tif (probe) return probe(pid);\n\t\tprocess.kill(pid, 0);\n\t\treturn true;\n\t} catch (error) {\n\t\tconst code = errorCode(error);\n\t\tif (code === \"EPERM\") return true;\n\t\tif (code === \"ESRCH\") return false;\n\t\tthrow error;\n\t}\n}\n\nconst isFiniteNumber = (value: unknown): value is number => typeof value === \"number\" && Number.isFinite(value);\n\nexport function readLeaseRecord(raw: string): LeaseRecord | \"unparseable\" {\n\ttry {\n\t\tconst parsed: unknown = JSON.parse(raw);\n\t\tif (typeof parsed !== \"object\" || parsed === null) return \"unparseable\";\n\t\tconst candidate = parsed as Record<string, unknown>;\n\t\tif (!isFiniteNumber(candidate.pid) || !isFiniteNumber(candidate.startedAtMs)) return \"unparseable\";\n\t\treturn {\n\t\t\tpid: candidate.pid,\n\t\t\tstartedAtMs: candidate.startedAtMs,\n\t\t\t...(isFiniteNumber(candidate.v) ? { v: candidate.v } : {}),\n\t\t\t...(typeof candidate.token === \"string\" ? { token: candidate.token } : {}),\n\t\t\t...(isFiniteNumber(candidate.bootAtMs) ? { bootAtMs: candidate.bootAtMs } : {}),\n\t\t\t...(isFiniteNumber(candidate.processStartedAtMs) ? { processStartedAtMs: candidate.processStartedAtMs } : {}),\n\t\t\t...(isFiniteNumber(candidate.acquiredAtMs) ? { acquiredAtMs: candidate.acquiredAtMs } : {}),\n\t\t};\n\t} catch {\n\t\treturn \"unparseable\";\n\t}\n}\n\nasync function readLeaseFile(path: string): Promise<LeaseRecord | \"missing\" | \"unparseable\"> {\n\tconst raw = await readLeaseText(path);\n\treturn raw === undefined ? \"missing\" : readLeaseRecord(raw);\n}\n\n/**\n * Decide what an existing lease is. A pid alone is never trusted: the holder is alive only when\n * its pid answers AND its recorded start instant matches the process now wearing that pid\n * (probed on this cold path only). A boot mismatch alone never reclaims an alive pid. Our own\n * pid is \"self\" only when the file carries the token this process minted for the session (or a\n * legacy record without one): a multi-session host holds many sessions under one pid, and a\n * lease another live generation in this process owns is a live holder, not a re-entry.\n */\nexport async function classifyLease(\n\texisting: LeaseRecord,\n\tself: LeaseSelfIdentity,\n\tprobes: {\n\t\treadonly isProcessAlive?: (pid: number) => boolean;\n\t\treadonly readProcessStartMs: (pid: number) => Promise<number | undefined>;\n\t\treadonly liveTokens?: ReadonlySet<string>;\n\t},\n): Promise<LeaseClassification> {\n\tif (existing.pid === self.pid) {\n\t\tif (existing.token !== undefined && (probes.liveTokens ?? liveTokens).has(existing.token)) return \"live-foreign\";\n\t\treturn \"self\";\n\t}\n\tif (!probeAlive(existing.pid, probes.isProcessAlive)) return \"dead\";\n\tlet observedStart: number | undefined;\n\ttry {\n\t\tobservedStart = await probes.readProcessStartMs(existing.pid);\n\t} catch {\n\t\tobservedStart = undefined;\n\t}\n\tif (observedStart === undefined) return \"live-foreign\";\n\tif (existing.processStartedAtMs === undefined) {\n\t\t// A v1 record's startedAtMs is when the lease was taken, so its holder started no later\n\t\t// than that; a process that started afterwards on the same pid is a reuse.\n\t\treturn observedStart <= existing.startedAtMs + PROCESS_START_TOLERANCE_MS ? \"live-foreign\" : \"reused\";\n\t}\n\treturn sameProcessStart(existing.processStartedAtMs, observedStart) ? \"live-foreign\" : \"reused\";\n}\n\nfunction holderOf(record: LeaseRecord): LeaseHolder {\n\treturn {\n\t\tpid: record.pid,\n\t\tstartedAtMs: record.startedAtMs,\n\t\t...(record.bootAtMs !== undefined ? { bootAtMs: record.bootAtMs } : {}),\n\t};\n}\n\nexport async function acquireTerminalLease(options: AcquireTerminalLeaseOptions): Promise<AcquireTerminalLeaseResult> {\n\tconst now = (options.now ?? Date.now)();\n\tconst self: LeaseSelfIdentity = options.self ?? {\n\t\tpid: options.pid ?? process.pid,\n\t\tbootAtMs: processBootAtMs(),\n\t\tprocessStartedAtMs: ownProcessStartedAtMs(),\n\t};\n\tconst pid = options.pid ?? self.pid;\n\tconst path = join(options.dir, `${options.encodedSessionId}.lease`);\n\tawait mkdir(options.dir, { recursive: true });\n\tconst token = randomUUID();\n\tconst record: LeaseRecord = {\n\t\tv: LEASE_RECORD_VERSION,\n\t\ttoken,\n\t\tpid,\n\t\tstartedAtMs: now,\n\t\tbootAtMs: self.bootAtMs,\n\t\tprocessStartedAtMs: self.processStartedAtMs,\n\t\tacquiredAtMs: now,\n\t};\n\tconst acquired = (): AcquireTerminalLeaseResult => {\n\t\tgenerationTokens.set(options.encodedSessionId, token);\n\t\tliveTokens.add(token);\n\t\treturn { acquired: true, path, pid, token };\n\t};\n\tconst probes = {\n\t\tisProcessAlive: options.isProcessAlive,\n\t\treadProcessStartMs: options.readProcessStartMs ?? defaultReadProcessStartMs,\n\t};\n\tconst content = JSON.stringify(record);\n\tfor (let attempt = 0; attempt < 3; attempt += 1) {\n\t\ttry {\n\t\t\tawait publishExclusive(path, content);\n\t\t\treturn acquired();\n\t\t} catch (error) {\n\t\t\tif (errorCode(error) !== \"EEXIST\") throw error;\n\t\t}\n\t\tconst raw = await readLeaseText(path);\n\t\tif (raw === undefined) continue;\n\t\tconst existing = readLeaseRecord(raw);\n\t\tconst verdict = existing === \"unparseable\" ? \"dead\" : await classifyLease(existing, { ...self, pid }, probes);\n\t\tif (verdict === \"self\") {\n\t\t\tawait publishReplace(path, content);\n\t\t\treturn acquired();\n\t\t}\n\t\tif (verdict === \"live-foreign\" && existing !== \"unparseable\")\n\t\t\treturn { acquired: false, holder: holderOf(existing) };\n\t\t// Only the record judged stale is removed; a racer's fresh lease makes the next try lose cleanly.\n\t\tconst reclaim = await reclaimInspected(path, raw, probes);\n\t\t// Someone is reclaiming right now: wait on that live process, never on the stale record.\n\t\tif (reclaim.outcome === \"busy\" && reclaim.holder !== undefined) {\n\t\t\tconst { pid: holderPid, processStartedAtMs, bootAtMs } = reclaim.holder;\n\t\t\treturn { acquired: false, holder: { pid: holderPid, startedAtMs: processStartedAtMs, bootAtMs } };\n\t\t}\n\t}\n\tconst raw = await readLeaseText(path);\n\tconst last = raw === undefined ? \"unparseable\" : readLeaseRecord(raw);\n\tif (last !== \"unparseable\" && (await classifyLease(last, { ...self, pid }, probes)) === \"live-foreign\") {\n\t\treturn { acquired: false, holder: holderOf(last) };\n\t}\n\tthrow new Error(`terminal lease ${path} kept changing while it was being acquired`);\n}\n\n/** Release only the generation that acquired: a stale release from an earlier generation is a no-op. */\nexport async function releaseTerminalLease(handle: { path: string; pid: number; token?: string }): Promise<void> {\n\tconst existing = await readLeaseFile(handle.path);\n\tif (existing === \"missing\" || existing === \"unparseable\") return;\n\tif (existing.pid !== handle.pid) return;\n\tif (handle.token !== undefined && existing.token !== undefined && existing.token !== handle.token) return;\n\tawait unlinkIfPresent(handle.path);\n\tif (existing.token !== undefined) {\n\t\tliveTokens.delete(existing.token);\n\t\tfor (const [sessionId, token] of generationTokens)\n\t\t\tif (token === existing.token) generationTokens.delete(sessionId);\n\t}\n}\n"]}

package/dist/core/extensions/builtin/terminal/monitor-registry.d.ts

@@ -111,6 +111,8 @@ export declare class MonitorRegistry {
     } | undefined;
     /** Emit one restored-watch line through the SAME sink a live watch uses (coalescing, wake budget). */
     emitFileLine(id: string, line: string): boolean;
+    /** Inject one line into a live command or file watch's event stream (e.g. a restore notice). */
+    emitLine(id: string, line: string): boolean;
     stopFile(id: string): Promise<boolean>;
     stopAllFiles(): Promise<number>;
     register(options: RegisterMonitorOptions): string;

package/dist/core/extensions/builtin/terminal/monitor-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monitor-registry.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monitor-registry.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-registry.ts"],"names":[],"mappings":"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"}

package/dist/core/extensions/builtin/terminal/monitor-registry.js

@@ -232,6 +232,7 @@ export class MonitorRegistry {
             cleanupRegistration();
             throw new Error("Cannot create file monitor: monitor registry is disposed.");
         }
+        const persistent = options.persistent ?? options.expiresAt !== undefined;
         const record = {
             id,
             monitorId: options.monitorId ?? allocateMonitorId(),
@@ -240,10 +241,8 @@ export class MonitorRegistry {
             startedAtMs: Date.now(),
             command: null,
             filter: null,
-            persistent: options.persistent ?? options.expiresAt !== undefined,
-            deadlineMs: (options.persistent ?? options.expiresAt !== undefined)
-                ? null
-                : (options.deadlineMs ?? Date.now() + options.timeoutMs),
+            persistent,
+            deadlineMs: persistent ? null : (options.deadlineMs ?? Date.now() + options.timeoutMs),
             fireCount: 0,
             lastFiredAtMs: null,
             expiresAt: options.expiresAt,
@@ -267,11 +266,13 @@ export class MonitorRegistry {
             dirtyPasses: 0,
             dirtyWindowStartedAt: 0,
             checking: undefined,
-            deadline: setTimeout(() => {
-                const current = this.#files.get(id);
-                if (current)
-                    this.#settleFile(current, "watcher timed_out");
-            }, options.timeoutMs),
+            deadline: persistent
+                ? undefined
+                : setTimeout(() => {
+                    const current = this.#files.get(id);
+                    if (current)
+                        this.#settleFile(current, "watcher timed_out");
+                }, options.timeoutMs),
         };
         this.#files.set(id, record);
         if (this.#parked)
@@ -292,7 +293,11 @@ export class MonitorRegistry {
     }
     /** Emit one restored-watch line through the SAME sink a live watch uses (coalescing, wake budget). */
     emitFileLine(id, line) {
-        const record = this.#files.get(id);
+        return this.#files.has(id) && this.emitLine(id, line);
+    }
+    /** Inject one line into a live command or file watch's event stream (e.g. a restore notice). */
+    emitLine(id, line) {
+        const record = this.#records.get(id) ?? this.#files.get(id);
         if (!record || record.settled)
             return false;
         this.#emitForRecord(record, { type: "line", id: record.id, description: record.description, line });