thinkncollab-shell 0.0.6 → 0.0.7

package/bin/thinknsh.js

@@ -46,9 +46,9 @@ if (args.includes('--version') || args.includes('-v')) {
 }
 
 const shell = new ThinkNCollabShell({
-    serverUrl:   process.env.THINKNCOLLAB_SERVER    || 'https://thinkncollab.com',  // ← /thinknsh hata
-    apiUrl:      process.env.THINKNCOLLAB_API_URL   || 'https://thinkncollab.com',
-    wsUrl:       process.env.THINKNCOLLAB_WS_URL    || 'https://thinkncollab.com',
+    serverUrl:   process.env.THINKNCOLLAB_SERVER    || 'http://localhost:3001',  // ← /thinknsh hata
+    apiUrl:      process.env.THINKNCOLLAB_API_URL   || 'http://localhost:3001',
+    wsUrl:       process.env.THINKNCOLLAB_WS_URL    || 'http://localhost:3001',
     autoConnect: process.env.THINKNCOLLAB_AUTO_CONNECT === 'true'
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkncollab-shell",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "ThinkNCollab Custom Shell with WebSocket collaboration",
   "main": "src/core/shell.js",
   "bin": {

package/src/commands/auth/whoami.js

@@ -1,47 +1,52 @@
-/**
- * Whoami Command
- * 
- * Usage: whoami
- */
-
 const chalk = require('chalk');
 
 module.exports = {
     name: 'whoami',
     description: 'Show current user information',
     aliases: ['user', 'me'],
-    requiresAuth: true,
-    
-    async execute(args, shell) {
-        const user = shell.api.getUser();
-        const room = shell.api.getCurrentRoom();
-        
-        console.log(chalk.cyan('\n👤 User Information:'));
-        console.log(chalk.dim('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
-        console.log(`  ${chalk.yellow('Email:')}     ${user.email}`);
-        console.log(`  ${chalk.yellow('Name:')}      ${user.name || 'Not set'}`);
-        console.log(`  ${chalk.yellow('User ID:')}   ${user.id || 'N/A'}`);
-        
-        if (user.team) {
-            console.log(`  ${chalk.yellow('Team:')}      ${user.team}`);
-        }
-        
-        if (user.role) {
-            console.log(`  ${chalk.yellow('Role:')}      ${user.role}`);
-        }
-        
-        console.log(`  ${chalk.yellow('Status:')}    ${shell.api.isConnected() ? chalk.green('Online') : chalk.gray('Offline')}`);
-        
-        if (room) {
-            console.log(`  ${chalk.yellow('Room:')}      ${chalk.cyan(room.name)} (${room.id})`);
-        }
-        
-        // Show last login if available
-        if (user.lastLogin) {
-            const lastLogin = new Date(user.lastLogin).toLocaleString();
-            console.log(`  ${chalk.yellow('Last Login:')} ${lastLogin}`);
-        }
-        
-        console.log();
+    requiresAuth: false,
+
+async execute(args, shell) {
+    const user    = shell.api.getUser();
+    const room    = shell.ws.getCurrentRoom?.();
+    const session = shell.api.session;
+
+    // ✅ Server se last session history fetch karo
+    let lastSession = null;
+    try {
+        const history = await shell.api._request('GET', '/thinknsh/session/history');
+        // Current session chhod ke last wali lo
+        const prev = history.find(s => s._id !== session?.shellSessionId);
+        if (prev) lastSession = prev;
+    } catch {}
+
+    console.log(chalk.cyan('\n👤 User Information:'));
+    console.log(chalk.dim('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    console.log(`  ${chalk.yellow('Name:')}         ${user.name || 'Not set'}`);
+    console.log(`  ${chalk.yellow('Email:')}        ${user.email}`);
+    console.log(`  ${chalk.yellow('User ID:')}      ${user._id || 'N/A'}`);
+    console.log(`  ${chalk.yellow('Type:')}         ${user.userType || 'User'}`);
+    console.log(`  ${chalk.yellow('Status:')}       ${shell.ws.isConnected?.() ? chalk.green('● Online') : chalk.gray('○ Offline')}`);
+
+    if (room) {
+        console.log(`  ${chalk.yellow('Room:')}         ${chalk.cyan(room)}`);
+    }
+
+    if (session?.timestamp) {
+        console.log(`  ${chalk.yellow('Login At:')}     ${chalk.dim(new Date(session.timestamp).toLocaleString())}`);
+    }
+
+    // ✅ Server se actual logout time
+    if (lastSession?.logoutAt) {
+        console.log(`  ${chalk.yellow('Last Logout:')}  ${chalk.dim(new Date(lastSession.logoutAt).toLocaleString())}`);
+    } else if (lastSession?.lastSeenAt) {
+        console.log(`  ${chalk.yellow('Last Seen:')}    ${chalk.dim(new Date(lastSession.lastSeenAt).toLocaleString())} ${chalk.red('(crash?)')}`);
     }
+
+    if (lastSession?.machineId) {
+        console.log(`  ${chalk.yellow('Last Machine:')} ${chalk.dim(lastSession.machineId)}`);
+    }
+
+    console.log();
+}
 };

package/src/commands/index.js

@@ -51,13 +51,20 @@ const load = (path, category) => {
         // Tasks
         load('./tasks/tasks',       'tasks');
         load('./tasks/task',        'tasks');
+        load('./tasks/task-status', 'tasks'); 
         // load('./tasks/start',       'tasks');
         load('./tasks/complete',    'tasks');
         // load('./tasks/comment',     'tasks');
         load('./tasks/create-task', 'tasks');
+        
 
         // Terminal
         load('./terminal/share', 'terminal');
+
+
+
+
+
     }
 
     register(command, category) {

package/src/commands/tasks/complete.js

@@ -6,7 +6,7 @@ const chalk = require('chalk');
 module.exports = {
     name:         'complete',
     description:  'Mark a task as completed',
-    aliases:      ['done', 'finish'],
+    aliases:      ['done', 'finish', 'complete'],
     requiresAuth: true,
 
     async execute(args, shell) {

package/src/commands/tasks/task-status.js

@@ -0,0 +1,61 @@
+// src/commands/tasks/task-status.js
+const chalk = require('chalk');
+
+const STATUS_MAP = {
+    accept:   'accepted',
+    start:    'inprogress',
+    complete: 'completed',
+    reject:   'rejected',
+    done:     'completed',
+};
+
+module.exports = {
+    name:         'task-status',
+    description:  'Update your task status',
+    aliases:      ['accept', 'start', 'complete', 'reject', 'done'],
+    requiresAuth: true,
+    requiresRoom: true,
+
+    async execute(args, shell) {
+        const roomId  = shell.ws.getCurrentRoom();
+        const taskId  = args[0];
+        // invoked as 'accept <id>', 'start <id>', etc.
+        const verb    = shell._lastCommand || 'task-status';
+        const status  = STATUS_MAP[verb] || args[1];
+
+        if (!taskId) {
+            console.log(chalk.yellow('  Usage: accept <taskId> | start <taskId> | complete <taskId>'));
+            return;
+        }
+        if (!status) {
+            console.log(chalk.yellow('  Usage: task-status <taskId> <accepted|inprogress|completed|rejected>'));
+            return;
+        }
+
+        const statusColors = {
+            accepted:   chalk.green,
+            inprogress: chalk.blue,
+            completed:  chalk.green,
+            rejected:   chalk.red,
+        };
+        const col = statusColors[status] || chalk.white;
+
+        try {
+            const result = await shell.api._request(
+                'POST',
+                `/thinknsh/${roomId}/tasks/${taskId}/status`,
+                { status }
+            );
+
+            console.log(col(`\n  ✓ Task "${result.taskTitle}" → ${status}`));
+            if (result.allCompleted) {
+                console.log(chalk.green('  🎉 All assignees done — task fully completed!\n'));
+            } else {
+                console.log('');
+            }
+
+        } catch (err) {
+            console.log(chalk.red(`\n  ❌ ${err.message}\n`));
+        }
+    }
+};

package/src/commands/tasks/tasks.js

@@ -1,74 +1,183 @@
+/**
+ * src/commands/tasks/tasks.js — List my tasks + suggestions in current room
+ */
 const chalk = require('chalk');
 
 module.exports = {
-    name: 'myTask',
-    description: 'My Tasks in the Room',
-    aliases: ['mytasks'],
+    name:         'tasks',
+    description:  'List your tasks + suggested tasks in the current room',
+    aliases:      ['mytasks', 'my-tasks'],
     requiresAuth: true,
+    requiresRoom: true,
 
     async execute(args, shell) {
-        const user  = shell.api.getUser();
-        const token = shell.api.getToken();
-
+        const user   = shell.api.getUser();
+        const roomId = shell.ws.getCurrentRoom();
+
+        if (!user)   { console.log(chalk.red('❌ Please login first')); return; }
+        if (!roomId) { console.log(chalk.yellow('⚠️  Join a room first: join <room-id>')); return; }
+
+        // ── Flags ────────────────────────────────────────────────────────────
+        const showAll       = args.includes('--all')   || args.includes('-a');
+        const noSuggestions = args.includes('--no-suggest') || args.includes('-ns');
+        const filterStatus  = args.find(a => ['pending','inprogress','review','completed','reopened'].includes(a));
+        const topN          = args.find(a => /^\d+$/.test(a)) || 5;
+
+        // ── Color maps ───────────────────────────────────────────────────────
+        const stColors = {
+            pending:    chalk.yellow,
+            inprogress: chalk.blue,
+            review:     chalk.magenta,
+            completed:  chalk.green,
+            reopened:   chalk.cyan,
+        };
+        const prColors = {
+            critical: chalk.red,
+            high:     chalk.hex('#FF6B35'),
+            medium:   chalk.yellow,
+            low:      chalk.green,
+        };
+        const scoreColor = s => s >= 80 ? chalk.red(s) : s >= 60 ? chalk.yellow(s) : chalk.green(s);
+        const plColor    = pl => ({
+            CRITICAL: chalk.red,
+            HIGH:     chalk.hex('#FF6B35'),
+            MEDIUM:   chalk.yellow,
+            LOW:      chalk.green,
+            'VERY LOW': chalk.dim,
+        }[pl] || chalk.white);
+
+        // ── Helpers ──────────────────────────────────────────────────────────
+        const fmtDue = dueDate => {
+            if (!dueDate) return '';
+            const d    = new Date(dueDate);
+            const days = Math.ceil((d - new Date().setHours(0,0,0,0)) / 86400000);
+            const str  = d.toLocaleDateString('en-IN', { day:'2-digit', month:'short' });
+            if (days < 0)  return chalk.red(` due:${str}(!)`);
+            if (days === 0) return chalk.yellow(` due:TODAY`);
+            if (days === 1) return chalk.yellow(` due:${str}`);
+            return chalk.dim(` due:${str}`);
+        };
+
+        const divider  = (color = chalk.cyan) => color('  ' + '─'.repeat(58));
+        const subline  = (label, val) =>
+            `     ${chalk.dim(label+':')} ${chalk.dim(val)}`;
+
+        // ── Fetch ────────────────────────────────────────────────────────────
+        process.stdout.write(chalk.dim('  Fetching tasks...\r'));
+
+        let result;
         try {
-            if (!user || !token) {
-                console.log(chalk.red('❌ Please login first: login'));
-                return;
-            }
-
-            // FIX: getCurrentRoom() lives on shell.ws, not shell.api
-            const roomId = shell.ws.getCurrentRoom();
-
-            if (!roomId) {
-                console.log(chalk.yellow('⚠️  Please join a room first: join <room-id>'));
-                return;
-            }
-
-            if (!shell.api) {
-                console.log(chalk.red('❌ API not initialized'));
-                return;
-            }
-
-            console.log(chalk.dim('  Fetching tasks...'));
-
-            // FIX: pass `roomId` (was passing undefined `roomId` from shell.api.getCurrentRoom())
-            const result = await shell.api.mytasks(user, token, roomId);
-
-            if (!result || !result.tasks || result.tasks.length === 0) {
-                console.log(chalk.yellow('  No tasks found in this room.'));
-                return;
-            }
-
-            console.log(chalk.cyan(`\n📋 Your Tasks in room: ${chalk.white(roomId)}\n`));
-            console.log(chalk.dim('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
-
-            result.tasks.forEach((task, index) => {
-                const statusColor = {
-                    completed: chalk.green,
-                    in_progress: chalk.yellow,
-                    pending: chalk.dim,
-                }[task.status] || chalk.white;
-
-                const status  = statusColor(`[${task.status || 'pending'}]`);
-                const title   = chalk.white(task.title || task.name || 'Untitled');
-                const due     = task.dueDate ? chalk.dim(` — due: ${new Date(task.dueDate).toLocaleDateString()}`) : '';
+            result = await shell.api._request('GET', `/thinknsh/${roomId}/tasks?n=${topN}`);
+        } catch (err) {
+            console.log(chalk.red(`\n  ❌ ${err.message}\n`));
+            return;
+        }
 
-                console.log(`  ${chalk.dim(`${index + 1}.`)} ${status} ${title}${due}`);
+        process.stdout.write(' '.repeat(30) + '\r'); // clear spinner line
+
+        // ════════════════════════════════════════════════════════════════════
+        //  MY TASKS
+        // ════════════════════════════════════════════════════════════════════
+        let tasks = result.tasks || [];
+
+        if (filterStatus) tasks = tasks.filter(t => t.status === filterStatus);
+        if (!showAll)      tasks = tasks.filter(t => !['completed','done'].includes(t.status));
+
+        console.log(divider());
+        console.log(chalk.cyan(`  MY TASKS`) + chalk.dim(`  (${tasks.length} active${result.total > tasks.length ? ` of ${result.total}` : ''})`));
+        console.log(divider());
+
+        if (!tasks.length) {
+            console.log(chalk.dim('\n  No assigned tasks.\n'));
+        } else {
+            tasks.forEach((task, i) => {
+                const sc = stColors[task.status]   || chalk.white;
+                const pc = prColors[task.priority] || chalk.white;
+
+                const num      = chalk.dim(`  ${String(i+1).padStart(2)}.`);
+                const status   = sc(`[${(task.status || 'unknown').padEnd(10)}]`);
+                const title    = task.status === 'completed'
+                    ? chalk.dim(task.title)
+                    : chalk.white(task.title);
+                const due      = fmtDue(task.dueDate);
+                const myStatus = task.myStatus && task.myStatus !== task.status
+                    ? chalk.dim(` (${task.myStatus})`)
+                    : '';
+                const col      = task.column ? chalk.dim(` [${task.column}]`) : '';
+
+                console.log(`\n${num} ${status} ${title}`);
+                console.log(subline('id', task._id) +
+                    `  ${chalk.dim('priority:')} ${pc(task.priority)}` +
+                    due + myStatus + col);
 
                 if (task.description) {
-                    console.log(`     ${chalk.dim(task.description)}`);
+                    const desc = task.description.length > 90
+                        ? task.description.slice(0, 87) + '...'
+                        : task.description;
+                    console.log(`     ${chalk.dim(desc)}`);
                 }
             });
+        }
 
-            console.log(chalk.dim('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
-            console.log(chalk.green(`  ✅ ${result.tasks.length} task(s) fetched successfully.\n`));
-
-        } catch (err) {
-            if (err.name === 'ExitPromptError' || err.message?.includes('force closed')) {
-                console.log(chalk.yellow('⚠️  Cancelled'));
+        // ════════════════════════════════════════════════════════════════════
+        //  SUGGESTIONS
+        // ════════════════════════════════════════════════════════════════════
+        if (!noSuggestions) {
+            const suggestions = result.suggestions?.tasks    || [];
+            const insights    = result.suggestions?.insights || {};
+            const meta        = result.suggestions?.metadata || {};
+
+            console.log('\n' + divider(chalk.magenta));
+            console.log(chalk.magenta(`  SUGGESTED FOR YOU`) +
+                chalk.dim(`  (top ${suggestions.length}${meta.totalScored ? ` of ${meta.totalScored} available` : ''})`));
+            console.log(divider(chalk.magenta));
+
+            if (!suggestions.length) {
+                console.log(chalk.dim('\n  No suggestions — all tasks are assigned.\n'));
             } else {
-                console.log(chalk.red(`❌ Fetching tasks failed: ${err.message}`));
+                suggestions.forEach((task, i) => {
+                    const pc  = prColors[task.priority] || chalk.white;
+                    const plc = plColor(task.priorityLevel);
+                    const due = fmtDue(task.dueDate);
+                    const col = task.column ? chalk.dim(` [${task.column}]`) : '';
+                    const assignees = task.assigneeCount
+                        ? chalk.dim(` · ${task.assigneeCount} assigned`)
+                        : chalk.dim(' · unassigned');
+                    const urgentTag = task.isOverdue
+                        ? chalk.red(' ⚠ OVERDUE')
+                        : task.isUrgent ? chalk.yellow(' ⏰ URGENT') : '';
+
+                    const num   = chalk.dim(`  ${String(i+1).padStart(2)}.`);
+                    const score = `[score:${scoreColor(task.score)}]`;
+                    const level = plc(`[${task.priorityLevel}]`);
+
+                    console.log(`\n${num} ${score} ${level} ${chalk.white(task.title)}${urgentTag}`);
+                    console.log(subline('id', task._id) +
+                        `  ${chalk.dim('priority:')} ${pc(task.priority)}` +
+                        due + col + assignees);
+
+                    if (task.priorityReason) {
+                        console.log(`     ${chalk.dim('↳ ' + task.priorityReason)}`);
+                    }
+                });
+
+                // ── Insights bar ─────────────────────────────────────────────
+                console.log('\n' + divider(chalk.dim));
+                if (insights.focusRecommendation) {
+                    console.log(`  ${chalk.magenta('💡')} ${chalk.white(insights.focusRecommendation)}`);
+                }
+                if (insights.estimatedTime) {
+                    console.log(`  ${chalk.dim('⏱  Est. time:')} ${chalk.white(insights.estimatedTime)}`);
+                }
+                if (meta.scoreRange) {
+                    console.log(`  ${chalk.dim('📊 Score range:')} ${chalk.white(`${meta.scoreRange.min}–${meta.scoreRange.max}`)}  ${chalk.dim('avg:')} ${chalk.white(meta.scoreRange.avg)}`);
+                }
             }
         }
+
+        // ── Footer ───────────────────────────────────────────────────────────
+        console.log('\n' + divider());
+        console.log(chalk.dim('  task <id>  ·  complete <id>  ·  tasks --all  ·  tasks 10  ·  tasks --no-suggest'));
+        console.log(divider() + '\n');
     }
 };

package/src/core/api-client.js

@@ -11,8 +11,8 @@ const os    = require('os');
 class ThinkNCollabAPI {
 
     constructor(options = {}) {
-        this.apiUrl      = (options.apiUrl || 'https://thinkncollab.com').replace(/\/$/, '');
-        this.wsUrl       = (options.wsUrl  || 'https://thinkncollab.com').replace(/\/$/, '');
+        this.apiUrl      = (options.apiUrl || 'http://localhost:3001').replace(/\/$/, '');
+        this.wsUrl       = (options.wsUrl  || 'http://localhost:3001').replace(/\/$/, '');
         this.session     = null;
         this.sessionPath = path.join(os.homedir(), '.thinkncollab', 'session.json');
         this._loadSession();
@@ -115,37 +115,73 @@ class ThinkNCollabAPI {
 
     // ─── Auth ─────────────────────────────────────────────────────────────────
 
-    async login(email, password) {
-        const result = await this._request('POST', '/thinknsh/login', null, {
-            'x-email':      email,
-            'x-password':   password,
-            'x-machine-id': os.hostname()
-        });
+async login(email, password) {
+    const result = await this._request('POST', '/thinknsh/login', null, {
+        'x-email':      email,
+        'x-password':   password,
+        'x-machine-id': os.hostname()
+    });
+
+    this._saveSession({
+        token:          result.shellToken,
+        shellSessionId: result.shellSessionId,  // ✅ add karo
+        user: {
+            _id:      result._id,
+            userId:   result._id,
+            email:    result.email,
+            name:     result.name,
+            userType: result.userType || result.model || 'User',
+        },
+        timestamp: new Date().toISOString()
+    });
+
+    return {
+        token: result.shellToken,
+        user:  this.getUser()
+    };
+}
 
-        // Normalise: store with BOTH _id and userId so getUser() always works
-        this._saveSession({
-            token: result.shellToken,
-            user: {
-                _id:      result._id,
-                userId:   result._id,   // explicit — ws needs this
-                email:    result.email,
-                name:     result.name,
-                userType: result.userType || result.model || 'User',
-            },
-            timestamp: new Date().toISOString()
-        });
+// ─── Session event logger ─────────────────────────────────────────────────
 
-        return {
-            token: result.shellToken,
-            user:  this.getUser()       // return normalised shape
-        };
-    }
+async logEvent(type, roomId = null, meta = {}) {
+    const sessionId = this.session?.shellSessionId;
+    if (!sessionId) return;
+    await this._request('POST', '/thinknsh/session/event', {
+        sessionId, type, roomId, meta
+    }).catch(() => {}); // silently fail — never block shell
+}
+
+// ─── Heartbeat — keeps lastSeenAt fresh while shell is open ──────────────
+
+startHeartbeat(intervalMs = 60000) {
+    if (this._heartbeatTimer) return; // already running
+    this._heartbeatTimer = setInterval(() => {
+        const sessionId = this.session?.shellSessionId;
+        if (!sessionId) return;
+        this._request('POST', '/thinknsh/session/event', {
+            sessionId,
+            type: 'heartbeat',
+            meta: { ts: new Date().toISOString() }
+        }).catch(() => {});
+    }, intervalMs);
+}
 
-    async logout() {
-        this._clearSession();
-        return { success: true };
+stopHeartbeat() {
+    if (this._heartbeatTimer) {
+        clearInterval(this._heartbeatTimer);
+        this._heartbeatTimer = null;
     }
+}
 
+async logout() {
+    const sessionId = this.session?.shellSessionId;
+    if (sessionId) {
+        await this._request('POST', '/thinknsh/session/end', { sessionId }).catch(() => {});
+    }
+    this.stopHeartbeat();
+    this._clearSession();
+    return { success: true };
+}
     async whoami() {
         if (!this.isAuthenticated()) throw new Error('Not logged in');
         return this.getUser();

package/src/core/project-config.js

@@ -18,7 +18,7 @@ const fs   = require('fs-extra');
 const path = require('path');
 const os   = require('os');
 
-const CONFIG_FILE  = '.tncproject';
+const CONFIG_FILE  = 'tncproject';
 const MAGIC        = Buffer.from('TNCP');
 const ROOM_ID_SIZE = 24;
 const MIN_SIZE     = 4 + 1 + ROOM_ID_SIZE + 12 + 16 + 2;  // 59 bytes minimum