kimaki 0.4.84 → 0.4.85

package/dist/discord-bot.js

@@ -185,7 +185,11 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
         await setupHandlers(discordClient);
     }
     else {
-        discordClient.once(Events.ClientReady, setupHandlers);
+        discordClient.once(Events.ClientReady, (readyClient) => {
+            void setupHandlers(readyClient).catch((error) => {
+                discordLogger.error(`[GATEWAY] ClientReady handler failed: ${formatErrorWithStack(error)}`);
+            });
+        });
     }
     discordClient.on(Events.Error, (error) => {
         discordLogger.error('[GATEWAY] Client error:', formatErrorWithStack(error));

package/dist/external-opencode-sync.js

@@ -19,7 +19,7 @@ function isSyntheticTextPart(part) {
     return candidate.synthetic === true;
 }
 function parseDiscordOriginMetadata(text) {
-    const match = text.match(/^<discord-user\s+([^>]+)\s*\/>$/);
+    const match = text.match(/<discord-user\s+([^>]+)\s*\/>/);
     if (!match?.[1]) {
         return null;
     }
@@ -42,17 +42,17 @@ function parseDiscordOriginMetadata(text) {
     };
 }
 function getDiscordOriginMetadataFromMessage({ message, }) {
-    const syntheticTexts = message.parts.flatMap((part) => {
-        if (part.type !== 'text') {
-            return [];
-        }
-        if (!isSyntheticTextPart(part)) {
-            return [];
-        }
-        return [part.text || ''];
+    const textParts = message.parts.filter((p) => {
+        return p.type === 'text';
     });
-    for (const text of syntheticTexts) {
-        const metadata = parseDiscordOriginMetadata(text);
+    // Synthetic parts first (normal promptAsync path), then non-synthetic
+    // (session.command() path where the tag is embedded in arguments text).
+    const sorted = [
+        ...textParts.filter((p) => { return isSyntheticTextPart(p); }),
+        ...textParts.filter((p) => { return !isSyntheticTextPart(p); }),
+    ];
+    for (const part of sorted) {
+        const metadata = parseDiscordOriginMetadata(part.text || '');
         if (metadata) {
             return metadata;
         }

package/dist/session-handler/thread-session-runtime.js

@@ -2667,12 +2667,18 @@ export class ThreadSessionRuntime {
         if (input.command) {
             const queuedCommand = input.command;
             const commandSignal = AbortSignal.timeout(30_000);
+            // session.command() only accepts FilePart in parts, not text parts.
+            // Append <discord-user /> tag to arguments so external sync can
+            // detect this message came from Discord (same tag as promptAsync).
+            const discordTag = input.username
+                ? `\n<discord-user name="${input.username}" />`
+                : '';
             const commandResponse = await errore.tryAsync(() => {
                 return getClient().session.command({
                     sessionID: session.id,
                     directory: this.sdkDirectory,
                     command: queuedCommand.name,
-                    arguments: queuedCommand.arguments,
+                    arguments: queuedCommand.arguments + discordTag,
                     agent: earlyAgentPreference,
                     ...variantField,
                 }, { signal: commandSignal });

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.84",
+  "version": "0.4.85",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -25,8 +25,8 @@
     "prisma": "7.4.2",
     "tsx": "^4.20.5",
     "discord-digital-twin": "^0.1.0",
-    "opencode-cached-provider": "^0.0.1",
     "opencode-deterministic-provider": "^0.0.1",
+    "opencode-cached-provider": "^0.0.1",
     "db": "^0.0.0"
   },
   "dependencies": {

package/src/discord-bot.ts

@@ -316,7 +316,13 @@ export async function startDiscordBot({
   if (discordClient.isReady()) {
     await setupHandlers(discordClient)
   } else {
-    discordClient.once(Events.ClientReady, setupHandlers)
+    discordClient.once(Events.ClientReady, (readyClient) => {
+      void setupHandlers(readyClient).catch((error) => {
+        discordLogger.error(
+          `[GATEWAY] ClientReady handler failed: ${formatErrorWithStack(error)}`,
+        )
+      })
+    })
   }
 
   discordClient.on(Events.Error, (error) => {

package/src/external-opencode-sync.ts

@@ -86,7 +86,7 @@ function isSyntheticTextPart(part: Extract<Part, { type: 'text' }>): boolean {
 }
 
 function parseDiscordOriginMetadata(text: string): DiscordOriginMetadata | null {
-  const match = text.match(/^<discord-user\s+([^>]+)\s*\/>$/)
+  const match = text.match(/<discord-user\s+([^>]+)\s*\/>/)
   if (!match?.[1]) {
     return null
   }
@@ -117,23 +117,21 @@ function getDiscordOriginMetadataFromMessage({
 }: {
   message: SessionMessageLike
 }): DiscordOriginMetadata | null {
-  const syntheticTexts = message.parts.flatMap((part) => {
-    if (part.type !== 'text') {
-      return [] as string[]
-    }
-    if (!isSyntheticTextPart(part)) {
-      return [] as string[]
-    }
-    return [part.text || '']
+  const textParts = message.parts.filter((p): p is Extract<typeof p, { type: 'text' }> => {
+    return p.type === 'text'
   })
-
-  for (const text of syntheticTexts) {
-    const metadata = parseDiscordOriginMetadata(text)
+  // Synthetic parts first (normal promptAsync path), then non-synthetic
+  // (session.command() path where the tag is embedded in arguments text).
+  const sorted = [
+    ...textParts.filter((p) => { return isSyntheticTextPart(p) }),
+    ...textParts.filter((p) => { return !isSyntheticTextPart(p) }),
+  ]
+  for (const part of sorted) {
+    const metadata = parseDiscordOriginMetadata(part.text || '')
     if (metadata) {
       return metadata
     }
   }
-
   return null
 }
 

package/src/session-handler/thread-session-runtime.ts

@@ -3510,13 +3510,20 @@ export class ThreadSessionRuntime {
     if (input.command) {
       const queuedCommand = input.command
       const commandSignal = AbortSignal.timeout(30_000)
+      // session.command() only accepts FilePart in parts, not text parts.
+      // Append <discord-user /> tag to arguments so external sync can
+      // detect this message came from Discord (same tag as promptAsync).
+      const discordTag = input.username
+        ? `\n<discord-user name="${input.username}" />`
+        : ''
       const commandResponse = await errore.tryAsync(() => {
         return getClient().session.command(
           {
             sessionID: session.id,
+
             directory: this.sdkDirectory,
             command: queuedCommand.name,
-            arguments: queuedCommand.arguments,
+            arguments: queuedCommand.arguments + discordTag,
             agent: earlyAgentPreference,
             ...variantField,
           },