tabctl 0.3.0 → 0.4.0

package/README.md

@@ -25,7 +25,7 @@ If you haven't run `npm link`, you can always use `node ./cli/tabctl.js` instead
 
 ### 2. Set up your browser
 
-Run the interactive setup — it syncs the extension, tells you where to load it, and prompts for the extension ID:
+Run setup — it syncs the extension, tells you where to load it, and auto-derives the extension ID:
 
 <!-- test: "setup explicit --extension-id overrides auto-derived ID" -->
 ```bash
@@ -36,11 +36,11 @@ This will:
 1. Copy the extension to a stable location (`~/.local/state/tabctl/extension/`)
 2. Print the path (and copy it to your clipboard)
 3. Ask you to load it as an unpacked extension in `chrome://extensions`
-4. Prompt you to paste the extension ID
+4. Auto-derive the extension ID from the installed path
 
 > **Edge?** Use `--browser edge` and load from `edge://extensions` instead.
 
-If you already know your extension ID, skip the interactive flow:
+If you need to override the auto-derived ID (e.g. for a custom extension path):
 
 <!-- test: "setup writes native host manifest for chrome" -->
 ```bash
@@ -63,8 +63,10 @@ tabctl list       # see your open tabs
 | Command | Description |
 |---------|-------------|
 | `tabctl list` | List open tabs and groups |
+| `tabctl open --url <url> --group <name>` | Open tabs into a group (reuses existing, skips duplicates) |
 | `tabctl analyze` | Find stale or duplicate tabs |
 | `tabctl inspect --tab <id>` | Extract page metadata or CSS selectors |
+| `tabctl group-gather` | Merge duplicate groups with the same name |
 | `tabctl close --tab <id>` | Close tabs with full undo support |
 | `tabctl report` | Generate reports in JSON, Markdown, or CSV |
 | `tabctl undo` | Revert the last action |
@@ -167,10 +169,10 @@ tabctl supports multiple browser profiles. Each profile connects to a different
 <!-- test: "setup writes native host manifest", "setup writes native host manifest for chrome", "setup --name creates custom-named profile", "profile-list with multiple profiles shows all", "profile-switch success updates default", "--profile flag overrides active profile" -->
 ```bash
 # Setup for Edge
-tabctl setup --browser edge --extension-id <edge-id>
+tabctl setup --browser edge
 
 # Setup for Chrome (with custom name)
-tabctl setup --browser chrome --extension-id <chrome-id> --name chrome-work
+tabctl setup --browser chrome --name chrome-work
 
 # List profiles
 tabctl profile-list

package/dist/cli/lib/client.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRequestId = createRequestId;
 exports.sendRequest = sendRequest;
 exports.fetchSnapshot = fetchSnapshot;
-const net_1 = __importDefault(require("net"));
+exports.sendFireAndForget = sendFireAndForget;
+const node_net_1 = __importDefault(require("node:net"));
 const constants_1 = require("./constants");
 function createRequestId() {
     return `req-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
@@ -14,7 +15,7 @@ function createRequestId() {
 function sendRequest(payload, onProgress) {
     return new Promise((resolve, reject) => {
         const { socketPath } = (0, constants_1.resolveConfig)();
-        const client = net_1.default.createConnection(socketPath);
+        const client = node_net_1.default.createConnection(socketPath);
         let buffer = "";
         client.on("connect", () => {
             client.write(`${JSON.stringify(payload)}\n`);
@@ -60,3 +61,23 @@ async function fetchSnapshot() {
     }
     return response.data;
 }
+/** Send a request without waiting for a response (fire-and-forget). */
+function sendFireAndForget(payload) {
+    try {
+        const { socketPath } = (0, constants_1.resolveConfig)();
+        const client = node_net_1.default.createConnection(socketPath);
+        client.on("connect", () => {
+            client.write(`${JSON.stringify(payload)}\n`);
+            // Unref after write so Node can exit without waiting for response
+            client.unref();
+            const timer = setTimeout(() => { client.end(); client.destroy(); }, 200);
+            timer.unref();
+        });
+        client.on("error", () => {
+            // Silently ignore — this is best-effort
+        });
+    }
+    catch {
+        // Silently ignore
+    }
+}

package/dist/cli/lib/commands/index.js

@@ -4,7 +4,7 @@
  * Re-exports all command handlers and parameter builders.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildUndoParams = exports.buildHistoryParams = exports.buildScreenshotParams = exports.buildReportParams = exports.buildCloseParams = exports.buildArchiveParams = exports.buildMergeWindowParams = exports.buildMoveGroupParams = exports.buildMoveTabParams = exports.buildGroupAssignParams = exports.buildGroupUngroupParams = exports.buildGroupUpdateParams = exports.buildOpenParams = exports.buildRefreshParams = exports.buildFocusParams = exports.buildInspectParams = exports.buildAnalyzeParams = exports.runProfileRemove = exports.runProfileSwitch = exports.runProfileShow = exports.runProfileList = exports.runGroupList = exports.runList = exports.runPing = exports.runUndo = exports.runHistory = exports.runPolicy = exports.runVersion = exports.runSkillInstall = exports.runSetup = void 0;
+exports.buildUndoParams = exports.buildHistoryParams = exports.buildScreenshotParams = exports.buildReportParams = exports.buildCloseParams = exports.buildArchiveParams = exports.buildMergeWindowParams = exports.buildMoveGroupParams = exports.buildMoveTabParams = exports.buildGroupGatherParams = exports.buildGroupAssignParams = exports.buildGroupUngroupParams = exports.buildGroupUpdateParams = exports.buildOpenParams = exports.buildRefreshParams = exports.buildFocusParams = exports.buildInspectParams = exports.buildAnalyzeParams = exports.runProfileRemove = exports.runProfileSwitch = exports.runProfileShow = exports.runProfileList = exports.runGroupList = exports.runList = exports.runPing = exports.runUndo = exports.runHistory = exports.runPolicy = exports.runVersion = exports.runSkillInstall = exports.runSetup = void 0;
 // Setup command
 var setup_1 = require("./setup");
 Object.defineProperty(exports, "runSetup", { enumerable: true, get: function () { return setup_1.runSetup; } });
@@ -36,6 +36,7 @@ Object.defineProperty(exports, "buildOpenParams", { enumerable: true, get: funct
 Object.defineProperty(exports, "buildGroupUpdateParams", { enumerable: true, get: function () { return params_1.buildGroupUpdateParams; } });
 Object.defineProperty(exports, "buildGroupUngroupParams", { enumerable: true, get: function () { return params_1.buildGroupUngroupParams; } });
 Object.defineProperty(exports, "buildGroupAssignParams", { enumerable: true, get: function () { return params_1.buildGroupAssignParams; } });
+Object.defineProperty(exports, "buildGroupGatherParams", { enumerable: true, get: function () { return params_1.buildGroupGatherParams; } });
 Object.defineProperty(exports, "buildMoveTabParams", { enumerable: true, get: function () { return params_1.buildMoveTabParams; } });
 Object.defineProperty(exports, "buildMoveGroupParams", { enumerable: true, get: function () { return params_1.buildMoveGroupParams; } });
 Object.defineProperty(exports, "buildMergeWindowParams", { enumerable: true, get: function () { return params_1.buildMergeWindowParams; } });

package/dist/cli/lib/commands/meta.js

@@ -15,9 +15,9 @@ exports.runPolicy = runPolicy;
 exports.runHistory = runHistory;
 exports.runUndo = runUndo;
 exports.runPing = runPing;
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
 const constants_1 = require("../constants");
 const output_1 = require("../output");
@@ -31,23 +31,23 @@ Object.defineProperty(exports, "runSetup", { enumerable: true, get: function ()
 // ============================================================================
 function resolveProjectRoot() {
     try {
-        return fs_1.default.realpathSync(process.cwd());
+        return node_fs_1.default.realpathSync(process.cwd());
     }
     catch {
-        return path_1.default.resolve(process.cwd());
+        return node_path_1.default.resolve(process.cwd());
     }
 }
 function resolveConfigHome() {
-    return process.env.XDG_CONFIG_HOME || path_1.default.join(os_1.default.homedir(), ".config");
+    return process.env.XDG_CONFIG_HOME || node_path_1.default.join(node_os_1.default.homedir(), ".config");
 }
 function resolveSkillTargetDir(globalInstall) {
     if (globalInstall) {
-        return path_1.default.join(resolveConfigHome(), "opencode", "skills", constants_1.SKILL_NAME);
+        return node_path_1.default.join(resolveConfigHome(), "opencode", "skills", constants_1.SKILL_NAME);
     }
-    return path_1.default.join(resolveProjectRoot(), ".opencode", "skills", constants_1.SKILL_NAME);
+    return node_path_1.default.join(resolveProjectRoot(), ".opencode", "skills", constants_1.SKILL_NAME);
 }
 function runSkillsCli(args) {
-    const result = (0, node_child_process_1.spawnSync)("npx", ["skills", ...args], { stdio: "pipe" });
+    const result = (0, node_child_process_1.spawnSync)("npx", ["skills", ...args], { stdio: "pipe", shell: process.platform === "win32" });
     if (result.error) {
         (0, output_1.errorOut)(`Failed to run skills CLI: ${result.error.message}`);
     }
@@ -116,7 +116,7 @@ function runVersion(prettyOutput) {
 function runPolicy(options, policyContext, prettyOutput) {
     const policyPath = (0, policy_1.defaultPolicyPath)();
     if (options.init) {
-        if (fs_1.default.existsSync(policyPath)) {
+        if (node_fs_1.default.existsSync(policyPath)) {
             (0, output_1.printJson)({
                 ok: true,
                 data: {
@@ -126,9 +126,9 @@ function runPolicy(options, policyContext, prettyOutput) {
             }, prettyOutput);
             return;
         }
-        const dir = path_1.default.dirname(policyPath);
-        fs_1.default.mkdirSync(dir, { recursive: true });
-        fs_1.default.writeFileSync(policyPath, JSON.stringify((0, policy_1.defaultPolicyTemplate)(), null, 2), "utf8");
+        const dir = node_path_1.default.dirname(policyPath);
+        node_fs_1.default.mkdirSync(dir, { recursive: true });
+        node_fs_1.default.writeFileSync(policyPath, JSON.stringify((0, policy_1.defaultPolicyTemplate)(), null, 2), "utf8");
         (0, output_1.printJson)({
             ok: true,
             data: {
@@ -166,6 +166,7 @@ async function runHistory(options, prettyOutput) {
             dirty: constants_1.DIRTY,
         },
     });
+    (0, output_1.emitVersionWarnings)(response, "history");
     (0, output_1.printJson)(response, prettyOutput);
     if (!response.ok) {
         process.exit(1);
@@ -198,6 +199,7 @@ async function runUndo(options, prettyOutput) {
             dirty: constants_1.DIRTY,
         },
     });
+    (0, output_1.emitVersionWarnings)(response, "undo");
     (0, output_1.printJson)(response, prettyOutput);
     if (!response.ok) {
         process.exit(1);
@@ -219,6 +221,7 @@ async function runPing(prettyOutput) {
             dirty: constants_1.DIRTY,
         },
     });
+    (0, output_1.emitVersionWarnings)(response, "ping");
     (0, output_1.printJson)(response, prettyOutput);
     if (!response.ok) {
         process.exit(1);

package/dist/cli/lib/commands/params-groups.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildGroupUpdateParams = buildGroupUpdateParams;
 exports.buildGroupUngroupParams = buildGroupUngroupParams;
 exports.buildGroupAssignParams = buildGroupAssignParams;
+exports.buildGroupGatherParams = buildGroupGatherParams;
 const params_1 = require("./params");
 function buildGroupUpdateParams(options) {
     const windowValue = (0, params_1.parseWindowScope)(options.window, { allowNew: false });
@@ -38,3 +39,10 @@ function buildGroupAssignParams(options) {
         collapsed: options.collapsed === true ? true : options.expanded === true ? false : undefined,
     };
 }
+function buildGroupGatherParams(options) {
+    const windowValue = (0, params_1.parseWindowScope)(options.window, { allowNew: false });
+    return {
+        windowId: windowValue,
+        groupTitle: options.group,
+    };
+}

package/dist/cli/lib/commands/params.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildMergeWindowParams = exports.buildMoveGroupParams = exports.buildMoveTabParams = exports.buildGroupUngroupParams = exports.buildGroupAssignParams = exports.buildGroupUpdateParams = void 0;
+exports.buildMergeWindowParams = exports.buildMoveGroupParams = exports.buildMoveTabParams = exports.buildGroupGatherParams = exports.buildGroupUngroupParams = exports.buildGroupAssignParams = exports.buildGroupUpdateParams = void 0;
 exports.buildAnalyzeParams = buildAnalyzeParams;
 exports.buildInspectParams = buildInspectParams;
 exports.buildFocusParams = buildFocusParams;
@@ -20,7 +20,7 @@ exports.buildScreenshotParams = buildScreenshotParams;
 exports.parseWindowScope = parseWindowScope;
 exports.buildHistoryParams = buildHistoryParams;
 exports.buildUndoParams = buildUndoParams;
-const fs_1 = __importDefault(require("fs"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const output_1 = require("../output");
 const args_1 = require("../args");
 // ============================================================================
@@ -99,7 +99,7 @@ function buildInspectParams(options) {
     let signalConfig;
     if (options["signal-config"]) {
         try {
-            const configRaw = fs_1.default.readFileSync(String(options["signal-config"]), "utf8");
+            const configRaw = node_fs_1.default.readFileSync(String(options["signal-config"]), "utf8");
             signalConfig = JSON.parse(configRaw);
         }
         catch {
@@ -164,6 +164,8 @@ function buildOpenParams(options) {
         windowGroupTitle: options["window-group"],
         windowTabId: options["window-tab"] ? Number(options["window-tab"]) : undefined,
         windowUrl: options["window-url"],
+        newGroup: options["new-group"] === true,
+        allowDuplicates: options["allow-duplicates"] === true,
     };
 }
 // ============================================================================
@@ -173,6 +175,7 @@ var params_groups_1 = require("./params-groups");
 Object.defineProperty(exports, "buildGroupUpdateParams", { enumerable: true, get: function () { return params_groups_1.buildGroupUpdateParams; } });
 Object.defineProperty(exports, "buildGroupAssignParams", { enumerable: true, get: function () { return params_groups_1.buildGroupAssignParams; } });
 Object.defineProperty(exports, "buildGroupUngroupParams", { enumerable: true, get: function () { return params_groups_1.buildGroupUngroupParams; } });
+Object.defineProperty(exports, "buildGroupGatherParams", { enumerable: true, get: function () { return params_groups_1.buildGroupGatherParams; } });
 // ============================================================================
 // Move Command Parameters (re-exported from params-move.ts)
 // ============================================================================

package/dist/cli/lib/commands/setup.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Setup command handler: interactive browser profile configuration.
+ * Setup command handler: browser profile configuration.
  * Extracted from meta.ts for modularity.
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -9,16 +9,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveBrowser = resolveBrowser;
 exports.resolveExtensionId = resolveExtensionId;
-exports.promptExtensionId = promptExtensionId;
 exports.resolveNodePath = resolveNodePath;
 exports.resolveManifestDir = resolveManifestDir;
 exports.writeWrapper = writeWrapper;
 exports.runSetup = runSetup;
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const readline_1 = __importDefault(require("readline"));
-const node_child_process_1 = require("node:child_process");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const constants_1 = require("../constants");
 const output_1 = require("../output");
 const profiles_1 = require("../../../shared/profiles");
@@ -49,76 +46,6 @@ function resolveExtensionId(options, required) {
     }
     return value;
 }
-async function promptExtensionId(browser) {
-    const maxAttempts = 3;
-    const extPage = browser === "chrome" ? "chrome://extensions" : "edge://extensions";
-    const instructions = [
-        "",
-        "Next steps:",
-        `  1. Open ${extPage}`,
-        "  2. Enable Developer mode",
-        '  3. Click "Load unpacked" and select the path above',
-        "  4. Copy the extension ID shown on the extensions page",
-        "",
-    ].join("\n");
-    process.stderr.write(instructions);
-    // Collect lines from stdin and provide them on demand
-    const lines = [];
-    let closed = false;
-    let waiting = null;
-    const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stderr, terminal: false });
-    rl.on("line", (line) => {
-        if (waiting) {
-            const cb = waiting;
-            waiting = null;
-            cb(line.trim());
-        }
-        else {
-            lines.push(line.trim());
-        }
-    });
-    rl.on("close", () => {
-        closed = true;
-        if (waiting) {
-            const cb = waiting;
-            waiting = null;
-            cb(null);
-        }
-    });
-    const nextLine = (prompt) => {
-        process.stderr.write(prompt);
-        if (lines.length > 0) {
-            return Promise.resolve(lines.shift());
-        }
-        if (closed)
-            return Promise.resolve(null);
-        return new Promise((resolve) => { waiting = resolve; });
-    };
-    try {
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-            const raw = await nextLine("Paste the extension ID: ");
-            if (raw === null) {
-                (0, output_1.errorOut)("No input received (stdin closed).");
-            }
-            const value = raw.toLowerCase();
-            if (constants_1.EXTENSION_ID_PATTERN.test(value)) {
-                return value;
-            }
-            const remaining = maxAttempts - attempt;
-            if (remaining > 0) {
-                process.stderr.write(`Invalid extension ID (expected 32 lowercase a-p characters). ${remaining} attempt(s) remaining.\n`);
-            }
-            else {
-                (0, output_1.errorOut)("Invalid extension ID after 3 attempts.");
-            }
-        }
-    }
-    finally {
-        rl.close();
-    }
-    // unreachable due to errorOut, but satisfies TypeScript
-    return "";
-}
 function resolveNodePath(options) {
     const raw = typeof options.node === "string"
         ? String(options.node)
@@ -127,38 +54,106 @@ function resolveNodePath(options) {
     if (!value) {
         (0, output_1.errorOut)("Node binary not found. Set --node or TABCTL_NODE.");
     }
-    if (!path_1.default.isAbsolute(value)) {
+    if (!node_path_1.default.isAbsolute(value)) {
         (0, output_1.errorOut)(`Node path must be absolute: ${value}`);
     }
-    try {
-        fs_1.default.accessSync(value, fs_1.default.constants.X_OK);
+    if (process.platform !== "win32") {
+        try {
+            node_fs_1.default.accessSync(value, node_fs_1.default.constants.X_OK);
+        }
+        catch {
+            (0, output_1.errorOut)(`Node binary not executable: ${value}`);
+        }
     }
-    catch {
-        (0, output_1.errorOut)(`Node binary not executable: ${value}`);
+    else {
+        try {
+            node_fs_1.default.accessSync(value, node_fs_1.default.constants.R_OK);
+        }
+        catch {
+            (0, output_1.errorOut)(`Node binary not found: ${value}`);
+        }
     }
     return value;
 }
-function resolveHostPath() {
-    const root = path_1.default.resolve(__dirname, "../../..");
-    const hostPath = path_1.default.join(root, "host", "host.js");
-    if (!fs_1.default.existsSync(hostPath)) {
-        (0, output_1.errorOut)(`Host script not found at ${hostPath}. Run: npm run build`);
+function resolveHostPath(dataDir) {
+    // Sync host bundle to stable path so wrapper survives npm upgrades
+    try {
+        const result = (0, extension_sync_1.syncHost)(dataDir);
+        return result.hostPath;
+    }
+    catch (err) {
+        const detail = err instanceof Error ? err.message : String(err);
+        (0, output_1.errorOut)(`Failed to resolve native host. Make sure the CLI is built (run: npm run build). Details: ${detail}`);
     }
-    return hostPath;
 }
 function resolveManifestDir(browser) {
-    const home = os_1.default.homedir();
+    const home = node_os_1.default.homedir();
     if (!home) {
         (0, output_1.errorOut)("Home directory not found.");
     }
+    if (process.platform === "win32") {
+        // Windows: registry-based is preferred, but file-based works with --user-data-dir.
+        // For system-wide, we point to the per-user NativeMessagingHosts under LOCALAPPDATA.
+        const base = process.env.LOCALAPPDATA || node_path_1.default.join(home, "AppData", "Local");
+        if (browser === "edge") {
+            return node_path_1.default.join(base, "Microsoft", "Edge", "User Data", "NativeMessagingHosts");
+        }
+        return node_path_1.default.join(base, "Google", "Chrome", "User Data", "NativeMessagingHosts");
+    }
+    if (process.platform === "linux") {
+        if (browser === "edge") {
+            return node_path_1.default.join(home, ".config", "microsoft-edge", "NativeMessagingHosts");
+        }
+        return node_path_1.default.join(home, ".config", "google-chrome", "NativeMessagingHosts");
+    }
+    // macOS
     if (browser === "edge") {
-        return path_1.default.join(home, "Library", "Application Support", "Microsoft Edge", "NativeMessagingHosts");
+        return node_path_1.default.join(home, "Library", "Application Support", "Microsoft Edge", "NativeMessagingHosts");
     }
-    return path_1.default.join(home, "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts");
+    return node_path_1.default.join(home, "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts");
 }
 function writeWrapper(nodePath, hostPath, profileName, wrapperDir) {
-    fs_1.default.mkdirSync(wrapperDir, { recursive: true, mode: 0o700 });
-    const wrapperPath = path_1.default.join(wrapperDir, "tabctl-host.sh");
+    node_fs_1.default.mkdirSync(wrapperDir, { recursive: true });
+    if (process.platform !== "win32") {
+        try {
+            node_fs_1.default.chmodSync(wrapperDir, 0o700);
+        }
+        catch { /* ignore */ }
+    }
+    if (process.platform === "win32") {
+        // Prefer the Go launcher binary from the platform package.
+        // Falls back to a .cmd wrapper if unavailable (dev/testing only —
+        // .cmd wrappers don't work for Chrome native messaging).
+        let exeSrc;
+        try {
+            exeSrc = require.resolve("tabctl-win32-x64/tabctl-host.exe");
+        }
+        catch {
+            // Not installed
+        }
+        if (exeSrc) {
+            const exeDst = node_path_1.default.join(wrapperDir, "tabctl-host.exe");
+            node_fs_1.default.copyFileSync(exeSrc, exeDst);
+            const cfgLines = [nodePath, hostPath];
+            if (profileName) {
+                cfgLines.push(`TABCTL_PROFILE=${profileName}`);
+            }
+            cfgLines.push("");
+            node_fs_1.default.writeFileSync(node_path_1.default.join(wrapperDir, "host-launcher.cfg"), cfgLines.join("\r\n"), "utf8");
+            return exeDst;
+        }
+        // Fallback: .cmd wrapper (won't work with Chrome native messaging)
+        const wrapperPath = node_path_1.default.join(wrapperDir, "tabctl-host.cmd");
+        const lines = ["@echo off"];
+        if (profileName) {
+            lines.push(`set TABCTL_PROFILE=${profileName}`);
+        }
+        lines.push(`"${nodePath}" "${hostPath}" %*`);
+        lines.push("");
+        node_fs_1.default.writeFileSync(wrapperPath, lines.join("\r\n"), "utf8");
+        return wrapperPath;
+    }
+    const wrapperPath = node_path_1.default.join(wrapperDir, "tabctl-host.sh");
     const escapedNode = nodePath.replace(/"/g, "\\\"");
     const escapedHost = hostPath.replace(/"/g, "\\\"");
     const lines = [
@@ -171,22 +166,19 @@ function writeWrapper(nodePath, hostPath, profileName, wrapperDir) {
     lines.push(`exec \"${escapedNode}\" \"${escapedHost}\"`);
     lines.push("");
     const wrapper = lines.join("\n");
-    fs_1.default.writeFileSync(wrapperPath, wrapper, "utf8");
-    fs_1.default.chmodSync(wrapperPath, 0o700);
+    node_fs_1.default.writeFileSync(wrapperPath, wrapper, "utf8");
+    node_fs_1.default.chmodSync(wrapperPath, 0o700);
     return wrapperPath;
 }
-async function runSetup(options, prettyOutput) {
-    if (process.platform !== "darwin") {
-        (0, output_1.errorOut)("tabctl setup is only supported on macOS.");
-    }
+function runSetup(options, prettyOutput) {
     const browser = resolveBrowser(options.browser);
     if (!browser) {
         (0, output_1.errorOut)("Missing or invalid --browser (edge|chrome)");
     }
     const nodePath = resolveNodePath(options);
-    const hostPath = resolveHostPath();
-    // Sync extension to stable path (before extensionId so interactive mode can show it)
+    // Sync extension + host to stable paths (before extensionId so interactive mode can show it)
     const config = (0, constants_1.resolveConfig)();
+    const hostPath = resolveHostPath(config.baseDataDir);
     let extensionSync;
     try {
         extensionSync = (0, extension_sync_1.syncExtension)(config.baseDataDir);
@@ -198,29 +190,15 @@ async function runSetup(options, prettyOutput) {
     let extensionId = resolveExtensionId(options, false);
     if (!extensionId) {
         // Auto-derive from the installed extension path (Chromium uses SHA256 of the path)
-        const installedDir = (0, extension_sync_1.resolveInstalledExtensionDir)(config.baseDataDir);
-        if (fs_1.default.existsSync(path_1.default.join(installedDir, "manifest.json"))) {
+        // Prefer the just-synced path; fall back to resolving independently
+        const installedDir = extensionSync?.extensionDir ?? (0, extension_sync_1.resolveInstalledExtensionDir)(config.baseDataDir);
+        if (node_fs_1.default.existsSync(node_path_1.default.join(installedDir, "manifest.json"))) {
             extensionId = (0, extension_sync_1.deriveExtensionId)(installedDir);
             process.stderr.write(`Extension ID derived from: ${installedDir}\n`);
         }
     }
     if (!extensionId) {
-        // Interactive mode: sync hadn't happened or path doesn't exist
-        if (extensionSync?.extensionDir) {
-            process.stderr.write(`\nExtension synced to: ${extensionSync.extensionDir}\n`);
-            try {
-                const pbcopy = (0, node_child_process_1.spawn)("pbcopy", { stdio: ["pipe", "ignore", "ignore"] });
-                pbcopy.stdin.end(extensionSync.extensionDir);
-                pbcopy.on("exit", (code) => {
-                    if (code === 0)
-                        process.stderr.write("(Path copied to clipboard)\n");
-                });
-            }
-            catch {
-                // clipboard copy is best-effort
-            }
-        }
-        extensionId = await promptExtensionId(browser);
+        (0, output_1.errorOut)("Could not derive extension ID (extension not synced). Use --extension-id <id> or set TABCTL_EXTENSION_ID.");
     }
     // Profile name: --name flag or browser type
     const profileName = typeof options.name === "string" && options.name.trim()
@@ -233,20 +211,20 @@ async function runSetup(options, prettyOutput) {
         (0, output_1.errorOut)(err.message);
     }
     // Profile data dir (use baseDataDir to avoid nesting under another profile)
-    const profileDataDir = path_1.default.join(config.baseDataDir, "profiles", profileName);
-    fs_1.default.mkdirSync(profileDataDir, { recursive: true, mode: 0o700 });
+    const profileDataDir = node_path_1.default.join(config.baseDataDir, "profiles", profileName);
+    node_fs_1.default.mkdirSync(profileDataDir, { recursive: true });
     // Write profile-specific wrapper
     const wrapperPath = writeWrapper(nodePath, hostPath, profileName, profileDataDir);
     // Resolve manifest directory: custom user-data-dir or system-wide
     const rawUserDataDir = typeof options["user-data-dir"] === "string"
         ? options["user-data-dir"].trim()
         : "";
-    const userDataDir = rawUserDataDir ? path_1.default.resolve(rawUserDataDir) : "";
+    const userDataDir = rawUserDataDir ? node_path_1.default.resolve(rawUserDataDir) : "";
     const manifestDir = userDataDir
-        ? path_1.default.join(userDataDir, "NativeMessagingHosts")
+        ? node_path_1.default.join(userDataDir, "NativeMessagingHosts")
         : resolveManifestDir(browser);
-    fs_1.default.mkdirSync(manifestDir, { recursive: true });
-    const manifestPath = path_1.default.join(manifestDir, `${constants_1.HOST_NAME}.json`);
+    node_fs_1.default.mkdirSync(manifestDir, { recursive: true });
+    const manifestPath = node_path_1.default.join(manifestDir, `${constants_1.HOST_NAME}.json`);
     const manifest = {
         name: constants_1.HOST_NAME,
         description: constants_1.HOST_DESCRIPTION,
@@ -254,7 +232,7 @@ async function runSetup(options, prettyOutput) {
         type: "stdio",
         allowed_origins: [`chrome-extension://${extensionId}/`],
     };
-    fs_1.default.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), "utf8");
+    node_fs_1.default.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), "utf8");
     // Register profile
     const profileEntry = {
         browser,

package/dist/cli/lib/options-commands.js

@@ -85,6 +85,8 @@ exports.COMMANDS = {
             { flag: "--window-group <name>", desc: "Find window containing group" },
             { flag: "--window-tab <id>", desc: "Find window containing tab" },
             { flag: "--window-url <substring>", desc: "Find window containing URL" },
+            { flag: "--new-group", desc: "Force new group even if one exists" },
+            { flag: "--allow-duplicates", desc: "Open duplicate URLs" },
         ],
     },
     "group-list": {
@@ -129,6 +131,13 @@ exports.COMMANDS = {
             { flag: "--expanded", desc: "Expand group after assign" },
         ],
     },
+    "group-gather": {
+        description: "Merge duplicate groups with the same name",
+        options: [
+            { flag: "--window <id|active|last-focused>", desc: "Target window" },
+            { flag: "--group <name>", desc: "Group name to gather (optional, gathers all if omitted)" },
+        ],
+    },
     "move-tab": {
         description: "Move a tab to a new position",
         options: [
@@ -167,7 +176,7 @@ exports.COMMANDS = {
         description: "Configure tabctl connection",
         options: [
             { flag: "--browser edge|chrome", desc: "Browser type" },
-            { flag: "--extension-id <id>", desc: "Extension ID to connect to" },
+            { flag: "--extension-id <id>", desc: "Override auto-derived extension ID" },
             { flag: "--node <path>", desc: "Path to Node.js executable" },
             { flag: "--name <name>", desc: "Profile name (default: browser type)" },
             { flag: "--user-data-dir <path>", desc: "Chrome/Edge user data directory for custom profiles" },
@@ -253,4 +262,7 @@ exports.COMMANDS = {
     ping: {
         description: "Test connection to browser extension",
     },
+    reload: {
+        description: "Reload the browser extension (internal, used for upgrades)",
+    },
 };