@junghanacs/entwurf 0.45.0 → 0.50.0

package/pi/pi-durable/carrier/sessions.js

@@ -4,6 +4,55 @@ import { mkdir, readdir, realpath, stat } from "node:fs/promises";
 import { basename, join, resolve } from "node:path";
 import lockfile from "proper-lockfile";
 import { getAgentDir } from "entwurf-pi-dist:config.js";
+import { isSessionName } from "./session-name.js";
+
+/**
+ * An owner's end as the opener observed it (#157 B3): the storage outcome of the first actual close, and the
+ * lease outcome of its release.
+ */
+                           
+	                                                                   
+	                                                                 
+	                               
+	                        
+ 
+
+/** One admitted owner of a session directory, from before its native lease through its end. */
+                              
+	                                                                                                         
+	                              
+	                                     
+	                        
+	                                                           
+	                               
+	                                     
+	                                          
+	                                                                                       
+	                             
+ 
+
+/** What an owned open hands the fence once its directory is chosen, before its native lease. */
+                                 
+	                                                                           
+	                           
+	                                                    
+	                           
+	                                                     
+	                          
+	   
+	                                                                                                                
+	                                                                    
+	   
+	                         
+ 
+
+/**
+ * The owner fence every owned open takes before its native lease (#157 B3). Supplied by the host, never imported
+ * here; it admits this opener or refuses, and a refusal opens nothing.
+ */
+                               
+	                                                     
+ 
 
 /** One session directory holding `session.sqlite`, locked by this process. */
                                   
@@ -13,6 +62,8 @@ import { getAgentDir } from "entwurf-pi-dist:config.js";
 	            
 	                 
 	                         
+	                                                                      
+	                    
  
 
 /** One session of a directory as its files show it (#143): nothing in it is opened. */
@@ -27,8 +78,6 @@ import { getAgentDir } from "entwurf-pi-dist:config.js";
 	                       
  
 
-const SESSION_NAME = /^\d{13}-[0-9a-f-]{36}$/u;
-
 /** A path's stat, or undefined when nothing is there; any other failure is thrown, never read as absence. */
 async function statIfPresent(path        )                             {
 	try {
@@ -39,15 +88,17 @@ async function statIfPresent(path        )                             {
 	}
 }
 
-async function sessionRoot(cwdInput        )                                         {
+async function sessionRoot(cwdInput        )                                                          {
 	const cwd = await realpath(resolve(cwdInput));
+	// Read once: the root is joined from this value, and the fence is handed this same value as it came (#157 B3).
+	const agentDir = getAgentDir();
 	const root = join(
-		getAgentDir(),
+		agentDir,
 		"experimental",
 		"durable-sessions",
 		createHash("sha256").update(cwd).digest("hex").slice(0, 24),
 	);
-	return { cwd, root };
+	return { cwd, root, profile: agentDir };
 }
 
 /** The sessions of `cwd`, most recently written first. Reads names, file times and locks; creates nothing. */
@@ -62,7 +113,7 @@ export async function listSessions(cwdInput        )                          {
 	}
 	const sessions                 = [];
 	for (const entry of entries) {
-		if (!entry.isDirectory() || !SESSION_NAME.test(entry.name)) continue;
+		if (!entry.isDirectory() || !isSessionName(entry.name)) continue;
 		const directory = join(root, entry.name);
 		let lastWriteAt                    ;
 		for (const file of ["session.sqlite", "session.sqlite-wal"]) {
@@ -80,19 +131,23 @@ export async function listSessions(cwdInput        )                          {
 	return sessions.sort((a, b) => (b.lastWriteAt ?? b.createdAt) - (a.lastWriteAt ?? a.createdAt));
 }
 
-/** A new session for `cwd`, its newest one with `continueSession`, or the existing one named by `sessionId`. */
+/**
+ * A new session for `cwd`, its newest one with `continueSession`, or the existing one named by `sessionId`, admitted
+ * by `fence` before its native lease is taken.
+ */
 export async function selectSession(
+	fence              ,
 	cwdInput        ,
 	continueSession         ,
 	sessionId         ,
 )                           {
-	const { cwd, root } = await sessionRoot(cwdInput);
+	const { cwd, root, profile } = await sessionRoot(cwdInput);
 	await mkdir(root, { recursive: true });
 
 	let directory        ;
 	let created = false;
 	if (sessionId !== undefined) {
-		const chosen = SESSION_NAME.test(sessionId) ? join(root, sessionId) : undefined;
+		const chosen = isSessionName(sessionId) ? join(root, sessionId) : undefined;
 		if (chosen === undefined || !(await statIfPresent(chosen))?.isDirectory()) {
 			throw new Error(`No durable session ${sessionId} exists for ${cwd}`);
 		}
@@ -100,7 +155,7 @@ export async function selectSession(
 	} else if (continueSession) {
 		const entries = await readdir(root, { withFileTypes: true });
 		const newest = entries
-			.filter((entry) => entry.isDirectory() && SESSION_NAME.test(entry.name))
+			.filter((entry) => entry.isDirectory() && isSessionName(entry.name))
 			.map((entry) => entry.name)
 			.sort()
 			.at(-1);
@@ -112,15 +167,36 @@ export async function selectSession(
 		created = true;
 	}
 
-	let release                     ;
-	try {
-		// A lock left by a crashed process goes stale after 10 s; wait that long before giving up.
-		release = await lockfile.lock(directory, {
-			realpath: false,
-			retries: { retries: 12, minTimeout: 1000, maxTimeout: 1000 },
+	// The owner fence admits this opener BEFORE the native lease, or refuses with nothing taken (#157 B3).
+	const ticket = await fence.admit({ directory, selectedN: basename(directory), created, profile });
+	// A lock left by a crashed process goes stale after 10 s; wait that long before giving up.
+	const lease = lockfile.lock(directory, {
+		realpath: false,
+		retries: { retries: 12, minTimeout: 1000, maxTimeout: 1000 },
+	});
+	const release = await lease.catch(async (error) => {
+		const refused = new Error(`Session is already open in another process: ${directory}`, { cause: error });
+		// No acquisition was observed: this owner ends with nothing opened and no lease held.
+		await ticket.endUnleased().catch((fenceError) => {
+			throw new AggregateError([refused, fenceError], `${refused.message}; its owner end was not recorded`);
 		});
-	} catch (error) {
-		throw new Error(`Session is already open in another process: ${directory}`, { cause: error });
-	}
-	return { id: basename(directory), directory, database: join(directory, "session.sqlite"), cwd, created, release };
+		throw refused;
+	});
+	// Apart from the lease's own failure: the lease IS held here, so a failed checkpoint is never recorded as an
+	// acquire failure. The open fails and releases the lease; the claim stays fenced under this live owner.
+	await ticket.leased().catch(async (error) => {
+		await release().catch((releaseError) => {
+			throw new AggregateError([error, releaseError], `lease checkpoint and release both failed: ${directory}`);
+		});
+		throw error;
+	});
+	return {
+		id: basename(directory),
+		directory,
+		database: join(directory, "session.sqlite"),
+		cwd,
+		created,
+		release,
+		ticket,
+	};
 }

package/pi/pi-durable/overlay/upstream-pin.json

@@ -55,7 +55,7 @@
 		}
 	},
 	"carrier": {
-		"comment": "files: the six app files bootstrap.mjs needs (main.ts is replaced by the bootstrap), each emitted from its owned `source`. distTargets: every pi-coding-agent internal the stripped files import, as paths under the published dist/; the emitter refuses a set that differs and the resolver answers no other.",
+		"comment": "files: the six app files bootstrap.mjs needs (main.ts is replaced by the bootstrap) and the import-free session-name grammar Entwurf owns beside them (#157 G3 B-L1, no upstream origin), each emitted from its owned `source`. distTargets: every pi-coding-agent internal the stripped files import, as paths under the published dist/; the emitter refuses a set that differs and the resolver answers no other.",
 		"emitter": {
 			"tool": "node:module.stripTypeScriptTypes",
 			"mode": "strip",
@@ -70,8 +70,8 @@
 			{
 				"name": "runtime.js",
 				"source": "pi/pi-durable/src/experimental/durable/runtime.ts",
-				"blob": "75d7bf2b4fdc36aa775f73f9d7f3de8659f19187",
-				"sha256": "725757156580ad2a2d170c790440763371bb8035052a0c6caae6af5159d4718f"
+				"blob": "bb5715ab143945e9f2c067ff71d890fe29875d09",
+				"sha256": "437834997b9870ab0383aea7d86ff7880ef7e2ebbbfe4c6360f67d8d36f777ec"
 			},
 			{
 				"name": "tui.js",
@@ -94,14 +94,20 @@
 			{
 				"name": "sessions.js",
 				"source": "pi/pi-durable/src/experimental/durable/sessions.ts",
-				"blob": "eed4b3ca51c6f5a3bab8106adaf0062f3f7d5b56",
-				"sha256": "668373feadabcf13bd4dd7431e5429b7d7376c47c367e4b15353c57cb8711892"
+				"blob": "f107238fefb63c95b29add5aa76fcbd9153c94db",
+				"sha256": "0ac7c919f2bf8a3b0e5dbd307045108a803b161f87298cd9fe440f239784c7ac"
 			},
 			{
 				"name": "subagent.js",
 				"source": "pi/pi-durable/src/experimental/durable/subagent.ts",
 				"blob": "3fa9aebbe93e82cfff436e7b9d4c9877e0ed0e27",
 				"sha256": "1cb2390b673a0d914117bc07708c39b004fb10e48b31436bf9d9d2b953a64220"
+			},
+			{
+				"name": "session-name.js",
+				"source": "pi/pi-durable/src/experimental/durable/session-name.ts",
+				"blob": "c57c760ca3c14363f195ac9d9c2add984e4118d5",
+				"sha256": "9eadecfe9a48bba0d221370f4a236286e0d6f10d663b15ff4cb5975adee67018"
 			}
 		],
 		"distTargets": [