@gajae-code/coding-agent 0.11.6 → 0.11.8

package/src/session/session-storage.ts

@@ -259,6 +259,19 @@ export interface VerifiedSessionDeleteTarget {
 	detachedArtifactsPath?: string;
 	/** Identity-bound quarantine path retained when transcript unlink deferred cleanup. */
 	detachedTranscriptPath?: string;
+	/** Native-retained publisher successor observed during transcript cleanup. */
+	retainedTranscriptSuccessorPath?: string;
+	/** Native-retained exchange placeholder observed during transcript cleanup. */
+	retainedTranscriptPlaceholderPath?: string;
+	/** Native-retained transcript entry whose identity could not be verified. */
+	retainedTranscriptUnknownPath?: string;
+	/** Native-retained publisher successor observed during cleanup. */
+	retainedArtifactsSuccessorPath?: string;
+	/** Native-retained exchange placeholder observed during cleanup. */
+	retainedArtifactsPlaceholderPath?: string;
+	/** Native-retained entry whose identity could not be verified. */
+	retainedArtifactsUnknownPath?: string;
+
 	/** Caller-published, no-replace quarantine pathname for the next artifact detach. */
 	plannedArtifactsPath?: string;
 	/** Caller-published, no-replace quarantine pathname for the next transcript detach. */
@@ -288,6 +301,9 @@ export type VerifiedSessionDeleteResult =
 			artifactsTree: NativeDirectoryTreeSnapshot;
 			/** Transcript identity (unchanged) for retry binding. */
 			transcriptIdentity: SessionStorageFileIdentity;
+			retainedSuccessorPath?: string;
+			retainedPlaceholderPath?: string;
+			retainedUnknownPath?: string;
 	  }
 	| {
 			kind: "cleanup_pending";
@@ -297,6 +313,9 @@ export type VerifiedSessionDeleteResult =
 			transcriptIdentity: SessionStorageFileIdentity;
 			/** Optional identity-bound transcript quarantine path for restart cleanup. */
 			detachedTranscriptPath?: string;
+			retainedSuccessorPath?: string;
+			retainedPlaceholderPath?: string;
+			retainedUnknownPath?: string;
 	  };
 
 /** Default OS-close dispatcher: a direct `fs.closeSync`. */
@@ -306,7 +325,22 @@ const defaultCloseAdapter: SessionStorageWriterCloseAdapter = {
 	},
 };
 
-type NativeExactUnlinkResult = { ok: true; detachedPath?: string } | { ok: false; code: string; detachedPath?: string };
+type NativeExactUnlinkResult =
+	| {
+			ok: true;
+			detachedPath?: string;
+			retainedSuccessorPath?: string;
+			retainedPlaceholderPath?: string;
+			retainedUnknownPath?: string;
+	  }
+	| {
+			ok: false;
+			code: string;
+			detachedPath?: string;
+			retainedSuccessorPath?: string;
+			retainedPlaceholderPath?: string;
+			retainedUnknownPath?: string;
+	  };
 type NativeExactUnlink = (
 	path: string,
 	identity: {
@@ -766,7 +800,13 @@ export class FileSessionStorage implements SessionStorage {
 			expectedArtifactsIdentity,
 			expectedArtifactsTree,
 			detachedArtifactsPath,
+			retainedArtifactsSuccessorPath,
+			retainedArtifactsPlaceholderPath,
+			retainedArtifactsUnknownPath,
 			detachedTranscriptPath,
+			retainedTranscriptSuccessorPath,
+			retainedTranscriptPlaceholderPath,
+			retainedTranscriptUnknownPath,
 			plannedArtifactsPath,
 			plannedTranscriptPath,
 			artifactsRemoved,
@@ -847,7 +887,8 @@ export class FileSessionStorage implements SessionStorage {
 			if (
 				!expectedArtifactsIdentity ||
 				path.dirname(detachedArtifactsPath) !== path.dirname(transcriptPath) ||
-				!path.basename(detachedArtifactsPath).startsWith(".gjc-delete-")
+				(!path.basename(detachedArtifactsPath).startsWith(".gjc-delete-") &&
+					!detachedArtifactsPath.endsWith(".removing"))
 			) {
 				throw new SessionDeleteVerificationError("artifacts", "Detached artifact cleanup evidence is invalid");
 			}
@@ -882,17 +923,20 @@ export class FileSessionStorage implements SessionStorage {
 					artifactsIdentity: expectedArtifactsIdentity,
 					detachedArtifactsPath: retainedRoot,
 					artifactsTree: expectedArtifactsTree,
+					...((removal.retainedSuccessorPath ?? retainedArtifactsSuccessorPath)
+						? { retainedSuccessorPath: removal.retainedSuccessorPath ?? retainedArtifactsSuccessorPath }
+						: {}),
+					...((removal.retainedPlaceholderPath ?? retainedArtifactsPlaceholderPath)
+						? { retainedPlaceholderPath: removal.retainedPlaceholderPath ?? retainedArtifactsPlaceholderPath }
+						: {}),
+					...((removal.retainedUnknownPath ?? retainedArtifactsUnknownPath)
+						? { retainedUnknownPath: removal.retainedUnknownPath ?? retainedArtifactsUnknownPath }
+						: {}),
 					transcriptIdentity,
 				};
 			}
 		}
 
-		if (artifactsRemoved && (detachedArtifactsPath || expectedArtifactsIdentity)) {
-			throw new SessionDeleteVerificationError(
-				"artifacts",
-				"Artifact phase receipt conflicts with pending artifact cleanup",
-			);
-		}
 		const artifactsDir = transcriptPath.slice(0, -6);
 		const artifactsIdentity = this.#optionalDirectoryIdentity(artifactsDir);
 		if (artifactsRemoved && artifactsIdentity) {
@@ -947,12 +991,48 @@ export class FileSessionStorage implements SessionStorage {
 				directory: true,
 				quarantineName: path.basename(plannedArtifactsPath),
 			});
-			if (!detach.ok || !detach.detachedPath) {
+			if (!detach.detachedPath) {
 				throw new SessionDeleteVerificationError(
 					"artifacts",
 					`Exact artifact detach rejected: ${detach.ok ? "missing_path" : detach.code}`,
 				);
 			}
+			if (!detach.ok && process.platform !== "win32") {
+				let descriptor: number | undefined;
+				try {
+					descriptor = fs.openSync(
+						path.dirname(transcriptPath),
+						fs.constants.O_RDONLY | fs.constants.O_DIRECTORY | fs.constants.O_NOFOLLOW,
+					);
+					const durableParent = fs.fstatSync(descriptor, { bigint: true });
+					if (
+						!durableParent.isDirectory() ||
+						durableParent.dev !== parentIdentity.dev ||
+						durableParent.ino !== parentIdentity.ino
+					)
+						throw new Error("parent_changed");
+					fs.fsyncSync(descriptor);
+				} catch (error) {
+					throw new SessionDeleteVerificationError("artifacts", "durability_failed", { cause: toError(error) });
+				} finally {
+					if (descriptor !== undefined) fs.closeSync(descriptor);
+				}
+			}
+			if (!detach.ok) {
+				return {
+					kind: "cleanup_pending",
+					phase: "artifacts",
+					error: new SessionDeleteVerificationError("artifacts", `Exact artifact detach retained: ${detach.code}`),
+					artifactsIdentity,
+					detachedArtifactsPath: detach.detachedPath,
+					artifactsTree,
+					...(detach.retainedSuccessorPath ? { retainedSuccessorPath: detach.retainedSuccessorPath } : {}),
+					...(detach.retainedPlaceholderPath ? { retainedPlaceholderPath: detach.retainedPlaceholderPath } : {}),
+					...(detach.retainedUnknownPath ? { retainedUnknownPath: detach.retainedUnknownPath } : {}),
+
+					transcriptIdentity,
+				};
+			}
 			const removal = removeDirectoryTreeExact(detach.detachedPath, artifactsTree);
 			if (!removal.ok) {
 				const retainedRoot = removal.detachedPath ?? detach.detachedPath;
@@ -971,6 +1051,15 @@ export class FileSessionStorage implements SessionStorage {
 					artifactsIdentity,
 					detachedArtifactsPath: retainedRoot,
 					artifactsTree,
+					...((removal.retainedSuccessorPath ?? retainedArtifactsSuccessorPath)
+						? { retainedSuccessorPath: removal.retainedSuccessorPath ?? retainedArtifactsSuccessorPath }
+						: {}),
+					...((removal.retainedPlaceholderPath ?? retainedArtifactsPlaceholderPath)
+						? { retainedPlaceholderPath: removal.retainedPlaceholderPath ?? retainedArtifactsPlaceholderPath }
+						: {}),
+					...((removal.retainedUnknownPath ?? retainedArtifactsUnknownPath)
+						? { retainedUnknownPath: removal.retainedUnknownPath ?? retainedArtifactsUnknownPath }
+						: {}),
 					transcriptIdentity,
 				};
 			}
@@ -1010,13 +1099,27 @@ export class FileSessionStorage implements SessionStorage {
 			});
 			if (!deletion.ok) {
 				const error = exactUnlinkFailure(deletion);
-				if (error.kind === "identity" || error.kind === "symlink") throw error;
+				const retainedAuthority =
+					deletion.detachedPath ||
+					deletion.retainedSuccessorPath ||
+					deletion.retainedPlaceholderPath ||
+					deletion.retainedUnknownPath;
+				if ((error.kind === "identity" || error.kind === "symlink") && !retainedAuthority) throw error;
 				return {
 					kind: "cleanup_pending",
 					phase: "transcript",
 					error,
 					transcriptIdentity,
 					detachedTranscriptPath: deletion.detachedPath ?? detachedTranscriptPath,
+					...((deletion.retainedSuccessorPath ?? retainedTranscriptSuccessorPath)
+						? { retainedSuccessorPath: deletion.retainedSuccessorPath ?? retainedTranscriptSuccessorPath }
+						: {}),
+					...((deletion.retainedPlaceholderPath ?? retainedTranscriptPlaceholderPath)
+						? { retainedPlaceholderPath: deletion.retainedPlaceholderPath ?? retainedTranscriptPlaceholderPath }
+						: {}),
+					...((deletion.retainedUnknownPath ?? retainedTranscriptUnknownPath)
+						? { retainedUnknownPath: deletion.retainedUnknownPath ?? retainedTranscriptUnknownPath }
+						: {}),
 				};
 			}
 			return { kind: "deleted" };
@@ -1058,13 +1161,27 @@ export class FileSessionStorage implements SessionStorage {
 		});
 		if (!deletion.ok) {
 			const error = exactUnlinkFailure(deletion);
-			if (error.kind === "identity" || error.kind === "symlink") throw error;
+			const retainedAuthority =
+				deletion.detachedPath ||
+				deletion.retainedSuccessorPath ||
+				deletion.retainedPlaceholderPath ||
+				deletion.retainedUnknownPath;
+			if ((error.kind === "identity" || error.kind === "symlink") && !retainedAuthority) throw error;
 			return {
 				kind: "cleanup_pending",
 				phase: "transcript",
 				error,
 				transcriptIdentity,
 				detachedTranscriptPath: deletion.detachedPath,
+				...((deletion.retainedSuccessorPath ?? retainedTranscriptSuccessorPath)
+					? { retainedSuccessorPath: deletion.retainedSuccessorPath ?? retainedTranscriptSuccessorPath }
+					: {}),
+				...((deletion.retainedPlaceholderPath ?? retainedTranscriptPlaceholderPath)
+					? { retainedPlaceholderPath: deletion.retainedPlaceholderPath ?? retainedTranscriptPlaceholderPath }
+					: {}),
+				...((deletion.retainedUnknownPath ?? retainedTranscriptUnknownPath)
+					? { retainedUnknownPath: deletion.retainedUnknownPath ?? retainedTranscriptUnknownPath }
+					: {}),
 			};
 		}
 		return { kind: "deleted" };

package/src/setup/credential-import.ts

@@ -391,7 +391,7 @@ export function formatCredentialSummary(credential: ImportableCredential): strin
 	const identityPart = identity ? ` ${identity}` : "";
 	let expiry = "";
 	if (credential.kind === "oauth" && credential.expiresAt !== undefined) {
-		expiry = credential.expiresAt < Date.now() ? " [expired]" : "";
+		expiry = credential.expiresAt <= Date.now() ? " [expired]" : "";
 	}
 	return `${provider} · ${kind}${identityPart} · token ${credential.redactedToken}${expiry} (from ${credential.source})`;
 }
@@ -413,7 +413,10 @@ export function formatDiscoverySummary(result: CredentialDiscoveryResult): strin
 	return lines;
 }
 
-export function isAutoImportOAuthCredential(credential: ImportableCredential): boolean {
+/** Reason shown when automatic OAuth import rejects an unusable discovery record. */
+export const INVALID_AUTO_IMPORT_OAUTH_EXPIRY_REASON = "OAuth credential has no valid future expiry";
+
+function hasAutoImportOAuthProviderOrigin(credential: ImportableCredential): boolean {
 	return (
 		AUTO_IMPORT_OAUTH_PROVIDER_ORIGINS[credential.provider]?.has(credential.origin) === true &&
 		credential.kind === "oauth" &&
@@ -421,8 +424,30 @@ export function isAutoImportOAuthCredential(credential: ImportableCredential): b
 	);
 }
 
+export function isAutoImportOAuthCredential(credential: ImportableCredential, now: number = Date.now()): boolean {
+	return (
+		hasAutoImportOAuthProviderOrigin(credential) &&
+		typeof credential.expiresAt === "number" &&
+		Number.isFinite(credential.expiresAt) &&
+		credential.expiresAt > now
+	);
+}
+
+/** Keep rejected OAuth discoveries visible to operators without offering them for automatic import. */
+export function getAutoImportOAuthCredentialSkips(
+	credentials: readonly ImportableCredential[],
+	now: number = Date.now(),
+): SkippedCredential[] {
+	return credentials.flatMap(credential =>
+		hasAutoImportOAuthProviderOrigin(credential) && !isAutoImportOAuthCredential(credential, now)
+			? [{ origin: credential.origin, source: credential.source, reason: INVALID_AUTO_IMPORT_OAUTH_EXPIRY_REASON }]
+			: [],
+	);
+}
+
 export function filterAutoImportOAuthCredentials(credentials: readonly ImportableCredential[]): ImportableCredential[] {
-	return credentials.filter(isAutoImportOAuthCredential);
+	const now = Date.now();
+	return credentials.filter(credential => isAutoImportOAuthCredential(credential, now));
 }
 
 /**

package/src/setup/provider-onboarding.ts

@@ -49,6 +49,7 @@ interface ProviderPreset {
 	baseUrl: string;
 	apiKeyEnv: string;
 	models: readonly string[];
+	modelApi?: Readonly<Record<string, ProviderSetupApi>>;
 	compat?: ProviderCompatConfig;
 }
 
@@ -113,6 +114,7 @@ function resolvePresetInput(input: ProviderSetupInput): {
 	apiKey?: string;
 	apiKeyEnv?: string;
 	models: readonly string[];
+	modelApi?: Readonly<Record<string, ProviderSetupApi>>;
 	api: ProviderSetupApi;
 	compat?: ProviderCompatConfig;
 } {
@@ -152,11 +154,32 @@ function resolvePresetInput(input: ProviderSetupInput): {
 		apiKey: input.apiKey,
 		apiKeyEnv: input.apiKeyEnv ?? preset?.apiKeyEnv,
 		models: input.models && input.models.length > 0 ? input.models : (preset?.models ?? []),
+		modelApi: preset?.modelApi,
 		api: preset?.api ?? apiForCompatibility(compatibility),
 		compat: preset?.compat,
 	};
 }
 
+export function validateModelApi(
+	modelApi: Readonly<Record<string, string>> | undefined,
+	models: readonly string[],
+	presetId: string,
+): void {
+	if (!modelApi) return;
+	const modelSet = new Set(models);
+	const validApis: readonly string[] = ["openai-responses", "openai-completions", "anthropic-messages"];
+	for (const [key, value] of Object.entries(modelApi)) {
+		if (!modelSet.has(key)) {
+			throw new Error(`Provider preset '${presetId}' declares modelApi for unknown model '${key}'.`);
+		}
+		if (!validApis.includes(value)) {
+			throw new Error(
+				`Provider preset '${presetId}' declares invalid modelApi value '${value}' for model '${key}'.`,
+			);
+		}
+	}
+}
+
 function validateSetupInput(input: ProviderSetupInput): {
 	providerId: string;
 	baseUrl: string;
@@ -166,6 +189,7 @@ function validateSetupInput(input: ProviderSetupInput): {
 	compatibility: ProviderCompatibility;
 	api: ProviderSetupApi;
 	compat?: ProviderCompatConfig;
+	modelApi?: Readonly<Record<string, ProviderSetupApi>>;
 	preset?: ProviderPreset;
 } {
 	const resolved = resolvePresetInput(input);
@@ -201,6 +225,7 @@ function validateSetupInput(input: ProviderSetupInput): {
 
 	const models = parseModelList(resolved.models);
 	if (models.length === 0) throw new Error("At least one model id is required.");
+	validateModelApi(resolved.modelApi, models, resolved.preset?.id ?? resolved.providerId);
 
 	return {
 		providerId,
@@ -210,6 +235,7 @@ function validateSetupInput(input: ProviderSetupInput): {
 		models,
 		compatibility: resolved.compatibility,
 		api: resolved.api,
+		modelApi: resolved.modelApi,
 		compat: resolved.compat,
 		preset: resolved.preset,
 	};
@@ -275,7 +301,10 @@ export async function addApiCompatibleProvider(input: ProviderSetupInput): Promi
 		baseUrl: validated.baseUrl,
 		api: validated.api,
 		auth: "apiKey",
-		models: validated.models.map(id => ({ id })),
+		models: validated.models.map(id => {
+			const api = validated.modelApi?.[id];
+			return api ? { id, api } : { id };
+		}),
 	};
 	if (validated.compat) provider.compat = validated.compat;
 	if (validated.credentialSource === "env") {

package/src/setup/provider-presets.json

@@ -1,5 +1,6 @@
 [
   {"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":"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}}
 ]

package/src/slash-commands/builtin-registry.ts

@@ -1515,7 +1515,7 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 	},
 	{
 		name: "btw",
-		description: "Ask an ephemeral side question using the current session context",
+		description: "Start an ephemeral multi-turn side chat using the current session context",
 		inlineHint: "<question>",
 		allowArgs: true,
 		handleTui: async (command, runtime) => {

package/src/ssh/utils.ts

@@ -3,6 +3,20 @@ export function sanitizeHostName(name: string): string {
 	return sanitized.length > 0 ? sanitized : "remote";
 }
 
+export function validateSshDestination(username: string | undefined, host: string): string | undefined {
+	if (host.startsWith("-") || username?.startsWith("-")) {
+		return "username and host must not begin with '-'";
+	}
+	if (/\0|\r|\n/.test(host) || (username !== undefined && /\0|\r|\n/.test(username))) {
+		return "username and host must not contain NUL or line breaks";
+	}
+	return undefined;
+}
+
 export function buildSshTarget(username: string | undefined, host: string): string {
+	const validationError = validateSshDestination(username, host);
+	if (validationError) {
+		throw new Error(`Invalid SSH destination: ${validationError}`);
+	}
 	return username ? `${username}@${host}` : host;
 }

package/src/task/discovery.ts

@@ -14,6 +14,7 @@ import * as path from "node:path";
 import { logger } from "@gajae-code/utils";
 import { isProviderEnabled } from "../capability";
 import { findAllNearestProjectConfigDirs, getConfigDirs } from "../config";
+import type { Settings } from "../config/settings";
 import { listClaudePluginRoots } from "../discovery/helpers";
 import { rootContainsGjcManifest } from "../extensibility/gjc-plugins/paths";
 import { loadBundledAgents, parseAgent } from "./agents";
@@ -57,8 +58,13 @@ async function loadAgentsFromDir(dir: string, source: AgentSource): Promise<Agen
  * Precedence (highest wins): .gjc project, .gjc user, GJC plugins, then bundled
  *
  * @param cwd - Current working directory for project agent discovery
+ * @param activeSettings - Settings used to resolve enabled providers.
  */
-export async function discoverAgents(cwd: string, home: string = os.homedir()): Promise<DiscoveryResult> {
+export async function discoverAgents(
+	cwd: string,
+	home: string = os.homedir(),
+	activeSettings?: Settings,
+): Promise<DiscoveryResult> {
 	const resolvedCwd = path.resolve(cwd);
 	const agentSources = Array.from(new Set(getConfigDirs("", { project: false }).map(entry => entry.source)));
 
@@ -91,7 +97,7 @@ export async function discoverAgents(cwd: string, home: string = os.homedir()):
 	}
 
 	// Load agents from GJC marketplace plugins.
-	const { roots: pluginRoots } = isProviderEnabled("claude-plugins")
+	const { roots: pluginRoots } = isProviderEnabled("claude-plugins", activeSettings)
 		? await listClaudePluginRoots(home, resolvedCwd)
 		: { roots: [] };
 	const nonGjcPluginRoots = [];

package/src/task/gjc-command.ts

@@ -1,6 +1,6 @@
 import process from "node:process";
 
-import { $env } from "@gajae-code/utils";
+import { $pickenv } from "@gajae-code/utils";
 
 interface GjcCommand {
 	cmd: string;
@@ -12,7 +12,7 @@ const DEFAULT_CMD = process.platform === "win32" ? "gjc.cmd" : "gjc";
 const DEFAULT_SHELL = process.platform === "win32";
 
 export function resolveGjcCommand(): GjcCommand {
-	const envCmd = $env.PI_SUBPROCESS_CMD;
+	const envCmd = $pickenv("GJC_SUBPROCESS_CMD", "PI_SUBPROCESS_CMD");
 	if (envCmd?.trim()) {
 		return { cmd: envCmd, args: [], shell: DEFAULT_SHELL };
 	}