open-agents-ai 0.187.216 → 0.187.217

package/dist/index.js

@@ -293277,6 +293277,7 @@ __export(setup_exports, {
   pullModelWithAutoUpdate: () => pullModelWithAutoUpdate,
   recommendModel: () => recommendModel,
   renderScoreBar: () => renderScoreBar,
+  runElevatedCommand: () => runElevatedCommand,
   runSetupWizard: () => runSetupWizard,
   updateOllama: () => updateOllama
 });
@@ -293564,15 +293565,24 @@ function ensureZstd() {
   process.stdout.write(`
   ${c3.cyan("●")} Installing zstd (required by ollama install.sh)...
 `);
-  const candidates = [
-    `pkexec sh -c "${installCmd}"`,
-    `sudo ${installCmd}`,
-    installCmd
-    // bare (works if already root)
-  ];
-  for (const cmd of candidates) {
+  const hasDisplay = !!(process.env.DISPLAY || process.env.WAYLAND_DISPLAY);
+  const askpassHelper = detectAskpassHelper() ?? writeAskpassHelper();
+  const askpassEnv = askpassHelper ? { ...process.env, SUDO_ASKPASS: askpassHelper, DEBIAN_FRONTEND: "noninteractive" } : { ...process.env, DEBIAN_FRONTEND: "noninteractive" };
+  const candidates = [];
+  if (hasCmd("pkexec") && hasDisplay) {
+    candidates.push({ cmd: `pkexec sh -c ${shellEscape(installCmd)}`, env: process.env });
+  }
+  if (askpassHelper) {
+    candidates.push({ cmd: `sudo -A ${installCmd}`, env: askpassEnv });
+  }
+  candidates.push({ cmd: installCmd, env: process.env });
+  for (const cand of candidates) {
     try {
-      execSync48(cmd, { stdio: "inherit", timeout: 18e4 });
+      execSync48(cand.cmd, {
+        stdio: ["ignore", "inherit", "pipe"],
+        env: cand.env,
+        timeout: 18e4
+      });
       if (hasCmd("zstd")) {
         process.stdout.write(`  ${c3.green("✔")} zstd installed.
 `);
@@ -293585,17 +293595,159 @@ function ensureZstd() {
 `);
   return false;
 }
+function detectAskpassHelper() {
+  const linuxHelpers = [
+    "/usr/lib/ssh/ssh-askpass",
+    // openssh-askpass
+    "/usr/lib/openssh/ssh-askpass",
+    "/usr/libexec/openssh/ssh-askpass",
+    "/usr/bin/ksshaskpass",
+    // KDE
+    "/usr/bin/lxqt-openssh-askpass"
+  ];
+  if (process.platform === "linux") {
+    for (const path5 of linuxHelpers) {
+      try {
+        if (existsSync59(path5)) return path5;
+      } catch {
+      }
+    }
+    for (const name10 of ["ssh-askpass", "ksshaskpass", "x11-ssh-askpass"]) {
+      if (hasCmd(name10)) {
+        try {
+          const p2 = execSync48(`command -v ${name10}`, { encoding: "utf8" }).trim();
+          if (p2) return p2;
+        } catch {
+        }
+      }
+    }
+  }
+  return null;
+}
+function writeAskpassHelper() {
+  const tmpDir = join76(homedir26(), ".open-agents");
+  try {
+    mkdirSync33(tmpDir, { recursive: true });
+  } catch {
+  }
+  const helperPath = join76(tmpDir, "askpass-helper.sh");
+  let body = "";
+  if (process.platform === "darwin") {
+    body = `#!/bin/sh
+osascript -e 'Tell application "System Events" to display dialog "Open Agents needs admin access to update Ollama.\\n\\nPassword:" with title "Open Agents" with hidden answer default answer "" buttons {"Cancel","OK"} default button "OK"' -e 'text returned of result' 2>/dev/null
+`;
+  } else if (process.platform === "linux") {
+    const hasZenity = hasCmd("zenity");
+    const hasKdialog = hasCmd("kdialog");
+    const hasYad = hasCmd("yad");
+    if (!hasZenity && !hasKdialog && !hasYad) return null;
+    const lines = ["#!/bin/sh", 'TITLE="Open Agents"', 'TEXT="Open Agents needs admin access to update Ollama. Enter your password:"'];
+    if (hasZenity) {
+      lines.push('zenity --password --title="$TITLE" --text="$TEXT" 2>/dev/null && exit 0');
+    }
+    if (hasKdialog) {
+      lines.push('kdialog --title "$TITLE" --password "$TEXT" 2>/dev/null && exit 0');
+    }
+    if (hasYad) {
+      lines.push('yad --title="$TITLE" --text="$TEXT" --entry --hide-text 2>/dev/null && exit 0');
+    }
+    lines.push("exit 1");
+    body = lines.join("\n") + "\n";
+  } else {
+    return null;
+  }
+  try {
+    writeFileSync30(helperPath, body, { mode: 448 });
+    execSync48(`chmod 700 "${helperPath}"`, { stdio: "ignore" });
+    return helperPath;
+  } catch {
+    return null;
+  }
+}
+function buildElevatedInstall() {
+  const installCmd = "curl -fsSL https://ollama.com/install.sh | sh";
+  const baseEnv = { ...process.env };
+  if (process.platform === "linux" && hasCmd("pkexec") && (process.env.DISPLAY || process.env.WAYLAND_DISPLAY)) {
+    return {
+      cmd: `pkexec sh -c ${shellEscape(installCmd)}`,
+      env: baseEnv,
+      mode: "pkexec"
+    };
+  }
+  const nativeAskpass = detectAskpassHelper();
+  const writtenHelper = nativeAskpass ?? writeAskpassHelper();
+  if (writtenHelper) {
+    return {
+      cmd: installCmd,
+      // unchanged — install.sh's internal sudo calls will use ASKPASS
+      env: { ...baseEnv, SUDO_ASKPASS: writtenHelper, DEBIAN_FRONTEND: "noninteractive" },
+      mode: "askpass"
+    };
+  }
+  return {
+    cmd: installCmd,
+    env: baseEnv,
+    mode: "fallback"
+  };
+}
+function shellEscape(s2) {
+  return `'${s2.replace(/'/g, `'\\''`)}'`;
+}
+function runElevatedCommand(command, opts = {}) {
+  const timeout2 = opts.timeoutMs ?? 6e4;
+  const hasDisplay = !!(process.env.DISPLAY || process.env.WAYLAND_DISPLAY);
+  const askpassHelper = detectAskpassHelper() ?? writeAskpassHelper();
+  const askpassEnv = askpassHelper ? { ...process.env, SUDO_ASKPASS: askpassHelper } : process.env;
+  const candidates = [];
+  if (hasCmd("pkexec") && hasDisplay) {
+    candidates.push({ cmd: `pkexec sh -c ${shellEscape(command)}`, env: process.env });
+  }
+  if (askpassHelper) {
+    candidates.push({ cmd: `sudo -A sh -c ${shellEscape(command)}`, env: askpassEnv });
+  }
+  candidates.push({ cmd: command, env: process.env });
+  let lastErr = null;
+  for (const cand of candidates) {
+    try {
+      execSync48(cand.cmd, {
+        stdio: ["ignore", "pipe", "pipe"],
+        // never inherit TUI stdin
+        env: cand.env,
+        timeout: timeout2
+      });
+      return;
+    } catch (err) {
+      lastErr = err;
+    }
+  }
+  if (!opts.swallowErrors && lastErr) {
+    throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+  }
+}
 function runOllamaInstallScript() {
   const zstdReady = ensureZstd();
   if (!zstdReady) {
     process.stdout.write(`  ${c3.yellow("⚠")} Proceeding without zstd — install may fail if the script requires it.
 `);
   }
-  const cmd = "curl -fsSL https://ollama.com/install.sh | sh";
+  const elevated = buildElevatedInstall();
+  if (elevated.mode === "pkexec") {
+    process.stdout.write(`  ${c3.cyan("●")} Elevation: pkexec (graphical PolicyKit prompt)
+`);
+  } else if (elevated.mode === "askpass") {
+    process.stdout.write(`  ${c3.cyan("●")} Elevation: SUDO_ASKPASS (GUI password modal)
+`);
+  } else {
+    process.stdout.write(`  ${c3.yellow("⚠")} No GUI password helper available — install may stall waiting for sudo.
+`);
+    process.stdout.write(`  ${c3.yellow("⚠")} Install one of: pkexec / zenity / kdialog / yad / ssh-askpass
+`);
+  }
   const runOnce = () => {
-    execSync48(cmd, {
-      stdio: ["inherit", "inherit", "pipe"],
-      timeout: 3e5
+    execSync48(elevated.cmd, {
+      stdio: ["ignore", "inherit", "pipe"],
+      env: elevated.env,
+      timeout: 6e5
     });
   };
   try {
@@ -304975,10 +305127,13 @@ async function handleParallel(arg, ctx3) {
       const overrideContent = `[Service]
 Environment="OLLAMA_NUM_PARALLEL=${n2}"
 `;
-      execSync57(`sudo mkdir -p ${overrideDir}`, { stdio: "pipe" });
-      execSync57(`echo '${overrideContent}' | sudo tee ${overrideFile} > /dev/null`, { stdio: "pipe" });
-      execSync57("sudo systemctl daemon-reload", { stdio: "pipe" });
-      execSync57("sudo systemctl restart ollama.service", { stdio: "pipe" });
+      const { runElevatedCommand: runElev } = await Promise.resolve().then(() => (init_setup(), setup_exports));
+      runElev(`mkdir -p ${overrideDir}`, { timeoutMs: 3e4 });
+      const escapedContent = overrideContent.replace(/'/g, `'\\''`);
+      runElev(`bash -c 'cat > ${overrideFile} <<EOF
+${escapedContent}EOF'`, { timeoutMs: 3e4 });
+      runElev("systemctl daemon-reload", { timeoutMs: 3e4 });
+      runElev("systemctl restart ollama.service", { timeoutMs: 3e4 });
       let ready = false;
       for (let i2 = 0; i2 < 30 && !ready; i2++) {
         await new Promise((r2) => setTimeout(r2, 500));
@@ -305410,8 +305565,8 @@ async function handleUpdate(subcommand, ctx3) {
       if (doUpdateOllama()) {
         renderInfo("Ollama updated successfully.");
         try {
-          const { execSync: es } = await import("node:child_process");
-          es("sudo systemctl restart ollama 2>/dev/null || true", { timeout: 1e4, stdio: "pipe" });
+          const { runElevatedCommand: runElevatedCommand2 } = await Promise.resolve().then(() => (init_setup(), setup_exports));
+          runElevatedCommand2("systemctl restart ollama", { timeoutMs: 1e4, swallowErrors: true });
         } catch {
         }
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.216",
+  "version": "0.187.217",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",