webhelm 1.0.20 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webhelm",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "Agent browser automation in a visible managed Chrome with persistent JavaScript sessions",
   "type": "module",
   "bin": {

package/runtime/chatgpt/chatgpt-queue.mjs

@@ -60,11 +60,18 @@ const chatgptQueuePolicy = {
     db.prepare("UPDATE turns SET state='CHECKING',lease_owner=?,lease_until=?,attempts=attempts+1 WHERE id=?").run(owner,now+leaseSeconds,row.id);
     return this.one(db, "SELECT * FROM turns WHERE id=?", row.id);
   },
+  // A queue adapter registers a display description; Actions stay unaware of queues.
+  describe(row) {
+    const firstLine = row.message.split(/\r?\n/, 1)[0].replace(/\s+/g, ' ').trim();
+    const title = firstLine ? (firstLine.length > 52 ? `${firstLine.slice(0, 51)}…` : firstLine) : 'ChatGPT message';
+    const prefix = row.project_id ? `/g/${encodeURIComponent(row.project_id)}` : '';
+    return {title, url:`https://chatgpt.com${prefix}/c/${encodeURIComponent(row.thread_id)}`};
+  },
   cancel(db, id) {
     const row=this.one(db, "SELECT * FROM turns WHERE id=?", id);
     if (!row) return {ok:false,queue_id:id,error:"queue item not found"};
-    if (row.state!=="QUEUED") return {ok:false,queue_id:id,state:row.state,error:"only queued items can be cancelled"};
-    db.prepare("UPDATE turns SET state='CANCELLED',lease_owner=NULL,lease_until=NULL WHERE id=? AND state='QUEUED'").run(id);
+    if (!["QUEUED","WAITING","BLOCKED"].includes(row.state)) return {ok:false,queue_id:id,state:row.state,error:"cannot remove a running or uncertain item"};
+    db.prepare("UPDATE turns SET state='CANCELLED',lease_owner=NULL,lease_until=NULL WHERE id=? AND state IN ('QUEUED','WAITING','BLOCKED')").run(id);
     return {ok:true,queue_id:id,state:"CANCELLED"};
   },
   list(db) {

package/runtime/durable-queue-core.mjs

@@ -42,7 +42,16 @@ export class DurableQueueCore {
   cancel(id) {
     return this._transaction(() => this.policy.cancel(this.db, id));
   }
-  list() { return this.policy.list(this.db); }
+  list() {
+    const result = this.policy.list(this.db);
+    if (typeof this.policy.describe !== 'function') return result;
+    const rows = new Map(this.rows().map(row => [row.id, row]));
+    return {...result, items: result.items.map(item => {
+      const row = rows.get(item.id);
+      const description = row && this.policy.describe(row);
+      return description ? {...item, title: description.title, url: description.url} : item;
+    })};
+  }
   start() {
     if (this.started) return this;
     this.started = true;

package/runtime/extension/control-channel.mjs

@@ -85,7 +85,7 @@ export class ControlChannel {
       if (state.request) throw new Error('Another WebHelm operation is already running');
       if (!Number.isFinite(state.daemon?.seenAt) || this.now() - state.daemon.seenAt >= FRESH_MS)
         throw new Error('WebHelm daemon is not responding');
-      if (!(state.queue || []).some(item => item.id === queueId && item.state === 'QUEUED'))
+      if (!(state.queue || []).some(item => item.id === queueId && ['QUEUED','WAITING','BLOCKED'].includes(item.state)))
         throw new Error('Queue item is no longer cancellable');
       const request = {id:this.makeId(), action:'queue-cancel', queueId, state:'pending', createdAt:this.now()};
       await this.save({...state, request, lastResult:null});

package/runtime/extension/control-rpc.mjs

@@ -1,10 +1,46 @@
-export function createControlRpc({control, manager, summarizeWorkspaces, scheduleBadge}) {
+function validTabId(tabId) { return Number.isSafeInteger(tabId) && tabId > 0; }
+function validateQueueUrl(url) {
+  const parsed = new URL(url);
+  if (parsed.protocol !== 'https:' || !parsed.hostname) throw Error('Queue target must be an HTTPS URL');
+  return parsed.href;
+}
+
+export function createControlRpc({control, manager, summarizeWorkspaces, scheduleBadge, chromeApi=globalThis.chrome ?? control.chrome}) {
   return async function controlRpc(method, args = {}) {
     switch (method) {
       case "workspace.control.status": {
         const state = await control.status();
         const summary = summarizeWorkspaces((await manager.list()).workspaces, state.sessions);
-        return {...state,...summary};
+        const workspaces = await Promise.all(summary.workspaces.map(async workspace => ({
+          ...workspace,
+          sessions: await Promise.all(workspace.sessions.map(async session => {
+            if (!validTabId(session.tabId)) return session;
+            try {
+              const tab = await chromeApi.tabs.get(session.tabId);
+              return {...session, tab_title: tab.title || 'Untitled tab'};
+            } catch { return {...session, tabId:null}; }
+          })),
+        })));
+        return {...state,...summary,workspaces};
+      }
+      case "workspace.control.activateTab": {
+        const state = await control.status();
+        if (!state.connected) throw Error('WebHelm daemon is not responding');
+        const session = state.sessions.find(s => s.session_id === args.sessionId);
+        if (!session || !validTabId(session.tabId)) throw Error('Session tab is no longer active');
+        const tab = await chromeApi.tabs.get(session.tabId);
+        await chromeApi.tabs.update(tab.id,{active:true});
+        await chromeApi.windows.update(tab.windowId,{focused:true});
+        return {ok:true};
+      }
+      case "workspace.control.openQueue": {
+        const state = await control.status();
+        if (!state.connected) throw Error('WebHelm daemon is not responding');
+        const item = state.queue.find(item => item.id === args.queueId);
+        if (!item || typeof item.url !== 'string') throw Error('Queue entry no longer available');
+        const url = validateQueueUrl(item.url);
+        await chromeApi.tabs.create({url, active:true});
+        return {ok:true};
       }
       case "workspace.control.requestStop":
         return control.requestStop(args.action, args.sessionId, args.workspace);

package/runtime/extension/popup.html

@@ -37,6 +37,12 @@
     .queue-info { min-width:0; flex:1; overflow-wrap:anywhere; }
     .queue-info span { display:block; color:light-dark(var(--muted),#acb8c9); font-size:11px; }
     .queue-row button { width:auto; padding:5px 9px; font-size:11px; }
+    button.tab-title, button.queue-title { flex:1; min-width:0; width:100%; padding:0; border:0; border-radius:2px; background:transparent; color:inherit; text-align:left; font-size:12px; font-weight:600; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; cursor:pointer; }
+    button.tab-title:hover, button.queue-title:hover { text-decoration:underline; }
+    button.tab-title:disabled, button.queue-title:disabled { cursor:default; text-decoration:none; }
+    .session-info, .queue-info { overflow:hidden; }
+    .queue-info .queue-title { margin:0; }
+
     #message { margin-top:8px; font-size:11px; overflow-wrap:anywhere; }
     #message:empty { display:none; }
     [hidden] { display:none !important; }
@@ -48,8 +54,8 @@
     <span id="daemon-status" class="daemon-state" role="status">Connecting…</span>
   </header>
   <div id="workspace-list" class="session-list" aria-label="Workspaces" aria-live="polite">Connecting…</div>
-  <strong>ChatGPT queue</strong>
-  <div id="queue-list" class="session-list" aria-label="ChatGPT queue" aria-live="polite">No queued turns</div>
+  <strong>Queue</strong>
+  <div id="queue-list" class="session-list" aria-label="Queue" aria-live="polite">No queue entries</div>
   <section id="confirmation" hidden aria-label="Confirm clear sessions">
     <p id="confirm-text">Stop the selected WebHelm session(s)? Tasks in progress may be interrupted. Queued jobs remain and may create new sessions.</p>
     <div class="buttons">

package/runtime/extension/popup.mjs

@@ -23,9 +23,10 @@ function showConfirmation(action, params = {}) {
   }
 }
 
-function actionButton(label, disabled, onClick) {
+function actionButton(label, disabled, onClick, className = '') {
   const button = document.createElement('button');
   button.textContent = label;
+  if (className) button.className = className;
   button.disabled = disabled;
   button.addEventListener('click', onClick);
   return button;
@@ -33,7 +34,7 @@ function actionButton(label, disabled, onClick) {
 
 function renderWorkspaces(workspaces, busy, connected) {
   const signature = JSON.stringify(workspaces.map(w => [
-    w.name,w.initialized,w.available,w.poolSize,w.idleTabs,w.leasedTabs,w.sessions.map(s => s.session_id),
+    w.name,w.initialized,w.available,w.poolSize,w.idleTabs,w.leasedTabs,w.sessions.map(s => [s.session_id,s.tab_title,s.tabId]),
   ])) + ':' + busy + ':' + connected;
   if (signature === lastSignature) return;
   lastSignature = signature;
@@ -63,9 +64,12 @@ function renderWorkspaces(workspaces, busy, connected) {
       sessionRow.className = 'session-row';
       const details = document.createElement('div');
       details.className = 'session-info';
-      const identifier = document.createElement('span');
-      identifier.textContent = `Session ${session.session_id.slice(0, 12)}…`;
-      details.append(identifier);
+      const title = actionButton(session.tab_title || 'Untitled tab', busy || !connected || !session.tabId, async () => {
+        try { await rpc('workspace.control.activateTab', {sessionId:session.session_id}); }
+        catch(error) { el('message').textContent=error.message; }
+      }, 'tab-title');
+      title.title = session.tab_title || 'Untitled tab';
+      details.append(title);
       sessionRow.append(details, actionButton('Stop', busy || !connected,
         () => showConfirmation('stop', {sessionId:session.session_id})));
       row.append(sessionRow);
@@ -77,18 +81,25 @@ function renderWorkspaces(workspaces, busy, connected) {
 function renderQueue(items, busy, connected) {
   const target=el('queue-list');
   target.replaceChildren();
-  if (!items.length) { target.textContent='No active turns'; return; }
+  if (!items.length) { target.textContent='No queue entries'; return; }
   for (const item of items) {
     const row=document.createElement('div'); row.className='queue-row';
     const info=document.createElement('div'); info.className='queue-info';
-    const title=document.createElement('strong'); title.textContent=`Thread ${item.thread_id}`;
+    const title=actionButton(item.title || 'ChatGPT message', !connected || !item.url, async()=>{
+      try { await rpc('workspace.control.openQueue',{queueId:item.id}); }
+      catch(error) { el('message').textContent=error.message; }
+    }, 'queue-title');
+    title.title=item.title || 'ChatGPT message';
     const detail=document.createElement('span'); detail.textContent=`${item.state.toLowerCase()} · ${item.attempts} attempt${item.attempts===1?'':'s'}`;
     info.append(title,detail); row.append(info);
-    if (item.state==='QUEUED') row.append(actionButton('Cancel',busy || !connected,async()=>{
+    const safe=['QUEUED','WAITING','BLOCKED'].includes(item.state);
+    const remove=actionButton('Remove',!safe || busy || !connected,async()=>{
       try { const result=await rpc('workspace.control.queueCancel',{queueId:item.id}); if(!result.id) throw new Error('Missing queue request ID'); el('message').textContent='Waiting for WebHelm daemon…'; }
       catch(error) { el('message').textContent=error.message; }
       refresh();
-    }));
+    });
+    if (!safe) remove.title='Cannot remove a running or unverified submission';
+    row.append(remove);
     target.append(row);
   }
 }
@@ -105,10 +116,10 @@ async function refresh() {
     renderQueue(state.queue || [], busy, state.connected);
     el('confirm').disabled = !state.connected || busy;
     if (busy) {
-      el('message').textContent = 'Stopping sessions…';
+      el('message').textContent = 'Applying WebHelm action…';
     } else if (state.lastResult) {
       el('message').textContent = state.lastResult.ok
-        ? `Last action: stopped ${state.lastResult.stoppedCount} session(s).`
+        ? (state.lastResult.queue_id ? 'Queue entry removed.' : `Last action: stopped ${state.lastResult.stoppedCount} session(s).`)
         : `Last action failed: ${state.lastResult.error}`;
     }
   } catch (error) {

package/runtime/extension/service-worker.mjs

@@ -92,7 +92,8 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
   }
   if (request?.method?.startsWith("workspace.control.") &&
       (sender?.url !== chrome.runtime.getURL("popup.html") ||
-        !["workspace.control.requestStop", "workspace.control.queueCancel", "workspace.control.status"].includes(request.method))) {
+        !["workspace.control.requestStop", "workspace.control.queueCancel", "workspace.control.status",
+         "workspace.control.activateTab", "workspace.control.openQueue"].includes(request.method))) {
     sendResponse({ok:false,error:{message:"WebHelm control actions require the toolbar popup"}});
     return false;
   }

package/runtime/node-daemon.mjs

@@ -615,6 +615,7 @@ let controlPollActive = false;
 function visibleSessions() {
   return [...sessions.values()].map(s => ({
     session_id:s.session_id,workspace:s.workspace,last_used_at:s.last_used_at,
+    tabId:s.leasedTabs.get(s.targetId) ?? s.leasedTabs.get(s.rootTargetId) ?? null,
   }));
 }
 async function pollExtensionControl() {