@brianli/kimaki 0.4.72-brianli.2 → 0.4.72-brianli.4

package/dist/cli.js

@@ -761,20 +761,34 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels, })
     // 1. KIMAKI_BOT_TOKEN env var (headless/CI deployments)
     // 2. Saved credentials in the database
     // 3. Interactive setup wizard (first-time users)
-    // App ID is always derived from the token (base64 first segment).
+    // App ID comes from auth mode env or is derived from token (base64 first segment).
     const { appId, token, isQuickStart } = await (async () => {
         const envBot = getBotToken({ allowDatabase: false });
         const existingBot = getBotToken({ preferEnv: false });
-        // 1. Env var takes precedence (headless deployments)
-        if (envBot && !forceSetup) {
-            const derivedAppId = appIdFromToken(envBot.token);
-            if (!derivedAppId) {
-                cliLogger.error('Could not derive Application ID from KIMAKI_BOT_TOKEN. The token appears malformed.');
+        // 1. Env var/auth mode takes precedence (headless deployments)
+        if (envBot && (!forceSetup || envBot.source === 'auth')) {
+            if (forceSetup && envBot.source === 'auth') {
+                cliLogger.log('Auth mode enabled; skipping interactive setup (--restart ignored)');
+            }
+            const resolvedAppId = envBot.appId || appIdFromToken(envBot.token);
+            if (!resolvedAppId) {
+                cliLogger.error(envBot.source === 'auth'
+                    ? 'Auth mode requires KIMAKI_APP_ID when using KIMAKI_GUILD_ID/KIMAKI_PRIVATE_KEY.'
+                    : 'Could not derive Application ID from KIMAKI_BOT_TOKEN. The token appears malformed.');
                 process.exit(EXIT_NO_RESTART);
             }
-            await setBotToken(derivedAppId, envBot.token);
-            cliLogger.log(`Using KIMAKI_BOT_TOKEN env var (App ID: ${derivedAppId})`);
-            return { appId: derivedAppId, token: envBot.token, isQuickStart: !addChannels };
+            await setBotToken(resolvedAppId, envBot.token);
+            if (envBot.source === 'auth') {
+                cliLogger.log(`Using auth mode credentials (App ID: ${resolvedAppId})`);
+            }
+            else {
+                cliLogger.log(`Using KIMAKI_BOT_TOKEN env var (App ID: ${resolvedAppId})`);
+            }
+            return {
+                appId: resolvedAppId,
+                token: envBot.token,
+                isQuickStart: !addChannels,
+            };
         }
         // 2. Saved credentials in the database
         if (existingBot && !forceSetup) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@brianli/kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.72-brianli.2",
+  "version": "0.4.72-brianli.4",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [

package/src/cli.ts

@@ -1121,7 +1121,7 @@ async function run({
   // 1. KIMAKI_BOT_TOKEN env var (headless/CI deployments)
   // 2. Saved credentials in the database
   // 3. Interactive setup wizard (first-time users)
-  // App ID is always derived from the token (base64 first segment).
+  // App ID comes from auth mode env or is derived from token (base64 first segment).
   const { appId, token, isQuickStart } = await (async (): Promise<{
     appId: string
     token: string
@@ -1130,18 +1130,33 @@ async function run({
     const envBot = getBotToken({ allowDatabase: false })
     const existingBot = getBotToken({ preferEnv: false })
 
-    // 1. Env var takes precedence (headless deployments)
-    if (envBot && !forceSetup) {
-      const derivedAppId = appIdFromToken(envBot.token)
-      if (!derivedAppId) {
+    // 1. Env var/auth mode takes precedence (headless deployments)
+    if (envBot && (!forceSetup || envBot.source === 'auth')) {
+      if (forceSetup && envBot.source === 'auth') {
+        cliLogger.log('Auth mode enabled; skipping interactive setup (--restart ignored)')
+      }
+      const resolvedAppId = envBot.appId || appIdFromToken(envBot.token)
+      if (!resolvedAppId) {
         cliLogger.error(
-          'Could not derive Application ID from KIMAKI_BOT_TOKEN. The token appears malformed.',
+          envBot.source === 'auth'
+            ? 'Auth mode requires KIMAKI_APP_ID when using KIMAKI_GUILD_ID/KIMAKI_PRIVATE_KEY.'
+            : 'Could not derive Application ID from KIMAKI_BOT_TOKEN. The token appears malformed.',
         )
         process.exit(EXIT_NO_RESTART)
       }
-      await setBotToken(derivedAppId, envBot.token)
-      cliLogger.log(`Using KIMAKI_BOT_TOKEN env var (App ID: ${derivedAppId})`)
-      return { appId: derivedAppId, token: envBot.token, isQuickStart: !addChannels }
+      await setBotToken(resolvedAppId, envBot.token)
+      if (envBot.source === 'auth') {
+        cliLogger.log(`Using auth mode credentials (App ID: ${resolvedAppId})`)
+      } else {
+        cliLogger.log(
+          `Using KIMAKI_BOT_TOKEN env var (App ID: ${resolvedAppId})`,
+        )
+      }
+      return {
+        appId: resolvedAppId,
+        token: envBot.token,
+        isQuickStart: !addChannels,
+      }
     }
 
     // 2. Saved credentials in the database