@gajae-code/coding-agent 0.12.4 → 0.12.6

package/src/session/messages.ts

@@ -194,14 +194,39 @@ function utf8Suffix(text: string, maxBytes: number): string {
  * next provider context is constructed. Byte boundaries never split UTF-8
  * code points, so head/tail recovery remains readable for emoji and CJK text.
  */
-export function createPreAdmissionArtifactSpillPreview(fullText: string, artifactId: string, digest: string): string {
+export function createPreAdmissionArtifactSpillPreview(
+	fullText: string,
+	artifactId: string,
+	digest: string,
+	options: { maxInlineBytes?: number; fullOutput?: boolean } = {},
+): string {
 	const totalBytes = Buffer.byteLength(fullText, "utf-8");
-	const head = utf8Prefix(fullText, PRE_ADMISSION_ARTIFACT_SPILL_HEAD_BYTES);
-	const tail = utf8Suffix(fullText, PRE_ADMISSION_ARTIFACT_SPILL_TAIL_BYTES);
-	const retainedBytes = Buffer.byteLength(head, "utf-8") + Buffer.byteLength(tail, "utf-8");
-	const omittedBytes = Math.max(0, totalBytes - retainedBytes);
-	const receipt = `[${omittedBytes} bytes omitted; sha256:${digest}; full output: artifact://${artifactId}]`;
-	return `${head}\n\n${receipt}\n\n${tail}`;
+	const maxInlineBytes = options.maxInlineBytes;
+	const referenceKind = options.fullOutput === false ? "retained output" : "full output";
+	let headBudget = PRE_ADMISSION_ARTIFACT_SPILL_HEAD_BYTES;
+	let tailBudget = PRE_ADMISSION_ARTIFACT_SPILL_TAIL_BYTES;
+	if (maxInlineBytes !== undefined) {
+		const receiptReserve = Buffer.byteLength(
+			`\n\n[${totalBytes} bytes omitted; sha256:${digest}; ${referenceKind}: artifact://${artifactId}]\n\n`,
+			"utf-8",
+		);
+		const contentBudget = Math.max(0, maxInlineBytes - receiptReserve);
+		headBudget = Math.min(headBudget, Math.ceil(contentBudget / 2));
+		tailBudget = Math.min(tailBudget, Math.floor(contentBudget / 2));
+	}
+	for (;;) {
+		const head = utf8Prefix(fullText, headBudget);
+		const tail = utf8Suffix(fullText, tailBudget);
+		const retainedBytes = Buffer.byteLength(head, "utf-8") + Buffer.byteLength(tail, "utf-8");
+		const omittedBytes = Math.max(0, totalBytes - retainedBytes);
+		const receipt = `[${omittedBytes} bytes omitted; sha256:${digest}; ${referenceKind}: artifact://${artifactId}]`;
+		const preview = `${head}\n\n${receipt}\n\n${tail}`;
+		if (maxInlineBytes === undefined || Buffer.byteLength(preview, "utf-8") <= maxInlineBytes) return preview;
+		if (headBudget === 0 && tailBudget === 0) return utf8Prefix(receipt, maxInlineBytes);
+		const overflow = Buffer.byteLength(preview, "utf-8") - maxInlineBytes;
+		if (tailBudget >= headBudget) tailBudget = Math.max(0, tailBudget - overflow);
+		else headBudget = Math.max(0, headBudget - overflow);
+	}
 }
 
 /**

package/src/session/session-manager.ts

@@ -37,7 +37,7 @@ import { assertSafePathComponent } from "../gjc-runtime/session-layout";
 import { writeTextAtomic } from "../gjc-runtime/state-writer";
 import type { ManagedLegacyLocalMigrationSource } from "../internal-urls/local-protocol";
 import * as git from "../utils/git";
-import { ArtifactManager } from "./artifacts";
+import { ArtifactManager, type ArtifactSaveReceipt } from "./artifacts";
 import {
 	type BlobPutResult,
 	BlobStore,
@@ -895,6 +895,7 @@ export interface ResumeSessionIdentity {
 	sessionId: string;
 	dev: bigint;
 	ino: bigint;
+	nlink?: bigint;
 	size: number;
 	mtimeMs: number;
 	mtimeNs: bigint;
@@ -1132,7 +1133,7 @@ export function createReadonlySessionManager(manager: SessionManager): ReadonlyS
 
 /** Internal artifact-writing capability. Read-only facades expose it only through a private weak-map lookup. */
 export type SessionArtifactCapability = Readonly<
-	Pick<SessionManager, "allocateArtifactPath" | "saveArtifact" | "putBlob">
+	Pick<SessionManager, "allocateArtifactPath" | "saveArtifact" | "getArtifactPath" | "putBlob">
 >;
 
 const sessionArtifactCapabilities = new WeakMap<SessionManager, SessionArtifactCapability>();
@@ -1149,6 +1150,7 @@ export function sessionArtifactCapability(value: unknown): SessionArtifactCapabi
 			capability = Object.freeze({
 				allocateArtifactPath: value.allocateArtifactPath.bind(value),
 				saveArtifact: value.saveArtifact.bind(value),
+				getArtifactPath: value.getArtifactPath.bind(value),
 				putBlob: value.putBlob.bind(value),
 			});
 			sessionArtifactCapabilities.set(value, capability);
@@ -1831,6 +1833,7 @@ function retainedTreeSnapshotEquals(
 				entry.kind === other.kind &&
 				entry.dev === other.dev &&
 				entry.ino === other.ino &&
+				entry.nlink === other.nlink &&
 				entry.size === other.size &&
 				entry.mtimeNs === other.mtimeNs &&
 				entry.ctimeNs === other.ctimeNs &&
@@ -1856,6 +1859,7 @@ function retainedTreeSnapshotEqualsAfterRename(
 				entry.kind === other.kind &&
 				entry.dev === other.dev &&
 				entry.ino === other.ino &&
+				entry.nlink === other.nlink &&
 				entry.size === other.size &&
 				entry.mtimeNs === other.mtimeNs &&
 				(entry.relativePath === "" || entry.ctimeNs === other.ctimeNs) &&
@@ -2147,6 +2151,7 @@ function sameResumeIdentity(left: ResumeSessionIdentity, right: ResumeSessionIde
 		left.sessionId === right.sessionId &&
 		left.dev === right.dev &&
 		left.ino === right.ino &&
+		left.nlink === right.nlink &&
 		left.size === right.size &&
 		left.mtimeMs === right.mtimeMs &&
 		left.mtimeNs === right.mtimeNs &&
@@ -2160,6 +2165,7 @@ function sameResumeStat(left: SessionStorageStat, right: SessionStorageStat): bo
 		right.isFile &&
 		left.dev === right.dev &&
 		left.ino === right.ino &&
+		left.nlink === right.nlink &&
 		left.size === right.size &&
 		left.mtimeMs === right.mtimeMs &&
 		left.mtimeNs === right.mtimeNs
@@ -2356,6 +2362,7 @@ function inspectResumeSessionFile(
 			sessionId: header.id,
 			dev: snapshot.dev,
 			ino: snapshot.ino,
+			nlink: snapshot.nlink,
 			size: snapshot.size,
 			mtimeMs: snapshot.mtimeMs,
 			mtimeNs: snapshot.mtimeNs,
@@ -2393,6 +2400,7 @@ function revalidateResumeSessionIdentity(
 		sessionId: expected.sessionId,
 		dev: snapshot.stat.dev,
 		ino: snapshot.stat.ino,
+		nlink: snapshot.stat.nlink,
 		size: snapshot.stat.size,
 		mtimeMs: snapshot.stat.mtimeMs,
 		mtimeNs: snapshot.stat.mtimeNs,
@@ -4764,10 +4772,6 @@ 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;
 	readonly #blobStore: BlobStore;
 	#residentTextBlobStore: BlobStore = new MemoryBlobStore();
 	#residentImageBlobStore: BlobStore;
@@ -5361,8 +5365,6 @@ 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;
@@ -5581,8 +5583,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,
@@ -5605,8 +5605,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;
@@ -6052,8 +6050,6 @@ 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;
@@ -7983,17 +7979,19 @@ 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).
+	 * Save artifact content under the current persisted session and return its artifact ID.
+	 * In-memory sessions cannot produce protocol-resolvable artifact references.
 	 */
 	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;
+		return undefined;
+	}
+
+	async saveArtifactReceipt(content: string, toolType: string): Promise<ArtifactSaveReceipt | undefined> {
+		const manager = this.#getOrCreateArtifactManager();
+		if (!manager) return undefined;
+		return manager.saveWithReceipt(content, toolType);
 	}
 
 	/**
@@ -9708,6 +9706,7 @@ export class SessionManager {
 		destination: SessionDestination,
 		store: ManagedSessionDescendantStore,
 		storage: SessionStorage = new FileSessionStorage(),
+		cwdOverride?: string,
 	): Promise<SessionManager> {
 		if (destination.kind !== "managed" || !trustedSessionDestinations.has(destination))
 			throw new Error("Nested managed session authority is unavailable");
@@ -9721,16 +9720,20 @@ export class SessionManager {
 		const captured = store.readExpected(path.basename(resolved));
 		const entries = captured ? parseSessionEntries(captured.bytes.toString("utf8")) : [];
 		const header = entries.find(entry => entry.type === "session") as SessionHeader | undefined;
-		const manager = new SessionManager(
-			header?.cwd ?? getProjectDir(),
-			destination.directory,
-			true,
-			storage,
-			destination,
+		const sessionCwd = cwdOverride ? path.resolve(cwdOverride) : (header?.cwd ?? getProjectDir());
+		const cwdChanged = Boolean(
+			header && cwdOverride && resolveEquivalentPath(header.cwd) !== resolveEquivalentPath(sessionCwd),
 		);
+		if (header && cwdChanged) header.cwd = sessionCwd;
+		const manager = new SessionManager(sessionCwd, destination.directory, true, storage, destination);
 		if (entries.length > 0) {
-			const migrationApplied = migrateToCurrentVersion(entries);
+			const migrationApplied = migrateToCurrentVersion(entries) || cwdChanged;
 			await manager.#hydrateExistingSession(resolved, entries, migrationApplied, "memory-fallback");
+			if (cwdChanged) {
+				await manager.#rewriteFile();
+				manager.#flushed = true;
+				manager.#ensuredOnDisk = true;
+			}
 			writeTerminalBreadcrumb(manager.cwd, resolved);
 			await manager.#sanitizeLoadedOpenAIResponsesReplayMetadataAndPersist();
 		} else {