@brianli/kimaki 0.4.73-brianli.2 → 0.4.73-brianli.5

package/dist/cli.js

@@ -874,6 +874,28 @@ async function run({ restartOnboarding, addChannels, useWorktrees, enableVoiceCh
         else if (forceRestartOnboarding && existingBot) {
             note('Ignoring saved credentials due to --restart-onboarding flag', 'Restart Onboarding');
         }
+        // 3b. Gateway env vars present — skip all interactive prompts entirely.
+        if (KIMAKI_CLIENT_ID && KIMAKI_CLIENT_SECRET && !forceRestartOnboarding) {
+            if (!KIMAKI_SHARED_APP_ID) {
+                cliLogger.error('Gateway mode is not available yet. KIMAKI_SHARED_APP_ID is not configured.');
+                process.exit(EXIT_NO_RESTART);
+            }
+            cliLogger.log('Using KIMAKI_CLIENT_ID and KIMAKI_CLIENT_SECRET from environment. Skipping onboarding.');
+            await setBotMode({
+                appId: KIMAKI_SHARED_APP_ID,
+                mode: 'gateway',
+                clientId: KIMAKI_CLIENT_ID,
+                clientSecret: KIMAKI_CLIENT_SECRET,
+                proxyUrl: KIMAKI_GATEWAY_PROXY_REST_BASE_URL,
+            });
+            return {
+                appId: KIMAKI_SHARED_APP_ID,
+                token: `${KIMAKI_CLIENT_ID}:${KIMAKI_CLIENT_SECRET}`,
+                isQuickStart: false,
+                isGatewayMode: true,
+                previousAppId: existingBot?.appId,
+            };
+        }
         // When --gateway is passed, skip the mode selector and go straight to gateway mode.
         const modeChoice = forceGateway
             ? 'gateway'
@@ -914,70 +936,73 @@ async function run({ restartOnboarding, addChannels, useWorktrees, enableVoiceCh
             const clientId = KIMAKI_CLIENT_ID || crypto.randomUUID();
             const clientSecret = KIMAKI_CLIENT_SECRET
                 || crypto.randomBytes(32).toString('hex');
-            if (KIMAKI_CLIENT_ID && KIMAKI_CLIENT_SECRET) {
-                cliLogger.log('Using KIMAKI_CLIENT_ID and KIMAKI_CLIENT_SECRET from environment for gateway mode.');
-            }
-            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 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',
@@ -1067,6 +1092,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/dist/debounced-process-flush.js

@@ -0,0 +1,77 @@
+// Debounced async callback with centralized shutdown flushing.
+// Used for persistence paths that should batch writes during runtime
+// while allowing the bot's single SIGTERM/SIGINT handler to flush all callbacks.
+const processFlushCallbacks = new Set();
+export async function flushDebouncedProcessCallbacks() {
+    const callbacks = [...processFlushCallbacks];
+    await Promise.allSettled(callbacks.map((callback) => {
+        return callback();
+    }));
+}
+export function createDebouncedProcessFlush({ waitMs, callback, onError, }) {
+    let timeout;
+    let inFlight;
+    let dirty = false;
+    async function run() {
+        if (!dirty) {
+            return;
+        }
+        if (inFlight) {
+            await inFlight;
+            if (!dirty) {
+                return;
+            }
+        }
+        dirty = false;
+        const current = Promise.resolve()
+            .then(() => {
+            return callback();
+        })
+            .catch((error) => {
+            if (onError) {
+                const wrappedError = error instanceof Error
+                    ? error
+                    : new Error('Debounced process flush failed', { cause: error });
+                onError(wrappedError);
+            }
+        });
+        inFlight = current;
+        await current;
+        if (inFlight === current) {
+            inFlight = undefined;
+        }
+        if (dirty) {
+            await run();
+        }
+    }
+    function trigger() {
+        dirty = true;
+        if (timeout) {
+            return;
+        }
+        timeout = setTimeout(() => {
+            timeout = undefined;
+            void run();
+        }, waitMs);
+    }
+    async function flush() {
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = undefined;
+        }
+        await run();
+    }
+    const processFlushCallback = async () => {
+        await flush();
+    };
+    processFlushCallbacks.add(processFlushCallback);
+    async function dispose() {
+        processFlushCallbacks.delete(processFlushCallback);
+        await flush();
+    }
+    return {
+        trigger,
+        flush,
+        dispose,
+    };
+}