@gajae-code/utils 0.16.3 → 0.16.6

package/dist/types/dirs.d.ts

@@ -82,6 +82,8 @@ export declare function getTrustedConfigRootDir(): string;
 export declare function setAgentDir(dir: string): void;
 /** Get the agent config directory (~/.gjc/agent). */
 export declare function getAgentDir(): string;
+/** Resolver-owned profile classification, stable across HOME refreshes. */
+export declare function getAgentProfileAuthority(): "default" | "custom";
 export declare function getConfigDirName(): string;
 /**
  * Join a file under the provenance-checked agent directory, never the XDG
@@ -112,6 +114,8 @@ export declare function getLogPath(date?: Date): string;
  * form — XDG semantics are preserved.
  */
 export declare function getPluginsDir(home?: string): string;
+/** Get the default-profile plugin directory without ambient profile authority. */
+export declare function getDefaultPluginsDir(): string;
 /** Where npm installs packages (~/.gjc/plugins/node_modules). */
 export declare function getPluginsNodeModules(): string;
 /** Plugin manifest (~/.gjc/plugins/package.json). */
@@ -216,4 +220,4 @@ export declare function getProjectPluginOverridesPath(cwd?: string): string;
  */
 export declare function getMCPConfigPath(scope: "user" | "project", cwd?: string, agentDir?: string): string;
 /** Get the SSH config file path. */
-export declare function getSSHConfigPath(scope: "user" | "project", cwd?: string): string;
+export declare function getSSHConfigPath(scope: "user" | "project", cwd?: string, agentDir?: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@gajae-code/utils",
-	"version": "0.16.3",
+	"version": "0.16.6",
 	"description": "Shared utilities for pi packages",
 	"homepage": "https://gajae-code.com",
 	"author": "Yeachan-Heo",
@@ -31,7 +31,7 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@gajae-code/natives": "0.16.3",
+		"@gajae-code/natives": "0.16.6",
 		"beautiful-mermaid": "^1.1.3",
 		"handlebars": "^4.7.9",
 		"winston": "^3.19.0",

package/src/crash-redaction.ts

@@ -25,13 +25,37 @@ export function redactCrashSecrets(text: string): string {
 	redacted = redacted.replace(/\bgh[opsur]_[A-Za-z0-9]{16,}\b/g, "«redacted-github-token»");
 	redacted = redacted.replace(/\bgithub_pat_[A-Za-z0-9_]{20,}\b/g, "«redacted-github-token»");
 	redacted = redacted.replace(/\bxox[baprs]-[A-Za-z0-9-]{8,}\b/g, "«redacted-slack-token»");
+	// A PEM block carries the key material itself, so it is redacted whole rather
+	// than line by line. It runs before the narrower rules because they would
+	// otherwise chew on the base64 body and leave a truncated key behind.
+	redacted = redacted.replace(
+		/-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z0-9 ]*PRIVATE KEY-----/g,
+		"«redacted-private-key»",
+	);
+	// Google API keys are a fixed 39-character shape that carries no label of its
+	// own, so the labeled-value rule below never sees one.
+	redacted = redacted.replace(
+		/(?<![A-Za-z0-9_-])AIza[0-9A-Za-z_-]{35}(?![A-Za-z0-9_-])/g,
+		"«redacted-google-api-key»",
+	);
+	// Basic-auth credentials embedded in a URL. Scheme and host stay readable
+	// because they are the diagnostic value; only the userinfo is dropped. The
+	// scheme repetition is bounded: an unbounded `[a-z0-9+.-]*` in front of the
+	// literal `://` re-tries every prefix of a long alphabetic run, which is
+	// quadratic in input length and costs ~10s on a 200 KB crash body.
+	redacted = redacted.replace(
+		/(?<![A-Za-z0-9+.-])([a-z][a-z0-9+.-]{0,15}:\/\/)[^/\s:@]{1,256}:[^/\s@]{1,256}@/gi,
+		"$1«redacted-url-credential»@",
+	);
 	// AKIA is the long-term access key id; ASIA is the temporary/STS one, which is
-	// the shape that actually shows up in a crashed request. The id alone is not
+	// the shape that actually shows up in a crashed request. ABIA (bearer) and
+	// ACCA (context) complete the set the session-import scrubber already lists.
+	// The id alone is not
 	// the credential: an STS payload carries `SecretAccessKey` and `SessionToken`
 	// alongside it, so the labeled-value rule below must name both. `secret_key`
 	// does not match `SecretAccessKey` (the canonical field has `Access` in the
 	// middle), and `access_token` does not match `SessionToken`.
-	redacted = redacted.replace(/\b(?:AKIA|ASIA)[0-9A-Z]{16}\b/g, "«redacted-aws-key»");
+	redacted = redacted.replace(/\b(?:AKIA|ASIA|ABIA|ACCA)[0-9A-Z]{16}\b/g, "«redacted-aws-key»");
 	redacted = redacted.replace(
 		/(?<![A-Za-z0-9_])(["']?(?:api[_-]?key|apikey|access[_-]?token|refresh[_-]?token|id[_-]?token|session[_-]?token|client[_-]?secret|secret[_-]?key|secret[_-]?access[_-]?key|password|passwd|authorization)["']?\s*[=:]\s*["']?)[^\s"',;}\]]{8,}/gi,
 		"$1«redacted»",
@@ -47,5 +71,8 @@ export const CRASH_REDACTION_MARKERS: readonly string[] = [
 	"«redacted-github-token»",
 	"«redacted-slack-token»",
 	"«redacted-aws-key»",
+	"«redacted-private-key»",
+	"«redacted-google-api-key»",
+	"«redacted-url-credential»",
 	"«redacted»",
 ];

package/src/dirs.ts

@@ -438,9 +438,11 @@ class DirResolver {
 	// Per-category base dirs. Without XDG, all three equal configRoot / agentDir.
 	// With XDG on Linux, they point to $XDG_*_HOME/gjc/.
 	#rootDirs: Record<XdgCategory, string>;
+	#defaultRootDirs: Record<XdgCategory, string>;
 	#agentDirs: Record<XdgCategory, string>;
 
 	readonly #rootCache = new Map<string, string>();
+	readonly #defaultRootCache = new Map<string, string>();
 	readonly #agentCache = new Map<string, string>();
 
 	constructor(agentDirOverride?: string, snapshot = projectEnvSnapshot()) {
@@ -463,7 +465,7 @@ class DirResolver {
 		// the parent reading `$XDG_STATE_HOME/gjc/python-gateway` while the child
 		// read `<agentDir>/python-gateway`. Splitting a live store in half is worse
 		// than the narrower complaint it was meant to answer.
-		const isDefault = this.agentDir === defaultAgent;
+		const isDefault = normalizePathForComparison(this.agentDir) === normalizePathForComparison(defaultAgent);
 		// That decision is then *sticky*. Recomputing it later from path shape is
 		// what let a pinned agent directory silently change storage lane when a home
 		// refresh made it coincide with the new default: `getAgentDir()` looked
@@ -471,10 +473,15 @@ class DirResolver {
 		this.#xdgEligible = isDefault;
 
 		this.#rootDirs = { data: this.configRoot, state: this.configRoot, cache: this.configRoot };
+		this.#defaultRootDirs = { data: this.configRoot, state: this.configRoot, cache: this.configRoot };
 		this.#agentDirs = { data: this.agentDir, state: this.agentDir, cache: this.agentDir };
 		this.refreshCategoryDirs(snapshot, isDefault);
 	}
 
+	get profileAuthority(): "default" | "custom" {
+		return this.#xdgEligible ? "default" : "custom";
+	}
+
 	/**
 	 * `isDefault` decides whether the agent directory may follow `$XDG_*_HOME`.
 	 *
@@ -491,7 +498,7 @@ class DirResolver {
 		let xdgData: string | undefined;
 		let xdgState: string | undefined;
 		let xdgCache: string | undefined;
-		if ((process.platform === "linux" || process.platform === "darwin") && isDefault) {
+		if (process.platform === "linux" || process.platform === "darwin") {
 			const resolveIf = (envVar: string) => {
 				const value = trustedValue(envVar, snapshot);
 				if (!value) return undefined;
@@ -506,15 +513,20 @@ class DirResolver {
 			xdgState = resolveIf("XDG_STATE_HOME");
 			xdgCache = resolveIf("XDG_CACHE_HOME");
 		}
-		this.#rootDirs = {
+		this.#defaultRootDirs = {
 			data: xdgData ?? this.configRoot,
 			state: xdgState ?? this.configRoot,
 			cache: xdgCache ?? this.configRoot,
 		};
+		this.#rootDirs = {
+			data: isDefault ? (xdgData ?? this.configRoot) : this.configRoot,
+			state: isDefault ? (xdgState ?? this.configRoot) : this.configRoot,
+			cache: isDefault ? (xdgCache ?? this.configRoot) : this.configRoot,
+		};
 		this.#agentDirs = {
-			data: xdgData ?? this.agentDir,
-			state: xdgState ?? this.agentDir,
-			cache: xdgCache ?? this.agentDir,
+			data: isDefault ? (xdgData ?? this.agentDir) : this.agentDir,
+			state: isDefault ? (xdgState ?? this.agentDir) : this.agentDir,
+			cache: isDefault ? (xdgCache ?? this.agentDir) : this.agentDir,
 		};
 	}
 
@@ -543,6 +555,7 @@ class DirResolver {
 		// its path coincide with (or diverge from) the new default.
 		this.refreshCategoryDirs(this.#projectEnv, this.#xdgEligible);
 		this.#rootCache.clear();
+		this.#defaultRootCache.clear();
 		this.#agentCache.clear();
 	}
 
@@ -571,7 +584,7 @@ class DirResolver {
 	agentSubdir(userAgentDir: string | undefined, subdir: string, xdg?: XdgCategory): string {
 		this.refreshConfigDirOverride();
 		if (!this.#homeAvailable) throw new Error("User state is unavailable: no trustworthy home directory");
-		if (!userAgentDir || userAgentDir === this.agentDir) {
+		if (!userAgentDir || normalizePathForComparison(userAgentDir) === normalizePathForComparison(this.agentDir)) {
 			const cached = this.#agentCache.get(subdir);
 			if (cached) return cached;
 			const base = xdg ? this.#agentDirs[xdg] : this.agentDir;
@@ -582,6 +595,19 @@ class DirResolver {
 		return path.join(userAgentDir, subdir);
 	}
 
+	/** Config-root subdirectory for the resolver-owned default profile. */
+	rootSubdirForDefaultProfile(subdir: string, xdg?: XdgCategory): string {
+		this.refreshConfigDirOverride();
+		if (!this.#homeAvailable) throw new Error("User state is unavailable: no trustworthy home directory");
+		const cacheKey = `${xdg ?? "config"}:${subdir}`;
+		const cached = this.#defaultRootCache.get(cacheKey);
+		if (cached) return cached;
+		const base = xdg ? this.#defaultRootDirs[xdg] : this.configRoot;
+		const result = path.join(base, subdir);
+		this.#defaultRootCache.set(cacheKey, result);
+		return result;
+	}
+
 	get configDirName(): string {
 		return this.#configDirName;
 	}
@@ -654,6 +680,11 @@ export function getAgentDir(): string {
 	return dirs.agentDir;
 }
 
+/** Resolver-owned profile classification, stable across HOME refreshes. */
+export function getAgentProfileAuthority(): "default" | "custom" {
+	return dirs.profileAuthority;
+}
+
 export function getConfigDirName(): string {
 	dirs.refreshConfigDirOverride();
 	return dirs.configDirName;
@@ -723,6 +754,11 @@ export function getPluginsDir(home?: string): string {
 	return dirs.rootSubdir("plugins", "data");
 }
 
+/** Get the default-profile plugin directory without ambient profile authority. */
+export function getDefaultPluginsDir(): string {
+	return dirs.rootSubdirForDefaultProfile("plugins", "data");
+}
+
 /** Where npm installs packages (~/.gjc/plugins/node_modules). */
 export function getPluginsNodeModules(): string {
 	return path.join(getPluginsDir(), "node_modules");
@@ -972,9 +1008,9 @@ export function getMCPConfigPath(scope: "user" | "project", cwd: string = getPro
 }
 
 /** Get the SSH config file path. */
-export function getSSHConfigPath(scope: "user" | "project", cwd: string = getProjectDir()): string {
+export function getSSHConfigPath(scope: "user" | "project", cwd: string = getProjectDir(), agentDir?: string): string {
 	if (scope === "user") {
-		return path.join(getAgentDir(), "ssh.json");
+		return path.join(agentDir ?? getAgentDir(), "ssh.json");
 	}
 	return path.join(getProjectAgentDir(cwd), "ssh.json");
 }