npm - kimaki - Versions diffs - 0.3.0 → 0.3.2 - Mend

kimaki 0.3.0 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/discordBot.js CHANGED Viewed

@@ -718,22 +718,29 @@ function formatPart(part) {
             return `▪︎ thinking: ${escapeDiscordFormatting(part.text || '')}`;
         case 'tool':
             if (part.state.status === 'completed' || part.state.status === 'error') {
-                // console.log(part)
-                // Escape triple backticks so Discord does not break code blocks
                 let language = '';
                 let outputToDisplay = '';
+                let summaryText = '';
                 if (part.tool === 'bash') {
-                    outputToDisplay =
-                        part.state.status === 'completed'
-                            ? part.state.output
-                            : part.state.error;
-                    outputToDisplay ||= '';
+                    const output = part.state.status === 'completed'
+                        ? part.state.output
+                        : part.state.error;
+                    const lines = (output || '').split('\n').filter((l) => l.trim());
+                    summaryText = `(${lines.length} line${lines.length === 1 ? '' : 's'})`;
                 }
-                if (part.tool === 'edit') {
-                    outputToDisplay = part.state.input?.newString || '';
-                    language = path.extname(part.state.input.filePath || '');
+                else if (part.tool === 'edit') {
+                    const newString = part.state.input?.newString || '';
+                    const oldString = part.state.input?.oldString || '';
+                    const added = newString.split('\n').length;
+                    const removed = oldString.split('\n').length;
+                    summaryText = `(+${added}-${removed})`;
                 }
-                if (part.tool === 'todowrite') {
+                else if (part.tool === 'write') {
+                    const content = part.state.input?.content || '';
+                    const lines = content.split('\n').length;
+                    summaryText = `(${lines} line${lines === 1 ? '' : 's'})`;
+                }
+                else if (part.tool === 'todowrite') {
                     const todos = part.state.input?.todos || [];
                     outputToDisplay = todos
                         .map((todo) => {
@@ -756,20 +763,27 @@ function formatPart(part) {
                     })
                         .filter(Boolean)
                         .join('\n');
-                    language = '';
                 }
-                if (part.tool === 'write') {
-                    outputToDisplay = part.state.input?.content || '';
-                    language = path.extname(part.state.input.filePath || '');
+                else if (part.tool === 'webfetch') {
+                    const url = part.state.input?.url || '';
+                    const urlWithoutProtocol = url.replace(/^https?:\/\//, '');
+                    summaryText = urlWithoutProtocol ? `(${urlWithoutProtocol})` : '';
+                }
+                else if (part.state.input) {
+                    const inputFields = Object.entries(part.state.input)
+                        .map(([key, value]) => {
+                        if (value === null || value === undefined)
+                            return null;
+                        const stringValue = typeof value === 'string' ? value : JSON.stringify(value);
+                        const truncatedValue = stringValue.length > 100 ? stringValue.slice(0, 100) + '…' : stringValue;
+                        return `${key}: ${truncatedValue}`;
+                    })
+                        .filter(Boolean);
+                    if (inputFields.length > 0) {
+                        outputToDisplay = inputFields.join('\n');
+                    }
                 }
-                outputToDisplay =
-                    outputToDisplay.length > 500
-                        ? outputToDisplay.slice(0, 497) + `…`
-                        : outputToDisplay;
-                // Escape Discord formatting characters that could break code blocks
-                outputToDisplay = escapeDiscordFormatting(outputToDisplay);
                 let toolTitle = part.state.status === 'completed' ? part.state.title || '' : 'error';
-                // Escape backticks in the title before wrapping in backticks
                 if (toolTitle) {
                     toolTitle = `\`${escapeInlineCode(toolTitle)}\``;
                 }
@@ -778,19 +792,10 @@ function formatPart(part) {
                     : part.state.status === 'error'
                         ? '⨯'
                         : '';
-                const title = `${icon} ${part.tool} ${toolTitle}`;
+                const title = `${icon} ${part.tool} ${toolTitle} ${summaryText}`;
                 let text = title;
                 if (outputToDisplay) {
-                    // Don't wrap todowrite output in code blocks
-                    if (part.tool === 'todowrite') {
-                        text += '\n\n' + outputToDisplay;
-                    }
-                    else {
-                        if (language.startsWith('.')) {
-                            language = language.slice(1);
-                        }
-                        text += '\n\n```' + language + '\n' + outputToDisplay + '\n```';
-                    }
+                    text += '\n\n' + outputToDisplay;
                 }
                 return text;
             }
@@ -1168,7 +1173,14 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
                     discordLogger.log(`Could not update reaction:`, e);
                 }
             }
-            await sendThreadMessage(thread, `✗ Unexpected bot Error: ${error instanceof Error ? error.stack || error.message : String(error)}`);
+            // Always log the error's constructor name (if any) and make error reporting more readable
+            const errorName = error && typeof error === 'object' && 'constructor' in error && error.constructor && typeof error.constructor.name === 'string'
+                ? error.constructor.name
+                : typeof error;
+            const errorMsg = error instanceof Error
+                ? (error.stack || error.message)
+                : String(error);
+            await sendThreadMessage(thread, `✗ Unexpected bot Error: [${errorName}]\n${errorMsg}`);
         }
     }
 }

package/dist/utils.js CHANGED Viewed

@@ -40,11 +40,12 @@ export function deduplicateByKey(arr, keyFn) {
     });
 }
 export function isAbortError(error, signal) {
-    return (error instanceof Error &&
+    return ((error instanceof Error &&
         (error.name === 'AbortError' ||
             error.name === 'Aborterror' ||
             error.name === 'aborterror' ||
             error.name.toLowerCase() === 'aborterror' ||
             error.message?.includes('aborted') ||
-            (signal?.aborted ?? false)));
+            (signal?.aborted ?? false))) ||
+        (error instanceof DOMException && error.name === 'AbortError'));
 }

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -45,7 +45,7 @@
     "zod": "^4.0.17"
   },
   "scripts": {
-    "dev": "pnpm tsc && DEBUG=1 tsx --env-file .env src/cli.ts",
+    "dev": "pnpm tsc && tsx --env-file .env src/cli.ts",
     "dev:bun": "DEBUG=1 bun --env-file .env src/cli.ts",
     "test": "tsx scripts/test-opencode.ts",
     "watch": "tsx scripts/watch-session.ts",

package/src/discordBot.ts CHANGED Viewed

@@ -954,22 +954,28 @@ function formatPart(part: Part): string {
       return `▪︎ thinking: ${escapeDiscordFormatting(part.text || '')}`
     case 'tool':
       if (part.state.status === 'completed' || part.state.status === 'error') {
-        // console.log(part)
-        // Escape triple backticks so Discord does not break code blocks
         let language = ''
         let outputToDisplay = ''
+        let summaryText = ''
         if (part.tool === 'bash') {
-          outputToDisplay =
+          const output =
             part.state.status === 'completed'
               ? part.state.output
               : part.state.error
-          outputToDisplay ||= ''
-        }
-        if (part.tool === 'edit') {
-          outputToDisplay = (part.state.input?.newString as string) || ''
-          language = path.extname((part.state.input.filePath as string) || '')
-        }
-        if (part.tool === 'todowrite') {
+          const lines = (output || '').split('\n').filter((l) => l.trim())
+          summaryText = `(${lines.length} line${lines.length === 1 ? '' : 's'})`
+        } else if (part.tool === 'edit') {
+          const newString = (part.state.input?.newString as string) || ''
+          const oldString = (part.state.input?.oldString as string) || ''
+          const added = newString.split('\n').length
+          const removed = oldString.split('\n').length
+          summaryText = `(+${added}-${removed})`
+        } else if (part.tool === 'write') {
+          const content = (part.state.input?.content as string) || ''
+          const lines = content.split('\n').length
+          summaryText = `(${lines} line${lines === 1 ? '' : 's'})`
+        } else if (part.tool === 'todowrite') {
           const todos =
             (part.state.input?.todos as {
               content: string
@@ -996,23 +1002,26 @@ function formatPart(part: Part): string {
             })
             .filter(Boolean)
             .join('\n')
-          language = ''
-        }
-        if (part.tool === 'write') {
-          outputToDisplay = (part.state.input?.content as string) || ''
-          language = path.extname((part.state.input.filePath as string) || '')
+        } else if (part.tool === 'webfetch') {
+          const url = (part.state.input?.url as string) || ''
+          const urlWithoutProtocol = url.replace(/^https?:\/\//, '')
+          summaryText = urlWithoutProtocol ? `(${urlWithoutProtocol})` : ''
+        } else if (part.state.input) {
+          const inputFields = Object.entries(part.state.input)
+            .map(([key, value]) => {
+              if (value === null || value === undefined) return null
+              const stringValue = typeof value === 'string' ? value : JSON.stringify(value)
+              const truncatedValue = stringValue.length > 100 ? stringValue.slice(0, 100) + '…' : stringValue
+              return `${key}: ${truncatedValue}`
+            })
+            .filter(Boolean)
+          if (inputFields.length > 0) {
+            outputToDisplay = inputFields.join('\n')
+          }
         }
-        outputToDisplay =
-          outputToDisplay.length > 500
-            ? outputToDisplay.slice(0, 497) + `…`
-            : outputToDisplay
-        // Escape Discord formatting characters that could break code blocks
-        outputToDisplay = escapeDiscordFormatting(outputToDisplay)
         let toolTitle =
           part.state.status === 'completed' ? part.state.title || '' : 'error'
-        // Escape backticks in the title before wrapping in backticks
         if (toolTitle) {
           toolTitle = `\`${escapeInlineCode(toolTitle)}\``
         }
@@ -1022,20 +1031,12 @@ function formatPart(part: Part): string {
             : part.state.status === 'error'
               ? '⨯'
               : ''
-        const title = `${icon} ${part.tool} ${toolTitle}`
+        const title = `${icon} ${part.tool} ${toolTitle} ${summaryText}`
         let text = title
         if (outputToDisplay) {
-          // Don't wrap todowrite output in code blocks
-          if (part.tool === 'todowrite') {
-            text += '\n\n' + outputToDisplay
-          } else {
-            if (language.startsWith('.')) {
-              language = language.slice(1)
-            }
-            text += '\n\n```' + language + '\n' + outputToDisplay + '\n```'
-          }
+          text += '\n\n' + outputToDisplay
         }
         return text
       }
@@ -1513,9 +1514,16 @@ async function handleOpencodeSession(
           discordLogger.log(`Could not update reaction:`, e)
         }
       }
+      // Always log the error's constructor name (if any) and make error reporting more readable
+      const errorName = error && typeof error === 'object' && 'constructor' in error && error.constructor && typeof error.constructor.name === 'string'
+        ? error.constructor.name
+        : typeof error
+      const errorMsg = error instanceof Error
+        ? (error.stack || error.message)
+        : String(error)
       await sendThreadMessage(
         thread,
-        `✗ Unexpected bot Error: ${error instanceof Error ? error.stack || error.message : String(error)}`,
+        `✗ Unexpected bot Error: [${errorName}]\n${errorMsg}`,
       )
     }
   }

package/src/utils.ts CHANGED Viewed

@@ -65,12 +65,13 @@ export function isAbortError(
   signal?: AbortSignal,
 ): error is Error {
   return (
-    error instanceof Error &&
-    (error.name === 'AbortError' ||
-      error.name === 'Aborterror' ||
-      error.name === 'aborterror' ||
-      error.name.toLowerCase() === 'aborterror' ||
-      error.message?.includes('aborted') ||
-      (signal?.aborted ?? false))
+    (error instanceof Error &&
+      (error.name === 'AbortError' ||
+        error.name === 'Aborterror' ||
+        error.name === 'aborterror' ||
+        error.name.toLowerCase() === 'aborterror' ||
+        error.message?.includes('aborted') ||
+        (signal?.aborted ?? false))) ||
+    (error instanceof DOMException && error.name === 'AbortError')
   )
 }