@gajae-code/coding-agent 0.1.1 → 0.1.3

package/src/tools/gh.ts

@@ -106,6 +106,34 @@ const GH_PR_CHECKOUT_FIELDS = [
 	"title",
 	"url",
 ];
+
+const PR_CHECKOUT_BRANCH_CONFIG = {
+	headRef: "gjcPrHeadRef",
+	url: "gjcPrUrl",
+	isCrossRepository: "gjcPrIsCrossRepository",
+	maintainerCanModify: "gjcPrMaintainerCanModify",
+} as const;
+
+const LEGACY_PR_CHECKOUT_BRANCH_CONFIG = {
+	headRef: "ompPrHeadRef",
+	url: "ompPrUrl",
+	isCrossRepository: "ompPrIsCrossRepository",
+	maintainerCanModify: "ompPrMaintainerCanModify",
+} as const;
+
+type PrCheckoutBranchConfigKey = keyof typeof PR_CHECKOUT_BRANCH_CONFIG;
+
+async function getPrCheckoutBranchConfig(
+	repoRoot: string,
+	localBranch: string,
+	key: PrCheckoutBranchConfigKey,
+	signal?: AbortSignal,
+): Promise<string | undefined> {
+	return (
+		(await git.config.getBranch(repoRoot, localBranch, PR_CHECKOUT_BRANCH_CONFIG[key], signal)) ??
+		(await git.config.getBranch(repoRoot, localBranch, LEGACY_PR_CHECKOUT_BRANCH_CONFIG[key], signal))
+	);
+}
 // /search/<endpoint> API response shapes (subset). Used when projecting raw
 // REST results into the normalized `GhSearch*Result` shapes the formatters
 // consume. We talk to the API directly because `gh search prs`/`issues`
@@ -1023,21 +1051,21 @@ async function resolvePrBranchPushTarget(
 	maintainerCanModify?: boolean;
 	isCrossRepository: boolean;
 }> {
-	const headRef = await git.config.getBranch(repoRoot, localBranch, "ompPrHeadRef", signal);
+	const headRef = await getPrCheckoutBranchConfig(repoRoot, localBranch, "headRef", signal);
 	if (!headRef) {
 		throw new ToolError(`branch ${localBranch} has no PR push metadata; check it out via op: pr_checkout first`);
 	}
 
 	const pushRemote = await git.config.getBranch(repoRoot, localBranch, "pushRemote", signal);
 	const remote = await git.config.getBranch(repoRoot, localBranch, "remote", signal);
-	const prUrl = await git.config.getBranch(repoRoot, localBranch, "ompPrUrl", signal);
-	const maintainerCanModifyValue = await git.config.getBranch(
+	const prUrl = await getPrCheckoutBranchConfig(repoRoot, localBranch, "url", signal);
+	const maintainerCanModifyValue = await getPrCheckoutBranchConfig(
 		repoRoot,
 		localBranch,
-		"ompPrMaintainerCanModify",
+		"maintainerCanModify",
 		signal,
 	);
-	const isCrossRepositoryValue = await git.config.getBranch(repoRoot, localBranch, "ompPrIsCrossRepository", signal);
+	const isCrossRepositoryValue = await getPrCheckoutBranchConfig(repoRoot, localBranch, "isCrossRepository", signal);
 
 	const remoteName = pushRemote ?? remote;
 	if (!remoteName) {
@@ -2989,19 +3017,19 @@ async function checkoutPullRequest(
 			await git.config.setBranch(repoRoot, localBranch, "remote", remote.name, signal);
 			await git.config.setBranch(repoRoot, localBranch, "merge", `refs/heads/${headRefName}`, signal);
 			await git.config.setBranch(repoRoot, localBranch, "pushRemote", remote.name, signal);
-			await git.config.setBranch(repoRoot, localBranch, "ompPrHeadRef", headRefName, signal);
-			await git.config.setBranch(repoRoot, localBranch, "ompPrUrl", data.url ?? "", signal);
+			await git.config.setBranch(repoRoot, localBranch, PR_CHECKOUT_BRANCH_CONFIG.headRef, headRefName, signal);
+			await git.config.setBranch(repoRoot, localBranch, PR_CHECKOUT_BRANCH_CONFIG.url, data.url ?? "", signal);
 			await git.config.setBranch(
 				repoRoot,
 				localBranch,
-				"ompPrIsCrossRepository",
+				PR_CHECKOUT_BRANCH_CONFIG.isCrossRepository,
 				String(Boolean(data.isCrossRepository)),
 				signal,
 			);
 			await git.config.setBranch(
 				repoRoot,
 				localBranch,
-				"ompPrMaintainerCanModify",
+				PR_CHECKOUT_BRANCH_CONFIG.maintainerCanModify,
 				String(Boolean(data.maintainerCanModify)),
 				signal,
 			);

package/src/tools/image-gen.ts

@@ -44,6 +44,7 @@ interface ImageApiKey {
 	apiKey: string;
 	projectId?: string;
 	model?: Model;
+	authCredentialType?: "api_key" | "oauth";
 }
 
 const responseModalitySchema = z.enum(["IMAGE", "TEXT"] as const);
@@ -441,6 +442,7 @@ async function findOpenAIHostedImageCredentials(
 		provider: getOpenAIHostedImageProvider(activeModel),
 		apiKey,
 		model: activeModel,
+		authCredentialType: modelRegistry.getSessionCredentialType?.(activeModel.provider, sessionId),
 	};
 }
 
@@ -700,16 +702,21 @@ function getOpenAIResponseErrorMessage(rawText: string): string {
 	}
 }
 
-function getOpenAIBaseUrl(model: Model): string {
-	const fallback =
-		model.api === "openai-codex-responses" || model.provider === "openai-codex"
-			? CODEX_BASE_URL
-			: DEFAULT_OPENAI_BASE_URL;
-	return (model.baseUrl || fallback).replace(/\/+$/, "");
+function getOpenAIBaseUrl(model: Model, authCredentialType?: "api_key" | "oauth"): string {
+	if (model.api === "openai-codex-responses" || model.provider === "openai-codex") {
+		return (model.baseUrl || CODEX_BASE_URL).replace(/\/+$/, "");
+	}
+	if (authCredentialType === "oauth") return DEFAULT_OPENAI_BASE_URL;
+	const envBaseUrl = $env.OPENAI_BASE_URL?.trim();
+	const configuredBaseUrl = model.baseUrl?.trim();
+	if (envBaseUrl && (!configuredBaseUrl || configuredBaseUrl.toLowerCase().includes("api.openai.com"))) {
+		return envBaseUrl.replace(/\/+$/, "");
+	}
+	return (configuredBaseUrl || envBaseUrl || DEFAULT_OPENAI_BASE_URL).replace(/\/+$/, "");
 }
 
-function getOpenAIResponsesUrl(model: Model): string {
-	const baseUrl = getOpenAIBaseUrl(model);
+function getOpenAIResponsesUrl(model: Model, authCredentialType?: "api_key" | "oauth"): string {
+	const baseUrl = getOpenAIBaseUrl(model, authCredentialType);
 	if (model.api !== "openai-codex-responses" && model.provider !== "openai-codex") {
 		return `${baseUrl}/responses`;
 	}
@@ -782,11 +789,12 @@ async function generateOpenAIHostedImage(
 	inputImages: InlineImageData[],
 	signal: AbortSignal | undefined,
 	sessionId: string | undefined,
+	options?: { authCredentialType?: "api_key" | "oauth" },
 ): Promise<OpenAIHostedImageResult> {
 	const promptText = assemblePrompt(params);
 	const stream = model.api === "openai-codex-responses" || model.provider === "openai-codex";
 	const requestBody = buildOpenAIHostedImageRequest(model, promptText, params, inputImages, stream);
-	const response = await fetch(getOpenAIResponsesUrl(model), {
+	const response = await fetch(getOpenAIResponsesUrl(model, options?.authCredentialType), {
 		method: "POST",
 		headers: buildOpenAIImageHeaders(model, apiKey, sessionId),
 		body: JSON.stringify(requestBody),
@@ -946,6 +954,7 @@ export const imageGenTool: CustomTool<typeof imageGenSchema, ImageGenToolDetails
 					resolvedImages,
 					requestSignal,
 					sessionId,
+					{ authCredentialType: apiKey.authCredentialType },
 				);
 
 				if (parsed.images.length === 0) {
@@ -1075,7 +1084,7 @@ export const imageGenTool: CustomTool<typeof imageGenSchema, ImageGenToolDetails
 					headers: {
 						"Content-Type": "application/json",
 						Authorization: `Bearer ${apiKey.apiKey}`,
-						"HTTP-Referer": "https://gajae-code.dev/",
+						"HTTP-Referer": "https://gaebal-gajae.dev/",
 						"X-OpenRouter-Title": "Gajae Code",
 						"X-OpenRouter-Categories": "cli-agent",
 					},

package/src/tools/path-utils.ts

@@ -26,6 +26,7 @@ const INTERNAL_SCHEMES_WITH_SELECTORS: Record<string, true> = {
 	gjc: true,
 	pr: true,
 	rule: true,
+	skill: true,
 };
 const INTERNAL_URL_SCHEME_RE = /^([a-z][a-z0-9+.-]*):\/\//i;
 const NARROW_NO_BREAK_SPACE = "\u202F";