@gajae-code/coding-agent 0.12.21 → 0.13.0

package/src/export/html/index.ts

@@ -109,6 +109,59 @@ class Base64StreamEncoder {
 	}
 }
 
+async function canonicalizeExportPath(target: string, symlinks = new Set<string>()): Promise<string> {
+	const resolved = path.resolve(target);
+	const tail: string[] = [];
+	let current = resolved;
+	while (true) {
+		try {
+			const real = await fs.realpath(current);
+			return tail.length === 0 ? real : path.join(real, ...tail.reverse());
+		} catch (error) {
+			if (!isEnoent(error)) throw error;
+		}
+		const stat = await fs.lstat(current).catch(error => {
+			if (isEnoent(error)) return undefined;
+			throw error;
+		});
+		if (stat?.isSymbolicLink()) {
+			if (symlinks.has(current)) throw new Error("HTML export path contains a symlink loop");
+			const linkTarget = await fs.readlink(current);
+			return canonicalizeExportPath(
+				path.resolve(path.dirname(current), linkTarget, ...tail.slice().reverse()),
+				new Set([...symlinks, current]),
+			);
+		}
+		const parent = path.dirname(current);
+		if (parent === current) return resolved;
+		tail.push(path.basename(current));
+		current = parent;
+	}
+}
+
+async function assertExportDoesNotAliasSource(sourcePath: string, outputPath: string): Promise<void> {
+	const sourceResolvedPath = await canonicalizeExportPath(sourcePath);
+	const outputResolvedPath = await canonicalizeExportPath(outputPath);
+	if (sourceResolvedPath === outputResolvedPath)
+		throw new Error("HTML export output must not overwrite the source transcript");
+
+	const sourceIdentity = await fs.stat(sourcePath).catch(error => {
+		if (isEnoent(error)) return undefined;
+		throw error;
+	});
+	const outputIdentity = await fs.stat(outputPath).catch(error => {
+		if (isEnoent(error)) return undefined;
+		throw error;
+	});
+	if (
+		sourceIdentity &&
+		outputIdentity &&
+		sourceIdentity.dev === outputIdentity.dev &&
+		sourceIdentity.ino === outputIdentity.ino
+	)
+		throw new Error("HTML export output must not overwrite the source transcript");
+}
+
 async function writeSessionHtml(
 	sm: SessionManager,
 	state: AgentState | undefined,
@@ -121,12 +174,7 @@ async function writeSessionHtml(
 	const markerOffset = themedTemplate.indexOf(marker);
 	if (markerOffset < 0) throw new Error("HTML export template is missing the session-data marker");
 	const sourcePath = sm.getSessionFile();
-	if (sourcePath) {
-		const sourceIdentity = await fs.realpath(sourcePath).catch(() => path.resolve(sourcePath));
-		const outputIdentity = await fs.realpath(outputPath).catch(() => path.resolve(outputPath));
-		if (sourceIdentity === outputIdentity)
-			throw new Error("HTML export output must not overwrite the source transcript");
-	}
+	if (sourcePath) await assertExportDoesNotAliasSource(sourcePath, outputPath);
 	const sink = Bun.file(outputPath).writer();
 	const encoder = new Base64StreamEncoder();
 	const writeEncoded = (value: string): void => {
@@ -178,6 +226,7 @@ export async function exportSessionToHtml(
 /** Export session file to HTML (standalone). */
 export async function exportFromFile(inputPath: string, options?: ExportOptions | string): Promise<string> {
 	const opts: ExportOptions = typeof options === "string" ? { outputPath: options } : options || {};
+	const outputPath = opts.outputPath || `${APP_NAME}-session-${path.basename(inputPath, ".jsonl")}.html`;
 
 	let sm: SessionManager;
 	const artifactRoot = inputPath.endsWith(".jsonl") ? inputPath.slice(0, -6) : inputPath;
@@ -189,6 +238,8 @@ export async function exportFromFile(inputPath: string, options?: ExportOptions
 		)
 	).some(Boolean);
 	if (!(await Bun.file(inputPath).exists())) throw new Error(`File not found: ${inputPath}`);
+	await assertExportDoesNotAliasSource(inputPath, outputPath);
+
 	try {
 		sm = await SessionManager.open(
 			inputPath,
@@ -203,7 +254,6 @@ export async function exportFromFile(inputPath: string, options?: ExportOptions
 	}
 
 	try {
-		const outputPath = opts.outputPath || `${APP_NAME}-session-${path.basename(inputPath, ".jsonl")}.html`;
 		await writeSessionHtml(sm, undefined, outputPath, opts.themeName);
 		return outputPath;
 	} finally {

package/src/extensibility/custom-tools/types.ts

@@ -70,6 +70,8 @@ export interface CustomToolContext {
 	sessionManager: ReadonlySessionManager;
 	/** Model registry - use for API key resolution and model retrieval */
 	modelRegistry: ModelRegistry;
+	/** Credential-selection identity for provider authentication. */
+	credentialSessionId?: string;
 	/** Current model (may be undefined if no model is selected yet) */
 	model: Model | undefined;
 	/** Whether the agent is idle (not streaming) */

package/src/extensibility/extensions/compact-handler.ts

@@ -23,7 +23,8 @@ export async function runExtensionCompact(
 }
 
 interface SetModelCapableSession {
-	modelRegistry: { getApiKey(model: Model): Promise<string | undefined> };
+	credentialSessionId?: string;
+	modelRegistry: { getApiKey(model: Model, sessionId?: string): Promise<string | undefined> };
 	setModel(model: Model, role?: string, options?: { cause?: string }): Promise<unknown>;
 	/** Persist effective profile roles and clear its marker for a concrete default selection. */
 	materializeActiveDefaultModelProfileAssignment?(model: Model): boolean;
@@ -39,7 +40,7 @@ interface SetModelCapableSession {
  * Returns false when no API key is available for the requested model.
  */
 export async function runExtensionSetModel(session: SetModelCapableSession, model: Model): Promise<boolean> {
-	const key = await session.modelRegistry.getApiKey(model);
+	const key = await session.modelRegistry.getApiKey(model, session.credentialSessionId);
 	if (!key) return false;
 	await session.setModel(model, "default", { cause: "user-selection" });
 	// A durable profile is replaced by materializing its effective assignments

package/src/extensibility/extensions/runner.ts

@@ -197,6 +197,7 @@ export class ExtensionRunner {
 	#attemptRecordStore: AttemptRecordStore | undefined;
 
 	#getModel: () => Model | undefined = () => undefined;
+	#getCredentialSessionId: () => string = () => "";
 	#isIdleFn: () => boolean = () => true;
 	#getActivePromptHandleFn: () => string | undefined = () => undefined;
 	#waitForIdleFn: () => Promise<void> = async () => {};
@@ -323,6 +324,7 @@ export class ExtensionRunner {
 
 		// Context actions (required)
 		this.#getModel = contextActions.getModel;
+		this.#getCredentialSessionId = contextActions.getCredentialSessionId ?? (() => "");
 		this.#isIdleFn = contextActions.isIdle;
 		this.#getActivePromptHandleFn = contextActions.getActivePromptHandle ?? (() => undefined);
 		this.#abortFn = contextActions.abort;
@@ -597,6 +599,7 @@ export class ExtensionRunner {
 
 	createContext(): ExtensionContext {
 		const getModel = this.#getModel;
+		const getCredentialSessionId = this.#getCredentialSessionId;
 		return {
 			ui: this.#uiContext,
 			getContextUsage: () => this.#getContextUsageFn(),
@@ -606,6 +609,9 @@ export class ExtensionRunner {
 			sessionManager: createReadonlySessionManager(this.sessionManager),
 			sessionMetadata: this.sessionMetadata,
 			modelRegistry: this.modelRegistry,
+			get credentialSessionId() {
+				return getCredentialSessionId();
+			},
 			get model() {
 				return getModel();
 			},

package/src/extensibility/extensions/types.ts

@@ -360,6 +360,8 @@ export interface ExtensionContext {
 	sessionMetadata?: ExtensionSessionMetadata;
 	/** Model registry for API key resolution */
 	modelRegistry: ModelRegistry;
+	/** Credential-selection identity, distinct from logical/provider cache identity. */
+	credentialSessionId?: string;
 	/** Current model (may be undefined) */
 	model: Model | undefined;
 	/** Whether the agent is idle (not streaming) */
@@ -1479,6 +1481,7 @@ export interface ExtensionActions {
 /** Actions for ExtensionContext (ctx.* in event handlers). */
 export interface ExtensionContextActions {
 	getModel: () => Model | undefined;
+	getCredentialSessionId?: () => string;
 	isIdle: () => boolean;
 	/** Stable resource ownership identifier for the active prompt run. */
 	getActivePromptHandle?: () => string | undefined;