onkol 0.5.2 → 0.5.5

package/dist/cli/index.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 import { program } from 'commander';
 import chalk from 'chalk';
-import { mkdirSync, writeFileSync, readFileSync, copyFileSync, existsSync } from 'fs';
+import { mkdirSync, writeFileSync, readFileSync, copyFileSync, existsSync, unlinkSync } from 'fs';
 import { resolve } from 'path';
 import { execSync } from 'child_process';
 import { runSetupPrompts } from './prompts.js';
@@ -34,7 +34,6 @@ function saveCheckpoint(homeDir, checkpoint) {
 function clearCheckpoint(homeDir) {
     const p = resolve(homeDir, '.onkol-setup-checkpoint.json');
     if (existsSync(p)) {
-        const { unlinkSync } = require('fs');
         unlinkSync(p);
     }
 }
@@ -570,8 +569,8 @@ program
         console.log(chalk.cyan('[1/3] Updating files from npm package...'));
         try {
             // Find where this CLI is running from — that's the latest package
-            // __dirname is dist/cli/, so pkgRoot is the npm package root
-            const pkgRoot = resolve(__dirname, '..');
+            // __dirname is dist/cli/, so pkgRoot is two levels up (dist/cli -> dist -> package root)
+            const pkgRoot = resolve(__dirname, '../..');
             const { readdirSync, chmodSync } = await import('fs');
             // Try src/plugin first (has .ts files), then dist/plugin (.js files)
             let pluginUpdated = false;

package/dist/plugin/discord-client.js

@@ -2,9 +2,11 @@ import { Client, GatewayIntentBits } from 'discord.js';
 import { mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { tmpdir } from 'os';
-const IMAGE_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.svg']);
 const ATTACHMENT_DIR = join(tmpdir(), 'onkol-attachments');
 mkdirSync(ATTACHMENT_DIR, { recursive: true });
+// Small text files get inlined into the message content
+const INLINE_MAX_BYTES = 10_000;
+const INLINE_CONTENT_TYPES = ['text/', 'application/json', 'application/xml', 'application/csv'];
 export function shouldForwardMessage(messageChannelId, authorId, isBot, targetChannelId, allowedUsers) {
     if (isBot)
         return false;
@@ -14,38 +16,37 @@ export function shouldForwardMessage(messageChannelId, authorId, isBot, targetCh
         return false;
     return true;
 }
-function isTextAttachment(a) {
-    return a.contentType?.startsWith('text/') === true || a.name?.endsWith('.txt') === true;
-}
-function isImageAttachment(a) {
-    if (a.contentType?.startsWith('image/'))
-        return true;
-    const name = (a.name || '').toLowerCase();
-    return IMAGE_EXTENSIONS.has(name.slice(name.lastIndexOf('.')));
+function shouldInline(a) {
+    if (a.name?.endsWith('.txt') || a.name?.endsWith('.csv') || a.name?.endsWith('.json') || a.name?.endsWith('.md')) {
+        return (a.size || 0) <= INLINE_MAX_BYTES;
+    }
+    const ct = a.contentType || '';
+    return INLINE_CONTENT_TYPES.some(t => ct.startsWith(t)) && (a.size || 0) <= INLINE_MAX_BYTES;
 }
-// Resolve all attachments: text gets inlined, images get downloaded to temp files
+// Download all attachments: small text gets inlined, everything else saved to disk.
+// Claude Code's Read tool handles images, PDFs, CSVs, notebooks, etc. natively.
 async function resolveAttachments(message) {
     let content = message.content;
     for (const attachment of message.attachments.values()) {
         try {
-            if (isTextAttachment(attachment)) {
-                const res = await fetch(attachment.url);
-                if (res.ok) {
-                    const text = await res.text();
-                    content = content ? `${content}\n\n${text}` : text;
-                }
+            const res = await fetch(attachment.url);
+            if (!res.ok)
+                continue;
+            if (shouldInline(attachment)) {
+                // Inline small text files directly into the message
+                const text = await res.text();
+                const label = attachment.name ? `[${attachment.name}]` : '';
+                content = content ? `${content}\n\n${label}\n${text}` : `${label}\n${text}`;
             }
-            else if (isImageAttachment(attachment)) {
-                const res = await fetch(attachment.url);
-                if (res.ok) {
-                    const buffer = Buffer.from(await res.arrayBuffer());
-                    const filename = `${message.id}-${attachment.name || 'image.png'}`;
-                    const filepath = join(ATTACHMENT_DIR, filename);
-                    writeFileSync(filepath, buffer);
-                    const note = `[User sent an image: ${attachment.name || 'image'}. Saved to ${filepath} — use the Read tool to view it.]`;
-                    content = content ? `${content}\n\n${note}` : note;
-                    console.error(`[discord-filtered] Downloaded image: ${filepath} (${buffer.length} bytes)`);
-                }
+            else {
+                // Save to disk — Claude Code can Read images, PDFs, CSVs, etc.
+                const buffer = Buffer.from(await res.arrayBuffer());
+                const filename = `${message.id}-${attachment.name || 'file'}`;
+                const filepath = join(ATTACHMENT_DIR, filename);
+                writeFileSync(filepath, buffer);
+                const note = `[User sent a file: ${attachment.name || 'file'} (${formatSize(buffer.length)}). Saved to ${filepath} — use the Read tool to view it.]`;
+                content = content ? `${content}\n\n${note}` : note;
+                console.error(`[discord-filtered] Downloaded: ${filepath} (${formatSize(buffer.length)})`);
             }
         }
         catch (err) {
@@ -54,6 +55,13 @@ async function resolveAttachments(message) {
     }
     return content;
 }
+function formatSize(bytes) {
+    if (bytes < 1024)
+        return `${bytes}B`;
+    if (bytes < 1024 * 1024)
+        return `${(bytes / 1024).toFixed(1)}KB`;
+    return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+}
 export function createDiscordClient(config, onMessage) {
     const client = new Client({
         intents: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onkol",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "description": "Decentralized on-call agent system powered by Claude Code",
   "type": "module",
   "bin": {

package/scripts/dissolve-worker.sh

@@ -64,8 +64,14 @@ if [ -n "$CHANNEL_ID" ] && [ "$CHANNEL_ID" != "null" ]; then
   echo "Discord channel deleted."
 fi
 
-# Archive worker directory
-ARCHIVE_DIR="$ONKOL_DIR/workers/.archive/${DATE}-${WORKER_NAME}"
+# Archive worker directory (append counter if archive already exists from same day)
+ARCHIVE_BASE="$ONKOL_DIR/workers/.archive/${DATE}-${WORKER_NAME}"
+ARCHIVE_DIR="$ARCHIVE_BASE"
+COUNTER=1
+while [ -d "$ARCHIVE_DIR" ]; do
+  ARCHIVE_DIR="${ARCHIVE_BASE}-${COUNTER}"
+  COUNTER=$((COUNTER + 1))
+done
 mkdir -p "$ONKOL_DIR/workers/.archive"
 mv "$WORKER_DIR" "$ARCHIVE_DIR"
 echo "Worker directory archived to $ARCHIVE_DIR"

package/src/plugin/discord-client.ts

@@ -3,10 +3,13 @@ import { mkdirSync, writeFileSync } from 'fs'
 import { join } from 'path'
 import { tmpdir } from 'os'
 
-const IMAGE_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.svg'])
 const ATTACHMENT_DIR = join(tmpdir(), 'onkol-attachments')
 mkdirSync(ATTACHMENT_DIR, { recursive: true })
 
+// Small text files get inlined into the message content
+const INLINE_MAX_BYTES = 10_000
+const INLINE_CONTENT_TYPES = ['text/', 'application/json', 'application/xml', 'application/csv']
+
 export interface DiscordClientConfig {
   botToken: string
   channelId: string
@@ -26,39 +29,38 @@ export function shouldForwardMessage(
   return true
 }
 
-function isTextAttachment(a: Attachment): boolean {
-  return a.contentType?.startsWith('text/') === true || a.name?.endsWith('.txt') === true
-}
-
-function isImageAttachment(a: Attachment): boolean {
-  if (a.contentType?.startsWith('image/')) return true
-  const name = (a.name || '').toLowerCase()
-  return IMAGE_EXTENSIONS.has(name.slice(name.lastIndexOf('.')))
+function shouldInline(a: Attachment): boolean {
+  if (a.name?.endsWith('.txt') || a.name?.endsWith('.csv') || a.name?.endsWith('.json') || a.name?.endsWith('.md')) {
+    return (a.size || 0) <= INLINE_MAX_BYTES
+  }
+  const ct = a.contentType || ''
+  return INLINE_CONTENT_TYPES.some(t => ct.startsWith(t)) && (a.size || 0) <= INLINE_MAX_BYTES
 }
 
-// Resolve all attachments: text gets inlined, images get downloaded to temp files
+// Download all attachments: small text gets inlined, everything else saved to disk.
+// Claude Code's Read tool handles images, PDFs, CSVs, notebooks, etc. natively.
 async function resolveAttachments(message: Message): Promise<string> {
   let content = message.content
 
   for (const attachment of message.attachments.values()) {
     try {
-      if (isTextAttachment(attachment)) {
-        const res = await fetch(attachment.url)
-        if (res.ok) {
-          const text = await res.text()
-          content = content ? `${content}\n\n${text}` : text
-        }
-      } else if (isImageAttachment(attachment)) {
-        const res = await fetch(attachment.url)
-        if (res.ok) {
-          const buffer = Buffer.from(await res.arrayBuffer())
-          const filename = `${message.id}-${attachment.name || 'image.png'}`
-          const filepath = join(ATTACHMENT_DIR, filename)
-          writeFileSync(filepath, buffer)
-          const note = `[User sent an image: ${attachment.name || 'image'}. Saved to ${filepath} — use the Read tool to view it.]`
-          content = content ? `${content}\n\n${note}` : note
-          console.error(`[discord-filtered] Downloaded image: ${filepath} (${buffer.length} bytes)`)
-        }
+      const res = await fetch(attachment.url)
+      if (!res.ok) continue
+
+      if (shouldInline(attachment)) {
+        // Inline small text files directly into the message
+        const text = await res.text()
+        const label = attachment.name ? `[${attachment.name}]` : ''
+        content = content ? `${content}\n\n${label}\n${text}` : `${label}\n${text}`
+      } else {
+        // Save to disk — Claude Code can Read images, PDFs, CSVs, etc.
+        const buffer = Buffer.from(await res.arrayBuffer())
+        const filename = `${message.id}-${attachment.name || 'file'}`
+        const filepath = join(ATTACHMENT_DIR, filename)
+        writeFileSync(filepath, buffer)
+        const note = `[User sent a file: ${attachment.name || 'file'} (${formatSize(buffer.length)}). Saved to ${filepath} — use the Read tool to view it.]`
+        content = content ? `${content}\n\n${note}` : note
+        console.error(`[discord-filtered] Downloaded: ${filepath} (${formatSize(buffer.length)})`)
       }
     } catch (err) {
       console.error(`[discord-filtered] Failed to fetch attachment ${attachment.name}: ${err}`)
@@ -68,6 +70,12 @@ async function resolveAttachments(message: Message): Promise<string> {
   return content
 }
 
+function formatSize(bytes: number): string {
+  if (bytes < 1024) return `${bytes}B`
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`
+  return `${(bytes / (1024 * 1024)).toFixed(1)}MB`
+}
+
 export function createDiscordClient(
   config: DiscordClientConfig,
   onMessage: (content: string, message: Message) => void