vg-coder-cli 2.0.54 → 2.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vg-coder-cli",
-  "version": "2.0.54",
+  "version": "2.0.56",
   "description": "🚀 CLI tool to analyze projects, concatenate source files, count tokens, and export HTML with syntax highlighting and copy functionality",
   "main": "src/index.js",
   "bin": {

package/src/server/api-server.js

@@ -699,6 +699,19 @@ class ApiServer {
             const body = req.body || {};
             const opts = body.workerLabel ? { workerLabel: body.workerLabel } : {};
             const payload = { url: body.url, model: body.model, active: body.active };
+            // Pin model cho worker (theo email) — _recycleWorkerTab sau task done
+            // sẽ reopen tab với cùng model, giữ lock qua nhiều task. Nếu caller
+            // không truyền workerLabel, pin cho TẤT CẢ launcher email hiện tại
+            // (single-tenant case phổ biến: 1 container = 1 worker).
+            if (body.model) {
+                if (body.workerLabel) {
+                    taskQueue._pinnedModelByEmail.set(body.workerLabel, body.model);
+                } else {
+                    for (const l of taskQueue.launchers.values()) {
+                        if (l.email) taskQueue._pinnedModelByEmail.set(l.email, body.model);
+                    }
+                }
+            }
             // Timeout 15s vì worker đợi tab status="complete" + 1.5s render delay
             // để bắt AI Studio fallback. Worker-side timeout cũng là 8s — server
             // phải lớn hơn để có response thay vì error.

package/src/server/task-queue.js

@@ -38,6 +38,10 @@ class TaskQueue {
     // AI Studio tab (free CPU). Cancelled when a new task arrives or a worker
     // recycles for that email.
     this._idleCloseTimers = new Map();
+    // workerEmail → model string. Set qua /api/launcher/open-tab body.model;
+    // recycle dùng để reopen tab với cùng model (giữ pin qua nhiều task).
+    // Default null → recycle dùng AISTUDIO_DEFAULT_MODEL của extension.
+    this._pinnedModelByEmail = new Map();
   }
 
   attachIO(io) {
@@ -488,8 +492,10 @@ class TaskQueue {
           return;
         }
         await new Promise(r => setTimeout(r, 400));
-        await this.requestLauncher('launcher:open_tab', {}, { workerLabel: workerEmail }, 8_000);
-        console.log(chalk.cyan(`[TaskQueue] Recycled tab for ${workerEmail}`));
+        const pinned = this._pinnedModelByEmail.get(workerEmail);
+        const openPayload = pinned ? { model: pinned } : {};
+        await this.requestLauncher('launcher:open_tab', openPayload, { workerLabel: workerEmail }, 8_000);
+        console.log(chalk.cyan(`[TaskQueue] Recycled tab for ${workerEmail}${pinned ? ` (model=${pinned})` : ''}`));
         // Schedule idle close. If new task arrives before TTL, enqueue() will
         // cancel this timer.
         this._scheduleIdleClose(workerEmail);

package/src/server/views/js/features/task-worker.js

@@ -209,21 +209,32 @@ function throwIfRateLimited(stage = '') {
 // đầu. Không throw — fail thì return null, caller chấp nhận `actualModel: null`.
 async function readActualModel() {
     try {
+        const url0 = location.href;
         // Fast path: panel đã mở (worker tab đã chạy task → AI Studio thường giữ panel open)
         let selector = document.querySelector('ms-model-selector');
         if (selector) {
             const name = selector.querySelector('[data-test-id="model-name"]')?.innerText?.trim();
-            if (name) return name;
+            if (name) {
+                console.log('[ReadModel] FAST', { url: url0, name });
+                return name;
+            }
+        }
+        // Panel đóng — toggle mở (aria-label sẽ là "Toggle run settings panel" khi đóng,
+        // "Close run settings panel" khi mở. Match cả 2 để robust).
+        const toggle = document.querySelector('[aria-label="Toggle run settings panel"]')
+                    || document.querySelector('[aria-label="Open run settings panel"]');
+        if (!toggle) {
+            console.warn('[ReadModel] NO_TOGGLE', { url: url0 });
+            return null;
         }
-        // Slow path: toggle panel mở. Lưu state để restore sau khi đọc xong.
-        const toggle = document.querySelector('[aria-label="Toggle run settings panel"]');
-        if (!toggle) return null;
         toggle.click();
-        await new Promise(r => setTimeout(r, 800));
+        await new Promise(r => setTimeout(r, 1200));
         selector = document.querySelector('ms-model-selector');
         const name = selector?.querySelector('[data-test-id="model-name"]')?.innerText?.trim() || null;
-        // Đóng panel lại để không thay đổi UX (panel mở/đóng visible qua noVNC).
-        toggle.click();
+        console.log('[ReadModel] SLOW', { url: url0, urlNow: location.href, name });
+        // Đóng panel lại để không thay đổi UX (label sau khi mở thành "Close...")
+        const closeBtn = document.querySelector('[aria-label="Close run settings panel"]');
+        if (closeBtn) closeBtn.click();
         return name;
     } catch (err) {
         console.warn('[TaskWorker] readActualModel failed:', err?.message);