fluxy-bot 0.3.21 → 0.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "description": "Self-hosted AI bot — run your own AI assistant from anywhere",
   "type": "module",
   "license": "MIT",

package/shared/paths.ts

@@ -4,6 +4,7 @@ import { fileURLToPath } from 'url';
 
 export const PKG_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 export const DATA_DIR = path.join(os.homedir(), '.fluxy');
+export const WORKSPACE_DIR = path.join(PKG_DIR, 'workspace');
 
 const cfName = process.platform === 'win32' ? 'cloudflared.exe' : 'cloudflared';
 
@@ -12,8 +13,8 @@ export const paths = {
   db: path.join(DATA_DIR, 'memory.db'),
   widgetJs: path.join(PKG_DIR, 'supervisor', 'widget.js'),
   cloudflared: path.join(DATA_DIR, 'bin', cfName),
-  files: path.join(DATA_DIR, 'files'),
-  filesAudio: path.join(DATA_DIR, 'files', 'audio'),
-  filesImages: path.join(DATA_DIR, 'files', 'images'),
-  filesDocuments: path.join(DATA_DIR, 'files', 'documents'),
+  files: path.join(WORKSPACE_DIR, 'files'),
+  filesAudio: path.join(WORKSPACE_DIR, 'files', 'audio'),
+  filesImages: path.join(WORKSPACE_DIR, 'files', 'images'),
+  filesDocuments: path.join(WORKSPACE_DIR, 'files', 'documents'),
 };

package/supervisor/file-saver.ts

@@ -0,0 +1,50 @@
+import fs from 'fs';
+import crypto from 'crypto';
+import { paths } from '../shared/paths.js';
+
+export interface SavedFile {
+  type: 'image' | 'document';
+  name: string;
+  mediaType: string;
+  relPath: string;
+  absPath: string;
+}
+
+export function ensureFileDirs(): void {
+  fs.mkdirSync(paths.filesAudio, { recursive: true });
+  fs.mkdirSync(paths.filesImages, { recursive: true });
+  fs.mkdirSync(paths.filesDocuments, { recursive: true });
+}
+
+export function saveAttachment(att: { type: 'image' | 'file'; name: string; mediaType: string; data: string }): SavedFile {
+  const category = att.type === 'image' ? 'images' : 'documents';
+
+  const now = new Date();
+  const ts = now.toISOString().replace(/[-:T]/g, '').slice(0, 14);
+  const stamp = `${ts.slice(0, 8)}_${ts.slice(8, 14)}`;
+  const rand = crypto.randomBytes(3).toString('hex');
+
+  // Extract extension from original name or mediaType
+  const extFromName = att.name?.includes('.') ? att.name.split('.').pop()! : '';
+  const extFromMime: Record<string, string> = {
+    'image/png': 'png', 'image/jpeg': 'jpg', 'image/gif': 'gif', 'image/webp': 'webp',
+    'application/pdf': 'pdf', 'text/plain': 'txt', 'text/csv': 'csv',
+  };
+  const ext = extFromName || extFromMime[att.mediaType] || 'bin';
+
+  const filename = `${stamp}_${rand}.${ext}`;
+  const relPath = `files/${category}/${filename}`;
+
+  const dir = category === 'images' ? paths.filesImages : paths.filesDocuments;
+  const absPath = `${dir}/${filename}`;
+
+  fs.writeFileSync(absPath, Buffer.from(att.data, 'base64'));
+
+  return {
+    type: att.type === 'image' ? 'image' : 'document',
+    name: att.name,
+    mediaType: att.mediaType,
+    relPath,
+    absPath,
+  };
+}

package/supervisor/fluxy-agent.ts

@@ -8,6 +8,7 @@ import fs from 'fs';
 import path from 'path';
 import { log } from '../shared/logger.js';
 import { DATA_DIR, PKG_DIR } from '../shared/paths.js';
+import type { SavedFile } from './file-saver.js';
 import { getClaudeAccessToken } from '../worker/claude-auth.js';
 
 const PROMPT_FILE = path.join(import.meta.dirname, '..', 'worker', 'prompts', 'fluxy-system-prompt.txt');
@@ -29,7 +30,7 @@ export interface AgentAttachment {
 }
 
 /** Build a multi-part prompt with attachments for the SDK */
-function buildMultiPartPrompt(text: string, attachments: AgentAttachment[]): AsyncIterable<SDKUserMessage> {
+function buildMultiPartPrompt(text: string, attachments: AgentAttachment[], savedFiles?: SavedFile[]): AsyncIterable<SDKUserMessage> {
   return (async function* () {
     const content: any[] = [];
 
@@ -47,7 +48,14 @@ function buildMultiPartPrompt(text: string, attachments: AgentAttachment[]): Asy
       }
     }
 
-    content.push({ type: 'text', text: text || '(attached files)' });
+    // Append local file paths so Claude can reference them with tools
+    let promptText = text || '(attached files)';
+    if (savedFiles?.length) {
+      const lines = savedFiles.map((f) => `- ${f.name} -> ${f.relPath}`);
+      promptText += `\n\n[Attached files saved to disk]\n${lines.join('\n')}\nYou can read or reference these files using the paths above (relative to your cwd).`;
+    }
+
+    content.push({ type: 'text', text: promptText });
 
     yield {
       type: 'user' as const,
@@ -76,6 +84,7 @@ export async function startFluxyAgentQuery(
   model: string,
   onMessage: (type: string, data: any) => void,
   attachments?: AgentAttachment[],
+  savedFiles?: SavedFile[],
 ): Promise<void> {
   const oauthToken = await getClaudeAccessToken();
   if (!oauthToken) {
@@ -92,8 +101,15 @@ export async function startFluxyAgentQuery(
   let fullText = '';
   const usedTools = new Set<string>();
 
+  // If there are saved files but no inline attachments, append path info to plain text prompt
+  let plainPrompt = prompt;
+  if (savedFiles?.length && !attachments?.length) {
+    const lines = savedFiles.map((f) => `- ${f.name} -> ${f.relPath}`);
+    plainPrompt += `\n\n[Attached files saved to disk]\n${lines.join('\n')}\nYou can read or reference these files using the paths above (relative to your cwd).`;
+  }
+
   const sdkPrompt: string | AsyncIterable<SDKUserMessage> =
-    attachments?.length ? buildMultiPartPrompt(prompt, attachments) : prompt;
+    attachments?.length ? buildMultiPartPrompt(prompt, attachments, savedFiles) : plainPrompt;
 
   try {
     const claudeQuery = query({

package/supervisor/index.ts

@@ -13,6 +13,7 @@ import { spawnWorker, stopWorker, getWorkerPort, isWorkerAlive } from './worker.
 import { spawnBackend, stopBackend, getBackendPort, isBackendAlive, resetBackendRestarts } from './backend.js';
 import { updateTunnelUrl, startHeartbeat, stopHeartbeat, disconnect } from '../shared/relay.js';
 import { startFluxyAgentQuery, stopFluxyAgentQuery, clearFluxySession } from './fluxy-agent.js';
+import { ensureFileDirs, saveAttachment, type SavedFile } from './file-saver.js';
 import { startViteDevServers, stopViteDevServers } from './vite-dev.js';
 import { execSync } from 'child_process';
 
@@ -61,6 +62,9 @@ export async function startSupervisor() {
   const vitePorts = await startViteDevServers(config.port);
   console.log(`[supervisor] Vite ready — dashboard :${vitePorts.dashboard}`);
 
+  // Ensure file storage dirs exist
+  ensureFileDirs();
+
   // Fluxy's AI brain
   let ai: AiProvider | null = null;
   if (config.ai.provider && (config.ai.apiKey || config.ai.provider === 'ollama')) {
@@ -380,9 +384,27 @@ export async function startSupervisor() {
               }
               convId = dbConvId!;
 
-              // Save user message to DB
+              // Save attachments to disk
+              let savedFiles: SavedFile[] = [];
+              if (data.attachments?.length) {
+                for (const att of data.attachments) {
+                  try {
+                    savedFiles.push(saveAttachment(att));
+                  } catch (err: any) {
+                    log.warn(`[fluxy] File save error: ${err.message}`);
+                  }
+                }
+              }
+
+              // Save user message to DB (include attachment metadata)
+              const meta: any = { model: freshConfig.ai.model };
+              if (savedFiles.length) {
+                meta.attachments = savedFiles.map((f) => ({
+                  type: f.type, name: f.name, mediaType: f.mediaType, path: f.relPath,
+                }));
+              }
               await workerApi(`/api/conversations/${convId}/messages`, 'POST', {
-                role: 'user', content, meta: { model: freshConfig.ai.model },
+                role: 'user', content, meta,
               });
 
               // Broadcast user message to other clients
@@ -430,7 +452,7 @@ export async function startSupervisor() {
               if (ws.readyState === WebSocket.OPEN) {
                 ws.send(JSON.stringify({ type, data: eventData }));
               }
-            }, data.attachments);
+            }, data.attachments, savedFiles);
           })();
           return;
         }

package/worker/index.ts

@@ -7,7 +7,7 @@ import { initDb, closeDb, listConversations, createConversation, deleteConversat
 import { startCodexOAuth, cancelCodexOAuth, getCodexAuthStatus, readCodexAccessToken } from './codex-auth.js';
 import { startClaudeOAuth, exchangeClaudeCode, getClaudeAuthStatus, readClaudeAccessToken } from './claude-auth.js';
 import { checkAvailability, registerHandle, releaseHandle, updateTunnelUrl, startHeartbeat, stopHeartbeat } from '../shared/relay.js';
-import { ensureFileDirs } from './file-storage.js';
+import { ensureFileDirs } from '../supervisor/file-saver.js';
 
 // ── Password hashing (scrypt) ──
 
@@ -34,7 +34,7 @@ ensureFileDirs();
 
 // Express
 const app = express();
-app.use(express.json());
+app.use(express.json({ limit: '10mb' }));
 
 app.get('/api/health', (_, res) => res.json({ status: 'ok' }));
 app.get('/api/conversations', (_, res) => res.json(listConversations()));

package/worker/file-storage.ts

@@ -1,25 +0,0 @@
-import fs from 'fs';
-import crypto from 'crypto';
-import { paths } from '../shared/paths.js';
-
-export function ensureFileDirs(): void {
-  fs.mkdirSync(paths.filesAudio, { recursive: true });
-  fs.mkdirSync(paths.filesImages, { recursive: true });
-  fs.mkdirSync(paths.filesDocuments, { recursive: true });
-}
-
-export function saveFile(base64: string, category: 'audio' | 'images' | 'documents', ext: string): string {
-  const now = new Date();
-  const ts = now.toISOString().replace(/[-:T]/g, '').slice(0, 14); // YYYYMMDD_HHmmss → YYYYMMDDHHmmss
-  const stamp = `${ts.slice(0, 8)}_${ts.slice(8, 14)}`;
-  const rand = crypto.randomBytes(3).toString('hex');
-  const filename = `${stamp}_${rand}.${ext}`;
-  const relPath = `${category}/${filename}`;
-
-  const dir = category === 'audio' ? paths.filesAudio
-    : category === 'images' ? paths.filesImages
-    : paths.filesDocuments;
-
-  fs.writeFileSync(`${dir}/${filename}`, Buffer.from(base64, 'base64'));
-  return relPath;
-}