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

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,21 +2,7 @@
   "name": "@brianli/kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.72-brianli.1",
-  "scripts": {
-    "dev": "tsx --env-file .env src/cli.ts",
-    "prepublishOnly": "pnpm generate && pnpm tsc",
-    "dev:bun": "DEBUG=1 bun --env-file .env src/cli.ts",
-    "watch": "tsx scripts/watch-session.ts",
-    "generate": "prisma generate && pnpm generate:sql",
-    "generate:sql": "rm -f dev.db && prisma db push --url 'file:dev.db' --accept-data-loss && echo '-- This file is generated by pnpm generate:sql. Do not edit manually.' > src/schema.sql && sqlite3 dev.db '.schema' >> src/schema.sql",
-    "pcm-to-mp3": "bun scripts/pcm-to-mp3",
-    "test": "vitest",
-    "test:send": "tsx send-test-message.ts",
-    "register-commands": "tsx scripts/register-commands.ts",
-    "format": "oxfmt src",
-    "sync-skills": "tsx scripts/sync-skills.ts"
-  },
+  "version": "0.4.72-brianli.3",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -33,11 +19,11 @@
     "@types/json-schema": "^7.0.15",
     "@types/ms": "^2.1.0",
     "@types/node": "^24.3.0",
-    "discord-digital-twin": "workspace:^",
-    "opencode-cached-provider": "workspace:^",
-    "opencode-deterministic-provider": "workspace:^",
     "prisma": "7.3.0",
-    "tsx": "^4.20.5"
+    "tsx": "^4.20.5",
+    "opencode-deterministic-provider": "^0.0.1",
+    "discord-digital-twin": "^0.0.1",
+    "opencode-cached-provider": "^0.0.1"
   },
   "dependencies": {
     "@ai-sdk/google": "^3.0.30",
@@ -57,7 +43,6 @@
     "cron-parser": "^5.5.0",
     "discord.js": "^14.25.1",
     "domhandler": "^5.0.3",
-    "errore": "workspace:^",
     "goke": "^6.1.2",
     "htmlparser2": "^10.0.0",
     "js-yaml": "^4.1.0",
@@ -67,16 +52,30 @@
     "picocolors": "^1.1.1",
     "pretty-ms": "^9.3.0",
     "string-dedent": "^3.0.2",
-    "traforo": "workspace:^",
     "undici": "^7.16.0",
     "xdg-basedir": "^5.1.0",
     "zod": "^4.3.6",
-    "zustand": "^5.0.11"
+    "zustand": "^5.0.11",
+    "errore": "^0.14.0",
+    "traforo": "^0.0.9"
   },
   "optionalDependencies": {
     "@discordjs/opus": "^0.10.0",
     "heic-convert": "^2.1.0",
     "prism-media": "^1.3.5",
     "sharp": "^0.34.5"
+  },
+  "scripts": {
+    "dev": "tsx --env-file .env src/cli.ts",
+    "dev:bun": "DEBUG=1 bun --env-file .env src/cli.ts",
+    "watch": "tsx scripts/watch-session.ts",
+    "generate": "prisma generate && pnpm generate:sql",
+    "generate:sql": "rm -f dev.db && prisma db push --url 'file:dev.db' --accept-data-loss && echo '-- This file is generated by pnpm generate:sql. Do not edit manually.' > src/schema.sql && sqlite3 dev.db '.schema' >> src/schema.sql",
+    "pcm-to-mp3": "bun scripts/pcm-to-mp3",
+    "test": "vitest",
+    "test:send": "tsx send-test-message.ts",
+    "register-commands": "tsx scripts/register-commands.ts",
+    "format": "oxfmt src",
+    "sync-skills": "tsx scripts/sync-skills.ts"
   }
-}
+}

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