thepopebot 1.2.63 → 1.2.64

package/lib/chat/components/app-sidebar.js

@@ -130,20 +130,6 @@ function AppSidebar({ user }) {
             ) }),
             collapsed && /* @__PURE__ */ jsx(TooltipContent, { side: "right", children: "Notifications" })
           ] }) }),
-          /* @__PURE__ */ jsx(SidebarMenuItem, { children: /* @__PURE__ */ jsxs(Tooltip, { children: [
-            /* @__PURE__ */ jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(
-              SidebarMenuButton,
-              {
-                className: collapsed ? "justify-center" : "",
-                onClick: () => window.open("https://www.skool.com/ai-architects", "_blank"),
-                children: [
-                  /* @__PURE__ */ jsx(LifeBuoyIcon, { size: 16 }),
-                  !collapsed && /* @__PURE__ */ jsx("span", { children: "Support" })
-                ]
-              }
-            ) }),
-            collapsed && /* @__PURE__ */ jsx(TooltipContent, { side: "right", children: "Support" })
-          ] }) }),
           updateAvailable && /* @__PURE__ */ jsx(SidebarMenuItem, { children: /* @__PURE__ */ jsxs(Tooltip, { children: [
             /* @__PURE__ */ jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(
               SidebarMenuButton,
@@ -169,6 +155,20 @@ function AppSidebar({ user }) {
               "Upgrade to v",
               updateAvailable
             ] })
+          ] }) }),
+          /* @__PURE__ */ jsx(SidebarMenuItem, { children: /* @__PURE__ */ jsxs(Tooltip, { children: [
+            /* @__PURE__ */ jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(
+              SidebarMenuButton,
+              {
+                className: collapsed ? "justify-center" : "",
+                onClick: () => window.open("https://www.skool.com/ai-architects", "_blank"),
+                children: [
+                  /* @__PURE__ */ jsx(LifeBuoyIcon, { size: 16 }),
+                  !collapsed && /* @__PURE__ */ jsx("span", { children: "Support" })
+                ]
+              }
+            ) }),
+            collapsed && /* @__PURE__ */ jsx(TooltipContent, { side: "right", children: "Support" })
           ] }) })
         ] })
       ] }),

package/lib/chat/components/app-sidebar.jsx

@@ -162,24 +162,6 @@ export function AppSidebar({ user }) {
             </Tooltip>
           </SidebarMenuItem>
 
-          {/* Support */}
-          <SidebarMenuItem>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <SidebarMenuButton
-                  className={collapsed ? 'justify-center' : ''}
-                  onClick={() => window.open('https://www.skool.com/ai-architects', '_blank')}
-                >
-                  <LifeBuoyIcon size={16} />
-                  {!collapsed && <span>Support</span>}
-                </SidebarMenuButton>
-              </TooltipTrigger>
-              {collapsed && (
-                <TooltipContent side="right">Support</TooltipContent>
-              )}
-            </Tooltip>
-          </SidebarMenuItem>
-
           {/* Upgrade (only when update is available) */}
           {updateAvailable && (
             <SidebarMenuItem>
@@ -212,6 +194,24 @@ export function AppSidebar({ user }) {
             </SidebarMenuItem>
           )}
 
+          {/* Support */}
+          <SidebarMenuItem>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <SidebarMenuButton
+                  className={collapsed ? 'justify-center' : ''}
+                  onClick={() => window.open('https://www.skool.com/ai-architects', '_blank')}
+                >
+                  <LifeBuoyIcon size={16} />
+                  {!collapsed && <span>Support</span>}
+                </SidebarMenuButton>
+              </TooltipTrigger>
+              {collapsed && (
+                <TooltipContent side="right">Support</TooltipContent>
+              )}
+            </Tooltip>
+          </SidebarMenuItem>
+
         </SidebarMenu>
       </SidebarHeader>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.63",
+  "version": "1.2.64",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {

package/setup/lib/auth.mjs

@@ -110,6 +110,7 @@ export function writeEnvFile(config) {
     providerEnvKey,
     providerApiKey,
     openaiApiKey,
+    openaiBaseUrl,
     telegramChatId,
     telegramVerification,
     appUrl,
@@ -122,6 +123,7 @@ export function writeEnvFile(config) {
   if (providerEnvKey !== 'OPENAI_API_KEY') {
     apiKeyLines += `\n\n# OpenAI API key for Whisper voice transcription (optional)\nOPENAI_API_KEY=${openaiApiKey || ''}`;
   }
+  apiKeyLines += `\n\n# OpenAI-compatible base URL (optional, event handler only)\nOPENAI_BASE_URL=${openaiBaseUrl || ''}`;
 
   // Generate AUTH_SECRET (32 random bytes, base64 encoded)
   const authSecret = randomBytes(32).toString('base64');

package/setup/setup.mjs

@@ -114,6 +114,7 @@ async function main() {
   let agentModel = null;
   const collectedKeys = {};
   let braveKey = null;
+  let openaiBaseUrl = null;
   let webhookSecret = null;
   let owner = null;
   let repo = null;
@@ -421,7 +422,11 @@ async function main() {
       const providerLabel = env.LLM_PROVIDER === 'custom'
         ? 'Custom / Local'
         : (PROVIDERS[env.LLM_PROVIDER]?.label || env.LLM_PROVIDER);
-      printSuccess(`LLM: ${providerLabel} / ${env.LLM_MODEL} (${maskSecret(existingKey)})`);
+      let llmDisplay = `LLM: ${providerLabel} / ${env.LLM_MODEL} (${maskSecret(existingKey)})`;
+      if (env.LLM_PROVIDER === 'openai' && env.OPENAI_BASE_URL) {
+        llmDisplay += ` @ ${env.OPENAI_BASE_URL}`;
+      }
+      printSuccess(llmDisplay);
       if (!await confirm('Reconfigure?', false)) {
         agentProvider = env.LLM_PROVIDER;
         agentModel = env.LLM_MODEL;
@@ -477,6 +482,69 @@ async function main() {
     }
   }
 
+  // OpenAI custom base URL (event handler only, not the Docker agent)
+  if (agentProvider === 'openai') {
+    if (isRerun && env?.OPENAI_BASE_URL) {
+      // Existing base URL — offer to reconfigure
+      printSuccess(`Custom API URL: ${env.OPENAI_BASE_URL}`);
+      if (await confirm('Reconfigure?', false)) {
+        const useCustomUrl = await confirm('Use a custom OpenAI-compatible API URL?', false);
+        if (useCustomUrl) {
+          printInfo('If the model runs on this machine, use http://host.docker.internal:<port>');
+          printInfo('instead of localhost (localhost won\'t work from inside Docker)\n');
+          const { baseUrl } = await inquirer.prompt([
+            {
+              type: 'input',
+              name: 'baseUrl',
+              message: 'OpenAI-compatible base URL:',
+              validate: (input) => {
+                if (!input) return 'URL is required';
+                if (!input.startsWith('http://') && !input.startsWith('https://')) {
+                  return 'URL must start with http:// or https://';
+                }
+                return true;
+              },
+            },
+          ]);
+          openaiBaseUrl = baseUrl;
+          changedVars['OPENAI_BASE_URL'] = openaiBaseUrl;
+          printSuccess(`Custom base URL: ${openaiBaseUrl}`);
+        } else {
+          // Clear existing base URL
+          changedVars['OPENAI_BASE_URL'] = '';
+        }
+      } else {
+        openaiBaseUrl = env.OPENAI_BASE_URL;
+      }
+    } else if (!openaiBaseUrl) {
+      // No existing base URL — ask if they want one
+      const useCustomUrl = await confirm('Use a custom OpenAI-compatible API URL? (e.g. Ollama, vLLM)', false);
+      if (useCustomUrl) {
+        printInfo('If the model runs on this machine, use http://host.docker.internal:<port>');
+        printInfo('instead of localhost (localhost won\'t work from inside Docker)\n');
+        const { baseUrl } = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'baseUrl',
+            message: 'OpenAI-compatible base URL:',
+            validate: (input) => {
+              if (!input) return 'URL is required';
+              if (!input.startsWith('http://') && !input.startsWith('https://')) {
+                return 'URL must start with http:// or https://';
+              }
+              return true;
+            },
+          },
+        ]);
+        openaiBaseUrl = baseUrl;
+        if (isRerun) {
+          changedVars['OPENAI_BASE_URL'] = openaiBaseUrl;
+        }
+        printSuccess(`Custom base URL: ${openaiBaseUrl}`);
+      }
+    }
+  }
+
   // Step 3b: Voice Messages (OpenAI optional)
   if (collectedKeys['OPENAI_API_KEY']) {
     printSuccess('Your OpenAI key can also power voice messages.');
@@ -684,6 +752,7 @@ async function main() {
       providerEnvKey,
       providerApiKey: collectedKeys[providerEnvKey] || '',
       openaiApiKey: collectedKeys['OPENAI_API_KEY'] || '',
+      openaiBaseUrl: openaiBaseUrl || '',
       telegramChatId: null,
       telegramVerification: null,
       appUrl,