thepopebot 1.2.81 → 1.2.82

package/lib/chat/actions.js

@@ -1018,12 +1018,19 @@ export async function regenerateWebhookSecret(key) {
 export async function getTelegramStatus() {
   await requireAuth();
   try {
-    const { getConfigSecret } = await import('../db/config.js');
+    const { getConfigSecret, getConfigValue } = await import('../db/config.js');
+    const { getConfig } = await import('../config.js');
     const { validateBotToken, getTelegramWebhookInfo } = await import('../tools/telegram.js');
 
     const botToken = getConfigSecret('TELEGRAM_BOT_TOKEN');
     const webhookSecret = getConfigSecret('TELEGRAM_WEBHOOK_SECRET');
 
+    const appUrl = getConfig('APP_URL');
+    const defaultWebhookUrl = appUrl
+      ? `${appUrl.replace(/\/$/, '')}/api/telegram/webhook`
+      : '';
+    const webhookUrlOverride = getConfigValue('TELEGRAM_WEBHOOK_URL') || null;
+
     let botInfo = null;
     let webhookInfo = null;
     if (botToken) {
@@ -1049,6 +1056,8 @@ export async function getTelegramStatus() {
       botTokenSet: !!botToken,
       webhookSecretSet: !!webhookSecret,
       webhookInfo,
+      defaultWebhookUrl,
+      webhookUrlOverride,
     };
   } catch (err) {
     console.error('Failed to get Telegram status:', err);
@@ -1078,12 +1087,20 @@ export async function validateTelegramToken(token) {
 /**
  * Register the Telegram webhook with the currently saved bot token.
  * Generates a fresh webhook secret, saves it, and calls Telegram's setWebhook.
- * APP_URL must be configured.
- */
-export async function registerTelegramWebhook() {
+ *
+ * URL resolution:
+ *   - explicit `webhookUrl` arg (persisted as override if it differs from default)
+ *   - stored `TELEGRAM_WEBHOOK_URL` override
+ *   - `${APP_URL}/api/telegram/webhook` default
+ *
+ * Pass an empty string for `webhookUrl` to clear the override and fall back
+ * to the APP_URL-derived default.
+ */
+export async function registerTelegramWebhook(webhookUrl) {
   const user = await requireAdmin();
   try {
-    const { getConfigSecret, setConfigSecret } = await import('../db/config.js');
+    const { getConfigSecret, setConfigSecret, getConfigValue, setConfigValue, deleteConfigValue } =
+      await import('../db/config.js');
     const { getConfig } = await import('../config.js');
     const { setTelegramWebhook, generateWebhookSecret } = await import('../tools/telegram.js');
 
@@ -1091,17 +1108,43 @@ export async function registerTelegramWebhook() {
     if (!botToken) return { error: 'Bot token must be set first' };
 
     const appUrl = getConfig('APP_URL');
-    if (!appUrl) return { error: 'APP_URL must be configured first' };
+    const defaultUrl = appUrl ? `${appUrl.replace(/\/$/, '')}/api/telegram/webhook` : '';
+
+    // Resolve the URL to register.
+    let urlToRegister;
+    if (typeof webhookUrl === 'string') {
+      const trimmed = webhookUrl.trim();
+      if (!trimmed || trimmed === defaultUrl) {
+        deleteConfigValue('TELEGRAM_WEBHOOK_URL');
+        urlToRegister = trimmed || defaultUrl;
+      } else {
+        setConfigValue('TELEGRAM_WEBHOOK_URL', trimmed, user.id);
+        urlToRegister = trimmed;
+      }
+    } else {
+      urlToRegister = getConfigValue('TELEGRAM_WEBHOOK_URL') || defaultUrl;
+    }
+
+    if (!urlToRegister) {
+      return { error: 'Webhook URL is required (set APP_URL or supply a URL)' };
+    }
+    try {
+      const parsed = new URL(urlToRegister);
+      if (parsed.protocol !== 'https:') {
+        return { error: 'Webhook URL must use https://' };
+      }
+    } catch {
+      return { error: 'Webhook URL is not a valid URL' };
+    }
 
-    const webhookUrl = `${appUrl.replace(/\/$/, '')}/api/telegram/webhook`;
     const secret = generateWebhookSecret();
     setConfigSecret('TELEGRAM_WEBHOOK_SECRET', secret, user.id);
 
-    const result = await setTelegramWebhook(botToken, webhookUrl, secret);
+    const result = await setTelegramWebhook(botToken, urlToRegister, secret);
     if (!result.ok) {
       return { error: result.description || 'Failed to register webhook' };
     }
-    return { success: true, webhookUrl };
+    return { success: true, webhookUrl: urlToRegister };
   } catch (err) {
     console.error('Failed to register Telegram webhook:', err);
     return { error: err.message };

package/lib/chat/components/settings-secrets-page.js

@@ -273,6 +273,8 @@ function ApiKeysTelegramPage() {
   const [tokenError, setTokenError] = useState(null);
   const [webhookSaving, setWebhookSaving] = useState(false);
   const [webhookError, setWebhookError] = useState(null);
+  const [webhookEditing, setWebhookEditing] = useState(false);
+  const [webhookUrlInput, setWebhookUrlInput] = useState("");
   const loadStatus = async () => {
     try {
       const result = await getTelegramStatus();
@@ -284,6 +286,12 @@ function ApiKeysTelegramPage() {
   useEffect(() => {
     loadStatus();
   }, []);
+  useEffect(() => {
+    if (!status || webhookEditing) return;
+    setWebhookUrlInput(
+      status.webhookUrlOverride || status.webhookInfo?.url || status.defaultWebhookUrl || ""
+    );
+  }, [status, webhookEditing]);
   if (loading) {
     return /* @__PURE__ */ jsx("div", { className: "h-48 animate-pulse rounded-md bg-border/50" });
   }
@@ -318,11 +326,33 @@ function ApiKeysTelegramPage() {
   const handleRegisterWebhook = async () => {
     setWebhookSaving(true);
     setWebhookError(null);
-    const result = await registerTelegramWebhook();
-    if (result?.error) setWebhookError(result.error);
+    const url = webhookEditing ? webhookUrlInput.trim() : void 0;
+    const result = await registerTelegramWebhook(url);
+    if (result?.error) {
+      setWebhookError(result.error);
+      setWebhookSaving(false);
+      return;
+    }
+    setWebhookEditing(false);
+    setWebhookUrlInput("");
     await loadStatus();
     setWebhookSaving(false);
   };
+  const startWebhookEdit = () => {
+    setWebhookError(null);
+    setWebhookUrlInput(
+      status.webhookUrlOverride || status.webhookInfo?.url || status.defaultWebhookUrl || ""
+    );
+    setWebhookEditing(true);
+  };
+  const cancelWebhookEdit = () => {
+    setWebhookEditing(false);
+    setWebhookUrlInput("");
+    setWebhookError(null);
+  };
+  const resetWebhookToDefault = () => {
+    setWebhookUrlInput(status.defaultWebhookUrl || "");
+  };
   return /* @__PURE__ */ jsxs("div", { children: [
     /* @__PURE__ */ jsxs("div", { className: "mb-4", children: [
       /* @__PURE__ */ jsx("h2", { className: "text-base font-medium", children: "Telegram" }),
@@ -417,33 +447,75 @@ function ApiKeysTelegramPage() {
       /* @__PURE__ */ jsx("div", { className: `rounded-lg border bg-card p-4 ${!step1Done ? "opacity-50 pointer-events-none" : ""}`, children: /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3", children: [
         /* @__PURE__ */ jsx(StepIndicator, { n: 2, state: step2Done ? "done" : step1Done ? "active" : "pending" }),
         /* @__PURE__ */ jsxs("div", { className: "flex-1 min-w-0", children: [
-          /* @__PURE__ */ jsx("div", { className: "flex items-center justify-between gap-2", children: /* @__PURE__ */ jsxs("div", { className: "min-w-0", children: [
-            /* @__PURE__ */ jsx("h3", { className: "text-sm font-medium", children: "Webhook" }),
-            /* @__PURE__ */ jsx("p", { className: "text-xs text-muted-foreground mt-0.5", children: "Register your public URL with Telegram so it can deliver messages to your bot." }),
-            step2Done && /* @__PURE__ */ jsxs("div", { className: "mt-2 text-xs text-muted-foreground truncate", children: [
-              /* @__PURE__ */ jsx("span", { className: "font-mono", children: status.webhookInfo.url }),
-              status.webhookInfo.pendingUpdates > 0 && /* @__PURE__ */ jsxs("span", { className: "ml-2 text-yellow-500", children: [
-                "(",
-                status.webhookInfo.pendingUpdates,
-                " pending)"
-              ] }),
-              status.webhookInfo.lastErrorMessage && /* @__PURE__ */ jsxs("div", { className: "mt-1 text-destructive", children: [
-                "Last error: ",
-                status.webhookInfo.lastErrorMessage
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-2", children: [
+            /* @__PURE__ */ jsxs("div", { className: "min-w-0", children: [
+              /* @__PURE__ */ jsx("h3", { className: "text-sm font-medium", children: "Webhook" }),
+              /* @__PURE__ */ jsx("p", { className: "text-xs text-muted-foreground mt-0.5", children: "Register a public URL with Telegram so it can deliver messages to your bot." }),
+              step2Done && !webhookEditing && /* @__PURE__ */ jsxs("div", { className: "mt-2 text-xs text-muted-foreground truncate", children: [
+                /* @__PURE__ */ jsx("span", { className: "font-mono", children: status.webhookInfo.url }),
+                status.webhookInfo.pendingUpdates > 0 && /* @__PURE__ */ jsxs("span", { className: "ml-2 text-yellow-500", children: [
+                  "(",
+                  status.webhookInfo.pendingUpdates,
+                  " pending)"
+                ] }),
+                status.webhookInfo.lastErrorMessage && /* @__PURE__ */ jsxs("div", { className: "mt-1 text-destructive", children: [
+                  "Last error: ",
+                  status.webhookInfo.lastErrorMessage
+                ] })
               ] })
-            ] })
-          ] }) }),
-          /* @__PURE__ */ jsxs("div", { className: "mt-3", children: [
-            webhookError && /* @__PURE__ */ jsx("div", { className: "text-xs text-destructive mb-2", children: webhookError }),
-            /* @__PURE__ */ jsx(
+            ] }),
+            step2Done && !webhookEditing && /* @__PURE__ */ jsx(
               "button",
               {
-                onClick: handleRegisterWebhook,
-                disabled: !step1Done || webhookSaving,
-                className: "rounded-md bg-foreground text-background px-2.5 py-1.5 text-xs font-medium hover:bg-foreground/90 disabled:opacity-50 transition-colors",
-                children: webhookSaving ? "Registering..." : step2Done ? "Re-register Webhook" : "Register Webhook"
+                onClick: startWebhookEdit,
+                className: "shrink-0 text-xs text-muted-foreground hover:text-foreground underline transition-colors",
+                children: "Change"
               }
             )
+          ] }),
+          (!step2Done || webhookEditing) && /* @__PURE__ */ jsxs("div", { className: "mt-3 flex flex-col gap-2", children: [
+            /* @__PURE__ */ jsx(
+              "input",
+              {
+                type: "text",
+                value: webhookUrlInput,
+                onChange: (e) => {
+                  if (!webhookEditing) setWebhookEditing(true);
+                  setWebhookUrlInput(e.target.value);
+                },
+                placeholder: "https://example.com/api/telegram/webhook",
+                spellCheck: false,
+                className: "rounded-md border border-border bg-background px-3 py-1.5 text-sm font-mono focus:outline-none focus:ring-1 focus:ring-foreground"
+              }
+            ),
+            webhookError && /* @__PURE__ */ jsx("div", { className: "text-xs text-destructive", children: webhookError }),
+            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
+              /* @__PURE__ */ jsx(
+                "button",
+                {
+                  onClick: handleRegisterWebhook,
+                  disabled: !step1Done || webhookSaving || !webhookUrlInput.trim(),
+                  className: "rounded-md bg-foreground text-background px-2.5 py-1.5 text-xs font-medium hover:bg-foreground/90 disabled:opacity-50 transition-colors",
+                  children: webhookSaving ? "Registering..." : step2Done ? "Re-register Webhook" : "Register Webhook"
+                }
+              ),
+              webhookEditing && step2Done && /* @__PURE__ */ jsx(
+                "button",
+                {
+                  onClick: cancelWebhookEdit,
+                  className: "rounded-md border border-border px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:text-foreground transition-colors",
+                  children: "Cancel"
+                }
+              ),
+              status.defaultWebhookUrl && webhookUrlInput.trim() !== status.defaultWebhookUrl && /* @__PURE__ */ jsx(
+                "button",
+                {
+                  onClick: resetWebhookToDefault,
+                  className: "ml-auto text-xs text-muted-foreground hover:text-foreground underline transition-colors",
+                  children: "Reset to default"
+                }
+              )
+            ] })
           ] })
         ] })
       ] }) })

package/lib/chat/components/settings-secrets-page.jsx

@@ -329,6 +329,8 @@ export function ApiKeysTelegramPage() {
   // Step 2 — webhook
   const [webhookSaving, setWebhookSaving] = useState(false);
   const [webhookError, setWebhookError] = useState(null);
+  const [webhookEditing, setWebhookEditing] = useState(false);
+  const [webhookUrlInput, setWebhookUrlInput] = useState('');
 
   const loadStatus = async () => {
     try {
@@ -343,6 +345,16 @@ export function ApiKeysTelegramPage() {
     loadStatus();
   }, []);
 
+  // Keep the webhook URL input in sync with the saved/effective URL when not
+  // actively editing — covers the "unregistered" case where the field needs
+  // to be prefilled with the default so the user can just hit Register.
+  useEffect(() => {
+    if (!status || webhookEditing) return;
+    setWebhookUrlInput(
+      status.webhookUrlOverride || status.webhookInfo?.url || status.defaultWebhookUrl || ''
+    );
+  }, [status, webhookEditing]);
+
   if (loading) {
     return <div className="h-48 animate-pulse rounded-md bg-border/50" />;
   }
@@ -383,12 +395,37 @@ export function ApiKeysTelegramPage() {
   const handleRegisterWebhook = async () => {
     setWebhookSaving(true);
     setWebhookError(null);
-    const result = await registerTelegramWebhook();
-    if (result?.error) setWebhookError(result.error);
+    const url = webhookEditing ? webhookUrlInput.trim() : undefined;
+    const result = await registerTelegramWebhook(url);
+    if (result?.error) {
+      setWebhookError(result.error);
+      setWebhookSaving(false);
+      return;
+    }
+    setWebhookEditing(false);
+    setWebhookUrlInput('');
     await loadStatus();
     setWebhookSaving(false);
   };
 
+  const startWebhookEdit = () => {
+    setWebhookError(null);
+    setWebhookUrlInput(
+      status.webhookUrlOverride || status.webhookInfo?.url || status.defaultWebhookUrl || ''
+    );
+    setWebhookEditing(true);
+  };
+
+  const cancelWebhookEdit = () => {
+    setWebhookEditing(false);
+    setWebhookUrlInput('');
+    setWebhookError(null);
+  };
+
+  const resetWebhookToDefault = () => {
+    setWebhookUrlInput(status.defaultWebhookUrl || '');
+  };
+
   return (
     <div>
       <div className="mb-4">
@@ -488,9 +525,9 @@ export function ApiKeysTelegramPage() {
                 <div className="min-w-0">
                   <h3 className="text-sm font-medium">Webhook</h3>
                   <p className="text-xs text-muted-foreground mt-0.5">
-                    Register your public URL with Telegram so it can deliver messages to your bot.
+                    Register a public URL with Telegram so it can deliver messages to your bot.
                   </p>
-                  {step2Done && (
+                  {step2Done && !webhookEditing && (
                     <div className="mt-2 text-xs text-muted-foreground truncate">
                       <span className="font-mono">{status.webhookInfo.url}</span>
                       {status.webhookInfo.pendingUpdates > 0 && (
@@ -506,24 +543,62 @@ export function ApiKeysTelegramPage() {
                     </div>
                   )}
                 </div>
-              </div>
-
-              <div className="mt-3">
-                {webhookError && (
-                  <div className="text-xs text-destructive mb-2">{webhookError}</div>
+                {step2Done && !webhookEditing && (
+                  <button
+                    onClick={startWebhookEdit}
+                    className="shrink-0 text-xs text-muted-foreground hover:text-foreground underline transition-colors"
+                  >
+                    Change
+                  </button>
                 )}
-                <button
-                  onClick={handleRegisterWebhook}
-                  disabled={!step1Done || webhookSaving}
-                  className="rounded-md bg-foreground text-background px-2.5 py-1.5 text-xs font-medium hover:bg-foreground/90 disabled:opacity-50 transition-colors"
-                >
-                  {webhookSaving
-                    ? 'Registering...'
-                    : step2Done
-                      ? 'Re-register Webhook'
-                      : 'Register Webhook'}
-                </button>
               </div>
+
+              {(!step2Done || webhookEditing) && (
+                <div className="mt-3 flex flex-col gap-2">
+                  <input
+                    type="text"
+                    value={webhookUrlInput}
+                    onChange={(e) => {
+                      if (!webhookEditing) setWebhookEditing(true);
+                      setWebhookUrlInput(e.target.value);
+                    }}
+                    placeholder="https://example.com/api/telegram/webhook"
+                    spellCheck={false}
+                    className="rounded-md border border-border bg-background px-3 py-1.5 text-sm font-mono focus:outline-none focus:ring-1 focus:ring-foreground"
+                  />
+                  {webhookError && <div className="text-xs text-destructive">{webhookError}</div>}
+                  <div className="flex items-center gap-2">
+                    <button
+                      onClick={handleRegisterWebhook}
+                      disabled={!step1Done || webhookSaving || !webhookUrlInput.trim()}
+                      className="rounded-md bg-foreground text-background px-2.5 py-1.5 text-xs font-medium hover:bg-foreground/90 disabled:opacity-50 transition-colors"
+                    >
+                      {webhookSaving
+                        ? 'Registering...'
+                        : step2Done
+                          ? 'Re-register Webhook'
+                          : 'Register Webhook'}
+                    </button>
+                    {webhookEditing && step2Done && (
+                      <button
+                        onClick={cancelWebhookEdit}
+                        className="rounded-md border border-border px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:text-foreground transition-colors"
+                      >
+                        Cancel
+                      </button>
+                    )}
+                    {status.defaultWebhookUrl &&
+                      webhookUrlInput.trim() !== status.defaultWebhookUrl && (
+                        <button
+                          onClick={resetWebhookToDefault}
+                          className="ml-auto text-xs text-muted-foreground hover:text-foreground underline transition-colors"
+                        >
+                          Reset to default
+                        </button>
+                      )}
+                  </div>
+                </div>
+              )}
             </div>
           </div>
         </div>

package/lib/config.js

@@ -1,6 +1,5 @@
 /**
  * Config resolver. Reads from DB, falls back to defaults.
- * In-memory cache, invalidated on config writes.
  *
  * Usage:
  *   import { getConfig } from '../config.js';
@@ -63,6 +62,7 @@ const CONFIG_KEYS = new Set([
   'CODE_MODE_GIT_ACTION',
   'AGENT_MODE_AUTO_RUN',
   'CODE_MODE_AUTO_RUN',
+  'TELEGRAM_WEBHOOK_URL',
 ]);
 
 // Default values

package/package.json

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