@brianli/kimaki 0.4.73-brianli.1 → 0.4.73-brianli.3

package/dist/cli.js

@@ -43,6 +43,8 @@ const KIMAKI_GATEWAY_PROXY_URL = process.env.KIMAKI_GATEWAY_PROXY_URL ||
 const KIMAKI_GATEWAY_PROXY_REST_BASE_URL = getGatewayProxyRestBaseUrl({
     gatewayUrl: KIMAKI_GATEWAY_PROXY_URL,
 });
+const KIMAKI_CLIENT_ID = process.env.KIMAKI_CLIENT_ID?.trim() || undefined;
+const KIMAKI_CLIENT_SECRET = process.env.KIMAKI_CLIENT_SECRET?.trim() || undefined;
 // Strip bracketed paste escape sequences from terminal input.
 // iTerm2 and other terminals wrap pasted content with \x1b[200~ and \x1b[201~
 // which can cause validation to fail on macOS. See: https://github.com/remorses/kimaki/issues/18
@@ -903,70 +905,82 @@ async function run({ restartOnboarding, addChannels, useWorktrees, enableVoiceCh
                 cliLogger.error('Gateway mode is not available yet. KIMAKI_SHARED_APP_ID is not configured.');
                 process.exit(EXIT_NO_RESTART);
             }
-            // Generate client credentials
-            const clientId = crypto.randomUUID();
-            const clientSecret = crypto.randomBytes(32).toString('hex');
-            const statePayload = JSON.stringify({ clientId, clientSecret });
-            const oauthUrl = generateBotInstallUrl({
-                clientId: KIMAKI_SHARED_APP_ID,
-                state: statePayload,
-                redirectUri: `${KIMAKI_WEBSITE_URL}/api/auth/callback/discord`,
-                responseType: 'code',
-            });
-            note(`Open this URL to install the Kimaki bot in your Discord server:\n\n${oauthUrl}\n\nDo not share this URL with anyone — it contains your credentials.\n\nIf you don't have a server, create one first (+ button in the Discord sidebar).`, 'Install Bot');
-            // Open URL in default browser
-            const { exec } = await import('node:child_process');
-            const openCmd = process.platform === 'darwin'
-                ? 'open'
-                : process.platform === 'win32'
-                    ? 'start'
-                    : 'xdg-open';
-            exec(`${openCmd} "${oauthUrl}"`);
-            // Poll until the user installs the bot in a Discord server.
-            // 600 attempts x 2s = 20 minutes timeout.
-            const s = spinner();
-            s.start('Waiting for a Discord server with the bot installed...');
-            const pollUrl = new URL('/api/onboarding/status', KIMAKI_WEBSITE_URL);
-            pollUrl.searchParams.set('client_id', clientId);
-            pollUrl.searchParams.set('secret', clientSecret);
-            let guildId;
-            for (let attempt = 0; attempt < 600; attempt++) {
-                await new Promise((resolve) => {
-                    setTimeout(resolve, 2000);
+            const hasGatewayClientId = Boolean(KIMAKI_CLIENT_ID);
+            const hasGatewayClientSecret = Boolean(KIMAKI_CLIENT_SECRET);
+            if (hasGatewayClientId !== hasGatewayClientSecret) {
+                cliLogger.error('Gateway credential env vars must be set together: KIMAKI_CLIENT_ID and KIMAKI_CLIENT_SECRET.');
+                process.exit(EXIT_NO_RESTART);
+            }
+            const clientId = KIMAKI_CLIENT_ID || crypto.randomUUID();
+            const clientSecret = KIMAKI_CLIENT_SECRET
+                || crypto.randomBytes(32).toString('hex');
+            const hasGatewayEnvCredentials = hasGatewayClientId && hasGatewayClientSecret;
+            if (hasGatewayEnvCredentials) {
+                cliLogger.log('Using KIMAKI_CLIENT_ID and KIMAKI_CLIENT_SECRET from environment for gateway mode. Skipping OAuth onboarding.');
+            }
+            if (!hasGatewayEnvCredentials) {
+                const statePayload = JSON.stringify({ clientId, clientSecret });
+                const oauthUrl = generateBotInstallUrl({
+                    clientId: KIMAKI_SHARED_APP_ID,
+                    state: statePayload,
+                    redirectUri: `${KIMAKI_WEBSITE_URL}/api/auth/callback/discord`,
+                    responseType: 'code',
                 });
-                // Progressive hints for users who may be stuck
-                if (attempt === 15) {
-                    // ~30s
-                    s.message('Still waiting... Select a server in the Discord authorization page and click "Authorize"');
-                }
-                else if (attempt === 45) {
-                    // ~90s
-                    s.message(`Still waiting... If you don't see any servers, create one first (+ button in Discord sidebar), then reopen the URL above`);
-                }
-                else if (attempt === 150) {
-                    // ~5min
-                    s.message(`Still waiting... Reopen the install URL if you closed it:\n${oauthUrl}`);
-                }
-                try {
-                    const resp = await fetch(pollUrl.toString());
-                    if (resp.ok) {
-                        const data = (await resp.json());
-                        if (data.guild_id) {
-                            guildId = data.guild_id;
-                            break;
+                note(`Open this URL to install the Kimaki bot in your Discord server:\n\n${oauthUrl}\n\nDo not share this URL with anyone — it contains your credentials.\n\nIf you don't have a server, create one first (+ button in the Discord sidebar).`, 'Install Bot');
+                // Open URL in default browser
+                const { exec } = await import('node:child_process');
+                const openCmd = process.platform === 'darwin'
+                    ? 'open'
+                    : process.platform === 'win32'
+                        ? 'start'
+                        : 'xdg-open';
+                exec(`${openCmd} "${oauthUrl}"`);
+                // Poll until the user installs the bot in a Discord server.
+                // 600 attempts x 2s = 20 minutes timeout.
+                const s = spinner();
+                s.start('Waiting for a Discord server with the bot installed...');
+                const pollUrl = new URL('/api/onboarding/status', KIMAKI_WEBSITE_URL);
+                pollUrl.searchParams.set('client_id', clientId);
+                pollUrl.searchParams.set('secret', clientSecret);
+                let guildId;
+                for (let attempt = 0; attempt < 600; attempt++) {
+                    await new Promise((resolve) => {
+                        setTimeout(resolve, 2000);
+                    });
+                    // Progressive hints for users who may be stuck
+                    if (attempt === 15) {
+                        // ~30s
+                        s.message('Still waiting... Select a server in the Discord authorization page and click "Authorize"');
+                    }
+                    else if (attempt === 45) {
+                        // ~90s
+                        s.message(`Still waiting... If you don't see any servers, create one first (+ button in Discord sidebar), then reopen the URL above`);
+                    }
+                    else if (attempt === 150) {
+                        // ~5min
+                        s.message(`Still waiting... Reopen the install URL if you closed it:\n${oauthUrl}`);
+                    }
+                    try {
+                        const resp = await fetch(pollUrl.toString());
+                        if (resp.ok) {
+                            const data = (await resp.json());
+                            if (data.guild_id) {
+                                guildId = data.guild_id;
+                                break;
+                            }
                         }
                     }
+                    catch {
+                        // Network error, retry
+                    }
                 }
-                catch {
-                    // Network error, retry
+                if (!guildId) {
+                    s.stop('Authorization timed out');
+                    cliLogger.error('Bot authorization timed out after 20 minutes. Please try again.');
+                    process.exit(EXIT_NO_RESTART);
                 }
+                s.stop('Bot authorized successfully!');
             }
-            if (!guildId) {
-                s.stop('Authorization timed out');
-                cliLogger.error('Bot authorization timed out after 20 minutes. Please try again.');
-                process.exit(EXIT_NO_RESTART);
-            }
-            s.stop('Bot authorized successfully!');
             await setBotMode({
                 appId: KIMAKI_SHARED_APP_ID,
                 mode: 'gateway',
@@ -1056,6 +1070,11 @@ async function run({ restartOnboarding, addChannels, useWorktrees, enableVoiceCh
     // ensures they always get the bot that's actually running.
     await touchBotTokenTimestamp(appId);
     const shouldAddChannels = !isQuickStart || forceRestartOnboarding || Boolean(addChannels);
+    store.setState({
+        discordBaseUrl: isGatewayMode
+            ? KIMAKI_GATEWAY_PROXY_REST_BASE_URL
+            : 'https://discord.com',
+    });
     // Start OpenCode server EARLY - let it initialize in parallel with Discord login.
     // This is the biggest startup bottleneck (can take 1-30 seconds to spawn and wait for ready)
     const currentDir = process.cwd();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@brianli/kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.73-brianli.1",
+  "version": "0.4.73-brianli.3",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -22,8 +22,8 @@
     "prisma": "7.3.0",
     "tsx": "^4.20.5",
     "discord-digital-twin": "^0.0.1",
-    "db": "^0.0.0",
     "opencode-cached-provider": "^0.0.1",
+    "db": "^0.0.0",
     "opencode-deterministic-provider": "^0.0.1"
   },
   "dependencies": {
@@ -57,8 +57,8 @@
     "xdg-basedir": "^5.1.0",
     "zod": "^4.3.6",
     "zustand": "^5.0.11",
-    "errore": "^0.14.0",
-    "traforo": "^0.0.9"
+    "traforo": "^0.0.9",
+    "errore": "^0.14.0"
   },
   "optionalDependencies": {
     "@discordjs/opus": "^0.10.0",

package/src/cli.ts

@@ -133,6 +133,8 @@ const KIMAKI_GATEWAY_PROXY_URL =
 const KIMAKI_GATEWAY_PROXY_REST_BASE_URL = getGatewayProxyRestBaseUrl({
   gatewayUrl: KIMAKI_GATEWAY_PROXY_URL,
 })
+const KIMAKI_CLIENT_ID = process.env.KIMAKI_CLIENT_ID?.trim() || undefined
+const KIMAKI_CLIENT_SECRET = process.env.KIMAKI_CLIENT_SECRET?.trim() || undefined
 
 // Strip bracketed paste escape sequences from terminal input.
 // iTerm2 and other terminals wrap pasted content with \x1b[200~ and \x1b[201~
@@ -1303,89 +1305,105 @@ async function run({
         process.exit(EXIT_NO_RESTART)
       }
 
-      // Generate client credentials
-      const clientId = crypto.randomUUID()
-      const clientSecret = crypto.randomBytes(32).toString('hex')
+      const hasGatewayClientId = Boolean(KIMAKI_CLIENT_ID)
+      const hasGatewayClientSecret = Boolean(KIMAKI_CLIENT_SECRET)
+      if (hasGatewayClientId !== hasGatewayClientSecret) {
+        cliLogger.error(
+          'Gateway credential env vars must be set together: KIMAKI_CLIENT_ID and KIMAKI_CLIENT_SECRET.',
+        )
+        process.exit(EXIT_NO_RESTART)
+      }
+      const clientId = KIMAKI_CLIENT_ID || crypto.randomUUID()
+      const clientSecret = KIMAKI_CLIENT_SECRET
+        || crypto.randomBytes(32).toString('hex')
+      const hasGatewayEnvCredentials = hasGatewayClientId && hasGatewayClientSecret
+      if (hasGatewayEnvCredentials) {
+        cliLogger.log(
+          'Using KIMAKI_CLIENT_ID and KIMAKI_CLIENT_SECRET from environment for gateway mode. Skipping OAuth onboarding.',
+        )
+      }
 
-      const statePayload = JSON.stringify({ clientId, clientSecret } satisfies GatewayOAuthState)
-      const oauthUrl = generateBotInstallUrl({
-        clientId: KIMAKI_SHARED_APP_ID,
-        state: statePayload,
-        redirectUri: `${KIMAKI_WEBSITE_URL}/api/auth/callback/discord`,
-        responseType: 'code',
-      })
+      if (!hasGatewayEnvCredentials) {
+        const statePayload = JSON.stringify({ clientId, clientSecret } satisfies GatewayOAuthState)
+        const oauthUrl = generateBotInstallUrl({
+          clientId: KIMAKI_SHARED_APP_ID,
+          state: statePayload,
+          redirectUri: `${KIMAKI_WEBSITE_URL}/api/auth/callback/discord`,
+          responseType: 'code',
+        })
 
-      note(
-        `Open this URL to install the Kimaki bot in your Discord server:\n\n${oauthUrl}\n\nDo not share this URL with anyone — it contains your credentials.\n\nIf you don't have a server, create one first (+ button in the Discord sidebar).`,
-        'Install Bot',
-      )
+        note(
+          `Open this URL to install the Kimaki bot in your Discord server:\n\n${oauthUrl}\n\nDo not share this URL with anyone — it contains your credentials.\n\nIf you don't have a server, create one first (+ button in the Discord sidebar).`,
+          'Install Bot',
+        )
 
-      // Open URL in default browser
-      const { exec } = await import('node:child_process')
-      const openCmd =
-        process.platform === 'darwin'
-          ? 'open'
-          : process.platform === 'win32'
-            ? 'start'
-            : 'xdg-open'
-      exec(`${openCmd} "${oauthUrl}"`)
-
-      // Poll until the user installs the bot in a Discord server.
-      // 600 attempts x 2s = 20 minutes timeout.
-      const s = spinner()
-      s.start('Waiting for a Discord server with the bot installed...')
-
-      const pollUrl = new URL('/api/onboarding/status', KIMAKI_WEBSITE_URL)
-      pollUrl.searchParams.set('client_id', clientId)
-      pollUrl.searchParams.set('secret', clientSecret)
-
-      let guildId: string | undefined
-      for (let attempt = 0; attempt < 600; attempt++) {
-        await new Promise((resolve) => {
-          setTimeout(resolve, 2000)
-        })
+        // Open URL in default browser
+        const { exec } = await import('node:child_process')
+        const openCmd =
+          process.platform === 'darwin'
+            ? 'open'
+            : process.platform === 'win32'
+              ? 'start'
+              : 'xdg-open'
+        exec(`${openCmd} "${oauthUrl}"`)
+
+        // Poll until the user installs the bot in a Discord server.
+        // 600 attempts x 2s = 20 minutes timeout.
+        const s = spinner()
+        s.start('Waiting for a Discord server with the bot installed...')
+
+        const pollUrl = new URL('/api/onboarding/status', KIMAKI_WEBSITE_URL)
+        pollUrl.searchParams.set('client_id', clientId)
+        pollUrl.searchParams.set('secret', clientSecret)
+
+        let guildId: string | undefined
+        for (let attempt = 0; attempt < 600; attempt++) {
+          await new Promise((resolve) => {
+            setTimeout(resolve, 2000)
+          })
 
-        // Progressive hints for users who may be stuck
-        if (attempt === 15) {
-          // ~30s
-          s.message(
-            'Still waiting... Select a server in the Discord authorization page and click "Authorize"',
-          )
-        } else if (attempt === 45) {
-          // ~90s
-          s.message(
-            `Still waiting... If you don't see any servers, create one first (+ button in Discord sidebar), then reopen the URL above`,
-          )
-        } else if (attempt === 150) {
-          // ~5min
-          s.message(
-            `Still waiting... Reopen the install URL if you closed it:\n${oauthUrl}`,
-          )
-        }
+          // Progressive hints for users who may be stuck
+          if (attempt === 15) {
+            // ~30s
+            s.message(
+              'Still waiting... Select a server in the Discord authorization page and click "Authorize"',
+            )
+          } else if (attempt === 45) {
+            // ~90s
+            s.message(
+              `Still waiting... If you don't see any servers, create one first (+ button in Discord sidebar), then reopen the URL above`,
+            )
+          } else if (attempt === 150) {
+            // ~5min
+            s.message(
+              `Still waiting... Reopen the install URL if you closed it:\n${oauthUrl}`,
+            )
+          }
 
-        try {
-          const resp = await fetch(pollUrl.toString())
-          if (resp.ok) {
-            const data = (await resp.json()) as { guild_id?: string }
-            if (data.guild_id) {
-              guildId = data.guild_id
-              break
+          try {
+            const resp = await fetch(pollUrl.toString())
+            if (resp.ok) {
+              const data = (await resp.json()) as { guild_id?: string }
+              if (data.guild_id) {
+                guildId = data.guild_id
+                break
+              }
             }
+          } catch {
+            // Network error, retry
           }
-        } catch {
-          // Network error, retry
         }
-      }
 
-      if (!guildId) {
-        s.stop('Authorization timed out')
-        cliLogger.error(
-          'Bot authorization timed out after 20 minutes. Please try again.',
-        )
-        process.exit(EXIT_NO_RESTART)
-      }
+        if (!guildId) {
+          s.stop('Authorization timed out')
+          cliLogger.error(
+            'Bot authorization timed out after 20 minutes. Please try again.',
+          )
+          process.exit(EXIT_NO_RESTART)
+        }
 
-      s.stop('Bot authorized successfully!')
+        s.stop('Bot authorized successfully!')
+      }
 
       await setBotMode({
         appId: KIMAKI_SHARED_APP_ID,
@@ -1505,6 +1523,12 @@ async function run({
   const shouldAddChannels =
     !isQuickStart || forceRestartOnboarding || Boolean(addChannels)
 
+  store.setState({
+    discordBaseUrl: isGatewayMode
+      ? KIMAKI_GATEWAY_PROXY_REST_BASE_URL
+      : 'https://discord.com',
+  })
+
   // Start OpenCode server EARLY - let it initialize in parallel with Discord login.
   // This is the biggest startup bottleneck (can take 1-30 seconds to spawn and wait for ready)
   const currentDir = process.cwd()