@gajae-code/coding-agent 0.12.10 → 0.12.12

package/src/session/session-manager.ts

@@ -899,6 +899,7 @@ export interface ResumeSessionIdentity {
 	size: number;
 	mtimeMs: number;
 	mtimeNs: bigint;
+	ctimeNs?: bigint;
 	sha256: string;
 }
 
@@ -918,6 +919,21 @@ export interface ResumeTailError {
 }
 
 export type SessionDirectoryMigrationPolicy = ManagedMigrationPolicy;
+export type SessionAppendPersistenceFailurePhase = "current_append" | "prior_failure";
+
+export class SessionAppendPersistenceError extends Error {
+	readonly phase: SessionAppendPersistenceFailurePhase;
+	readonly entryId: string;
+	readonly persistenceError: Error;
+
+	constructor(phase: SessionAppendPersistenceFailurePhase, entryId: string, persistenceError: Error) {
+		super(persistenceError.message, { cause: persistenceError });
+		this.name = "SessionAppendPersistenceError";
+		this.phase = phase;
+		this.entryId = entryId;
+		this.persistenceError = persistenceError;
+	}
+}
 
 export class SessionManagedStorageError extends Error {
 	readonly code = "managed_storage_unsupported";
@@ -2161,6 +2177,7 @@ function sameResumeIdentity(left: ResumeSessionIdentity, right: ResumeSessionIde
 		left.size === right.size &&
 		left.mtimeMs === right.mtimeMs &&
 		left.mtimeNs === right.mtimeNs &&
+		(left.ctimeNs === undefined || right.ctimeNs === undefined || left.ctimeNs === right.ctimeNs) &&
 		left.sha256 === right.sha256
 	);
 }
@@ -2174,7 +2191,8 @@ function sameResumeStat(left: SessionStorageStat, right: SessionStorageStat): bo
 		left.nlink === right.nlink &&
 		left.size === right.size &&
 		left.mtimeMs === right.mtimeMs &&
-		left.mtimeNs === right.mtimeNs
+		left.mtimeNs === right.mtimeNs &&
+		left.ctimeNs === right.ctimeNs
 	);
 }
 
@@ -2372,6 +2390,7 @@ function inspectResumeSessionFile(
 			size: snapshot.size,
 			mtimeMs: snapshot.mtimeMs,
 			mtimeNs: snapshot.mtimeNs,
+			ctimeNs: snapshot.ctimeNs,
 			sha256: crypto.createHash("sha256").update(bytes).digest("hex"),
 		};
 		return { identity, content: bytes, entries, context, migrationApplied };
@@ -2380,6 +2399,46 @@ function inspectResumeSessionFile(
 	}
 }
 
+function fsyncResumeSessionIdentity(expected: ResumeSessionIdentity): void {
+	const fd = fs.openSync(expected.canonicalPath, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
+	try {
+		const before = fs.fstatSync(fd, { bigint: true });
+		if (
+			before.dev !== expected.dev ||
+			before.ino !== expected.ino ||
+			(expected.nlink !== undefined && before.nlink !== expected.nlink) ||
+			Number(before.size) !== expected.size ||
+			before.mtimeNs !== expected.mtimeNs ||
+			(expected.ctimeNs !== undefined && before.ctimeNs !== expected.ctimeNs)
+		) {
+			throw new Error("session_persistence_recovery_identity_mismatch");
+		}
+		fs.fsyncSync(fd);
+		const after = fs.fstatSync(fd, { bigint: true });
+		const named = fs.lstatSync(expected.canonicalPath, { bigint: true });
+		if (
+			after.dev !== before.dev ||
+			after.ino !== before.ino ||
+			after.nlink !== before.nlink ||
+			after.size !== before.size ||
+			after.mtimeNs !== before.mtimeNs ||
+			after.ctimeNs !== before.ctimeNs ||
+			named.dev !== after.dev ||
+			named.ino !== after.ino ||
+			named.nlink !== after.nlink
+		) {
+			throw new Error("session_persistence_recovery_identity_mismatch");
+		}
+	} finally {
+		fs.closeSync(fd);
+	}
+	const parentFd = fs.openSync(path.dirname(expected.canonicalPath), fs.constants.O_RDONLY | fs.constants.O_DIRECTORY);
+	try {
+		fs.fsyncSync(parentFd);
+	} finally {
+		fs.closeSync(parentFd);
+	}
+}
 /** Revalidate previously parsed authority without another decode, parse, migration, or context build. */
 function revalidateResumeSessionIdentity(
 	filePath: string,
@@ -2410,6 +2469,7 @@ function revalidateResumeSessionIdentity(
 		size: snapshot.stat.size,
 		mtimeMs: snapshot.stat.mtimeMs,
 		mtimeNs: snapshot.stat.mtimeNs,
+		ctimeNs: snapshot.stat.ctimeNs,
 		sha256: crypto.createHash("sha256").update(snapshot.bytes).digest("hex"),
 	};
 	return sameResumeIdentity(expected, observed) ? { kind: "valid" } : { kind: "error", reason: "identity-mismatch" };
@@ -4705,6 +4765,7 @@ interface SessionManagerStateSnapshot {
 	needsFullRewriteOnNextPersist: boolean;
 	fileEntries: FileEntry[];
 	materializedFileEntries: FileEntry[];
+	adoptedArtifactManager: ArtifactManager | null;
 }
 
 /** Benchmark-derived cap for strong materialized session snapshots. */
@@ -4715,6 +4776,7 @@ export const SessionManagerTestHooks: {
 	materializedCacheMaxBytesOverride?: number;
 	beforeResidentTransitionIndexBuild?: () => void;
 	afterForkSnapshot?: () => void | Promise<void>;
+	beforeEphemeralArtifactManagerInstall?: (dir: string) => void | Promise<void>;
 } = {};
 
 function materializedCacheMaxBytes(): number {
@@ -4751,7 +4813,9 @@ export class SessionManager {
 	#recoveryPromotionTranscriptPath: string | undefined;
 	#memoryGuardParticipantIngressToken: symbol | undefined;
 	#fileEntries: FileEntry[] = [];
-	#pendingStrictAdoption: { canonicalPath: string; identity: ResumeSessionIdentity } | undefined;
+	#pendingStrictAdoption:
+		| { canonicalPath: string; identity: ResumeSessionIdentity; inspection?: ResumeInspectionSnapshot }
+		| undefined;
 	#byId: Map<string, SessionEntry> = new Map();
 	#labelsById: Map<string, string> = new Map();
 	#leafId: string | null = null;
@@ -4779,10 +4843,13 @@ export class SessionManager {
 	// Subagents adopt the parent's manager so artifact IDs are unique across the
 	// whole agent tree and all files land in the parent's artifacts dir.
 	#adoptedArtifactManager: ArtifactManager | null = null;
-	// In-memory artifact fallback for non-persistent sessions (persist=false).
-	// Keyed by sequential numeric ID string; mirrors the file-based ArtifactManager ID scheme.
-	#inMemoryArtifacts: Map<string, string> | null = null;
-	#inMemoryArtifactCounter = 0;
+	// Filesystem-backed artifact fallback for non-persistent sessions (persist=false).
+	// The directory is created lazily on first save so artifact content is read back
+	// from disk on demand instead of being retained in memory for the session lifetime.
+	#ephemeralArtifactManager: ArtifactManager | null = null;
+	#ephemeralArtifactDir: string | null = null;
+	#ephemeralArtifactInit: Promise<ArtifactManager | null> | null = null;
+	#ephemeralArtifactCleanups = new Set<Promise<void>>();
 	readonly #blobStore: BlobStore;
 	#residentTextBlobStore: BlobStore = new MemoryBlobStore();
 	#residentImageBlobStore: BlobStore;
@@ -5298,6 +5365,7 @@ export class SessionManager {
 			// Rollback snapshots must own resident data before another session reset disposes
 			// the ephemeral store backing the resident sentinels above.
 			materializedFileEntries,
+			adoptedArtifactManager: this.#adoptedArtifactManager,
 		};
 	}
 
@@ -5335,7 +5403,7 @@ export class SessionManager {
 		this.#persistErrorReported = false;
 		this.#artifactManager = null;
 		this.#artifactManagerSessionFile = null;
-		this.#adoptedArtifactManager = null;
+		this.#adoptedArtifactManager = snapshot.adoptedArtifactManager;
 		this.#commitResidentTextStoreTransition(prepared);
 		if (this.#sessionFile) writeTerminalBreadcrumb(this.cwd, this.#sessionFile);
 	}
@@ -5376,8 +5444,7 @@ export class SessionManager {
 		this.#flushed = false;
 		this.#needsFullRewriteOnNextPersist = false;
 		this.#ensuredOnDisk = false;
-		this.#inMemoryArtifacts = null;
-		this.#inMemoryArtifactCounter = 0;
+
 		this.#artifactManager = null;
 		this.#artifactManagerSessionFile = null;
 		this.#adoptedArtifactManager = null;
@@ -5409,6 +5476,7 @@ export class SessionManager {
 			const prepared = this.#prepareFreshSessionTransition(fresh, "memory-fallback");
 			this.#applyFreshSessionMetadata(fresh);
 			this.#commitResidentTextStoreTransition(prepared);
+			this.#retireEphemeralArtifacts();
 			writeTerminalBreadcrumb(this.cwd, resolvedSessionFile);
 			await this.#rewriteFile();
 			this.#flushed = true;
@@ -5482,7 +5550,7 @@ export class SessionManager {
 	}
 
 	/** Switch to a different session file (used for resume and branching). */
-	async setSessionFile(sessionFile: string): Promise<void> {
+	async setSessionFile(sessionFile: string, options?: { deferEphemeralArtifactRetirement?: boolean }): Promise<void> {
 		this.#assertRecoveryHydrationWritable();
 		const resolvedSessionFile = this.storage instanceof FileSessionStorage ? path.resolve(sessionFile) : sessionFile;
 		const strictAdoption = this.#pendingStrictAdoption;
@@ -5501,11 +5569,14 @@ export class SessionManager {
 			if (strictAdoption && resolvedSessionFile === strictAdoption.canonicalPath) {
 				const inspected = inspectResumeSessionFile(resolvedSessionFile, this.storage);
 				if ("kind" in inspected || !sameResumeIdentity(strictAdoption.identity, inspected.identity))
-					throw new Error("Prepared managed session changed before strict adoption.");
+					throw new Error("Prepared session changed before strict adoption.");
 			}
 			let entries: FileEntry[];
 			let candidateMigrationApplied = false;
-			if (this.storage.existsSync(resolvedSessionFile)) {
+			if (strictAdoption?.inspection && resolvedSessionFile === strictAdoption.canonicalPath) {
+				entries = strictAdoption.inspection.entries;
+				candidateMigrationApplied = strictAdoption.inspection.migrationApplied;
+			} else if (this.storage.existsSync(resolvedSessionFile)) {
 				const inspected = inspectResumeSessionFile(resolvedSessionFile, this.storage);
 				if ("kind" in inspected) throw new Error(`Could not switch session: ${inspected.reason}`);
 				entries = inspected.entries;
@@ -5516,7 +5587,7 @@ export class SessionManager {
 			if (strictAdoption) {
 				const inspected = inspectResumeSessionFile(resolvedSessionFile, this.storage);
 				if ("kind" in inspected || !sameResumeIdentity(strictAdoption.identity, inspected.identity))
-					throw new Error("Prepared managed session changed during strict adoption.");
+					throw new Error("Prepared session changed during strict adoption.");
 			}
 			if (entries.length > 0) {
 				const header = entries.find(entry => entry.type === "session") as SessionHeader | undefined;
@@ -5541,6 +5612,13 @@ export class SessionManager {
 					prepared.dispose();
 					throw error;
 				}
+				if (strictAdoption) {
+					const inspected = inspectResumeSessionFile(resolvedSessionFile, this.storage);
+					if ("kind" in inspected || !sameResumeIdentity(strictAdoption.identity, inspected.identity)) {
+						prepared.dispose();
+						throw new Error("Prepared session changed before strict adoption commit.");
+					}
+				}
 				const previous = {
 					sessionId: this.#sessionId,
 					sessionName: this.#sessionName,
@@ -5569,6 +5647,7 @@ export class SessionManager {
 					prepared.dispose();
 					throw error;
 				}
+				if (!options?.deferEphemeralArtifactRetirement) this.#retireEphemeralArtifacts();
 				managedTransition?.settle();
 				this.#pendingStrictAdoption = undefined;
 				this.#flushed = true;
@@ -5596,8 +5675,6 @@ export class SessionManager {
 				flushed: this.#flushed,
 				needsFullRewriteOnNextPersist: this.#needsFullRewriteOnNextPersist,
 				ensuredOnDisk: this.#ensuredOnDisk,
-				inMemoryArtifacts: this.#inMemoryArtifacts,
-				inMemoryArtifactCounter: this.#inMemoryArtifactCounter,
 				artifactManager: this.#artifactManager,
 				artifactManagerSessionFile: this.#artifactManagerSessionFile,
 				adoptedArtifactManager: this.#adoptedArtifactManager,
@@ -5607,6 +5684,7 @@ export class SessionManager {
 				managedTransition?.adopt();
 				writeTerminalBreadcrumb(this.cwd, resolvedSessionFile);
 				this.#commitResidentTextStoreTransition(prepared);
+				if (!options?.deferEphemeralArtifactRetirement) this.#retireEphemeralArtifacts();
 			} catch (error) {
 				managedTransition?.rollback();
 				this.#lifecycleIdAdopted = previous.lifecycleIdAdopted;
@@ -5620,8 +5698,6 @@ export class SessionManager {
 				this.#flushed = previous.flushed;
 				this.#needsFullRewriteOnNextPersist = previous.needsFullRewriteOnNextPersist;
 				this.#ensuredOnDisk = previous.ensuredOnDisk;
-				this.#inMemoryArtifacts = previous.inMemoryArtifacts;
-				this.#inMemoryArtifactCounter = previous.inMemoryArtifactCounter;
 				this.#artifactManager = previous.artifactManager;
 				this.#artifactManagerSessionFile = previous.artifactManagerSessionFile;
 				this.#adoptedArtifactManager = previous.adoptedArtifactManager;
@@ -6067,12 +6143,12 @@ export class SessionManager {
 		this.#flushed = stage.flushed;
 		this.#needsFullRewriteOnNextPersist = false;
 		this.#ensuredOnDisk = stage.flushed;
-		this.#inMemoryArtifacts = null;
-		this.#inMemoryArtifactCounter = 0;
+
 		this.#artifactManager = null;
 		this.#artifactManagerSessionFile = null;
 		this.#adoptedArtifactManager = null;
 		this.#commitResidentTextStoreTransition(transition);
+		this.#retireEphemeralArtifacts();
 		stage.committed = true;
 		this.#preparedNewSessions.delete(stage);
 	}
@@ -6883,6 +6959,7 @@ export class SessionManager {
 		const prepared = this.#prepareFreshSessionTransition(fresh, "memory-fallback");
 		this.#applyFreshSessionMetadata(fresh);
 		this.#commitResidentTextStoreTransition(prepared);
+		this.#retireEphemeralArtifacts();
 		if (writeBreadcrumb && fresh.sessionFile) writeTerminalBreadcrumb(this.cwd, fresh.sessionFile);
 		return fresh.sessionFile;
 	}
@@ -7605,6 +7682,8 @@ export class SessionManager {
 				this.#flushed = true;
 			}
 		});
+		this.#retireEphemeralArtifacts();
+		await this.#drainEphemeralArtifactCleanups();
 		this.#releaseResidentTextStore();
 		this.#releaseOwnedManagedAuthority();
 		if (this.#persistError) throw this.#persistError;
@@ -7664,6 +7743,12 @@ export class SessionManager {
 		// close leaves the session live for a genuine retry.
 		if (!this.#persistWriter) {
 			this.#releaseResidentTextStore();
+			this.#retireEphemeralArtifacts();
+			try {
+				await this.#drainEphemeralArtifactCleanups();
+			} catch (error) {
+				outcome = { kind: "close_unknown", error: toError(error) };
+			}
 		}
 		return outcome;
 	}
@@ -7952,14 +8037,40 @@ export class SessionManager {
 		this.#adoptedArtifactManager = manager;
 	}
 
+	/** Release only the matching externally adopted manager. */
+	releaseArtifactManager(manager: ArtifactManager): void {
+		if (this.#adoptedArtifactManager === manager) this.#adoptedArtifactManager = null;
+	}
+
+	/** Temporarily release adopted authority while an outer transition validates its successor. */
+	stageAdoptedArtifactManagerForTransition(): void {
+		this.#adoptedArtifactManager = null;
+	}
+
+	/** Prove manager authority by exact object identity, never by pathname shape. */
+	isArtifactManagerAuthorized(manager: ArtifactManager): boolean {
+		return (
+			manager === this.#adoptedArtifactManager ||
+			manager === this.#artifactManager ||
+			manager === this.#ephemeralArtifactManager
+		);
+	}
+
 	/**
 	 * Returns the ArtifactManager this session writes through. Lazily creates
 	 * one bound to the current session file unless an external manager was
-	 * adopted via `adoptArtifactManager`. Returns null only for non-persistent
-	 * sessions with no adopted manager.
+	 * adopted via `adoptArtifactManager`. Falls back to the lazily created
+	 * ephemeral filesystem store once a non-persistent session has saved an
+	 * artifact, so `artifact://` stays resolvable. Returns null only when no
+	 * store has been established yet.
 	 */
 	getArtifactManager(): ArtifactManager | null {
-		return this.#getOrCreateArtifactManager();
+		return this.#getOrCreateArtifactManager() ?? this.#ephemeralArtifactManager;
+	}
+
+	/** Linearizably establish this session's persistent or ephemeral artifact manager. */
+	async ensureArtifactManager(): Promise<ArtifactManager | null> {
+		return this.#getOrCreateArtifactManager() ?? (await this.#ensureEphemeralArtifactManager());
 	}
 
 	/**
@@ -8002,28 +8113,89 @@ export class SessionManager {
 
 	/**
 	 * Save artifact content under the current session and return artifact ID.
-	 * Returns an artifact ID for all sessions (file-backed for persistent, in-memory fallback otherwise).
+	 * Persistent sessions write into the session artifact directory; non-persistent
+	 * sessions write into a lazily created temporary directory so the content is
+	 * read back from the filesystem instead of being retained in memory.
 	 */
 	async saveArtifact(content: string, toolType: string): Promise<string | undefined> {
-		const manager = this.#getOrCreateArtifactManager();
-		if (manager) return manager.save(content, toolType);
-		// Non-persistent session: store in memory so spill truncation can proceed.
-		if (!this.#inMemoryArtifacts) this.#inMemoryArtifacts = new Map();
-		const id = String(this.#inMemoryArtifactCounter++);
-		this.#inMemoryArtifacts.set(id, content);
-		return id;
+		const manager = this.#getOrCreateArtifactManager() ?? (await this.#ensureEphemeralArtifactManager());
+		return manager ? manager.save(content, toolType) : undefined;
 	}
 
 	/**
 	 * Resolve an artifact ID to an on-disk path for the current session.
-	 * Returns null when missing or when the session is not persisted.
+	 * Returns null when the artifact is missing.
 	 */
 	async getArtifactPath(id: string): Promise<string | null> {
-		const manager = this.#getOrCreateArtifactManager();
+		const manager = this.getArtifactManager();
 		if (!manager) return null;
 		return manager.getPath(id);
 	}
 
+	/**
+	 * Create the non-persistent session's temporary artifact directory on first use.
+	 * Returns null when the directory cannot be created; callers then report no artifact.
+	 */
+	async #ensureEphemeralArtifactManager(): Promise<ArtifactManager | null> {
+		if (!this.#ephemeralArtifactInit) {
+			let init: Promise<ArtifactManager | null>;
+			init = fs.promises
+				.mkdtemp(path.join(os.tmpdir(), "gjc-session-artifacts-"))
+				.then(async dir => {
+					try {
+						await SessionManagerTestHooks.beforeEphemeralArtifactManagerInstall?.(dir);
+					} catch (error) {
+						await fs.promises.rm(dir, { recursive: true, force: true });
+						throw error;
+					}
+					const manager = new ArtifactManager(dir);
+					if (this.#ephemeralArtifactInit !== init) {
+						await fs.promises.rm(dir, { recursive: true, force: true });
+						return null;
+					}
+					this.#ephemeralArtifactDir = dir;
+					this.#ephemeralArtifactManager = manager;
+					return manager;
+				})
+				.catch(() => null);
+			this.#ephemeralArtifactInit = init;
+		}
+		const init = this.#ephemeralArtifactInit;
+		const manager = await init;
+		if (!manager && this.#ephemeralArtifactInit === init) this.#ephemeralArtifactInit = null;
+		return manager;
+	}
+
+	/** Unbind the active ephemeral root only after a successor transition commits. */
+	#retireEphemeralArtifacts(): void {
+		const dir = this.#ephemeralArtifactDir;
+		const init = this.#ephemeralArtifactInit;
+		if (!dir && !init) return;
+		this.#ephemeralArtifactManager = null;
+		this.#ephemeralArtifactDir = null;
+		this.#ephemeralArtifactInit = null;
+		const cleanup = (async () => {
+			const initialized = await init;
+			const cleanupDir = dir ?? initialized?.dir;
+			if (cleanupDir) await fs.promises.rm(cleanupDir, { recursive: true, force: true });
+		})();
+		void cleanup.catch(() => {});
+		this.#ephemeralArtifactCleanups.add(cleanup);
+	}
+
+	/** Retire predecessor ephemeral artifacts after an outer logical transition commits. */
+	retireEphemeralArtifactsAfterTransition(): void {
+		this.#retireEphemeralArtifacts();
+	}
+
+	async #drainEphemeralArtifactCleanups(): Promise<void> {
+		while (this.#ephemeralArtifactCleanups.size > 0) {
+			const pending = Array.from(this.#ephemeralArtifactCleanups);
+			this.#ephemeralArtifactCleanups.clear();
+			await Promise.all(pending);
+		}
+	}
+
 	/**
 	 * Path to the unsent-input draft sidecar for an explicit session. It lives
 	 * inside the artifacts directory so `dropSession` removes it with its owner.
@@ -8157,20 +8329,26 @@ export class SessionManager {
 		await this.#persistPatch({ type: "header_patch", patch });
 	}
 
-	#appendManagedRecordSync(record: FileEntry | SessionPatchRecord): void {
+	#appendManagedRecordsSync(records: readonly (FileEntry | SessionPatchRecord)[]): void {
 		if (!this.#sessionFile) throw new Error("Managed transcript path is unavailable");
 		const store = this.#managedTranscriptStore();
 		const relativePath = path.basename(this.#sessionFile);
-		store.appendSync(relativePath, Buffer.from(`${JSON.stringify(record)}\n`, "utf8"));
+		const bytes = Buffer.from(`${records.map(record => JSON.stringify(record)).join("\n")}\n`, "utf8");
+		store.appendSync(relativePath, bytes);
 	}
 
 	async #persistPatch(record: SessionPatchRecord): Promise<void> {
-		if (!this.persist || !this.#sessionFile || !this.storage.existsSync(this.#sessionFile)) return;
+		await this.#persistPatches([record]);
+	}
+
+	async #persistPatches(records: readonly SessionPatchRecord[]): Promise<void> {
+		if (records.length === 0 || !this.persist || !this.#sessionFile || !this.storage.existsSync(this.#sessionFile))
+			return;
 		await this.#queuePersistTask(async () => {
 			const header = this.#fileEntries.find(entry => entry.type === "session") as SessionHeader | undefined;
 			if (this.#needsFullRewriteOnNextPersist || !this.#flushed || (header?.version ?? 1) < CURRENT_SESSION_VERSION)
 				return this.#rewriteFileContents();
-			const persistedRecord =
+			const persistedRecords = records.map(record =>
 				record.type === "entry_patch"
 					? (prepareEntryForPersistenceSync(
 							materializeResidentEntryForPersistenceSync(
@@ -8180,14 +8358,17 @@ export class SessionManager {
 							),
 							this.#blobStore,
 						) as unknown as SessionPatchRecord)
-					: record;
+					: record,
+			);
 			if (this.destination.kind === "managed") {
-				this.#appendManagedRecordSync(persistedRecord);
+				this.#appendManagedRecordsSync(persistedRecords);
 				return;
 			}
 			const writer = this.#ensurePersistWriter();
 			if (!writer) return this.#rewriteFileContents();
-			await writer.write(persistedRecord);
+			for (const persistedRecord of persistedRecords) {
+				await writer.write(persistedRecord);
+			}
 		});
 	}
 	_persist(entry: SessionEntry): void {
@@ -8236,7 +8417,7 @@ export class SessionManager {
 					new Map(),
 				);
 				const persistedEntry = prepareEntryForPersistenceSync(materializedEntry, this.#blobStore);
-				this.#appendManagedRecordSync(persistedEntry);
+				this.#appendManagedRecordsSync([persistedEntry]);
 				return;
 			}
 			const writer = this.#ensurePersistWriter();
@@ -8265,13 +8446,31 @@ export class SessionManager {
 		this.#assertRecoveryHydrationWritable();
 		const normalizedEntry = normalizeSessionEntryForStorage(entry);
 		const residentEntry = this.#prepareEntryForCurrentResidentStore(normalizedEntry) as SessionEntry;
+		const previousLeafId = this.#leafId;
+		const priorPersistenceError = this.#persistError;
 		this.#fileEntries.push(residentEntry);
 		this.#byId.set(residentEntry.id, residentEntry);
 		this.#leafId = residentEntry.id;
 		this.#bumpEntryRevision();
 		this.#leafRevision++;
 		if (entry.type === "label") this.#labelRevision++;
-		this._persist(residentEntry);
+		try {
+			this._persist(residentEntry);
+		} catch (error) {
+			const removed = this.#fileEntries.pop();
+			if (removed !== residentEntry)
+				throw new Error("Session append rollback lost resident ordering.", { cause: error });
+			this.#byId.delete(residentEntry.id);
+			this.#leafId = previousLeafId;
+			this.#bumpEntryRevision();
+			this.#leafRevision++;
+			if (entry.type === "label") this.#labelRevision++;
+			throw new SessionAppendPersistenceError(
+				priorPersistenceError ? "prior_failure" : "current_append",
+				residentEntry.id,
+				this.#persistError ?? toError(error),
+			);
+		}
 		// Same validated, overflow-guarded aggregation as the resume path (#buildIndex): a
 		// malformed task-result or assistant usage shape reaching the append path must not
 		// crash or poison getUsageStatistics() either.
@@ -8513,6 +8712,50 @@ export class SessionManager {
 		this.#replayMetadataRevision++;
 	}
 
+	/**
+	 * Rehydrate the canonical transcript after a synchronous persistence failure.
+	 *
+	 * The failed append may have committed before reporting an uncertain outcome,
+	 * so callers must not clear the sticky error or retry against the resident
+	 * branch. Reloading the exact session file is the only supported recovery
+	 * boundary for both managed and explicit persistent destinations.
+	 */
+	async recoverPersistenceFailure(): Promise<void> {
+		const persistenceError = this.#persistError;
+		if (!persistenceError) return;
+		if (!this.#sessionFile) throw persistenceError;
+		const sessionFile = this.#sessionFile;
+		try {
+			await this.#closePersistWriter();
+		} catch {
+			// A writer reports its prior write failure after a confirmed close. A
+			// second close clears that terminal writer; retryable close failures are
+			// genuinely re-dispatched and still fail if the descriptor cannot settle.
+		}
+		await this.#closePersistWriter();
+		const inspected = inspectResumeSessionFile(sessionFile, this.storage);
+		if ("kind" in inspected) throw persistenceError;
+		try {
+			fsyncResumeSessionIdentity(inspected.identity);
+		} catch {
+			throw persistenceError;
+		}
+		const durable = inspectResumeSessionFile(sessionFile, this.storage);
+		if ("kind" in durable || !sameResumeIdentity(inspected.identity, durable.identity)) {
+			throw persistenceError;
+		}
+		const adoption = {
+			canonicalPath: durable.identity.canonicalPath,
+			identity: durable.identity,
+			inspection: durable,
+		};
+		this.#pendingStrictAdoption = adoption;
+		try {
+			await this.setSessionFile(durable.identity.canonicalPath);
+		} finally {
+			if (this.#pendingStrictAdoption === adoption) this.#pendingStrictAdoption = undefined;
+		}
+	}
 	/**
 	 * Rewrite the session file after in-place entry updates.
 	 * Use sparingly (e.g., pruning old tool outputs).
@@ -9094,9 +9337,7 @@ export class SessionManager {
 
 	async #sanitizeLoadedOpenAIResponsesReplayMetadataAndPersist(): Promise<boolean> {
 		const patches = this.#sanitizeLoadedOpenAIResponsesReplayMetadata();
-		for (const patch of patches) {
-			await this.#persistPatch(patch);
-		}
+		await this.#persistPatches(patches);
 		return patches.length > 0;
 	}
 
@@ -9669,6 +9910,7 @@ export class SessionManager {
 		);
 		manager.#applyFreshSessionMetadata(fresh);
 		manager.#commitResidentTextStoreTransition(transition);
+		manager.#retireEphemeralArtifacts();
 		if (fresh.sessionFile) writeTerminalBreadcrumb(manager.cwd, fresh.sessionFile);
 		manager.sanitizeLoadedOpenAIResponsesReplayMetadata();
 		await manager.#rewriteFile();
@@ -9771,6 +10013,7 @@ export class SessionManager {
 			const transition = manager.#prepareFreshSessionTransition(fresh, "memory-fallback");
 			manager.#applyFreshSessionMetadata(fresh);
 			manager.#commitResidentTextStoreTransition(transition);
+			manager.#retireEphemeralArtifacts();
 			writeTerminalBreadcrumb(manager.cwd, resolved);
 			await manager.#rewriteFile();
 			manager.#flushed = true;
@@ -9962,6 +10205,7 @@ export class SessionManager {
 			);
 			manager.#applyFreshSessionMetadata(fresh);
 			manager.#commitResidentTextStoreTransition(transition);
+			manager.#retireEphemeralArtifacts();
 			manager.sanitizeLoadedOpenAIResponsesReplayMetadata();
 			const beforeWrite = inspectResumeSessionFile(snapshot.sourcePath, snapshot.storage);
 			if ("kind" in beforeWrite) {

package/src/session/session-storage.ts

@@ -28,6 +28,7 @@ export interface SessionStorageStat {
 	size: number;
 	mtimeMs: number;
 	mtimeNs: bigint;
+	ctimeNs: bigint;
 	mtime: Date;
 	isFile: boolean;
 }
@@ -47,6 +48,7 @@ function statFromNode(stats: fs.BigIntStats): SessionStorageStat {
 		size: Number(stats.size),
 		mtimeMs: Number(stats.mtimeMs),
 		mtimeNs: stats.mtimeNs,
+		ctimeNs: stats.ctimeNs,
 		mtime: stats.mtime,
 		isFile: stats.isFile(),
 	};
@@ -1624,6 +1626,7 @@ export class MemorySessionStorage implements SessionStorage {
 			size: entry.content.byteLength,
 			mtimeMs: entry.mtimeMs,
 			mtimeNs: BigInt(entry.mtimeMs) * 1_000_000n,
+			ctimeNs: BigInt(entry.mtimeMs) * 1_000_000n,
 			mtime: new Date(entry.mtimeMs),
 			isFile: true,
 		};

package/src/setup/provider-presets.json

@@ -2,5 +2,5 @@
   {"id":"minimax","aliases":["minimax-code"],"name":"MiniMax Coding Plan","description":"OpenAI-compatible MiniMax Coding Plan endpoint","compatibility":"openai","api":"openai-completions","providerId":"minimax-code","baseUrl":"https://api.minimax.io/v1","apiKeyEnv":"MINIMAX_CODE_API_KEY","models":["minimax-m3"],"compat":{"supportsStore":false,"supportsDeveloperRole":false,"supportsReasoningEffort":false,"reasoningContentField":"reasoning_content"}},
   {"id":"minimax-cn","aliases":["minimax-code-cn","minimaxi"],"name":"MiniMax Coding Plan (China)","description":"OpenAI-compatible MiniMax China endpoint","compatibility":"openai","api":"openai-completions","providerId":"minimax-code-cn","baseUrl":"https://api.minimaxi.com/v1","apiKeyEnv":"MINIMAX_CODE_CN_API_KEY","models":["minimax-m3"],"compat":{"supportsStore":false,"supportsDeveloperRole":false,"supportsReasoningEffort":false,"reasoningContentField":"reasoning_content"}},
   {"id":"glm","aliases":["zai","z-ai","bigmodel"],"name":"GLM / zAI","description":"OpenAI-compatible GLM endpoint from zAI/BigModel","compatibility":"openai","api":"openai-completions","providerId":"glm-proxy","baseUrl":"https://api.z.ai/api/paas/v4","apiKeyEnv":"ZAI_API_KEY","models":["glm-4.6"],"compat":{"supportsDeveloperRole":false,"supportsReasoningEffort":false,"thinkingFormat":"zai","reasoningContentField":"reasoning_content"}},
-  {"id":"alibaba-token-plan","aliases":["alibaba","token-plan"],"name":"Alibaba Token Plan","description":"OpenAI-compatible Alibaba Token Plan endpoint","compatibility":"openai","api":"openai-completions","providerId":"alibaba-token-plan","baseUrl":"https://token-plan.ap-southeast-1.maas.aliyuncs.com/compatible-mode/v1","apiKeyEnv":"ALIBABA_TOKEN_PLAN_API_KEY","models":["qwen3.8-max-preview","glm-5.2","deepseek-v4-pro"],"modelApi":{"qwen3.8-max-preview":"openai-responses","glm-5.2":"openai-completions","deepseek-v4-pro":"openai-completions"},"compat":{"supportsDeveloperRole":false}}
+  {"id":"alibaba-token-plan","aliases":["alibaba","token-plan"],"name":"Alibaba Token Plan","description":"OpenAI-compatible Alibaba Token Plan endpoint","compatibility":"openai","api":"openai-completions","providerId":"alibaba-token-plan","baseUrl":"https://token-plan.ap-southeast-1.maas.aliyuncs.com/compatible-mode/v1","apiKeyEnv":"ALIBABA_TOKEN_PLAN_API_KEY","models":["qwen3.8-max-preview","qwen-3.8-max","glm-5.2","deepseek-v4-pro"],"modelApi":{"qwen3.8-max-preview":"openai-responses","qwen-3.8-max":"openai-responses","glm-5.2":"openai-completions","deepseek-v4-pro":"openai-completions"},"compat":{"supportsDeveloperRole":false}}
 ]