tabctl 0.6.0-alpha.6 → 0.6.0-alpha.8

package/README.md

@@ -264,7 +264,7 @@ Relevant knobs: `TABCTL_SOCKET`, `TABCTL_TCP_PORT`, `TABCTL_PROFILE`, `TABCTL_DA
 - Runtime command runs can auto-sync extension files when host/extension versions drift; rerun `tabctl reload` if the browser does not pick up changes immediately.
 - For local release-like testing while developing, force runtime sync behavior with `TABCTL_AUTO_SYNC_MODE=release-like`.
 - Disable runtime sync entirely with `TABCTL_AUTO_SYNC_MODE=off`.
-- `tabctl ping --json` is the canonical runtime version check (`data.versionsInSync`, `data.hostBaseVersion`, `data.baseVersion`).
+- `tabctl ping --json` is the canonical runtime version check (`versionsInSync`, `hostBaseVersion`, `baseVersion`).
 - Version metadata is intentionally health-only: regular command payloads (`open`, `list`, etc.) do not include version fields.
 - `tabctl ping` returns connect errors (`ENOENT`, `ECONNREFUSED`, timeout): ensure extension is loaded and active, rerun `tabctl setup`, and in WSL verify `TABCTL_TCP_PORT` or `<dataDir>/tcp-port` matches a listening localhost port.
 - `tabctl doctor --fix --json` includes per-profile connectivity diagnostics in `data.profiles[].connectivity`; if ping remains unhealthy after local repairs, follow `manualSteps`.
@@ -409,5 +409,5 @@ Notes:
 - Selector `attr` supports `href-url`/`src-url` to return absolute http(s) URLs.
 - `screenshot --out` writes per-tab folders into the target directory.
 - `tabctl undo` accepts a positional txid, `--txid`, or `--latest`.
-- `tabctl history --json` returns a JSON array in `data`.
+- `tabctl history --json` returns a top-level JSON array.
 - `--format` is only supported by `report` (use `--json` elsewhere).

package/dist/extension/background.js

@@ -318,7 +318,6 @@
         const tabs2 = selection.tabs;
         const entries = [];
         let totalTiles = 0;
-        const startedAt = Date.now();
         for (let index = 0; index < tabs2.length; index += 1) {
           const tab = tabs2[index];
           const tabId = tab.tabId;
@@ -374,19 +373,11 @@
             deps2.sendProgress(requestId, { phase: "screenshot", processed: index + 1, total: tabs2.length, tabId });
           }
         }
-        return {
-          generatedAt: Date.now(),
+        const response = {
           totals: { tabs: tabs2.length, tiles: totalTiles },
-          meta: {
-            durationMs: Date.now() - startedAt,
-            mode,
-            format,
-            quality: format === "jpeg" ? quality : null,
-            tileMaxDim: adjustedTileMaxDim,
-            maxBytes: adjustedMaxBytes
-          },
           entries
         };
+        return response;
       }
     }
   });
@@ -876,7 +867,7 @@
           throw new Error("Missing group update fields");
         }
         const updated = await chrome.tabGroups.update(match.group.groupId, update);
-        return {
+        const fullResult = {
           groupId: updated.id,
           windowId: updated.windowId,
           title: updated.title,
@@ -894,6 +885,13 @@
           },
           txid: params.txid || null
         };
+        return {
+          groupId: updated.id,
+          windowId: updated.windowId,
+          summary: { updatedGroups: 1 },
+          undo: fullResult.undo,
+          txid: fullResult.txid
+        };
       }
       async function groupUngroup2(params, deps2) {
         const groupId = Number.isFinite(params.groupId) ? Number(params.groupId) : null;
@@ -937,7 +935,7 @@
         if (tabIds.length) {
           await chrome.tabs.ungroup(tabIds);
         }
-        return {
+        const fullResult = {
           groupId: match.group.groupId,
           groupTitle: match.group.title || null,
           windowId: match.windowId,
@@ -955,6 +953,13 @@
           },
           txid: params.txid || null
         };
+        return {
+          groupId: match.group.groupId,
+          windowId: match.windowId,
+          summary: fullResult.summary,
+          undo: fullResult.undo,
+          txid: fullResult.txid
+        };
       }
       async function groupAssign2(params, deps2) {
         const rawTabIds = Array.isArray(params.tabIds) ? params.tabIds.map(Number) : [];
@@ -1078,7 +1083,7 @@
           }
           created = true;
         }
-        return {
+        const fullResult = {
           groupId: assignedGroupId,
           groupTitle: targetTitle || groupTitle || null,
           windowId: targetWindowId,
@@ -1100,6 +1105,15 @@
           },
           txid: params.txid || null
         };
+        return {
+          groupId: assignedGroupId,
+          windowId: targetWindowId,
+          created,
+          summary: fullResult.summary,
+          skipped: fullResult.skipped,
+          undo: fullResult.undo,
+          txid: fullResult.txid
+        };
       }
       async function groupGather2(params, deps2) {
         const snapshot = await deps2.getTabSnapshot();
@@ -1167,7 +1181,7 @@
             });
           }
         }
-        return {
+        const fullResult = {
           merged,
           summary: {
             mergedGroups: merged.reduce((sum, m) => sum + m.mergedGroupCount, 0),
@@ -1179,6 +1193,12 @@
           },
           txid: params.txid || null
         };
+        return {
+          merged,
+          summary: fullResult.summary,
+          undo: fullResult.undo,
+          txid: fullResult.txid
+        };
       }
     }
   });
@@ -1460,6 +1480,15 @@
         const index = Number(value);
         return Number.isFinite(index) ? index : null;
       }
+      function shapeOpenResult(result) {
+        return {
+          windowId: result.windowId,
+          groupId: result.groupId,
+          createdTabIds: result.created.map((tab) => tab.tabId).filter((id) => typeof id === "number"),
+          skipped: result.skipped,
+          summary: result.summary
+        };
+      }
       function matchIncludes(value, needle) {
         if (!needle) {
           return false;
@@ -1651,12 +1680,9 @@
               groupId2 = null;
             }
           }
-          return {
+          return shapeOpenResult({
             windowId: windowId2,
             groupId: groupId2,
-            groupTitle: groupTitle || null,
-            afterGroupTitle: null,
-            insertIndex: null,
             created: created2,
             skipped: skipped2,
             summary: {
@@ -1664,7 +1690,7 @@
               skippedUrls: skipped2.length,
               grouped: Boolean(groupId2)
             }
-          };
+          });
         }
         const snapshot = await deps2.getTabSnapshot();
         let openParams = params;
@@ -1775,6 +1801,7 @@
             skipped.push({ url, reason: "create_failed" });
           }
         }
+        const createdTabIds = new Set(created.map((tab) => tab.tabId).filter((id) => typeof id === "number"));
         let groupId = null;
         if (groupTitle && created.length > 0) {
           try {
@@ -1799,28 +1826,64 @@
         if (groupTitle && created.length === 0 && existingGroupId != null) {
           groupId = existingGroupId;
         }
+        const targetGroupId = groupId ?? existingGroupId;
+        if (targetGroupId != null && created.length > 0) {
+          try {
+            if (createdTabIds.size > 0) {
+              const latestTabs = await chrome.tabs.query({ windowId });
+              const missingGroupTabIds = latestTabs.filter((tab) => typeof tab.id === "number" && createdTabIds.has(tab.id) && tab.groupId !== targetGroupId).map((tab) => tab.id);
+              if (missingGroupTabIds.length > 0) {
+                await chrome.tabs.group({ groupId: targetGroupId, tabIds: missingGroupTabIds });
+              }
+            }
+          } catch (error) {
+            deps2.log("Failed to enforce grouping for newly opened tabs", error);
+          }
+        }
         try {
           const freshTabs = await chrome.tabs.query({ windowId });
           freshTabs.sort((a, b) => a.index - b.index);
           const firstUngroupedIndex = freshTabs.findIndex((t) => (t.groupId ?? -1) === -1);
           if (firstUngroupedIndex >= 0) {
-            const groupedAfterUngrouped = freshTabs.filter((t, i) => i > firstUngroupedIndex && (t.groupId ?? -1) !== -1);
-            if (groupedAfterUngrouped.length > 0) {
-              const tabIdsToMove = groupedAfterUngrouped.map((t) => t.id).filter((id) => typeof id === "number");
-              if (tabIdsToMove.length > 0) {
-                await chrome.tabs.move(tabIdsToMove, { index: firstUngroupedIndex });
-              }
+            let tabIdsToMove = [];
+            if (existingGroupId != null) {
+              tabIdsToMove = freshTabs.filter((tab, i) => i > firstUngroupedIndex && typeof tab.id === "number" && createdTabIds.has(tab.id) && (tab.groupId ?? -1) !== -1).map((tab) => tab.id);
+            } else {
+              tabIdsToMove = freshTabs.filter((tab, i) => i > firstUngroupedIndex && (tab.groupId ?? -1) !== -1).map((tab) => tab.id).filter((id) => typeof id === "number");
+            }
+            if (tabIdsToMove.length > 0) {
+              await chrome.tabs.move(tabIdsToMove, { index: firstUngroupedIndex });
             }
           }
         } catch (err) {
           deps2.log("Failed to reorder groups before ungrouped tabs", err);
         }
-        return {
+        if (targetGroupId != null && createdTabIds.size > 0) {
+          try {
+            const latestTabs = await chrome.tabs.query({ windowId });
+            const lateUngroupedTabIds = latestTabs.filter((tab) => typeof tab.id === "number" && createdTabIds.has(tab.id) && tab.groupId !== targetGroupId).map((tab) => tab.id);
+            if (lateUngroupedTabIds.length > 0) {
+              await chrome.tabs.group({ groupId: targetGroupId, tabIds: lateUngroupedTabIds });
+            }
+          } catch (error) {
+            deps2.log("Failed post-reorder grouping verification", error);
+          }
+        }
+        if (targetGroupId != null && createdTabIds.size > 0) {
+          try {
+            await deps2.delay(250);
+            const delayedTabs = await chrome.tabs.query({ windowId });
+            const delayedUngroupedTabIds = delayedTabs.filter((tab) => typeof tab.id === "number" && createdTabIds.has(tab.id) && tab.groupId !== targetGroupId).map((tab) => tab.id);
+            if (delayedUngroupedTabIds.length > 0) {
+              await chrome.tabs.group({ groupId: targetGroupId, tabIds: delayedUngroupedTabIds });
+            }
+          } catch (error) {
+            deps2.log("Failed delayed grouping verification", error);
+          }
+        }
+        return shapeOpenResult({
           windowId,
           groupId,
-          groupTitle: groupTitle || null,
-          afterGroupTitle: afterGroupTitle || null,
-          insertIndex,
           created,
           skipped,
           summary: {
@@ -1828,7 +1891,7 @@
             skippedUrls: skipped.length,
             grouped: Boolean(groupId)
           }
-        };
+        });
       }
     }
   });
@@ -1947,7 +2010,7 @@
               targetIndex2 = 0;
             }
           }
-          return {
+          const fullResult2 = {
             tabId,
             from: { windowId: sourceWindow.windowId, index: sourceTab.index },
             to: { windowId: targetWindowId2, index: targetIndex2 },
@@ -1970,6 +2033,14 @@
             },
             txid: params.txid || null
           };
+          return {
+            tabId,
+            fromWindowId: sourceWindow.windowId,
+            toWindowId: targetWindowId2,
+            summary: fullResult2.summary,
+            undo: fullResult2.undo,
+            txid: fullResult2.txid
+          };
         }
         let normalizedParams = params;
         if (params.windowId != null) {
@@ -1987,7 +2058,7 @@
           targetIndex -= 1;
         }
         const moved = await chrome.tabs.move(tabId, { windowId: targetWindowId, index: targetIndex });
-        return {
+        const fullResult = {
           tabId,
           from: { windowId: sourceWindow.windowId, index: sourceTab.index },
           to: { windowId: targetWindowId, index: moved.index },
@@ -2010,6 +2081,14 @@
           },
           txid: params.txid || null
         };
+        return {
+          tabId,
+          fromWindowId: sourceWindow.windowId,
+          toWindowId: targetWindowId,
+          summary: fullResult.summary,
+          undo: fullResult.undo,
+          txid: fullResult.txid
+        };
       }
       async function moveGroup(params, deps2) {
         const groupId = Number.isFinite(params.groupId) ? Number(params.groupId) : null;
@@ -2027,6 +2106,28 @@
         if (!source.tabs.length) {
           throw new Error("Group has no tabs to move");
         }
+        const ensureMovedTabsAreGrouped = async (movedTabIds, targetWindowId2, targetGroupId) => {
+          if (!targetGroupId || movedTabIds.length === 0) {
+            return;
+          }
+          const movedSet = new Set(movedTabIds);
+          const verify = async (step) => {
+            const tabs3 = await chrome.tabs.query({ windowId: targetWindowId2 });
+            const missingGroupTabIds = tabs3.filter((tab) => typeof tab.id === "number" && movedSet.has(tab.id) && tab.groupId !== targetGroupId).map((tab) => tab.id);
+            if (missingGroupTabIds.length > 0) {
+              await chrome.tabs.group({ groupId: targetGroupId, tabIds: missingGroupTabIds });
+            }
+          };
+          try {
+            await verify("group-verify");
+            await new Promise((resolve) => setTimeout(resolve, 250));
+            await verify("group-verify-delayed");
+            await new Promise((resolve) => setTimeout(resolve, 1500));
+            await verify("group-verify-delayed-late");
+          } catch (error) {
+            deps2.log("Failed to enforce moved group integrity", error);
+          }
+        };
         const newWindow = params.newWindow === true;
         const hasTarget = Number.isFinite(params.beforeTabId) || Number.isFinite(params.afterTabId) || typeof params.beforeGroupTitle === "string" && params.beforeGroupTitle.trim() || typeof params.afterGroupTitle === "string" && params.afterGroupTitle.trim();
         if (newWindow) {
@@ -2054,6 +2155,7 @@
           } catch (error) {
             deps2.log("Failed to regroup tabs", error);
           }
+          await ensureMovedTabsAreGrouped(tabIds2, targetWindowId2, newGroupId2);
           const undoTabs2 = source.tabs.map((tab) => ({
             tabId: tab.tabId,
             windowId: tab.windowId,
@@ -2063,7 +2165,7 @@
             groupColor: tab.groupColor,
             groupCollapsed: source.group.collapsed ?? null
           })).filter((tab) => typeof tab.tabId === "number");
-          return {
+          const fullResult2 = {
             groupId: source.group.groupId,
             windowId: source.windowId,
             movedToWindowId: targetWindowId2,
@@ -2081,6 +2183,15 @@
             },
             txid: params.txid || null
           };
+          return {
+            groupId: source.group.groupId,
+            windowId: source.windowId,
+            movedToWindowId: targetWindowId2,
+            newGroupId: newGroupId2,
+            summary: fullResult2.summary,
+            undo: fullResult2.undo,
+            txid: fullResult2.txid
+          };
         }
         const target = resolveMoveTarget(snapshot, params, deps2);
         if (target.error) {
@@ -2125,6 +2236,7 @@
             deps2.log("Failed to regroup tabs", error);
           }
         }
+        await ensureMovedTabsAreGrouped(tabIds, targetWindowId, targetWindowId === source.windowId ? source.group.groupId : newGroupId);
         const undoTabs = source.tabs.map((tab) => ({
           tabId: tab.tabId,
           windowId: tab.windowId,
@@ -2134,7 +2246,7 @@
           groupColor: tab.groupColor,
           groupCollapsed: source.group.collapsed ?? null
         })).filter((tab) => typeof tab.tabId === "number");
-        return {
+        const fullResult = {
           groupId: source.group.groupId,
           windowId: source.windowId,
           movedToWindowId: targetWindowId,
@@ -2152,6 +2264,15 @@
           },
           txid: params.txid || null
         };
+        return {
+          groupId: source.group.groupId,
+          windowId: source.windowId,
+          movedToWindowId: targetWindowId,
+          newGroupId,
+          summary: fullResult.summary,
+          undo: fullResult.undo,
+          txid: fullResult.txid
+        };
       }
     }
   });
@@ -2182,7 +2303,6 @@
         const selectedTabs = selection.tabs;
         const scopeTabs = selectedTabs;
         const now = Date.now();
-        const startedAt = Date.now();
         const normalizedMap = /* @__PURE__ */ new Map();
         const duplicates = /* @__PURE__ */ new Map();
         for (const tab of scopeTabs) {
@@ -2235,19 +2355,16 @@
             severity
           };
         });
-        return {
-          generatedAt: Date.now(),
+        const response = {
           staleDays,
           totals: {
             tabs: scopeTabs.length,
             analyzed: selectedTabs.length,
             candidates: candidates.length
           },
-          meta: {
-            durationMs: Date.now() - startedAt
-          },
           candidates
         };
+        return response;
       }
       async function inspectTabs(params, requestId, deps2) {
         const signalList = Array.isArray(params.signals) && params.signals.length > 0 ? params.signals.map(String) : ["page-meta"];
@@ -2269,7 +2386,6 @@
           throw selection.error;
         }
         const tabs3 = selection.tabs;
-        const startedAt = Date.now();
         const selectorSpecs = [];
         if (Array.isArray(params.selectorSpecs)) {
           selectorSpecs.push(...params.selectorSpecs);
@@ -2287,17 +2403,24 @@
             }
           }
         }
-        const normalizedSelectors = selectorSpecs.filter((spec) => spec && typeof spec.selector === "string" && spec.selector.length > 0).map((spec) => ({
-          name: typeof spec.name === "string" ? spec.name : void 0,
+        const normalizedSelectors = selectorSpecs.filter((spec) => spec && typeof spec.selector === "string" && spec.selector.length > 0).map((spec) => {
+          const selector = spec.selector;
+          return {
+            name: typeof spec.name === "string" ? spec.name : void 0,
+            selector,
+            attr: typeof spec.attr === "string" ? spec.attr : "text",
+            all: Boolean(spec.all),
+            text: typeof spec.text === "string" && spec.text.trim() ? spec.text.trim() : void 0,
+            textMode: typeof spec.textMode === "string" ? spec.textMode.trim().toLowerCase() : void 0
+          };
+        });
+        const selectorWarnings = normalizedSelectors.filter((spec) => spec.selector.includes(":contains(")).map((spec) => ({
+          code: "unsupported_selector_syntax",
+          signalId: "selector",
           selector: spec.selector,
-          attr: typeof spec.attr === "string" ? spec.attr : "text",
-          all: Boolean(spec.all),
-          text: typeof spec.text === "string" && spec.text.trim() ? spec.text.trim() : void 0,
-          textMode: typeof spec.textMode === "string" ? spec.textMode.trim().toLowerCase() : void 0
-        }));
-        const selectorWarnings = normalizedSelectors.filter((spec) => typeof spec.selector === "string" && spec.selector.includes(":contains(")).map((spec) => ({
           name: spec.name || spec.selector,
-          hint: "CSS :contains() is not supported; use selector text filters or a different selector."
+          message: "Selector uses unsupported CSS :contains() syntax.",
+          hint: "Use selector text filters (text/textMode) or a different selector."
         }));
         const signalDefs = [];
         for (const signalId of signalList) {
@@ -2339,19 +2462,22 @@
             const tabId = task.tab.tabId;
             let result = null;
             let error = null;
-            const started = Date.now();
             try {
               await waitForTabReady2(tabId, params, signalTimeoutMs);
               result = await task.signal.run(tabId);
+              if (task.signal.id === "selector" && result && typeof result === "object") {
+                const selectorErrors = Object.keys(result.errors || {});
+                if (selectorErrors.length > 0) {
+                  error = `selector failures: ${selectorErrors.join(", ")}`;
+                }
+              }
             } catch (err) {
               const message = err instanceof Error ? err.message : "signal_error";
               error = message;
             }
-            const durationMs = Date.now() - started;
             const entry = entryMap.get(tabId) || { tab: task.tab, signals: {} };
             entry.signals[task.signal.id] = {
               ok: error === null,
-              durationMs,
               data: result,
               error
             };
@@ -2377,21 +2503,18 @@
           title: entry.tab.title,
           signals: entry.signals
         }));
-        return {
-          generatedAt: Date.now(),
+        const response = {
           totals: {
             tabs: tabs3.length,
             signals: signalDefs.length,
             tasks: totalTasks
           },
-          meta: {
-            durationMs: Date.now() - startedAt,
-            signalTimeoutMs,
-            selectorCount: normalizedSelectors.length,
-            selectorWarnings: selectorWarnings.length > 0 ? selectorWarnings : void 0
-          },
           entries
         };
+        if (selectorWarnings.length > 0) {
+          response.warnings = selectorWarnings;
+        }
+        return response;
       }
     }
   });
@@ -2871,13 +2994,14 @@
           })).filter((win) => win.tabs.length > 0);
         }
         if (windowsToProcess.length === 0) {
-          return {
+          const fullResult2 = {
             txid: params.txid || null,
             summary: { movedTabs: 0, movedGroups: 0, skippedTabs: 0 },
             archiveWindowId: null,
             skipped: [],
             undo: { action: "archive", tabs: [] }
           };
+          return fullResult2;
         }
         const archiveWindowId = await ensureArchiveWindow(deps2);
         const undoTabs = [];
@@ -2980,7 +3104,7 @@
             }
           }
         }
-        return {
+        const fullResult = {
           txid: params.txid || null,
           summary: {
             movedTabs,
@@ -2994,6 +3118,13 @@
             tabs: undoTabs
           }
         };
+        return {
+          txid: fullResult.txid,
+          summary: fullResult.summary,
+          archiveWindowId,
+          skipped: fullResult.skipped,
+          undo: fullResult.undo
+        };
       }
       async function getTabsByIds(tabIds) {
         const results = [];
@@ -3022,12 +3153,13 @@
           tabIds = selection.tabs.map((tab) => tab.tabId);
         }
         if (!tabIds.length) {
-          return {
+          const fullResult2 = {
             txid: params.txid || null,
             summary: { closedTabs: 0, skippedTabs: 0 },
             skipped: [],
             undo: { action: "close", tabs: [] }
           };
+          return fullResult2;
         }
         const expectedUrls = params.expectedUrls || {};
         const tabInfos = await getTabsByIds(tabIds);
@@ -3067,7 +3199,7 @@
         if (validTabs.length > 0) {
           await chrome.tabs.remove(validTabs.map((tab) => tab.tabId));
         }
-        return {
+        const fullResult = {
           txid: params.txid || null,
           summary: {
             closedTabs: validTabs.length,
@@ -3085,6 +3217,12 @@
             }))
           }
         };
+        return {
+          txid: fullResult.txid,
+          summary: fullResult.summary,
+          skipped: fullResult.skipped,
+          undo: fullResult.undo
+        };
       }
       async function mergeWindow(params, deps2) {
         const fromWindowId = Number.isFinite(params.fromWindowId) ? Number(params.fromWindowId) : Number(params.windowId);
@@ -3119,7 +3257,7 @@
           selectedTabs = sourceWindow.tabs.filter((tab) => tabIdSet.has(tab.tabId));
         }
         if (selectedTabs.length === 0) {
-          return {
+          const fullResult2 = {
             fromWindowId,
             toWindowId,
             summary: { movedTabs: 0, movedGroups: 0, skippedTabs: skipped.length, closedSource: false },
@@ -3133,6 +3271,7 @@
               tabs: []
             }
           };
+          return fullResult2;
         }
         const orderedTabs = [...selectedTabs].sort((a, b) => {
           const aIndex = Number(a.index);
@@ -3231,7 +3370,7 @@
             deps2.log("Failed to close source window", error);
           }
         }
-        return {
+        const fullResult = {
           fromWindowId,
           toWindowId,
           summary: { movedTabs, movedGroups, skippedTabs: skipped.length, closedSource },
@@ -3246,6 +3385,15 @@
           },
           txid: params.txid || null
         };
+        return {
+          fromWindowId,
+          toWindowId,
+          summary: fullResult.summary,
+          skipped: fullResult.skipped,
+          groups: fullResult.groups,
+          undo: fullResult.undo,
+          txid: fullResult.txid
+        };
       }
     }
   });
@@ -3425,7 +3573,7 @@
           component: "extension"
         };
       case "list":
-        return await getTabSnapshot();
+        return shapeListSnapshot(await getTabSnapshot());
       case "analyze":
         return await inspect.analyzeTabs(params, requestId, deps);
       case "inspect":
@@ -3469,6 +3617,29 @@
         throw new Error(`Unknown action: ${action}`);
     }
   }
+  function shapeListSnapshot(snapshot) {
+    return {
+      windows: snapshot.windows.map((win) => ({
+        windowId: win.windowId,
+        focused: win.focused,
+        tabs: (win.tabs || []).map((tab) => ({
+          tabId: tab.tabId,
+          windowId: tab.windowId,
+          url: tab.url,
+          title: tab.title,
+          active: tab.active,
+          groupId: tab.groupId,
+          groupTitle: tab.groupTitle
+        })),
+        groups: (win.groups || []).map((group) => ({
+          groupId: group.groupId,
+          title: group.title,
+          color: group.color,
+          collapsed: group.collapsed
+        }))
+      }))
+    };
+  }
   function resolveWindowIdFromParams(snapshot, value) {
     if (typeof value === "number" && Number.isFinite(value)) {
       return value;

package/dist/extension/lib/archive.js

@@ -51,13 +51,14 @@ async function archiveTabs(params, deps) {
             .filter((win) => win.tabs.length > 0);
     }
     if (windowsToProcess.length === 0) {
-        return {
+        const fullResult = {
             txid: params.txid || null,
             summary: { movedTabs: 0, movedGroups: 0, skippedTabs: 0 },
             archiveWindowId: null,
             skipped: [],
             undo: { action: "archive", tabs: [] },
         };
+        return fullResult;
     }
     const archiveWindowId = await ensureArchiveWindow(deps);
     const undoTabs = [];
@@ -169,7 +170,7 @@ async function archiveTabs(params, deps) {
             }
         }
     }
-    return {
+    const fullResult = {
         txid: params.txid || null,
         summary: {
             movedTabs,
@@ -183,6 +184,13 @@ async function archiveTabs(params, deps) {
             tabs: undoTabs,
         },
     };
+    return {
+        txid: fullResult.txid,
+        summary: fullResult.summary,
+        archiveWindowId,
+        skipped: fullResult.skipped,
+        undo: fullResult.undo,
+    };
 }
 async function getTabsByIds(tabIds) {
     const results = [];
@@ -212,12 +220,13 @@ async function closeTabs(params, deps) {
         tabIds = selection.tabs.map((tab) => tab.tabId);
     }
     if (!tabIds.length) {
-        return {
+        const fullResult = {
             txid: params.txid || null,
             summary: { closedTabs: 0, skippedTabs: 0 },
             skipped: [],
             undo: { action: "close", tabs: [] },
         };
+        return fullResult;
     }
     const expectedUrls = params.expectedUrls || {};
     const tabInfos = await getTabsByIds(tabIds);
@@ -257,7 +266,7 @@ async function closeTabs(params, deps) {
     if (validTabs.length > 0) {
         await chrome.tabs.remove(validTabs.map((tab) => tab.tabId));
     }
-    return {
+    const fullResult = {
         txid: params.txid || null,
         summary: {
             closedTabs: validTabs.length,
@@ -275,6 +284,12 @@ async function closeTabs(params, deps) {
             })),
         },
     };
+    return {
+        txid: fullResult.txid,
+        summary: fullResult.summary,
+        skipped: fullResult.skipped,
+        undo: fullResult.undo,
+    };
 }
 async function mergeWindow(params, deps) {
     const fromWindowId = Number.isFinite(params.fromWindowId)
@@ -311,7 +326,7 @@ async function mergeWindow(params, deps) {
         selectedTabs = sourceWindow.tabs.filter((tab) => tabIdSet.has(tab.tabId));
     }
     if (selectedTabs.length === 0) {
-        return {
+        const fullResult = {
             fromWindowId,
             toWindowId,
             summary: { movedTabs: 0, movedGroups: 0, skippedTabs: skipped.length, closedSource: false },
@@ -325,6 +340,7 @@ async function mergeWindow(params, deps) {
                 tabs: [],
             },
         };
+        return fullResult;
     }
     const orderedTabs = [...selectedTabs].sort((a, b) => {
         const aIndex = Number(a.index);
@@ -426,7 +442,7 @@ async function mergeWindow(params, deps) {
             deps.log("Failed to close source window", error);
         }
     }
-    return {
+    const fullResult = {
         fromWindowId,
         toWindowId,
         summary: { movedTabs, movedGroups, skippedTabs: skipped.length, closedSource },
@@ -441,4 +457,13 @@ async function mergeWindow(params, deps) {
         },
         txid: params.txid || null,
     };
+    return {
+        fromWindowId,
+        toWindowId,
+        summary: fullResult.summary,
+        skipped: fullResult.skipped,
+        groups: fullResult.groups,
+        undo: fullResult.undo,
+        txid: fullResult.txid,
+    };
 }

package/dist/extension/lib/groups.js

@@ -211,7 +211,7 @@ async function groupUpdate(params, deps) {
         throw new Error("Missing group update fields");
     }
     const updated = await chrome.tabGroups.update(match.group.groupId, update);
-    return {
+    const fullResult = {
         groupId: updated.id,
         windowId: updated.windowId,
         title: updated.title,
@@ -229,6 +229,13 @@ async function groupUpdate(params, deps) {
         },
         txid: params.txid || null,
     };
+    return {
+        groupId: updated.id,
+        windowId: updated.windowId,
+        summary: { updatedGroups: 1 },
+        undo: fullResult.undo,
+        txid: fullResult.txid,
+    };
 }
 async function groupUngroup(params, deps) {
     const groupId = Number.isFinite(params.groupId) ? Number(params.groupId) : null;
@@ -277,7 +284,7 @@ async function groupUngroup(params, deps) {
     if (tabIds.length) {
         await chrome.tabs.ungroup(tabIds);
     }
-    return {
+    const fullResult = {
         groupId: match.group.groupId,
         groupTitle: match.group.title || null,
         windowId: match.windowId,
@@ -295,6 +302,13 @@ async function groupUngroup(params, deps) {
         },
         txid: params.txid || null,
     };
+    return {
+        groupId: match.group.groupId,
+        windowId: match.windowId,
+        summary: fullResult.summary,
+        undo: fullResult.undo,
+        txid: fullResult.txid,
+    };
 }
 async function groupAssign(params, deps) {
     const rawTabIds = Array.isArray(params.tabIds) ? params.tabIds.map(Number) : [];
@@ -423,7 +437,7 @@ async function groupAssign(params, deps) {
         }
         created = true;
     }
-    return {
+    const fullResult = {
         groupId: assignedGroupId,
         groupTitle: targetTitle || groupTitle || null,
         windowId: targetWindowId,
@@ -445,6 +459,15 @@ async function groupAssign(params, deps) {
         },
         txid: params.txid || null,
     };
+    return {
+        groupId: assignedGroupId,
+        windowId: targetWindowId,
+        created,
+        summary: fullResult.summary,
+        skipped: fullResult.skipped,
+        undo: fullResult.undo,
+        txid: fullResult.txid,
+    };
 }
 async function groupGather(params, deps) {
     const snapshot = await deps.getTabSnapshot();
@@ -514,7 +537,7 @@ async function groupGather(params, deps) {
             });
         }
     }
-    return {
+    const fullResult = {
         merged,
         summary: {
             mergedGroups: merged.reduce((sum, m) => sum + m.mergedGroupCount, 0),
@@ -526,4 +549,10 @@ async function groupGather(params, deps) {
         },
         txid: params.txid || null,
     };
+    return {
+        merged,
+        summary: fullResult.summary,
+        undo: fullResult.undo,
+        txid: fullResult.txid,
+    };
 }

package/dist/extension/lib/inspect.js

@@ -22,7 +22,6 @@ async function analyzeTabs(params, requestId, deps) {
     const selectedTabs = selection.tabs;
     const scopeTabs = selectedTabs;
     const now = Date.now();
-    const startedAt = Date.now();
     const normalizedMap = new Map();
     const duplicates = new Map();
     for (const tab of scopeTabs) {
@@ -78,19 +77,16 @@ async function analyzeTabs(params, requestId, deps) {
             severity,
         };
     });
-    return {
-        generatedAt: Date.now(),
+    const response = {
         staleDays,
         totals: {
             tabs: scopeTabs.length,
             analyzed: selectedTabs.length,
             candidates: candidates.length,
         },
-        meta: {
-            durationMs: Date.now() - startedAt,
-        },
         candidates,
     };
+    return response;
 }
 async function inspectTabs(params, requestId, deps) {
     const signalList = Array.isArray(params.signals) && params.signals.length > 0
@@ -120,7 +116,6 @@ async function inspectTabs(params, requestId, deps) {
         throw selection.error;
     }
     const tabs = selection.tabs;
-    const startedAt = Date.now();
     const selectorSpecs = [];
     if (Array.isArray(params.selectorSpecs)) {
         selectorSpecs.push(...params.selectorSpecs);
@@ -140,19 +135,26 @@ async function inspectTabs(params, requestId, deps) {
     }
     const normalizedSelectors = selectorSpecs
         .filter((spec) => spec && typeof spec.selector === "string" && spec.selector.length > 0)
-        .map((spec) => ({
-        name: typeof spec.name === "string" ? spec.name : undefined,
-        selector: spec.selector,
-        attr: typeof spec.attr === "string" ? spec.attr : "text",
-        all: Boolean(spec.all),
-        text: typeof spec.text === "string" && spec.text.trim() ? spec.text.trim() : undefined,
-        textMode: typeof spec.textMode === "string" ? spec.textMode.trim().toLowerCase() : undefined,
-    }));
+        .map((spec) => {
+        const selector = spec.selector;
+        return {
+            name: typeof spec.name === "string" ? spec.name : undefined,
+            selector,
+            attr: typeof spec.attr === "string" ? spec.attr : "text",
+            all: Boolean(spec.all),
+            text: typeof spec.text === "string" && spec.text.trim() ? spec.text.trim() : undefined,
+            textMode: typeof spec.textMode === "string" ? spec.textMode.trim().toLowerCase() : undefined,
+        };
+    });
     const selectorWarnings = normalizedSelectors
-        .filter((spec) => typeof spec.selector === "string" && spec.selector.includes(":contains("))
+        .filter((spec) => spec.selector.includes(":contains("))
         .map((spec) => ({
+        code: "unsupported_selector_syntax",
+        signalId: "selector",
+        selector: spec.selector,
         name: spec.name || spec.selector,
-        hint: "CSS :contains() is not supported; use selector text filters or a different selector.",
+        message: "Selector uses unsupported CSS :contains() syntax.",
+        hint: "Use selector text filters (text/textMode) or a different selector.",
     }));
     const signalDefs = [];
     for (const signalId of signalList) {
@@ -195,20 +197,23 @@ async function inspectTabs(params, requestId, deps) {
             const tabId = task.tab.tabId;
             let result = null;
             let error = null;
-            const started = Date.now();
             try {
                 await waitForTabReady(tabId, params, signalTimeoutMs);
                 result = await task.signal.run(tabId);
+                if (task.signal.id === "selector" && result && typeof result === "object") {
+                    const selectorErrors = Object.keys(result.errors || {});
+                    if (selectorErrors.length > 0) {
+                        error = `selector failures: ${selectorErrors.join(", ")}`;
+                    }
+                }
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : "signal_error";
                 error = message;
             }
-            const durationMs = Date.now() - started;
             const entry = entryMap.get(tabId) || { tab: task.tab, signals: {} };
             entry.signals[task.signal.id] = {
                 ok: error === null,
-                durationMs,
                 data: result,
                 error,
             };
@@ -234,19 +239,16 @@ async function inspectTabs(params, requestId, deps) {
         title: entry.tab.title,
         signals: entry.signals,
     }));
-    return {
-        generatedAt: Date.now(),
+    const response = {
         totals: {
             tabs: tabs.length,
             signals: signalDefs.length,
             tasks: totalTasks,
         },
-        meta: {
-            durationMs: Date.now() - startedAt,
-            signalTimeoutMs,
-            selectorCount: normalizedSelectors.length,
-            selectorWarnings: selectorWarnings.length > 0 ? selectorWarnings : undefined,
-        },
         entries,
     };
+    if (selectorWarnings.length > 0) {
+        response.warnings = selectorWarnings;
+    }
+    return response;
 }

package/dist/extension/lib/move.js

@@ -121,7 +121,7 @@ async function moveTab(params, deps) {
                 targetIndex = 0;
             }
         }
-        return {
+        const fullResult = {
             tabId,
             from: { windowId: sourceWindow.windowId, index: sourceTab.index },
             to: { windowId: targetWindowId, index: targetIndex },
@@ -144,6 +144,14 @@ async function moveTab(params, deps) {
             },
             txid: params.txid || null,
         };
+        return {
+            tabId,
+            fromWindowId: sourceWindow.windowId,
+            toWindowId: targetWindowId,
+            summary: fullResult.summary,
+            undo: fullResult.undo,
+            txid: fullResult.txid,
+        };
     }
     let normalizedParams = params;
     if (params.windowId != null) {
@@ -161,7 +169,7 @@ async function moveTab(params, deps) {
         targetIndex -= 1;
     }
     const moved = await chrome.tabs.move(tabId, { windowId: targetWindowId, index: targetIndex });
-    return {
+    const fullResult = {
         tabId,
         from: { windowId: sourceWindow.windowId, index: sourceTab.index },
         to: { windowId: targetWindowId, index: moved.index },
@@ -184,6 +192,14 @@ async function moveTab(params, deps) {
         },
         txid: params.txid || null,
     };
+    return {
+        tabId,
+        fromWindowId: sourceWindow.windowId,
+        toWindowId: targetWindowId,
+        summary: fullResult.summary,
+        undo: fullResult.undo,
+        txid: fullResult.txid,
+    };
 }
 async function moveGroup(params, deps) {
     const groupId = Number.isFinite(params.groupId) ? Number(params.groupId) : null;
@@ -203,6 +219,31 @@ async function moveGroup(params, deps) {
     if (!source.tabs.length) {
         throw new Error("Group has no tabs to move");
     }
+    const ensureMovedTabsAreGrouped = async (movedTabIds, targetWindowId, targetGroupId) => {
+        if (!targetGroupId || movedTabIds.length === 0) {
+            return;
+        }
+        const movedSet = new Set(movedTabIds);
+        const verify = async (step) => {
+            const tabs = await chrome.tabs.query({ windowId: targetWindowId });
+            const missingGroupTabIds = tabs
+                .filter((tab) => typeof tab.id === "number" && movedSet.has(tab.id) && tab.groupId !== targetGroupId)
+                .map((tab) => tab.id);
+            if (missingGroupTabIds.length > 0) {
+                await chrome.tabs.group({ groupId: targetGroupId, tabIds: missingGroupTabIds });
+            }
+        };
+        try {
+            await verify("group-verify");
+            await new Promise((resolve) => setTimeout(resolve, 250));
+            await verify("group-verify-delayed");
+            await new Promise((resolve) => setTimeout(resolve, 1500));
+            await verify("group-verify-delayed-late");
+        }
+        catch (error) {
+            deps.log("Failed to enforce moved group integrity", error);
+        }
+    };
     const newWindow = params.newWindow === true;
     const hasTarget = Number.isFinite(params.beforeTabId)
         || Number.isFinite(params.afterTabId)
@@ -234,6 +275,7 @@ async function moveGroup(params, deps) {
         catch (error) {
             deps.log("Failed to regroup tabs", error);
         }
+        await ensureMovedTabsAreGrouped(tabIds, targetWindowId, newGroupId);
         const undoTabs = source.tabs
             .map((tab) => ({
             tabId: tab.tabId,
@@ -245,7 +287,7 @@ async function moveGroup(params, deps) {
             groupCollapsed: source.group.collapsed ?? null,
         }))
             .filter((tab) => typeof tab.tabId === "number");
-        return {
+        const fullResult = {
             groupId: source.group.groupId,
             windowId: source.windowId,
             movedToWindowId: targetWindowId,
@@ -263,6 +305,15 @@ async function moveGroup(params, deps) {
             },
             txid: params.txid || null,
         };
+        return {
+            groupId: source.group.groupId,
+            windowId: source.windowId,
+            movedToWindowId: targetWindowId,
+            newGroupId,
+            summary: fullResult.summary,
+            undo: fullResult.undo,
+            txid: fullResult.txid,
+        };
     }
     const target = resolveMoveTarget(snapshot, params, deps);
     if (target.error) {
@@ -310,6 +361,7 @@ async function moveGroup(params, deps) {
             deps.log("Failed to regroup tabs", error);
         }
     }
+    await ensureMovedTabsAreGrouped(tabIds, targetWindowId, targetWindowId === source.windowId ? source.group.groupId : newGroupId);
     const undoTabs = source.tabs
         .map((tab) => ({
         tabId: tab.tabId,
@@ -321,7 +373,7 @@ async function moveGroup(params, deps) {
         groupCollapsed: source.group.collapsed ?? null,
     }))
         .filter((tab) => typeof tab.tabId === "number");
-    return {
+    const fullResult = {
         groupId: source.group.groupId,
         windowId: source.windowId,
         movedToWindowId: targetWindowId,
@@ -339,4 +391,13 @@ async function moveGroup(params, deps) {
         },
         txid: params.txid || null,
     };
+    return {
+        groupId: source.group.groupId,
+        windowId: source.windowId,
+        movedToWindowId: targetWindowId,
+        newGroupId,
+        summary: fullResult.summary,
+        undo: fullResult.undo,
+        txid: fullResult.txid,
+    };
 }

package/dist/extension/lib/screenshot.js

@@ -293,7 +293,6 @@ async function screenshotTabs(params, requestId, deps) {
     const tabs = selection.tabs;
     const entries = [];
     let totalTiles = 0;
-    const startedAt = Date.now();
     for (let index = 0; index < tabs.length; index += 1) {
         const tab = tabs[index];
         const tabId = tab.tabId;
@@ -351,17 +350,9 @@ async function screenshotTabs(params, requestId, deps) {
             deps.sendProgress(requestId, { phase: "screenshot", processed: index + 1, total: tabs.length, tabId });
         }
     }
-    return {
-        generatedAt: Date.now(),
+    const response = {
         totals: { tabs: tabs.length, tiles: totalTiles },
-        meta: {
-            durationMs: Date.now() - startedAt,
-            mode,
-            format,
-            quality: format === "jpeg" ? quality : null,
-            tileMaxDim: adjustedTileMaxDim,
-            maxBytes: adjustedMaxBytes,
-        },
         entries,
     };
+    return response;
 }

package/dist/extension/lib/tabs.js

@@ -58,6 +58,17 @@ function normalizeTabIndex(value) {
     const index = Number(value);
     return Number.isFinite(index) ? index : null;
 }
+function shapeOpenResult(result) {
+    return {
+        windowId: result.windowId,
+        groupId: result.groupId,
+        createdTabIds: result.created
+            .map((tab) => tab.tabId)
+            .filter((id) => typeof id === "number"),
+        skipped: result.skipped,
+        summary: result.summary,
+    };
+}
 function matchIncludes(value, needle) {
     if (!needle) {
         return false;
@@ -260,12 +271,9 @@ async function openTabs(params, deps) {
                 groupId = null;
             }
         }
-        return {
+        return shapeOpenResult({
             windowId,
             groupId,
-            groupTitle: groupTitle || null,
-            afterGroupTitle: null,
-            insertIndex: null,
             created,
             skipped,
             summary: {
@@ -273,7 +281,7 @@ async function openTabs(params, deps) {
                 skippedUrls: skipped.length,
                 grouped: Boolean(groupId),
             },
-        };
+        });
     }
     const snapshot = await deps.getTabSnapshot();
     let openParams = params;
@@ -393,6 +401,9 @@ async function openTabs(params, deps) {
             skipped.push({ url, reason: "create_failed" });
         }
     }
+    const createdTabIds = new Set(created
+        .map((tab) => tab.tabId)
+        .filter((id) => typeof id === "number"));
     let groupId = null;
     if (groupTitle && created.length > 0) {
         try {
@@ -421,30 +432,81 @@ async function openTabs(params, deps) {
     if (groupTitle && created.length === 0 && existingGroupId != null) {
         groupId = existingGroupId;
     }
-    // Reorder: groups before ungrouped tabs
+    const targetGroupId = groupId ?? existingGroupId;
+    if (targetGroupId != null && created.length > 0) {
+        try {
+            if (createdTabIds.size > 0) {
+                const latestTabs = await chrome.tabs.query({ windowId });
+                const missingGroupTabIds = latestTabs
+                    .filter((tab) => typeof tab.id === "number" && createdTabIds.has(tab.id) && tab.groupId !== targetGroupId)
+                    .map((tab) => tab.id);
+                if (missingGroupTabIds.length > 0) {
+                    await chrome.tabs.group({ groupId: targetGroupId, tabIds: missingGroupTabIds });
+                }
+            }
+        }
+        catch (error) {
+            deps.log("Failed to enforce grouping for newly opened tabs", error);
+        }
+    }
     try {
         const freshTabs = await chrome.tabs.query({ windowId });
         freshTabs.sort((a, b) => a.index - b.index);
         const firstUngroupedIndex = freshTabs.findIndex(t => (t.groupId ?? -1) === -1);
         if (firstUngroupedIndex >= 0) {
-            const groupedAfterUngrouped = freshTabs.filter((t, i) => i > firstUngroupedIndex && (t.groupId ?? -1) !== -1);
-            if (groupedAfterUngrouped.length > 0) {
-                const tabIdsToMove = groupedAfterUngrouped.map(t => t.id).filter(id => typeof id === "number");
-                if (tabIdsToMove.length > 0) {
-                    await chrome.tabs.move(tabIdsToMove, { index: firstUngroupedIndex });
-                }
+            let tabIdsToMove = [];
+            if (existingGroupId != null) {
+                // In reuse mode, only reorder tabs created by this operation.
+                tabIdsToMove = freshTabs
+                    .filter((tab, i) => i > firstUngroupedIndex && typeof tab.id === "number" && createdTabIds.has(tab.id) && (tab.groupId ?? -1) !== -1)
+                    .map((tab) => tab.id);
+            }
+            else {
+                tabIdsToMove = freshTabs
+                    .filter((tab, i) => i > firstUngroupedIndex && (tab.groupId ?? -1) !== -1)
+                    .map((tab) => tab.id)
+                    .filter((id) => typeof id === "number");
+            }
+            if (tabIdsToMove.length > 0) {
+                await chrome.tabs.move(tabIdsToMove, { index: firstUngroupedIndex });
             }
         }
     }
     catch (err) {
         deps.log("Failed to reorder groups before ungrouped tabs", err);
     }
-    return {
+    if (targetGroupId != null && createdTabIds.size > 0) {
+        try {
+            const latestTabs = await chrome.tabs.query({ windowId });
+            const lateUngroupedTabIds = latestTabs
+                .filter((tab) => typeof tab.id === "number" && createdTabIds.has(tab.id) && tab.groupId !== targetGroupId)
+                .map((tab) => tab.id);
+            if (lateUngroupedTabIds.length > 0) {
+                await chrome.tabs.group({ groupId: targetGroupId, tabIds: lateUngroupedTabIds });
+            }
+        }
+        catch (error) {
+            deps.log("Failed post-reorder grouping verification", error);
+        }
+    }
+    if (targetGroupId != null && createdTabIds.size > 0) {
+        try {
+            await deps.delay(250);
+            const delayedTabs = await chrome.tabs.query({ windowId });
+            const delayedUngroupedTabIds = delayedTabs
+                .filter((tab) => typeof tab.id === "number" && createdTabIds.has(tab.id) && tab.groupId !== targetGroupId)
+                .map((tab) => tab.id);
+            if (delayedUngroupedTabIds.length > 0) {
+                await chrome.tabs.group({ groupId: targetGroupId, tabIds: delayedUngroupedTabIds });
+            }
+        }
+        catch (error) {
+            deps.log("Failed delayed grouping verification", error);
+        }
+    }
+    return shapeOpenResult({
         windowId,
         groupId,
-        groupTitle: groupTitle || null,
-        afterGroupTitle: afterGroupTitle || null,
-        insertIndex,
         created,
         skipped,
         summary: {
@@ -452,5 +514,5 @@ async function openTabs(params, deps) {
             skippedUrls: skipped.length,
             grouped: Boolean(groupId),
         },
-    };
+    });
 }

package/dist/extension/manifest.json

@@ -19,5 +19,5 @@
   "background": {
     "service_worker": "background.js"
   },
-  "version_name": "0.6.0-alpha.6"
+  "version_name": "0.6.0-alpha.8"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabctl",
-  "version": "0.6.0-alpha.6",
+  "version": "0.6.0-alpha.8",
   "description": "CLI tool to manage and analyze browser tabs",
   "license": "MIT",
   "repository": {