Skip to content

Guard code extraction sessions and reset UI before extraction #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rawritude wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard code extraction sessions and reset UI before extraction #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 45 additions & 4 deletions sidepanel/sidepanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ let editorMode = 'blocks'; // 'blocks' or 'typescript'
let messages = [];
let isStreaming = false;
let complexity = 3; // Default: balanced
let isExtracting = false;
let extractSessionId = 0;
let latestExtractSessionId = 0;
let pendingExtractSessionId = null;

// Complexity level labels
const complexityLabels = {
Expand Down Expand Up @@ -52,9 +56,20 @@ async function loadSettings() {

// Extract code from page
async function extractCode() {
codeStatus.textContent = 'Loading...';
codeStatus.className = 'code-status';
const sessionId = ++extractSessionId;
latestExtractSessionId = sessionId;
prepareCodeExtractionUI();

if (isExtracting) {
pendingExtractSessionId = sessionId;
return;
}

await runExtractCode(sessionId);
}

async function runExtractCode(sessionId) {
isExtracting = true;
try {
// Request code extraction from background
const response = await new Promise((resolve, reject) => {
Expand All @@ -67,6 +82,10 @@ async function extractCode() {
});
});

if (sessionId !== latestExtractSessionId) {
return;
}

if (response?.success && response.data) {
projectCode = response.data.mainTs || '';
editorMode = response.data.editorMode || 'blocks';
Expand Down Expand Up @@ -98,8 +117,17 @@ async function extractCode() {
codeStatus.className = 'code-status error';
}
} catch (error) {
codeStatus.textContent = 'Connection error';
codeStatus.className = 'code-status error';
if (sessionId === latestExtractSessionId) {
codeStatus.textContent = 'Connection error';
codeStatus.className = 'code-status error';
}
} finally {
isExtracting = false;
if (pendingExtractSessionId) {
const nextSessionId = pendingExtractSessionId;
pendingExtractSessionId = null;
runExtractCode(nextSessionId);
}
}
}

Expand Down Expand Up @@ -163,10 +191,23 @@ function setupEventListeners() {
} else if (request.action === 'streamError') {
showError(request.error);
finishStreaming();
} else if (request.action === 'workspaceSessionChanged') {
handleWorkspaceSessionChanged();
}
});
}

function handleWorkspaceSessionChanged() {
extractCode();
}

function prepareCodeExtractionUI() {
projectCode = '';
codeDisplay.textContent = '';
codeStatus.textContent = 'Loading...';
codeStatus.className = 'code-status';
}

function setupQuickPrompts() {
document.querySelectorAll('.quick-prompt').forEach(btn => {
btn.addEventListener('click', () => {
Expand Down