@cmdctrl/cursor-cli 0.2.0 → 0.2.2

package/dist/session-watcher.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Cursor CLI Session Watcher
+ *
+ * Polls cursor-agent JSONL transcript files for new messages and emits events.
+ * Used with the SDK's onWatchSession / onUnwatchSession hooks.
+ */
+export interface CursorSessionEvent {
+    type: 'USER_MESSAGE' | 'AGENT_RESPONSE';
+    sessionId: string;
+    uuid: string;
+    content: string;
+}
+export interface CursorCompletionEvent {
+    sessionId: string;
+    filePath: string;
+    lastMessage: string;
+    messageCount: number;
+}
+type EventCallback = (event: CursorSessionEvent) => void;
+type CompletionCallback = (event: CursorCompletionEvent) => void;
+export declare class CursorSessionWatcher {
+    private watchedSessions;
+    private completionTimers;
+    private pollTimer;
+    private onEvent;
+    private onCompletion;
+    constructor(onEvent: EventCallback, onCompletion?: CompletionCallback);
+    watchSession(sessionId: string, filePath: string): void;
+    unwatchSession(sessionId: string): void;
+    unwatchAll(): void;
+    get watchCount(): number;
+    private startPolling;
+    private checkSession;
+    private startCompletionTimer;
+    private cancelCompletionTimer;
+}
+export {};
+//# sourceMappingURL=session-watcher.d.ts.map

package/dist/session-watcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-watcher.d.ts","sourceRoot":"","sources":["../src/session-watcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAAC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;AACzD,KAAK,kBAAkB,GAAG,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;AAWjE,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,eAAe,CAA0C;IACjE,OAAO,CAAC,gBAAgB,CAA0C;IAClE,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAA4B;gBAEpC,OAAO,EAAE,aAAa,EAAE,YAAY,CAAC,EAAE,kBAAkB;IAKrE,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA8BvD,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAWvC,UAAU,IAAI,IAAI;IAUlB,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,YAAY;IA2CpB,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,qBAAqB;CAO9B"}

package/dist/session-watcher.js

@@ -0,0 +1,175 @@
+"use strict";
+/**
+ * Cursor CLI Session Watcher
+ *
+ * Polls cursor-agent JSONL transcript files for new messages and emits events.
+ * Used with the SDK's onWatchSession / onUnwatchSession hooks.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CursorSessionWatcher = void 0;
+const fs = __importStar(require("fs"));
+const session_discovery_1 = require("./session-discovery");
+const POLL_INTERVAL_MS = 500;
+const COMPLETION_DELAY_MS = 5000;
+class CursorSessionWatcher {
+    watchedSessions = new Map();
+    completionTimers = new Map();
+    pollTimer = null;
+    onEvent;
+    onCompletion;
+    constructor(onEvent, onCompletion) {
+        this.onEvent = onEvent;
+        this.onCompletion = onCompletion || null;
+    }
+    watchSession(sessionId, filePath) {
+        if (this.watchedSessions.has(sessionId))
+            return;
+        if (!fs.existsSync(filePath)) {
+            console.warn(`[CursorWatcher] File not found: ${filePath}`);
+            return;
+        }
+        try {
+            const stat = fs.statSync(filePath);
+            const messages = (0, session_discovery_1.parseTranscriptFile)(filePath);
+            const lastAgent = [...messages].reverse().find(m => m.role === 'agent');
+            this.watchedSessions.set(sessionId, {
+                sessionId,
+                filePath,
+                lastSize: stat.size,
+                processedCount: messages.length,
+                messageCount: messages.length,
+                lastMessage: lastAgent?.content.slice(0, 200) || '',
+            });
+            console.log(`[CursorWatcher] Started watching session ${sessionId} (${messages.length} existing messages)`);
+            if (!this.pollTimer)
+                this.startPolling();
+        }
+        catch (err) {
+            console.error(`[CursorWatcher] Failed to watch ${filePath}:`, err);
+        }
+    }
+    unwatchSession(sessionId) {
+        this.cancelCompletionTimer(sessionId);
+        if (this.watchedSessions.delete(sessionId)) {
+            console.log(`[CursorWatcher] Stopped watching session ${sessionId}`);
+        }
+        if (this.watchedSessions.size === 0 && this.pollTimer) {
+            clearInterval(this.pollTimer);
+            this.pollTimer = null;
+        }
+    }
+    unwatchAll() {
+        for (const timer of this.completionTimers.values())
+            clearTimeout(timer);
+        this.completionTimers.clear();
+        this.watchedSessions.clear();
+        if (this.pollTimer) {
+            clearInterval(this.pollTimer);
+            this.pollTimer = null;
+        }
+    }
+    get watchCount() {
+        return this.watchedSessions.size;
+    }
+    startPolling() {
+        this.pollTimer = setInterval(() => {
+            for (const session of this.watchedSessions.values()) {
+                this.checkSession(session);
+            }
+        }, POLL_INTERVAL_MS);
+    }
+    checkSession(session) {
+        try {
+            if (!fs.existsSync(session.filePath)) {
+                this.unwatchSession(session.sessionId);
+                return;
+            }
+            const stat = fs.statSync(session.filePath);
+            if (stat.size === session.lastSize)
+                return;
+            session.lastSize = stat.size;
+            const allMessages = (0, session_discovery_1.parseTranscriptFile)(session.filePath);
+            const newMessages = allMessages.slice(session.processedCount);
+            if (newMessages.length === 0)
+                return;
+            let sawAgent = false;
+            for (const msg of newMessages) {
+                const uuid = (0, session_discovery_1.stableUuid)(session.sessionId + ':' + msg.id);
+                this.onEvent({
+                    type: msg.role === 'user' ? 'USER_MESSAGE' : 'AGENT_RESPONSE',
+                    sessionId: session.sessionId,
+                    uuid,
+                    content: msg.content,
+                });
+                if (msg.role === 'agent') {
+                    sawAgent = true;
+                    session.lastMessage = msg.content.slice(0, 200);
+                }
+                session.messageCount++;
+            }
+            session.processedCount = allMessages.length;
+            if (sawAgent)
+                this.startCompletionTimer(session);
+        }
+        catch (err) {
+            console.error(`[CursorWatcher] Error checking session ${session.sessionId}:`, err);
+        }
+    }
+    startCompletionTimer(session) {
+        this.cancelCompletionTimer(session.sessionId);
+        if (!this.onCompletion)
+            return;
+        const timer = setTimeout(() => {
+            this.completionTimers.delete(session.sessionId);
+            this.onCompletion?.({
+                sessionId: session.sessionId,
+                filePath: session.filePath,
+                lastMessage: session.lastMessage,
+                messageCount: session.messageCount,
+            });
+        }, COMPLETION_DELAY_MS);
+        this.completionTimers.set(session.sessionId, timer);
+    }
+    cancelCompletionTimer(sessionId) {
+        const timer = this.completionTimers.get(sessionId);
+        if (timer) {
+            clearTimeout(timer);
+            this.completionTimers.delete(sessionId);
+        }
+    }
+}
+exports.CursorSessionWatcher = CursorSessionWatcher;
+//# sourceMappingURL=session-watcher.js.map

package/dist/session-watcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-watcher.js","sourceRoot":"","sources":["../src/session-watcher.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmdctrl/cursor-cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "CmdCtrl daemon for Cursor CLI - connects your workstation to the CmdCtrl orchestration server",
   "main": "./dist/index.js",
   "bin": {

package/src/commands/start.ts

@@ -2,7 +2,8 @@ import { readFileSync } from 'fs';
 import { join } from 'path';
 import { DaemonClient, ConfigManager } from '@cmdctrl/daemon-sdk';
 import { CursorAdapter } from '../adapter/cursor-cli';
-import { MessageStore } from '../message-store';
+import { discoverSessions, readSessionMessages } from '../session-discovery';
+import { CursorSessionWatcher } from '../session-watcher';
 
 const configManager = new ConfigManager('cursor-cli');
 
@@ -39,9 +40,33 @@ export async function start(): Promise<void> {
 
   configManager.writePidFile(process.pid);
 
-  const messageStore = new MessageStore();
-  const pendingInstructions = new Map<string, string>();
-  const taskSessionMap = new Map<string, string>();
+  // Managed session IDs (started via task_start) – excluded from native discovery
+  const managedSessionIds = new Set<string>();
+
+  const sessionWatcher = new CursorSessionWatcher(
+    (event) => {
+      // Only send activity for user messages – agent responses are the final
+      // answer already shown via the transcript; sending them here duplicates.
+      if (event.type !== 'USER_MESSAGE') return;
+      client.sendSessionActivity(
+        event.sessionId,
+        '',
+        event.content,
+        1,
+        false,
+        new Date().toISOString()
+      );
+    },
+    (completion) => {
+      client.sendSessionActivity(
+        completion.sessionId,
+        completion.filePath,
+        completion.lastMessage,
+        completion.messageCount,
+        true
+      );
+    }
+  );
 
   // Event callback wired into the DaemonClient below
   let sendEvent: (taskId: string, eventType: string, data: Record<string, unknown>) => void;
@@ -49,21 +74,8 @@ export async function start(): Promise<void> {
   const adapter = new CursorAdapter((taskId, eventType, data) => {
     const sessionId = data.session_id as string | undefined;
 
-    // Store initial user message when session starts
     if (eventType === 'SESSION_STARTED' && sessionId) {
-      const instruction = pendingInstructions.get(taskId);
-      if (instruction) {
-        messageStore.storeMessage(sessionId, 'USER', instruction);
-        pendingInstructions.delete(taskId);
-      }
-    }
-
-    // Store agent response on completion
-    if (eventType === 'TASK_COMPLETE' && data.result) {
-      const sid = (data.session_id as string) || taskSessionMap.get(taskId);
-      if (sid) {
-        messageStore.storeMessage(sid, 'AGENT', data.result as string);
-      }
+      managedSessionIds.add(sessionId);
     }
 
     sendEvent(taskId, eventType, data);
@@ -77,10 +89,13 @@ export async function start(): Promise<void> {
     version: daemonVersion,
   });
 
-  // Wire up sendEvent to the client's internal method
+  client.setSessionsProvider(() => discoverSessions(managedSessionIds));
+
   sendEvent = (taskId, eventType, data) => {
-    // Use the client to send events — the SDK handles this via task handles,
-    // but since the adapter uses a callback pattern, we send raw events
+    // cursor-agent writes all content to transcript files – suppress OUTPUT events
+    // and strip result from TASK_COMPLETE to avoid duplicating transcript content.
+    if (eventType === 'OUTPUT') return;
+    if (eventType === 'TASK_COMPLETE') data = { ...data, result: '' };
     (client as any).send({
       type: 'event',
       task_id: taskId,
@@ -89,8 +104,15 @@ export async function start(): Promise<void> {
     });
   };
 
+  client.onWatchSession((sessionId, filePath) => {
+    sessionWatcher.watchSession(sessionId, filePath);
+  });
+
+  client.onUnwatchSession((sessionId) => {
+    sessionWatcher.unwatchSession(sessionId);
+  });
+
   client.onTaskStart(async (task) => {
-    pendingInstructions.set(task.taskId, task.instruction);
     try {
       await adapter.startTask(task.taskId, task.instruction, task.projectPath);
     } catch (err: unknown) {
@@ -99,8 +121,6 @@ export async function start(): Promise<void> {
   });
 
   client.onTaskResume(async (task) => {
-    messageStore.storeMessage(task.sessionId, 'USER', task.message);
-    taskSessionMap.set(task.taskId, task.sessionId);
     try {
       await adapter.resumeTask(task.taskId, task.sessionId, task.message, task.projectPath);
     } catch (err: unknown) {
@@ -112,19 +132,9 @@ export async function start(): Promise<void> {
     await adapter.cancelTask(taskId);
   });
 
+  // cursor-agent always writes to transcript files – use them as the single source of truth
   client.onGetMessages((req) => {
-    const result = messageStore.getMessages(
-      req.sessionId,
-      req.limit,
-      req.beforeUuid,
-      req.afterUuid
-    );
-    return {
-      messages: result.messages,
-      hasMore: result.hasMore,
-      oldestUuid: result.oldestUuid,
-      newestUuid: result.newestUuid,
-    };
+    return readSessionMessages(req.sessionId, req.limit, req.beforeUuid, req.afterUuid);
   });
 
   client.onVersionStatus((msg) => {
@@ -135,6 +145,7 @@ export async function start(): Promise<void> {
 
   const shutdown = async () => {
     console.log('\nShutting down...');
+    sessionWatcher.unwatchAll();
     await adapter.stopAll();
     await client.disconnect();
     configManager.deletePidFile();

package/src/commands/update.ts

@@ -1,7 +1,12 @@
-import { execSync } from 'child_process';
+import { execSync, spawn } from 'child_process';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+import { ConfigManager } from '@cmdctrl/daemon-sdk';
+import { stop } from './stop';
 
+const configManager = new ConfigManager('cursor-cli');
+
+// Get the current version from package.json
 function getCurrentVersion(): string {
   try {
     const pkg = JSON.parse(readFileSync(join(__dirname, '..', '..', 'package.json'), 'utf-8'));
@@ -16,6 +21,7 @@ function getCurrentVersion(): string {
   }
 }
 
+// Fetch the latest version from npm registry
 async function getLatestVersion(packageName: string): Promise<string | null> {
   try {
     const response = await fetch(`https://registry.npmjs.org/${packageName}/latest`);
@@ -30,6 +36,7 @@ async function getLatestVersion(packageName: string): Promise<string | null> {
 export async function update(): Promise<void> {
   const packageName = '@cmdctrl/cursor-cli';
   const currentVersion = getCurrentVersion();
+  const wasRunning = configManager.isDaemonRunning();
 
   console.log(`Current version: ${currentVersion}`);
   console.log(`Checking for updates...`);
@@ -46,6 +53,14 @@ export async function update(): Promise<void> {
     return;
   }
 
+  // Stop daemon before updating so the old process doesn't hold stale code
+  if (wasRunning) {
+    console.log('Stopping daemon before update...');
+    stop();
+    // Wait for stop to complete (uses setTimeout internally)
+    await new Promise((resolve) => setTimeout(resolve, 3000));
+  }
+
   console.log(`Updating ${packageName}: v${currentVersion} → v${latestVersion}`);
 
   try {
@@ -58,6 +73,7 @@ export async function update(): Promise<void> {
     process.exit(1);
   }
 
+  // Verify the update
   try {
     const result = execSync(`cmdctrl-cursor-cli --version`, { encoding: 'utf-8' }).trim();
     console.log(`\nUpdated successfully to v${result}`);
@@ -65,6 +81,14 @@ export async function update(): Promise<void> {
     console.log(`\nUpdate installed. Run 'cmdctrl-cursor-cli --version' to verify.`);
   }
 
-  console.log('\nIf the daemon is running, restart it:');
-  console.log('  cmdctrl-cursor-cli stop && cmdctrl-cursor-cli start');
+  // Restart daemon if it was running before update
+  if (wasRunning) {
+    console.log('Restarting daemon...');
+    const child = spawn('cmdctrl-cursor-cli', ['start'], {
+      detached: true,
+      stdio: 'ignore',
+    });
+    child.unref();
+    console.log('Daemon restarted.');
+  }
 }