opencode-studio-server 1.0.13 → 1.1.2

package/index.js

@@ -318,7 +318,6 @@ app.get('/api/plugins', (req, res) => {
     
     for (const entry of entries) {
         if (entry.isDirectory()) {
-            // Check for index.js or index.ts
             const jsPath = path.join(pluginDir, entry.name, 'index.js');
             const tsPath = path.join(pluginDir, entry.name, 'index.ts');
             
@@ -329,6 +328,12 @@ app.get('/api/plugins', (req, res) => {
                     enabled: true 
                 });
             }
+        } else if (entry.isFile() && (entry.name.endsWith('.js') || entry.name.endsWith('.ts'))) {
+            plugins.push({
+                name: entry.name.replace(/\.(js|ts)$/, ''),
+                path: path.join(pluginDir, entry.name),
+                enabled: true
+            });
         }
     }
     res.json(plugins);
@@ -350,6 +355,12 @@ app.get('/api/plugins/:name', (req, res) => {
     } else if (fs.existsSync(path.join(dirPath, 'index.ts'))) {
         content = fs.readFileSync(path.join(dirPath, 'index.ts'), 'utf8');
         filename = 'index.ts';
+    } else if (fs.existsSync(path.join(pluginDir, name + '.js'))) {
+        content = fs.readFileSync(path.join(pluginDir, name + '.js'), 'utf8');
+        filename = name + '.js';
+    } else if (fs.existsSync(path.join(pluginDir, name + '.ts'))) {
+        content = fs.readFileSync(path.join(pluginDir, name + '.ts'), 'utf8');
+        filename = name + '.ts';
     } else {
         return res.status(404).json({ error: 'Plugin not found' });
     }
@@ -384,6 +395,10 @@ app.delete('/api/plugins/:name', (req, res) => {
     
     if (fs.existsSync(dirPath)) {
         fs.rmSync(dirPath, { recursive: true, force: true });
+    } else if (fs.existsSync(path.join(pluginDir, name + '.js'))) {
+        fs.unlinkSync(path.join(pluginDir, name + '.js'));
+    } else if (fs.existsSync(path.join(pluginDir, name + '.ts'))) {
+        fs.unlinkSync(path.join(pluginDir, name + '.ts'));
     }
     res.json({ success: true });
 });
@@ -729,6 +744,7 @@ app.get('/api/debug/paths', (req, res) => {
 
 app.get('/api/usage', async (req, res) => {
     try {
+        const { projectId: filterProjectId, granularity = 'daily' } = req.query;
         const home = os.homedir();
         const candidatePaths = [
             process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'opencode', 'storage', 'message') : null,
@@ -736,16 +752,60 @@ app.get('/api/usage', async (req, res) => {
             path.join(home, '.opencode', 'storage', 'message')
         ].filter(p => p && fs.existsSync(p));
 
+        const getSessionDir = (messageDir) => {
+            return path.join(path.dirname(messageDir), 'session');
+        };
+
+        const sessionProjectMap = new Map();
+
+        const loadProjects = (messageDir) => {
+            const sessionDir = getSessionDir(messageDir);
+            if (!fs.existsSync(sessionDir)) return;
+
+            try {
+                const projectDirs = fs.readdirSync(sessionDir);
+                
+                for (const projDir of projectDirs) {
+                    const fullProjPath = path.join(sessionDir, projDir);
+                    if (!fs.statSync(fullProjPath).isDirectory()) continue;
+
+                    const files = fs.readdirSync(fullProjPath);
+                    for (const file of files) {
+                        if (file.startsWith('ses_') && file.endsWith('.json')) {
+                            const sessionId = file.replace('.json', '');
+                            try {
+                                const meta = JSON.parse(fs.readFileSync(path.join(fullProjPath, file), 'utf8'));
+                                let projectName = 'Unknown Project';
+                                if (meta.directory) {
+                                    projectName = path.basename(meta.directory);
+                                } else if (meta.projectID) {
+                                    projectName = meta.projectID.substring(0, 8);
+                                }
+                                sessionProjectMap.set(sessionId, { name: projectName, id: meta.projectID || projDir });
+                            } catch (e) {}
+                        }
+                    }
+                }
+            } catch (e) {
+                console.error('Error loading projects:', e);
+            }
+        };
+
+        for (const logDir of candidatePaths) {
+            loadProjects(logDir);
+        }
+
         const stats = {
             totalCost: 0,
             totalTokens: 0,
             byModel: {},
-            byDay: {}
+            byTime: {}, 
+            byProject: {} 
         };
 
         const processedFiles = new Set();
 
-        const processMessage = (filePath) => {
+        const processMessage = (filePath, sessionId) => {
             if (processedFiles.has(filePath)) return;
             processedFiles.add(filePath);
 
@@ -754,27 +814,62 @@ app.get('/api/usage', async (req, res) => {
                 const msg = JSON.parse(content);
                 
                 const model = msg.modelID || (msg.model && (msg.model.modelID || msg.model.id)) || 'unknown';
+                const projectInfo = sessionProjectMap.get(sessionId) || { name: 'Unassigned', id: 'unknown' };
+                const projectId = projectInfo.id || 'unknown';
+
+                if (filterProjectId && filterProjectId !== 'all' && projectId !== filterProjectId) {
+                    return;
+                }
                 
                 if (msg.role === 'assistant' && msg.tokens) {
                     const cost = msg.cost || 0;
-                    const tokens = (msg.tokens.input || 0) + (msg.tokens.output || 0);
-                    const date = new Date(msg.time.created).toISOString().split('T')[0];
+                    const inputTokens = msg.tokens.input || 0;
+                    const outputTokens = msg.tokens.output || 0;
+                    const tokens = inputTokens + outputTokens;
+                    
+                    const timestamp = msg.time.created;
+                    const dateObj = new Date(timestamp);
+                    let timeKey;
+                    
+                    if (granularity === 'hourly') {
+                        timeKey = dateObj.toISOString().substring(0, 13) + ':00:00Z';
+                    } else if (granularity === 'weekly') {
+                        const day = dateObj.getDay();
+                        const diff = dateObj.getDate() - day + (day === 0 ? -6 : 1);
+                        const monday = new Date(dateObj.setDate(diff));
+                        timeKey = monday.toISOString().split('T')[0];
+                    } else {
+                        timeKey = dateObj.toISOString().split('T')[0];
+                    }
 
                     if (tokens > 0) {
                         stats.totalCost += cost;
                         stats.totalTokens += tokens;
 
                         if (!stats.byModel[model]) {
-                            stats.byModel[model] = { name: model, cost: 0, tokens: 0 };
+                            stats.byModel[model] = { name: model, cost: 0, tokens: 0, inputTokens: 0, outputTokens: 0 };
                         }
                         stats.byModel[model].cost += cost;
                         stats.byModel[model].tokens += tokens;
+                        stats.byModel[model].inputTokens += inputTokens;
+                        stats.byModel[model].outputTokens += outputTokens;
 
-                        if (!stats.byDay[date]) {
-                            stats.byDay[date] = { date, cost: 0, tokens: 0 };
+                        if (!stats.byTime[timeKey]) {
+                            stats.byTime[timeKey] = { date: timeKey, cost: 0, tokens: 0, inputTokens: 0, outputTokens: 0 };
+                        }
+                        stats.byTime[timeKey].cost += cost;
+                        stats.byTime[timeKey].tokens += tokens;
+                        stats.byTime[timeKey].inputTokens += inputTokens;
+                        stats.byTime[timeKey].outputTokens += outputTokens;
+
+                        const projectName = projectInfo.name;
+                        if (!stats.byProject[projectId]) {
+                            stats.byProject[projectId] = { id: projectId, name: projectName, cost: 0, tokens: 0, inputTokens: 0, outputTokens: 0 };
                         }
-                        stats.byDay[date].cost += cost;
-                        stats.byDay[date].tokens += tokens;
+                        stats.byProject[projectId].cost += cost;
+                        stats.byProject[projectId].tokens += tokens;
+                        stats.byProject[projectId].inputTokens += inputTokens;
+                        stats.byProject[projectId].outputTokens += outputTokens;
                     }
                 }
             } catch (err) {
@@ -792,7 +887,7 @@ app.get('/api/usage', async (req, res) => {
                         const messages = fs.readdirSync(sessionDir);
                         for (const msgFile of messages) {
                             if (msgFile.endsWith('.json')) {
-                                processMessage(path.join(sessionDir, msgFile));
+                                processMessage(path.join(sessionDir, msgFile), session);
                             }
                         }
                     }
@@ -806,7 +901,8 @@ app.get('/api/usage', async (req, res) => {
             totalCost: stats.totalCost,
             totalTokens: stats.totalTokens,
             byModel: Object.values(stats.byModel).sort((a, b) => b.cost - a.cost),
-            byDay: Object.values(stats.byDay).sort((a, b) => a.date.localeCompare(b.date))
+            byDay: Object.values(stats.byTime).sort((a, b) => a.date.localeCompare(b.date)),
+            byProject: Object.values(stats.byProject).sort((a, b) => b.cost - a.cost)
         };
 
         res.json(response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-studio-server",
-  "version": "1.0.13",
+  "version": "1.1.2",
   "description": "Backend server for OpenCode Studio - manages opencode configurations",
   "main": "index.js",
   "bin": {