large update

src/main/connector-auth-service.ts

@@ -10,49 +10,11 @@ function escapeAppleScript(value: string) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
 
-function connectorAuthSpec(connectorId: ConnectorId, command: string) {
-  switch (connectorId) {
-    case "codex_local":
-      return {
-        title: "Codex Login",
-        shellCommand: `${quoteShell(command)} login`,
-        intro: "AgentCompany is opening the Codex login flow.",
-      };
-    case "claude_local":
-      return {
-        title: "Claude Code Login",
-        shellCommand: `${quoteShell(command)} auth login`,
-        intro: "AgentCompany is opening the Claude Code login flow.",
-      };
-    case "gemini_local":
-      return {
-        title: "Gemini CLI Login",
-        shellCommand: `${quoteShell(command)}`,
-        intro: "AgentCompany is opening Gemini CLI. If authentication is required, use /auth in the Gemini session.",
-      };
-  }
-}
-
-function buildTerminalCommand(connectorId: ConnectorId, command: string, cwd: string) {
-  const spec = connectorAuthSpec(connectorId, command);
-  const shell = process.env.SHELL || "/bin/zsh";
-  const script = [
-    "clear",
-    `echo ${quoteShell(spec.intro)}`,
-    "echo",
-    `cd ${quoteShell(cwd)}`,
-    spec.shellCommand,
-    "echo",
-    `echo ${quoteShell("You can close this terminal after the login flow completes.")}`,
-    `exec ${quoteShell(shell)} -l`,
-  ].join("; ");
-  return { title: spec.title, script };
-}
-
-export async function openConnectorAuthTerminal(connectorId: ConnectorId, command: string, cwd?: string) {
-  const targetCwd = cwd || process.env.HOME || homedir() || process.cwd();
-  const { script } = buildTerminalCommand(connectorId, command, targetCwd);
+/* ------------------------------------------------------------------ */
+/*  Shared terminal spawning — used by both auth and generic commands  */
+/* ------------------------------------------------------------------ */
 
+function spawnTerminalWithScript(script: string, title: string, cwd: string): boolean {
   if (process.platform === "darwin") {
     const appleScript = `tell application "Terminal" to do script "${escapeAppleScript(script)}"\ntell application "Terminal" to activate`;
     const child = spawn("osascript", ["-e", appleScript], {
@@ -64,18 +26,7 @@ export async function openConnectorAuthTerminal(connectorId: ConnectorId, comman
   }
 
   if (process.platform === "win32") {
-    const spec = connectorAuthSpec(connectorId, command);
-    const winScript = [
-      `@echo off`,
-      `echo ${spec.intro}`,
-      `echo.`,
-      `cd /d "${targetCwd}"`,
-      spec.shellCommand,
-      `echo.`,
-      `echo You can close this terminal after the login flow completes.`,
-      `pause`,
-    ].join(" & ");
-    const child = spawn("cmd.exe", ["/c", "start", "", "cmd.exe", "/k", winScript], {
+    const child = spawn("cmd.exe", ["/c", "start", "", "cmd.exe", "/k", script], {
       detached: true,
       stdio: "ignore",
       shell: false,
@@ -84,6 +35,7 @@ export async function openConnectorAuthTerminal(connectorId: ConnectorId, comman
     return true;
   }
 
+  // Linux — try multiple terminal emulators
   const linuxCandidates: Array<[string, string[]]> = [
     ["x-terminal-emulator", ["-e", "sh", "-lc", script]],
     ["gnome-terminal", ["--", "sh", "-lc", script]],
@@ -110,5 +62,101 @@ export async function openConnectorAuthTerminal(connectorId: ConnectorId, comman
     }
   }
 
-  throw new Error("No supported terminal application was found for connector login.");
+  throw new Error("No supported terminal application was found.");
+}
+
+/* ------------------------------------------------------------------ */
+/*  Connector auth terminal (existing API — unchanged behavior)       */
+/* ------------------------------------------------------------------ */
+
+function connectorAuthSpec(connectorId: ConnectorId, command: string) {
+  switch (connectorId) {
+    case "codex_local":
+      return {
+        title: "Codex Login",
+        shellCommand: `${quoteShell(command)} login`,
+        intro: "AgentCompany is opening the Codex login flow.",
+      };
+    case "claude_local":
+      return {
+        title: "Claude Code Login",
+        shellCommand: `${quoteShell(command)} auth login`,
+        intro: "AgentCompany is opening the Claude Code login flow.",
+      };
+    case "gemini_local":
+      return {
+        title: "Gemini CLI Login",
+        shellCommand: `${quoteShell(command)}`,
+        intro: "AgentCompany is opening Gemini CLI. If authentication is required, use /auth in the Gemini session.",
+      };
+  }
+}
+
+export async function openConnectorAuthTerminal(connectorId: ConnectorId, command: string, cwd?: string) {
+  const targetCwd = cwd || process.env.HOME || homedir() || process.cwd();
+  const spec = connectorAuthSpec(connectorId, command);
+
+  if (process.platform === "win32") {
+    // Windows: build a CMD-compatible script directly
+    const winScript = [
+      `@echo off`,
+      `echo ${spec.intro}`,
+      `echo.`,
+      `cd /d "${targetCwd}"`,
+      spec.shellCommand.replace(/'/g, ""),  // Remove shell quotes for CMD
+      `echo.`,
+      `echo You can close this terminal after the login flow completes.`,
+      `pause`,
+    ].join(" & ");
+    return spawnTerminalWithScript(winScript, spec.title, targetCwd);
+  }
+
+  // Unix: build a shell script
+  const shell = process.env.SHELL || "/bin/zsh";
+  const script = [
+    "clear",
+    `echo ${quoteShell(spec.intro)}`,
+    "echo",
+    `cd ${quoteShell(targetCwd)}`,
+    spec.shellCommand,
+    "echo",
+    `echo ${quoteShell("You can close this terminal after the login flow completes.")}`,
+    `exec ${quoteShell(shell)} -l`,
+  ].join("; ");
+  return spawnTerminalWithScript(script, spec.title, targetCwd);
+}
+
+/* ------------------------------------------------------------------ */
+/*  Generic terminal command (for install flows, etc.)                 */
+/* ------------------------------------------------------------------ */
+
+export async function openGenericTerminal(input: { title: string; command: string }) {
+  const cwd = process.env.HOME || homedir() || process.cwd();
+
+  if (process.platform === "win32") {
+    const winScript = [
+      `@echo off`,
+      `echo AgentCompany - ${input.title}`,
+      `echo.`,
+      `cd /d "${cwd}"`,
+      input.command,
+      `echo.`,
+      `echo Done. You can close this terminal.`,
+      `pause`,
+    ].join(" & ");
+    return spawnTerminalWithScript(winScript, input.title, cwd);
+  }
+
+  const shell = process.env.SHELL || "/bin/zsh";
+  const script = [
+    "clear",
+    `echo ${quoteShell(`AgentCompany — ${input.title}`)}`,
+    "echo",
+    `cd ${quoteShell(cwd)}`,
+    input.command,
+    "echo",
+    `echo ${quoteShell("Done. You can close this terminal.")}`,
+    `exec ${quoteShell(shell)} -l`,
+  ].join("; ");
+  return spawnTerminalWithScript(script, input.title, cwd);
 }