@eyeglass/bridge 0.1.2 → 0.1.4

package/dist/http.js

@@ -50,7 +50,7 @@ export function startHttpServer() {
         }
         res.json({ success: true });
     });
-    // Undo changes for a specific interaction
+    // Undo/discard changes for a specific interaction
     app.post('/undo', async (req, res) => {
         const { interactionId } = req.body;
         // Type validation
@@ -58,7 +58,27 @@ export function startHttpServer() {
             res.status(400).json({ error: 'Missing or invalid interactionId' });
             return;
         }
-        const result = await store.undoInteraction(interactionId);
+        // Try discard first (for uncommitted changes), then undo (for committed changes)
+        let result = await store.discardChanges(interactionId);
+        if (!result.success && result.message !== 'Not a git repository') {
+            // If discard didn't work, try undo (revert commit)
+            result = await store.undoInteraction(interactionId);
+        }
+        if (!result.success) {
+            res.status(400).json({ error: result.message });
+            return;
+        }
+        res.json({ success: true, message: result.message });
+    });
+    // Commit changes for a specific interaction (when autoCommit is disabled)
+    app.post('/commit', (req, res) => {
+        const { interactionId } = req.body;
+        // Type validation
+        if (typeof interactionId !== 'string' || !interactionId) {
+            res.status(400).json({ error: 'Missing or invalid interactionId' });
+            return;
+        }
+        const result = store.manualCommit(interactionId);
         if (!result.success) {
             res.status(400).json({ error: result.message });
             return;

package/dist/mcp.js

@@ -226,9 +226,13 @@ Handle this request now.`,
                     };
                 }
                 store.updateStatus(active.interactionId, status, message);
+                // On success/failed, hint to continue listening for more requests
+                const continueHint = (status === 'success' || status === 'failed')
+                    ? '\n\n**Ready for next request.** Call `wait_for_request()` to continue listening for user requests.'
+                    : '';
                 return {
                     content: [
-                        { type: 'text', text: `Status updated to "${status}"${message ? `: ${message}` : ''}` },
+                        { type: 'text', text: `Status updated to "${status}"${message ? `: ${message}` : ''}${continueHint}` },
                     ],
                 };
             }

package/dist/store.d.ts

@@ -7,6 +7,7 @@ export declare class ContextStore extends EventEmitter {
     private pendingQuestion;
     private pendingWait;
     private commitMap;
+    private pendingCommitMessage;
     setFocus(payload: FocusPayload): void;
     /**
      * Wait for a new focus request from the browser.
@@ -33,6 +34,20 @@ export declare class ContextStore extends EventEmitter {
         message: string;
     }>;
     private revertCommit;
+    /**
+     * Manually commit changes for an interaction (when autoCommit is disabled)
+     */
+    manualCommit(interactionId: string): {
+        success: boolean;
+        message: string;
+    };
+    /**
+     * Discard uncommitted changes for an interaction (when autoCommit is disabled)
+     */
+    discardChanges(interactionId: string): Promise<{
+        success: boolean;
+        message: string;
+    }>;
     sendThought(interactionId: string, content: string): void;
     reportAction(interactionId: string, action: 'reading' | 'writing' | 'searching' | 'thinking', target: string, complete?: boolean): void;
     askQuestion(interactionId: string, questionId: string, question: string, options: Array<{

package/dist/store.js

@@ -13,6 +13,7 @@ export class ContextStore extends EventEmitter {
         this.pendingQuestion = null;
         this.pendingWait = null;
         this.commitMap = new Map(); // interactionId -> commitHash
+        this.pendingCommitMessage = new Map(); // interactionId -> message (for manual commits)
     }
     setFocus(payload) {
         if (this.active) {
@@ -100,9 +101,16 @@ export class ContextStore extends EventEmitter {
         if (this.active?.interactionId !== interactionId)
             return;
         this.currentStatus = status;
-        // Auto-commit changes when marked as success
+        // Auto-commit changes when marked as success (if autoCommit is enabled)
         if (status === 'success') {
-            this.commitChanges(interactionId, message);
+            const shouldAutoCommit = this.active.autoCommit !== false; // Default to true
+            if (shouldAutoCommit) {
+                this.commitChanges(interactionId, message);
+            }
+            else {
+                // Store message for potential manual commit later
+                this.pendingCommitMessage.set(interactionId, message || 'Eyeglass change');
+            }
         }
         this.emitActivity({
             type: 'status',
@@ -193,6 +201,60 @@ export class ContextStore extends EventEmitter {
             return { success: false, message: `Failed to revert: ${errorMessage}` };
         }
     }
+    /**
+     * Manually commit changes for an interaction (when autoCommit is disabled)
+     */
+    manualCommit(interactionId) {
+        // Check if already committed
+        if (this.commitMap.has(interactionId)) {
+            return { success: false, message: 'Changes already committed' };
+        }
+        const commitMessage = this.pendingCommitMessage.get(interactionId) || 'Eyeglass change';
+        this.pendingCommitMessage.delete(interactionId);
+        try {
+            this.commitChanges(interactionId, commitMessage);
+            // Check if commit was successful
+            if (this.commitMap.has(interactionId)) {
+                return { success: true, message: 'Changes committed successfully' };
+            }
+            else {
+                return { success: false, message: 'No changes to commit' };
+            }
+        }
+        catch (err) {
+            const errorMessage = err instanceof Error ? err.message : 'Unknown error';
+            return { success: false, message: `Failed to commit: ${errorMessage}` };
+        }
+    }
+    /**
+     * Discard uncommitted changes for an interaction (when autoCommit is disabled)
+     */
+    async discardChanges(interactionId) {
+        // If already committed, use revert
+        if (this.commitMap.has(interactionId)) {
+            return this.undoInteraction(interactionId);
+        }
+        try {
+            const cwd = process.cwd();
+            // Check if we're in a git repo
+            try {
+                execFileSync('git', ['rev-parse', '--git-dir'], { cwd, stdio: 'pipe' });
+            }
+            catch {
+                return { success: false, message: 'Not a git repository' };
+            }
+            // Discard all uncommitted changes
+            execFileSync('git', ['checkout', '.'], { cwd, stdio: 'pipe' });
+            execFileSync('git', ['clean', '-fd'], { cwd, stdio: 'pipe' });
+            // Clean up pending commit message
+            this.pendingCommitMessage.delete(interactionId);
+            return { success: true, message: 'Changes discarded' };
+        }
+        catch (err) {
+            const errorMessage = err instanceof Error ? err.message : 'Unknown error';
+            return { success: false, message: `Failed to discard: ${errorMessage}` };
+        }
+    }
     // Send a thought/reasoning to the user
     sendThought(interactionId, content) {
         if (this.active?.interactionId !== interactionId)

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@eyeglass/bridge",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "MCP server bridge for Eyeglass",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
-    "eyeglass-bridge": "./dist/index.js"
+    "eyeglass-bridge": "dist/index.js"
   },
   "files": [
     "dist"
@@ -26,7 +26,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/donutboyband/eyeglass.git",
+    "url": "git+https://github.com/donutboyband/eyeglass.git",
     "directory": "packages/bridge"
   },
   "dependencies": {