fix: resolve gcloud python path

src/hooks/gmail-setup-utils.ts

@@ -6,7 +6,106 @@ import { runCommandWithTimeout } from "../process/exec.js";
 import { resolveUserPath } from "../utils.js";
 import { normalizeServePath } from "./gmail.js";
 
+let cachedPythonPath: string | null | undefined;
+
+function findExecutablesOnPath(bins: string[]): string[] {
+  const pathEnv = process.env.PATH ?? "";
+  const parts = pathEnv.split(path.delimiter).filter(Boolean);
+  const seen = new Set<string>();
+  const matches: string[] = [];
+  for (const part of parts) {
+    for (const bin of bins) {
+      const candidate = path.join(part, bin);
+      if (seen.has(candidate)) continue;
+      try {
+        fs.accessSync(candidate, fs.constants.X_OK);
+        matches.push(candidate);
+        seen.add(candidate);
+      } catch {
+        // keep scanning
+      }
+    }
+  }
+  return matches;
+}
+
+function ensurePathIncludes(dirPath: string, position: "append" | "prepend") {
+  const pathEnv = process.env.PATH ?? "";
+  const parts = pathEnv.split(path.delimiter).filter(Boolean);
+  if (parts.includes(dirPath)) return;
+  const next =
+    position === "prepend" ? [dirPath, ...parts] : [...parts, dirPath];
+  process.env.PATH = next.join(path.delimiter);
+}
+
+function ensureGcloudOnPath(): boolean {
+  if (hasBinary("gcloud")) return true;
+  const candidates = [
+    "/opt/homebrew/share/google-cloud-sdk/bin/gcloud",
+    "/usr/local/share/google-cloud-sdk/bin/gcloud",
+    "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/bin/gcloud",
+    "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/bin/gcloud",
+  ];
+  for (const candidate of candidates) {
+    try {
+      fs.accessSync(candidate, fs.constants.X_OK);
+      ensurePathIncludes(path.dirname(candidate), "append");
+      return true;
+    } catch {
+      // keep scanning
+    }
+  }
+  return false;
+}
+
+export async function resolvePythonExecutablePath(): Promise<string | undefined> {
+  if (cachedPythonPath !== undefined) {
+    return cachedPythonPath ?? undefined;
+  }
+  const candidates = findExecutablesOnPath(["python3", "python"]);
+  for (const candidate of candidates) {
+    const res = await runCommandWithTimeout(
+      [
+        candidate,
+        "-c",
+        "import os, sys; print(os.path.realpath(sys.executable))",
+      ],
+      { timeoutMs: 2_000 },
+    );
+    if (res.code !== 0) continue;
+    const resolved = res.stdout.trim().split(/\s+/)[0];
+    if (!resolved) continue;
+    try {
+      fs.accessSync(resolved, fs.constants.X_OK);
+      cachedPythonPath = resolved;
+      return resolved;
+    } catch {
+      // keep scanning
+    }
+  }
+  cachedPythonPath = null;
+  return undefined;
+}
+
+async function gcloudEnv(): Promise<NodeJS.ProcessEnv | undefined> {
+  if (process.env.CLOUDSDK_PYTHON) return undefined;
+  const pythonPath = await resolvePythonExecutablePath();
+  if (!pythonPath) return undefined;
+  return { CLOUDSDK_PYTHON: pythonPath };
+}
+
+async function runGcloudCommand(
+  args: string[],
+  timeoutMs: number,
+): Promise<Awaited<ReturnType<typeof runCommandWithTimeout>>> {
+  return await runCommandWithTimeout(["gcloud", ...args], {
+    timeoutMs,
+    env: await gcloudEnv(),
+  });
+}
+
 export async function ensureDependency(bin: string, brewArgs: string[]) {
+  if (bin === "gcloud" && ensureGcloudOnPath()) return;
   if (hasBinary(bin)) return;
   if (process.platform !== "darwin") {
     throw new Error(`${bin} not installed; install it and retry`);
@@ -14,8 +113,10 @@ export async function ensureDependency(bin: string, brewArgs: string[]) {
   if (!hasBinary("brew")) {
     throw new Error("Homebrew not installed (install brew and retry)");
   }
+  const brewEnv = bin === "gcloud" ? await gcloudEnv() : undefined;
   const result = await runCommandWithTimeout(["brew", "install", ...brewArgs], {
     timeoutMs: 600_000,
+    env: brewEnv,
   });
   if (result.code !== 0) {
     throw new Error(
@@ -28,31 +129,19 @@ export async function ensureDependency(bin: string, brewArgs: string[]) {
 }
 
 export async function ensureGcloudAuth() {
-  const res = await runCommandWithTimeout(
-    [
-      "gcloud",
-      "auth",
-      "list",
-      "--filter",
-      "status:ACTIVE",
-      "--format",
-      "value(account)",
-    ],
-    { timeoutMs: 30_000 },
+  const res = await runGcloudCommand(
+    ["auth", "list", "--filter", "status:ACTIVE", "--format", "value(account)"],
+    30_000,
   );
   if (res.code === 0 && res.stdout.trim()) return;
-  const login = await runCommandWithTimeout(["gcloud", "auth", "login"], {
-    timeoutMs: 600_000,
-  });
+  const login = await runGcloudCommand(["auth", "login"], 600_000);
   if (login.code !== 0) {
     throw new Error(login.stderr || "gcloud auth login failed");
   }
 }
 
 export async function runGcloud(args: string[]) {
-  const result = await runCommandWithTimeout(["gcloud", ...args], {
-    timeoutMs: 120_000,
-  });
+  const result = await runGcloudCommand(args, 120_000);
   if (result.code !== 0) {
     throw new Error(result.stderr || result.stdout || "gcloud command failed");
   }
@@ -60,17 +149,9 @@ export async function runGcloud(args: string[]) {
 }
 
 export async function ensureTopic(projectId: string, topicName: string) {
-  const describe = await runCommandWithTimeout(
-    [
-      "gcloud",
-      "pubsub",
-      "topics",
-      "describe",
-      topicName,
-      "--project",
-      projectId,
-    ],
-    { timeoutMs: 30_000 },
+  const describe = await runGcloudCommand(
+    ["pubsub", "topics", "describe", topicName, "--project", projectId],
+    30_000,
   );
   if (describe.code === 0) return;
   await runGcloud([
@@ -89,17 +170,9 @@ export async function ensureSubscription(
   topicName: string,
   pushEndpoint: string,
 ) {
-  const describe = await runCommandWithTimeout(
-    [
-      "gcloud",
-      "pubsub",
-      "subscriptions",
-      "describe",
-      subscription,
-      "--project",
-      projectId,
-    ],
-    { timeoutMs: 30_000 },
+  const describe = await runGcloudCommand(
+    ["pubsub", "subscriptions", "describe", subscription, "--project", projectId],
+    30_000,
   );
   if (describe.code === 0) {
     await runGcloud([
@@ -188,9 +261,8 @@ export async function resolveProjectIdFromGogCredentials(): Promise<
       const clientId = extractGogClientId(parsed);
       const projectNumber = extractProjectNumber(clientId);
       if (!projectNumber) continue;
-      const res = await runCommandWithTimeout(
+      const res = await runGcloudCommand(
         [
-          "gcloud",
           "projects",
           "list",
           "--filter",
@@ -198,7 +270,7 @@ export async function resolveProjectIdFromGogCredentials(): Promise<
           "--format",
           "value(projectId)",
         ],
-        { timeoutMs: 30_000 },
+        30_000,
       );
       if (res.code !== 0) continue;
       const projectId = res.stdout.trim().split(/\s+/)[0];