pi2dsh 0.17.0 → 0.18.0

package/dist/{runtime-DE2dU1cA.mjs → runtime-C-cmLDY0.mjs}

@@ -6,7 +6,7 @@ import { W as getKeybindings, _t as stripTerminalSequences } from "./pi-tui-DruS
 import { c as resolvePiProviderAuth, i as oauthCredentialRef, l as storedOAuthCredential, n as joinSignals, o as providerSupportsOAuth, r as loginPiProvider, t as FileCredentialStore } from "./oauth-bridge-C_MAPMGA.mjs";
 import { createRequire } from "node:module";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
-import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { tmpdir } from "node:os";
@@ -27,6 +27,81 @@ function entrySeq(id) {
 	const match = /^dsh-(\d+)$/.exec(id);
 	return match === null ? void 0 : Number(match[1]);
 }
+/** One Pi-only record as the Pi session-file entry line it is stored as. */
+function piEntryLineOf(record) {
+	const base = {
+		id: record.id,
+		parentId: null,
+		timestamp: record.timestamp
+	};
+	switch (record.kind) {
+		case "custom": return JSON.stringify({
+			type: "custom",
+			...base,
+			customType: record.customType,
+			...record.data === void 0 ? {} : { data: record.data }
+		});
+		case "label": return JSON.stringify({
+			type: "label",
+			...base,
+			targetId: record.targetId,
+			...record.label === void 0 ? {} : { label: record.label }
+		});
+		case "branch_summary": return JSON.stringify({
+			type: "branch_summary",
+			...base,
+			fromId: record.fromId,
+			summary: record.summary
+		});
+		case "name": return JSON.stringify({
+			type: "session_info",
+			...base,
+			name: record.name
+		});
+	}
+}
+/**
+* Normalize one parsed session-file line back into a record. Understands the
+* Pi entry shapes this bridge writes today AND the pre-0.18 private
+* `{kind: …}` lines, so archives written by older engines keep loading. A Pi
+* header line and anything unrecognized return undefined.
+*/
+function recordOfParsedLine(parsed) {
+	if (typeof parsed.kind === "string") return parsed;
+	const id = typeof parsed.id === "string" ? parsed.id : void 0;
+	const timestamp = typeof parsed.timestamp === "string" ? parsed.timestamp : void 0;
+	if (id === void 0 || timestamp === void 0) return void 0;
+	switch (parsed.type) {
+		case "custom": return {
+			kind: "custom",
+			id,
+			timestamp,
+			customType: String(parsed.customType ?? ""),
+			...parsed.data === void 0 ? {} : { data: parsed.data }
+		};
+		case "label": return {
+			kind: "label",
+			id,
+			timestamp,
+			...typeof parsed.targetId === "string" ? { targetId: parsed.targetId } : {},
+			...typeof parsed.label === "string" ? { label: parsed.label } : {}
+		};
+		case "branch_summary": return {
+			kind: "branch_summary",
+			id,
+			timestamp,
+			...typeof parsed.summary === "string" ? { summary: parsed.summary } : {},
+			...typeof parsed.fromId === "string" ? { fromId: parsed.fromId } : {}
+		};
+		case "session_info": return {
+			kind: "name",
+			id,
+			timestamp,
+			...typeof parsed.name === "string" ? { name: parsed.name } : {}
+		};
+		default: return;
+	}
+}
 function sidecarDir() {
 	return join(getAgentDir(), "session-entries");
 }
@@ -72,17 +147,24 @@ var PiSessionBridge = class {
 	/**
 	* The Pi-visible archive file for one DSH session — the established
 	* `<id>.jsonl` convention (getSessionFile/switchSession use the same one).
-	* Guaranteed to EXIST on return: Pi consumers treat the session file as the
-	* durable identity a conversation can be reopened by (pi-subagents guards
-	* its tombstone resurrect with existsSync, and Pi's SessionManager.open
-	* tolerates an empty file), so a merely virtual path would read as "the
-	* conversation is gone".
+	* Guaranteed to EXIST on return, and to start with a genuine Pi
+	* `{type:"session"}` header line: Pi consumers treat the session file as
+	* the durable identity a conversation can be reopened by (pi-subagents
+	* guards its tombstone resurrect with existsSync), and real Pi parsing
+	* (`SessionManager.open` reads the header for id/cwd) must see a Pi file,
+	* not a bare inode. An empty pre-existing file is upgraded in place.
 	*/
-	archiveFileFor(sessionId) {
+	archiveFileFor(sessionId, cwd) {
 		const path = this.sidecarPath(sessionId);
-		if (!existsSync(path)) {
+		if (!existsSync(path) || readFileSync(path, "utf8").trim().length === 0) {
 			mkdirSync(sidecarDir(), { recursive: true });
-			appendFileSync(path, "");
+			appendFileSync(path, `${JSON.stringify({
+				type: "session",
+				version: 3,
+				id: sessionId,
+				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+				cwd: cwd ?? process.cwd()
+			})}\n`);
 		}
 		return path;
 	}
@@ -100,6 +182,19 @@ var PiSessionBridge = class {
 		const base = basename(resolved);
 		return base.endsWith(".jsonl") ? base.slice(0, -6) : void 0;
 	}
+	/**
+	* Retire one archive this bridge minted: the file whose existence tells Pi
+	* consumers "this conversation can be reopened". Called ONLY on a positive
+	* persistence-layer verdict that the DSH session is gone, so existsSync
+	* answers honestly again.
+	*/
+	discardArchive(sessionId) {
+		try {
+			unlinkSync(this.sidecarPath(sessionId));
+		} catch {}
+		this.records.delete(sessionId);
+		this.loaded.delete(sessionId);
+	}
 	load(sessionId) {
 		if (this.loaded.has(sessionId)) return;
 		this.loaded.add(sessionId);
@@ -112,7 +207,8 @@ var PiSessionBridge = class {
 		for (const line of readFileSync(path, "utf8").split("\n")) {
 			if (line.trim().length === 0) continue;
 			try {
-				parsed.push(JSON.parse(line));
+				const record = recordOfParsedLine(JSON.parse(line));
+				if (record !== void 0) parsed.push(record);
 			} catch {}
 		}
 		this.records.set(sessionId, parsed);
@@ -122,8 +218,8 @@ var PiSessionBridge = class {
 		const list = this.records.get(sessionId) ?? [];
 		list.push(record);
 		this.records.set(sessionId, list);
-		mkdirSync(sidecarDir(), { recursive: true });
-		appendFileSync(this.sidecarPath(sessionId), `${JSON.stringify(record)}\n`);
+		this.archiveFileFor(sessionId);
+		appendFileSync(this.sidecarPath(sessionId), `${piEntryLineOf(record)}\n`);
 	}
 	appendCustomEntry(sessionId, customType, data) {
 		const id = randomUUID();
@@ -338,7 +434,7 @@ var PiSessionBridge = class {
 			getCwd: () => cwd,
 			getSessionDir: () => sidecarDir(),
 			getSessionId: () => session.id,
-			getSessionFile: () => this.archiveFileFor(session.id),
+			getSessionFile: () => this.archiveFileFor(session.id, cwd),
 			getLeafId: () => leafOf()?.id ?? null,
 			getLeafEntry: () => leafOf(),
 			getEntry: (id) => entriesOf().find((entry) => entry.id === id),
@@ -949,7 +1045,14 @@ async function createBridgedAgentSession(host, options) {
 			setup
 		});
 	} catch (error) {
-		throw new Error(resumeSessionId !== void 0 ? `pi2dsh: reopening child session ${JSON.stringify(resumeSessionId)} failed — its persisted log may be gone or this composition has no session persistence (${error instanceof Error ? error.message : String(error)})` : `pi2dsh: subagent creation needs the DSH host loop (model runtime) to provide the agent factory; this composition cannot run one (${error instanceof Error ? error.message : String(error)})`);
+		if (resumeSessionId !== void 0) {
+			if (await host.sessionGoneFromPersistence?.(resumeSessionId) === true) {
+				host.discardStaleArchive?.(resumeSessionId);
+				throw new Error(`pi2dsh: child session ${JSON.stringify(resumeSessionId)} no longer exists in the host's session persistence — the conversation is gone and its archive identity has been retired (${error instanceof Error ? error.message : String(error)})`);
+			}
+			throw new Error(`pi2dsh: reopening child session ${JSON.stringify(resumeSessionId)} failed — this composition may lack session persistence (${error instanceof Error ? error.message : String(error)})`);
+		}
+		throw new Error(`pi2dsh: subagent creation needs the DSH host loop (model runtime) to provide the agent factory; this composition cannot run one (${error instanceof Error ? error.message : String(error)})`);
 	}
 	const tools = [...Array.isArray(options.tools) ? options.tools : [], ...Array.isArray(options.customTools) ? options.customTools : []];
 	const childSession = handle.agent.session;
@@ -6779,6 +6882,16 @@ async function applyPiPackage(ctx, options) {
 			return state.bridge.readonlySessionManager(session, cwd);
 		},
 		resumeSessionIdFor: (file) => state.bridge.sessionIdOfArchiveFile(file),
+		sessionGoneFromPersistence: async (sessionId) => {
+			const persistence = optionalService(ctx, "sessionPersistence");
+			if (typeof persistence?.list !== "function") return void 0;
+			try {
+				return !(await persistence.list()).some((header) => String(header?.id ?? "") === sessionId);
+			} catch {
+				return;
+			}
+		},
+		discardStaleArchive: (sessionId) => state.bridge.discardArchive(sessionId),
 		parentModelRoute: () => {
 			const parent = currentAgent(state);
 			if (parent === void 0) return void 0;
@@ -6849,4 +6962,4 @@ const runtimeInternals = {
 //#endregion
 export { registerVisionCompanions as a, overlayProviderConfig as i, mergeProviderRegistration as n, runtimeInternals as o, normalizeToolSchema as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-DE2dU1cA.mjs.map
+//# sourceMappingURL=runtime-C-cmLDY0.mjs.map