npm - zubo - Versions diffs - 0.1.11 → 0.1.14 - Mend

zubo 0.1.11 → 0.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zubo",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "description": "Your AI agent that never forgets. Persistent memory, 25+ tools, 7 channels, 11+ LLM providers — runs entirely on your machine.",
   "license": "MIT",
   "author": "thomaskanze",

package/src/channels/webchat.ts CHANGED Viewed

@@ -1978,6 +1978,7 @@ export function createWebChatAdapter(
       server = Bun.serve({
         port,
         hostname: "127.0.0.1", // Bind to localhost only — prevents network exposure
+        idleTimeout: 120,
         async fetch(req) {
           const response = await handleRequest(req, router, sessionKey, chatLimiter, uploadLimiter, server, port);
           return addSecurityHeaders(response);

package/src/tools/builtin/google-oauth.ts CHANGED Viewed

@@ -16,9 +16,9 @@ export function registerGoogleOAuthTool(): void {
       name: "google_oauth",
       description:
         "Manage the Google OAuth 2.0 connection used by Gmail, Calendar, Sheets, Docs, and Drive. " +
-        "IMPORTANT: You need TWO credentials from the user: client_id (looks like 123456-abc.apps.googleusercontent.com) " +
-        "and client_secret (starts with GOCSPX-). Ask for BOTH before calling this tool. " +
-        "Use action 'start' to begin the OAuth flow. " +
+        "Use action 'start' to begin or re-start the OAuth flow. If credentials are already stored in secrets, " +
+        "you can call 'start' with NO parameters — it will automatically use the saved google_client_id and google_client_secret. " +
+        "Only ask the user for client_id and client_secret if this tool returns an error saying they are missing. " +
         "Use 'complete' to finish the flow by providing the authorization code the user copied from the browser. " +
         "Use 'status' to check connection state. Use 'disconnect' to remove all stored Google credentials.",
       input_schema: {
@@ -32,12 +32,12 @@ export function registerGoogleOAuthTool(): void {
           client_id: {
             type: "string",
             description:
-              "Google OAuth client ID (looks like 123456789-xxxx.apps.googleusercontent.com). Required for 'start'.",
+              "Google OAuth client ID. Optional — if omitted, uses the value already saved in secrets.",
           },
           client_secret: {
             type: "string",
             description:
-              "Google OAuth client secret (starts with GOCSPX-). Required for 'start'.",
+              "Google OAuth client secret. Optional — if omitted, uses the value already saved in secrets.",
           },
           code: {
             type: "string",
@@ -124,19 +124,11 @@ async function handleStart(
   setSecret("google_client_secret", clientSecret, "google");
   // Start a temporary local HTTP server to receive the OAuth callback
-  let resolveCallback: (code: string) => void;
-  let rejectCallback: (reason: Error) => void;
-  const codePromise = new Promise<string>((resolve, reject) => {
-    resolveCallback = resolve;
-    rejectCallback = reject;
-  });
   let server: ReturnType<typeof Bun.serve>;
   try {
     server = Bun.serve({
       port: 0,
-      idleTimeout: 120, // OAuth flow can take a while
+      idleTimeout: 120,
       fetch(req) {
         const url = new URL(req.url);
         if (url.pathname === "/oauth/callback") {
@@ -144,7 +136,7 @@ async function handleStart(
           const error = url.searchParams.get("error");
           if (error) {
-            rejectCallback(new Error(`Google OAuth error: ${error}`));
+            logger.error(`Google OAuth error: ${error}`);
             return new Response(
               "<html><body><h2>Authorization failed</h2><p>You can close this window.</p></body></html>",
               { headers: { "Content-Type": "text/html" } }
@@ -152,7 +144,19 @@ async function handleStart(
           }
           if (code) {
-            resolveCallback(code);
+            // Exchange code in the background — don't block the callback response
+            const storedRedirectUri = getSecret("google_redirect_uri") || `http://localhost:${server.port}/oauth/callback`;
+            exchangeGoogleCode(code, storedRedirectUri)
+              .then(() => {
+                logger.info("[OAuth] Google connected successfully via auto-callback");
+                // Auto-shutdown the callback server after success
+                setTimeout(() => server.stop(), 1000);
+              })
+              .catch((err) => {
+                logger.error("[OAuth] Auto-callback code exchange failed", { error: err.message });
+                setTimeout(() => server.stop(), 1000);
+              });
             return new Response(
               "<html><body><h2>Google connected successfully!</h2><p>You can close this window and return to Zubo.</p></body></html>",
               { headers: { "Content-Type": "text/html" } }
@@ -166,14 +170,12 @@ async function handleStart(
       },
     });
   } catch (err: any) {
-    // If local server fails (e.g. running in a container), fall back to manual flow
     logger.warn("Could not start local OAuth callback server", { error: err.message });
     return handleStartManual();
   }
   const port = server.port;
   const redirectUri = `http://localhost:${port}/oauth/callback`;
-  // Store redirect URI so 'complete' action can use it if auto-callback fails
   setSecret("google_redirect_uri", redirectUri, "google");
   let authUrl: string;
@@ -185,7 +187,6 @@ async function handleStart(
   }
   // Try to open the authorization URL in the user's default browser
-  let browserOpened = false;
   try {
     const cmd =
       process.platform === "darwin"
@@ -194,66 +195,29 @@ async function handleStart(
           ? ["cmd", "/c", "start", authUrl]
           : ["xdg-open", authUrl];
     Bun.spawn(cmd, { stdio: ["ignore", "ignore", "ignore"] });
-    browserOpened = true;
   } catch (err: any) {
-    logger.warn("Failed to open browser for Google OAuth", {
-      error: err.message,
-    });
+    logger.warn("Failed to open browser for Google OAuth", { error: err.message });
   }
-  // Wait for the callback with a 120-second timeout
-  const TIMEOUT_MS = 120_000;
-  let timeoutId: ReturnType<typeof setTimeout>;
-  const timeoutPromise = new Promise<never>((_resolve, reject) => {
-    timeoutId = setTimeout(() => {
-      reject(
-        new Error("TIMEOUT")
-      );
-    }, TIMEOUT_MS);
-  });
-  try {
-    const code = await Promise.race([codePromise, timeoutPromise]);
-    clearTimeout(timeoutId!);
-    await exchangeGoogleCode(code, redirectUri);
-    server.stop();
-    return JSON.stringify({
-      success: true,
-      message:
-        "Google connected successfully! The following services are now available: Gmail, Google Calendar, Google Sheets, Google Docs, Google Drive.",
-      services: [
-        "gmail",
-        "google_calendar",
-        "google_sheets",
-        "google_docs",
-        "google_drive",
-      ],
-    });
-  } catch (err: any) {
-    clearTimeout(timeoutId!);
-    server.stop();
+  // Auto-shutdown the callback server after 3 minutes if no callback received
+  setTimeout(() => {
+    try { server.stop(); } catch {}
+  }, 180_000);
-    // If timed out, it likely means the user is remote (Telegram) and can't use localhost callback.
-    // Return the auth URL so they can open it manually and paste back the code.
-    if (err.message === "TIMEOUT") {
-      logger.info("OAuth auto-callback timed out, providing manual flow URL");
-      return JSON.stringify({
-        error: "The automatic OAuth callback did not complete in time.",
-        manual_flow: true,
-        auth_url: authUrl,
-        instructions:
-          "Send the user this link to open in their browser. After they authorize, " +
-          "the browser will redirect to a localhost URL. The URL will contain a 'code' parameter. " +
-          "Ask the user to copy the FULL URL from their browser address bar after authorizing, " +
-          "then use google_oauth with action 'complete' and pass the code parameter value.",
-      });
-    }
-    logger.error("Google OAuth flow failed", { error: err.message });
-    return JSON.stringify({ error: err.message });
-  }
+  // Return immediately — don't block waiting for the callback.
+  // If the user is local, the browser will handle it automatically in the background.
+  // If the user is remote (Telegram, Discord), they can open the link manually.
+  return JSON.stringify({
+    auth_url: authUrl,
+    instructions:
+      "Send this authorization link to the user. Tell them to open it in their browser and authorize Google. " +
+      "If they are on this machine, a browser window should have opened automatically. " +
+      "After authorizing, the connection will be set up automatically. " +
+      "If the automatic callback fails (e.g. remote user), ask the user to copy the URL from their browser " +
+      "after authorizing (it will show a localhost URL), extract the 'code' parameter, and call google_oauth " +
+      "with action 'complete' and that code.",
+    message: "A browser window should open shortly. If not, use the link above to authorize Google.",
+  });
 }
 /**

package/src/tools/builtin/secrets.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { registerTool } from "../registry";
-import { setSecret, listSecrets, deleteSecret } from "../../secrets/store";
+import { setSecret, getSecret, listSecrets, deleteSecret } from "../../secrets/store";
 export function registerSecretTools() {
   registerTool({
@@ -52,6 +52,37 @@ export function registerSecretTools() {
     },
   });
+  registerTool({
+    definition: {
+      name: "secret_get",
+      description:
+        "Retrieve the value of a stored secret. Use this to access API keys, tokens, and credentials needed for tool calls and integrations.",
+      input_schema: {
+        type: "object",
+        properties: {
+          name: {
+            type: "string",
+            description: "The name of the secret to retrieve (e.g., 'github_token', 'google_client_id')",
+          },
+        },
+        required: ["name"],
+      },
+    },
+    execute: async (input) => {
+      const { name } = input as { name: string };
+      if (!name) {
+        return JSON.stringify({ error: "Secret name is required." });
+      }
+      const value = getSecret(name);
+      if (value === null) {
+        return JSON.stringify({ error: `No secret found with name "${name}".` });
+      }
+      return JSON.stringify({ name, value });
+    },
+  });
   registerTool({
     definition: {
       name: "secret_list",

package/src/tools/builtin-integrations/google/gmail/handler.ts CHANGED Viewed

@@ -41,9 +41,7 @@ export default async function (input: Record<string, unknown>): Promise<string>
   } catch (err: any) {
     return JSON.stringify({
       error: err.message,
-      action_required: "Google is not connected. The user needs to set up Google OAuth. " +
-        "Ask them for their Google OAuth client_id (ends with .apps.googleusercontent.com) " +
-        "and client_secret (starts with GOCSPX-), then use google_oauth tool with action 'start'.",
+      action_required: "Google is not connected. Call google_oauth with action 'start' (no other parameters needed — it will use stored credentials automatically). Only ask the user for credentials if google_oauth returns an error saying they are missing.",
     });
   }

package/src/tools/builtin-integrations/google/google_calendar/handler.ts CHANGED Viewed

@@ -24,9 +24,7 @@ export default async function (input: Record<string, unknown>): Promise<string>
   } catch (err: any) {
     return JSON.stringify({
       error: err.message,
-      action_required: "Google is not connected. The user needs to set up Google OAuth. " +
-        "Ask them for their Google OAuth client_id (ends with .apps.googleusercontent.com) " +
-        "and client_secret (starts with GOCSPX-), then use google_oauth tool with action 'start'.",
+      action_required: "Google is not connected. Call google_oauth with action 'start' (no other parameters needed — it will use stored credentials automatically). Only ask the user for credentials if google_oauth returns an error saying they are missing.",
     });
   }

package/src/tools/builtin-integrations/google/google_docs/handler.ts CHANGED Viewed

@@ -24,9 +24,7 @@ export default async function (input: Record<string, unknown>): Promise<string>
   } catch (err: any) {
     return JSON.stringify({
       error: err.message,
-      action_required: "Google is not connected. The user needs to set up Google OAuth. " +
-        "Ask them for their Google OAuth client_id (ends with .apps.googleusercontent.com) " +
-        "and client_secret (starts with GOCSPX-), then use google_oauth tool with action 'start'.",
+      action_required: "Google is not connected. Call google_oauth with action 'start' (no other parameters needed — it will use stored credentials automatically). Only ask the user for credentials if google_oauth returns an error saying they are missing.",
     });
   }

package/src/tools/builtin-integrations/google/google_drive/handler.ts CHANGED Viewed

@@ -24,9 +24,7 @@ export default async function (input: Record<string, unknown>): Promise<string>
   } catch (err: any) {
     return JSON.stringify({
       error: err.message,
-      action_required: "Google is not connected. The user needs to set up Google OAuth. " +
-        "Ask them for their Google OAuth client_id (ends with .apps.googleusercontent.com) " +
-        "and client_secret (starts with GOCSPX-), then use google_oauth tool with action 'start'.",
+      action_required: "Google is not connected. Call google_oauth with action 'start' (no other parameters needed — it will use stored credentials automatically). Only ask the user for credentials if google_oauth returns an error saying they are missing.",
     });
   }

package/src/tools/builtin-integrations/google/google_sheets/handler.ts CHANGED Viewed

@@ -24,9 +24,7 @@ export default async function (input: Record<string, unknown>): Promise<string>
   } catch (err: any) {
     return JSON.stringify({
       error: err.message,
-      action_required: "Google is not connected. The user needs to set up Google OAuth. " +
-        "Ask them for their Google OAuth client_id (ends with .apps.googleusercontent.com) " +
-        "and client_secret (starts with GOCSPX-), then use google_oauth tool with action 'start'.",
+      action_required: "Google is not connected. Call google_oauth with action 'start' (no other parameters needed — it will use stored credentials automatically). Only ask the user for credentials if google_oauth returns an error saying they are missing.",
     });
   }

package/src/tools/permissions.ts CHANGED Viewed

@@ -9,8 +9,9 @@ const DEFAULT_PERMISSIONS: Record<string, ToolPermission> = {
   reminder_set: "auto",
   diagnose: "auto",
-  // Secrets — set/list are safe, delete requires confirmation
+  // Secrets — set/list/get are safe, delete requires confirmation
   secret_set: "auto",
+  secret_get: "auto",
   secret_list: "auto",
   secret_delete: "confirm",