package.json

@@ -1,7 +1,7 @@
 {
     "name": "cheating-daddy",
     "productName": "cheating-daddy",
-    "version": "0.5.10",
+    "version": "0.5.8",
     "description": "cheating daddy",
     "main": "src/index.js",
     "scripts": {

src/components/app/CheatingDaddyApp.js

@@ -6,7 +6,6 @@ import { HelpView } from '../views/HelpView.js';
 import { HistoryView } from '../views/HistoryView.js';
 import { AssistantView } from '../views/AssistantView.js';
 import { OnboardingView } from '../views/OnboardingView.js';
-import { ScreenPickerDialog } from '../views/ScreenPickerDialog.js';
 
 export class CheatingDaddyApp extends LitElement {
     static styles = css`
@@ -113,8 +112,6 @@ export class CheatingDaddyApp extends LitElement {
         _storageLoaded: { state: true },
         aiProvider: { type: String },
         modelInfo: { type: Object },
-        showScreenPicker: { type: Boolean },
-        screenSources: { type: Array },
     };
 
     constructor() {
@@ -140,8 +137,6 @@ export class CheatingDaddyApp extends LitElement {
         this._storageLoaded = false;
         this.aiProvider = 'gemini';
         this.modelInfo = { model: '', visionModel: '', whisperModel: '' };
-        this.showScreenPicker = false;
-        this.screenSources = [];
 
         // Load from storage
         this._loadFromStorage();
@@ -554,16 +549,6 @@ export class CheatingDaddyApp extends LitElement {
                         <div class="view-container">${this.renderCurrentView()}</div>
                     </div>
                 </div>
-                ${this.showScreenPicker
-                    ? html`
-                          <screen-picker-dialog
-                              ?visible=${this.showScreenPicker}
-                              .sources=${this.screenSources}
-                              @source-selected=${this.handleSourceSelected}
-                              @cancelled=${this.handlePickerCancelled}
-                          ></screen-picker-dialog>
-                      `
-                    : ''}
             </div>
         `;
     }
@@ -594,44 +579,6 @@ export class CheatingDaddyApp extends LitElement {
 
         this.requestUpdate();
     }
-
-    async showScreenPickerDialog() {
-        const { ipcRenderer } = window.require('electron');
-        const result = await ipcRenderer.invoke('get-screen-sources');
-        
-        if (result.success) {
-            this.screenSources = result.sources;
-            this.showScreenPicker = true;
-            return new Promise((resolve) => {
-                this._screenPickerResolve = resolve;
-            });
-        } else {
-            console.error('Failed to get screen sources:', result.error);
-            return { cancelled: true };
-        }
-    }
-
-    async handleSourceSelected(event) {
-        const { source } = event.detail;
-        const { ipcRenderer } = window.require('electron');
-        
-        // Tell main process which source was selected
-        await ipcRenderer.invoke('set-selected-source', source.id);
-        
-        this.showScreenPicker = false;
-        if (this._screenPickerResolve) {
-            this._screenPickerResolve({ source });
-            this._screenPickerResolve = null;
-        }
-    }
-
-    handlePickerCancelled() {
-        this.showScreenPicker = false;
-        if (this._screenPickerResolve) {
-            this._screenPickerResolve({ cancelled: true });
-            this._screenPickerResolve = null;
-        }
-    }
 }
 
 customElements.define('cheating-daddy-app', CheatingDaddyApp);

src/components/views/ScreenPickerDialog.js

@@ -1,175 +0,0 @@
-import { html, css, LitElement } from '../../assets/lit-core-2.7.4.min.js';
-
-export class ScreenPickerDialog extends LitElement {
-    static properties = {
-        sources: { type: Array },
-        visible: { type: Boolean },
-    };
-
-    static styles = css`
-        :host {
-            display: none;
-            position: fixed;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background: rgba(0, 0, 0, 0.8);
-            z-index: 10000;
-            align-items: center;
-            justify-content: center;
-        }
-
-        :host([visible]) {
-            display: flex;
-        }
-
-        .dialog {
-            background: var(--background-color);
-            border: 1px solid var(--border-color);
-            border-radius: 8px;
-            padding: 24px;
-            max-width: 800px;
-            max-height: 80vh;
-            overflow-y: auto;
-        }
-
-        h2 {
-            margin: 0 0 16px 0;
-            color: var(--text-color);
-            font-size: 18px;
-            font-weight: 500;
-        }
-
-        .sources-grid {
-            display: grid;
-            grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-            gap: 12px;
-            margin-bottom: 16px;
-        }
-
-        .source-item {
-            background: var(--input-background);
-            border: 2px solid transparent;
-            border-radius: 6px;
-            padding: 12px;
-            cursor: pointer;
-            transition: all 0.2s ease;
-        }
-
-        .source-item:hover {
-            border-color: var(--border-default);
-            background: var(--button-hover);
-        }
-
-        .source-item.selected {
-            border-color: var(--accent-color);
-            background: var(--button-hover);
-        }
-
-        .source-thumbnail {
-            width: 100%;
-            height: 120px;
-            object-fit: contain;
-            background: #1a1a1a;
-            border-radius: 4px;
-            margin-bottom: 8px;
-        }
-
-        .source-name {
-            color: var(--text-color);
-            font-size: 13px;
-            text-align: center;
-            word-break: break-word;
-        }
-
-        .buttons {
-            display: flex;
-            gap: 8px;
-            justify-content: flex-end;
-        }
-
-        button {
-            background: var(--button-background);
-            color: var(--text-color);
-            border: 1px solid var(--border-color);
-            padding: 8px 16px;
-            border-radius: 3px;
-            cursor: pointer;
-            font-size: 13px;
-            transition: background-color 0.1s ease;
-        }
-
-        button:hover {
-            background: var(--button-hover);
-        }
-
-        button.primary {
-            background: var(--accent-color);
-            color: white;
-            border-color: var(--accent-color);
-        }
-
-        button.primary:hover {
-            background: var(--accent-hover);
-        }
-
-        button:disabled {
-            opacity: 0.5;
-            cursor: not-allowed;
-        }
-    `;
-
-    constructor() {
-        super();
-        this.sources = [];
-        this.visible = false;
-        this.selectedSource = null;
-    }
-
-    selectSource(source) {
-        this.selectedSource = source;
-        this.requestUpdate();
-    }
-
-    confirm() {
-        if (this.selectedSource) {
-            this.dispatchEvent(
-                new CustomEvent('source-selected', {
-                    detail: { source: this.selectedSource },
-                })
-            );
-        }
-    }
-
-    cancel() {
-        this.dispatchEvent(new CustomEvent('cancelled'));
-    }
-
-    render() {
-        return html`
-            <div class="dialog">
-                <h2>Choose screen or window to share</h2>
-                <div class="sources-grid">
-                    ${this.sources.map(
-                        source => html`
-                            <div
-                                class="source-item ${this.selectedSource?.id === source.id ? 'selected' : ''}"
-                                @click=${() => this.selectSource(source)}
-                            >
-                                <img class="source-thumbnail" src="${source.thumbnail}" alt="${source.name}" />
-                                <div class="source-name">${source.name}</div>
-                            </div>
-                        `
-                    )}
-                </div>
-                <div class="buttons">
-                    <button @click=${this.cancel}>Cancel</button>
-                    <button class="primary" @click=${this.confirm} ?disabled=${!this.selectedSource}>Share</button>
-                </div>
-            </div>
-        `;
-    }
-}
-
-customElements.define('screen-picker-dialog', ScreenPickerDialog);

src/utils/renderer.js

@@ -294,20 +294,9 @@ async function startCapture(screenshotIntervalSeconds = 5, imageQuality = 'mediu
 
             console.log('Linux capture started - system audio:', mediaStream.getAudioTracks().length > 0, 'microphone mode:', audioMode);
         } else {
-            // Windows - show custom screen picker first
+            // Windows - use display media with loopback for system audio
             logToMain('info', '=== Starting Windows audio capture ===');
-            cheatingDaddy.setStatus('Choose screen to share...');
+            cheatingDaddy.setStatus('Requesting screen & audio...');
-            
-            // Show screen picker dialog
-            const appElement = document.querySelector('cheating-daddy-app');
-            const pickerResult = await appElement.showScreenPickerDialog();
-            
-            if (pickerResult.cancelled) {
-                cheatingDaddy.setStatus('Cancelled');
-                return;
-            }
-            
-            cheatingDaddy.setStatus('Starting capture...');
             
             mediaStream = await navigator.mediaDevices.getDisplayMedia({
                 video: {

src/utils/window.js

@@ -33,54 +33,14 @@ function createWindow(sendToRenderer, geminiSessionRef) {
     });
 
     const { session, desktopCapturer } = require('electron');
-    
+    session.defaultSession.setDisplayMediaRequestHandler(
-    // Store selected source for Windows custom picker
+        (request, callback) => {
-    let selectedSourceId = null;
+            desktopCapturer.getSources({ types: ['screen'] }).then(sources => {
-    
+                callback({ video: sources[0], audio: 'loopback' });
-    // Setup display media handler based on platform
+            });
-    if (process.platform === 'darwin') {
+        },
-        // macOS: Use native system picker
+        { useSystemPicker: true }
-        session.defaultSession.setDisplayMediaRequestHandler(
+    );
-            (request, callback) => {
-                desktopCapturer.getSources({ types: ['screen'] }).then(sources => {
-                    callback({ video: sources[0], audio: 'loopback' });
-                });
-            },
-            { useSystemPicker: true }
-        );
-    } else {
-        // Windows/Linux: Use selected source from custom picker
-        session.defaultSession.setDisplayMediaRequestHandler(async (request, callback) => {
-            try {
-                const sources = await desktopCapturer.getSources({
-                    types: ['screen', 'window'],
-                    thumbnailSize: { width: 0, height: 0 },
-                });
-
-                // Find the selected source or use first screen
-                let source = sources[0];
-                if (selectedSourceId) {
-                    const found = sources.find(s => s.id === selectedSourceId);
-                    if (found) source = found;
-                }
-
-                if (source) {
-                    callback({ video: source, audio: 'loopback' });
-                } else {
-                    callback({});
-                }
-            } catch (error) {
-                console.error('Error in display media handler:', error);
-                callback({});
-            }
-        });
-    }
-
-    // IPC handler to set selected source
-    ipcMain.handle('set-selected-source', async (event, sourceId) => {
-        selectedSourceId = sourceId;
-        return { success: true };
-    });
 
     mainWindow.setResizable(false);
     mainWindow.setContentProtection(true);
@@ -755,29 +715,6 @@ function setupWindowIpcHandlers(mainWindow, sendToRenderer, geminiSessionRef) {
             return { success: false, error: error.message };
         }
     });
-
-    // Get available screen sources for picker
-    ipcMain.handle('get-screen-sources', async () => {
-        try {
-            const { desktopCapturer } = require('electron');
-            const sources = await desktopCapturer.getSources({
-                types: ['screen', 'window'],
-                thumbnailSize: { width: 150, height: 150 },
-            });
-
-            return {
-                success: true,
-                sources: sources.map(source => ({
-                    id: source.id,
-                    name: source.name,
-                    thumbnail: source.thumbnail.toDataURL(),
-                })),
-            };
-        } catch (error) {
-            console.error('Error getting screen sources:', error);
-            return { success: false, error: error.message };
-        }
-    });
 }
 
 module.exports = {