tabctl 0.1.0 → 0.2.0

package/{cli → dist/cli}/lib/commands/index.js

@@ -5,9 +5,11 @@
  */
 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;
-// Meta commands (version, ping, setup, skill, policy, history, undo)
+// Setup command
+var setup_1 = require("./setup");
+Object.defineProperty(exports, "runSetup", { enumerable: true, get: function () { return setup_1.runSetup; } });
+// Meta commands (version, ping, skill, policy, history, undo)
 var meta_1 = require("./meta");
-Object.defineProperty(exports, "runSetup", { enumerable: true, get: function () { return meta_1.runSetup; } });
 Object.defineProperty(exports, "runSkillInstall", { enumerable: true, get: function () { return meta_1.runSkillInstall; } });
 Object.defineProperty(exports, "runVersion", { enumerable: true, get: function () { return meta_1.runVersion; } });
 Object.defineProperty(exports, "runPolicy", { enumerable: true, get: function () { return meta_1.runPolicy; } });

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

@@ -0,0 +1,226 @@
+"use strict";
+/**
+ * Meta command handlers: version, ping, skill, policy, history, undo
+ * These commands don't operate on tab data and are relatively self-contained.
+ * Setup command is in ./setup.ts.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runSetup = void 0;
+exports.runSkillInstall = runSkillInstall;
+exports.runVersion = runVersion;
+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_child_process_1 = require("node:child_process");
+const constants_1 = require("../constants");
+const output_1 = require("../output");
+const client_1 = require("../client");
+const policy_1 = require("../policy");
+const scope_1 = require("../scope");
+var setup_1 = require("./setup");
+Object.defineProperty(exports, "runSetup", { enumerable: true, get: function () { return setup_1.runSetup; } });
+// ============================================================================
+// Skill Command
+// ============================================================================
+function resolveProjectRoot() {
+    try {
+        return fs_1.default.realpathSync(process.cwd());
+    }
+    catch {
+        return path_1.default.resolve(process.cwd());
+    }
+}
+function resolveConfigHome() {
+    return process.env.XDG_CONFIG_HOME || path_1.default.join(os_1.default.homedir(), ".config");
+}
+function resolveSkillTargetDir(globalInstall) {
+    if (globalInstall) {
+        return path_1.default.join(resolveConfigHome(), "opencode", "skills", constants_1.SKILL_NAME);
+    }
+    return 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" });
+    if (result.error) {
+        (0, output_1.errorOut)(`Failed to run skills CLI: ${result.error.message}`);
+    }
+    if (typeof result.status === "number" && result.status !== 0) {
+        const stderr = result.stderr ? result.stderr.toString().trim() : "";
+        const stdout = result.stdout ? result.stdout.toString().trim() : "";
+        const detail = stderr || stdout;
+        const message = detail ? `skills CLI failed: ${detail}` : `skills CLI exited with status ${result.status}`;
+        (0, output_1.errorOut)(message);
+    }
+}
+function runSkillInstall(options, prettyOutput) {
+    const globalInstall = options.global === true;
+    const installTarget = resolveSkillTargetDir(globalInstall);
+    const agents = Array.isArray(options.agent)
+        ? options.agent.filter((value) => typeof value === "string" && value.trim())
+        : [];
+    const args = ["add", constants_1.SKILL_REPO, "--skill", constants_1.SKILL_NAME];
+    if (agents.length > 0) {
+        for (const agent of agents) {
+            args.push("-a", agent);
+        }
+    }
+    if (globalInstall) {
+        args.push("-g");
+    }
+    const hintAgents = agents.length > 0 ? agents.map((agent) => `-a ${(0, scope_1.formatCliArgValue)(agent)}`).join(" ") : "";
+    const installHintParts = ["npx skills add", (0, scope_1.formatCliArgValue)(constants_1.SKILL_REPO), "--skill", constants_1.SKILL_NAME];
+    if (hintAgents) {
+        installHintParts.push(hintAgents);
+    }
+    if (globalInstall) {
+        installHintParts.push("-g");
+    }
+    const installHint = installHintParts.join(" ").trim();
+    runSkillsCli(args);
+    (0, output_1.printJson)({
+        ok: true,
+        data: {
+            name: constants_1.SKILL_NAME,
+            targetDir: installTarget,
+            scope: globalInstall ? "global" : "project",
+            installHint,
+            tool: "skills",
+        },
+    }, prettyOutput);
+}
+// ============================================================================
+// Version Command
+// ============================================================================
+function runVersion(prettyOutput) {
+    (0, output_1.printJson)({
+        ok: true,
+        data: {
+            version: constants_1.VERSION,
+            baseVersion: constants_1.BASE_VERSION,
+            gitSha: constants_1.GIT_SHA,
+            dirty: constants_1.DIRTY,
+            component: "cli",
+        },
+    }, prettyOutput);
+}
+// ============================================================================
+// Policy Command
+// ============================================================================
+function runPolicy(options, policyContext, prettyOutput) {
+    const policyPath = (0, policy_1.defaultPolicyPath)();
+    if (options.init) {
+        if (fs_1.default.existsSync(policyPath)) {
+            (0, output_1.printJson)({
+                ok: true,
+                data: {
+                    status: "exists",
+                    path: policyPath,
+                },
+            }, 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");
+        (0, output_1.printJson)({
+            ok: true,
+            data: {
+                status: "created",
+                path: policyPath,
+            },
+        }, prettyOutput);
+        return;
+    }
+    const policySummary = (0, policy_1.summarizePolicy)(policyContext.policy, policyContext.path);
+    (0, output_1.printJson)({
+        ok: true,
+        data: {
+            ...policySummary,
+            path: policyPath,
+        },
+    }, prettyOutput);
+}
+// ============================================================================
+// History Command
+// ============================================================================
+async function runHistory(options, prettyOutput) {
+    const params = {
+        limit: options.limit ? Number(options.limit) : undefined,
+    };
+    const response = await (0, client_1.sendRequest)({
+        id: (0, client_1.createRequestId)(),
+        action: "history",
+        params,
+        client: {
+            component: "cli",
+            version: constants_1.VERSION,
+            baseVersion: constants_1.BASE_VERSION,
+            gitSha: constants_1.GIT_SHA,
+            dirty: constants_1.DIRTY,
+        },
+    });
+    (0, output_1.printJson)(response, prettyOutput);
+    if (!response.ok) {
+        process.exit(1);
+    }
+}
+// ============================================================================
+// Undo Command
+// ============================================================================
+async function runUndo(options, prettyOutput) {
+    const positionalTxid = options._[0];
+    const flagTxid = options.txid;
+    const useLatest = options.latest === true;
+    if (useLatest && (positionalTxid || flagTxid)) {
+        (0, output_1.errorOut)("--latest cannot be combined with a txid argument or --txid");
+    }
+    const txid = positionalTxid || flagTxid;
+    const params = {
+        txid,
+        latest: useLatest,
+    };
+    const response = await (0, client_1.sendRequest)({
+        id: (0, client_1.createRequestId)(),
+        action: "undo",
+        params,
+        client: {
+            component: "cli",
+            version: constants_1.VERSION,
+            baseVersion: constants_1.BASE_VERSION,
+            gitSha: constants_1.GIT_SHA,
+            dirty: constants_1.DIRTY,
+        },
+    });
+    (0, output_1.printJson)(response, prettyOutput);
+    if (!response.ok) {
+        process.exit(1);
+    }
+}
+// ============================================================================
+// Ping Command
+// ============================================================================
+async function runPing(prettyOutput) {
+    const response = await (0, client_1.sendRequest)({
+        id: (0, client_1.createRequestId)(),
+        action: "ping",
+        params: {},
+        client: {
+            component: "cli",
+            version: constants_1.VERSION,
+            baseVersion: constants_1.BASE_VERSION,
+            gitSha: constants_1.GIT_SHA,
+            dirty: constants_1.DIRTY,
+        },
+    });
+    (0, output_1.printJson)(response, prettyOutput);
+    if (!response.ok) {
+        process.exit(1);
+    }
+}

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

@@ -0,0 +1,40 @@
+"use strict";
+/**
+ * Group-related parameter builders.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildGroupUpdateParams = buildGroupUpdateParams;
+exports.buildGroupUngroupParams = buildGroupUngroupParams;
+exports.buildGroupAssignParams = buildGroupAssignParams;
+const params_1 = require("./params");
+function buildGroupUpdateParams(options) {
+    const windowValue = (0, params_1.parseWindowScope)(options.window, { allowNew: false });
+    return {
+        groupTitle: options.group,
+        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
+        windowId: windowValue,
+        title: options.title,
+        color: options.color,
+        collapsed: options.collapsed === true ? true : options.expanded === true ? false : undefined,
+    };
+}
+function buildGroupUngroupParams(options) {
+    const windowValue = (0, params_1.parseWindowScope)(options.window, { allowNew: false });
+    return {
+        groupTitle: options.group,
+        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
+        windowId: windowValue,
+    };
+}
+function buildGroupAssignParams(options) {
+    const windowValue = (0, params_1.parseWindowScope)(options.window, { allowNew: false });
+    return {
+        tabIds: options.tab ? options.tab.map(Number) : undefined,
+        groupTitle: options.group,
+        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
+        windowId: windowValue,
+        create: Boolean(options.create),
+        color: options.color,
+        collapsed: options.collapsed === true ? true : options.expanded === true ? false : undefined,
+    };
+}

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

@@ -0,0 +1,44 @@
+"use strict";
+/**
+ * Movement-related parameter builders.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildMoveTabParams = buildMoveTabParams;
+exports.buildMoveGroupParams = buildMoveGroupParams;
+exports.buildMergeWindowParams = buildMergeWindowParams;
+const params_1 = require("./params");
+function buildMoveTabParams(options) {
+    const windowValue = (0, params_1.parseWindowScope)(options.window, { allowNew: false });
+    return {
+        tabId: options.tab ? Number(options.tab[0]) : undefined,
+        tabIds: options.tab ? options.tab.map(Number) : undefined,
+        beforeTabId: options["before-tab"] ? Number(options["before-tab"]) : undefined,
+        afterTabId: options["after-tab"] ? Number(options["after-tab"]) : undefined,
+        beforeGroupTitle: options["before-group"],
+        afterGroupTitle: options["after-group"],
+        windowId: windowValue,
+        newWindow: options["new-window"] === true,
+    };
+}
+function buildMoveGroupParams(options) {
+    const windowValue = (0, params_1.parseWindowScope)(options.window, { allowNew: false });
+    return {
+        groupTitle: options.group,
+        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
+        beforeTabId: options["before-tab"] ? Number(options["before-tab"]) : undefined,
+        afterTabId: options["after-tab"] ? Number(options["after-tab"]) : undefined,
+        beforeGroupTitle: options["before-group"],
+        afterGroupTitle: options["after-group"],
+        windowId: windowValue,
+        newWindow: options["new-window"] === true,
+    };
+}
+function buildMergeWindowParams(options) {
+    return {
+        fromWindowId: options.from ? Number(options.from) : undefined,
+        toWindowId: options.to ? Number(options.to) : undefined,
+        windowId: options.from ? Number(options.from) : undefined,
+        closeSource: options["close-source"] === true,
+        confirmed: options.confirm === true,
+    };
+}

package/{cli → dist/cli}/lib/commands/params.js

@@ -7,42 +7,51 @@ 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.buildAnalyzeParams = buildAnalyzeParams;
 exports.buildInspectParams = buildInspectParams;
 exports.buildFocusParams = buildFocusParams;
 exports.buildRefreshParams = buildRefreshParams;
 exports.buildOpenParams = buildOpenParams;
-exports.buildGroupUpdateParams = buildGroupUpdateParams;
-exports.buildGroupUngroupParams = buildGroupUngroupParams;
-exports.buildGroupAssignParams = buildGroupAssignParams;
-exports.buildMoveTabParams = buildMoveTabParams;
-exports.buildMoveGroupParams = buildMoveGroupParams;
-exports.buildMergeWindowParams = buildMergeWindowParams;
 exports.buildArchiveParams = buildArchiveParams;
 exports.buildCloseParams = buildCloseParams;
 exports.buildReportParams = buildReportParams;
 exports.buildScreenshotParams = buildScreenshotParams;
+exports.parseWindowScope = parseWindowScope;
 exports.buildHistoryParams = buildHistoryParams;
 exports.buildUndoParams = buildUndoParams;
 const fs_1 = __importDefault(require("fs"));
 const output_1 = require("../output");
 const args_1 = require("../args");
 // ============================================================================
-// Analyze Command Parameters
+// Shared Scope Builder
 // ============================================================================
-function buildAnalyzeParams(options) {
+function buildScopeFromOptions(options, { allowNew } = { allowNew: false }) {
     if (options.ungrouped && options["group-id"]) {
         (0, output_1.errorOut)("--ungrouped cannot be combined with --group-id");
     }
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
+    const windowId = parseWindowScope(options.window, { allowNew });
     return {
-        staleDays: options["stale-days"] ? Number(options["stale-days"]) : undefined,
-        checkGitHub: Boolean(options.github),
         tabIds: options.tab ? options.tab.map(Number) : undefined,
         groupTitle: options.group,
         groupId: options.ungrouped ? -1 : (options["group-id"] ? Number(options["group-id"]) : undefined),
-        windowId: windowValue,
-        all: options.all === true,
+        windowId,
+        all: Boolean(options.all),
+    };
+}
+// ============================================================================
+// Analyze Command Parameters
+// ============================================================================
+function buildAnalyzeParams(options) {
+    const { tabIds, groupTitle, groupId, windowId, all } = buildScopeFromOptions(options);
+    return {
+        staleDays: options["stale-days"] ? Number(options["stale-days"]) : undefined,
+        checkGitHub: Boolean(options.github),
+        tabIds,
+        groupTitle,
+        groupId,
+        windowId,
+        all,
         githubConcurrency: options["github-concurrency"] ? Number(options["github-concurrency"]) : undefined,
         githubTimeoutMs: options["github-timeout-ms"] ? Number(options["github-timeout-ms"]) : undefined,
         progress: Boolean(options.progress),
@@ -52,10 +61,7 @@ function buildAnalyzeParams(options) {
 // Inspect Command Parameters
 // ============================================================================
 function buildInspectParams(options) {
-    if (options.ungrouped && options["group-id"]) {
-        (0, output_1.errorOut)("--ungrouped cannot be combined with --group-id");
-    }
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
+    const { tabIds, groupTitle, groupId, windowId, all } = buildScopeFromOptions(options);
     const selectorAttr = options["selector-attr"] ? String(options["selector-attr"]).trim() : "";
     const allowedSelectorAttrs = new Set(["text", "href", "src", "href-url", "src-url"]);
     if (options["selector-attr"] && (!selectorAttr || !allowedSelectorAttrs.has(selectorAttr))) {
@@ -101,11 +107,11 @@ function buildInspectParams(options) {
         }
     }
     return {
-        all: Boolean(options.all),
-        windowId: windowValue,
-        groupTitle: options.group,
-        groupId: options.ungrouped ? -1 : (options["group-id"] ? Number(options["group-id"]) : undefined),
-        tabIds: options.tab ? options.tab.map(Number) : undefined,
+        all,
+        windowId,
+        groupTitle,
+        groupId,
+        tabIds,
         signals: options.signal ? options.signal : undefined,
         selectorSpecs,
         signalConfig,
@@ -161,98 +167,34 @@ function buildOpenParams(options) {
     };
 }
 // ============================================================================
-// Group Command Parameters
+// Group Command Parameters (re-exported from params-groups.ts)
 // ============================================================================
-function buildGroupUpdateParams(options) {
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
-    return {
-        groupTitle: options.group,
-        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
-        windowId: windowValue,
-        title: options.title,
-        color: options.color,
-        collapsed: options.collapsed === true ? true : options.expanded === true ? false : undefined,
-    };
-}
-function buildGroupUngroupParams(options) {
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
-    return {
-        groupTitle: options.group,
-        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
-        windowId: windowValue,
-    };
-}
-function buildGroupAssignParams(options) {
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
-    return {
-        tabIds: options.tab ? options.tab.map(Number) : undefined,
-        groupTitle: options.group,
-        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
-        windowId: windowValue,
-        create: Boolean(options.create),
-        color: options.color,
-        collapsed: options.collapsed === true ? true : options.expanded === true ? false : undefined,
-    };
-}
+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; } });
 // ============================================================================
-// Move Command Parameters
+// Move Command Parameters (re-exported from params-move.ts)
 // ============================================================================
-function buildMoveTabParams(options) {
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
-    return {
-        tabId: options.tab ? Number(options.tab[0]) : undefined,
-        tabIds: options.tab ? options.tab.map(Number) : undefined,
-        beforeTabId: options["before-tab"] ? Number(options["before-tab"]) : undefined,
-        afterTabId: options["after-tab"] ? Number(options["after-tab"]) : undefined,
-        beforeGroupTitle: options["before-group"],
-        afterGroupTitle: options["after-group"],
-        windowId: windowValue,
-        newWindow: options["new-window"] === true,
-    };
-}
-function buildMoveGroupParams(options) {
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
-    return {
-        groupTitle: options.group,
-        groupId: options["group-id"] ? Number(options["group-id"]) : undefined,
-        beforeTabId: options["before-tab"] ? Number(options["before-tab"]) : undefined,
-        afterTabId: options["after-tab"] ? Number(options["after-tab"]) : undefined,
-        beforeGroupTitle: options["before-group"],
-        afterGroupTitle: options["after-group"],
-        windowId: windowValue,
-        newWindow: options["new-window"] === true,
-    };
-}
-function buildMergeWindowParams(options) {
-    return {
-        fromWindowId: options.from ? Number(options.from) : undefined,
-        toWindowId: options.to ? Number(options.to) : undefined,
-        windowId: options.from ? Number(options.from) : undefined,
-        closeSource: options["close-source"] === true,
-        confirmed: options.confirm === true,
-    };
-}
+var params_move_1 = require("./params-move");
+Object.defineProperty(exports, "buildMoveTabParams", { enumerable: true, get: function () { return params_move_1.buildMoveTabParams; } });
+Object.defineProperty(exports, "buildMoveGroupParams", { enumerable: true, get: function () { return params_move_1.buildMoveGroupParams; } });
+Object.defineProperty(exports, "buildMergeWindowParams", { enumerable: true, get: function () { return params_move_1.buildMergeWindowParams; } });
 // ============================================================================
 // Archive/Close Command Parameters
 // ============================================================================
 function buildArchiveParams(options) {
-    if (options.ungrouped && options["group-id"]) {
-        (0, output_1.errorOut)("--ungrouped cannot be combined with --group-id");
-    }
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
+    const { tabIds, groupTitle, groupId, windowId, all } = buildScopeFromOptions(options);
     return {
-        all: Boolean(options.all),
-        windowId: windowValue,
-        groupTitle: options.group,
-        groupId: options.ungrouped ? -1 : (options["group-id"] ? Number(options["group-id"]) : undefined),
-        tabIds: options.tab ? options.tab.map(Number) : undefined,
+        all,
+        windowId,
+        groupTitle,
+        groupId,
+        tabIds,
     };
 }
 function buildCloseParams(options) {
-    if (options.ungrouped && options["group-id"]) {
-        (0, output_1.errorOut)("--ungrouped cannot be combined with --group-id");
-    }
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
+    const { tabIds, groupTitle, groupId, windowId } = buildScopeFromOptions(options);
     if (options.apply) {
         return { mode: "apply", analysisId: options.apply };
     }
@@ -262,46 +204,40 @@ function buildCloseParams(options) {
     return {
         mode: "direct",
         confirmed: true,
-        windowId: windowValue,
-        groupTitle: options.group,
-        groupId: options.ungrouped ? -1 : (options["group-id"] ? Number(options["group-id"]) : undefined),
-        tabIds: options.tab ? options.tab.map(Number) : undefined,
+        windowId,
+        groupTitle,
+        groupId,
+        tabIds,
     };
 }
 // ============================================================================
 // Report Command Parameters
 // ============================================================================
 function buildReportParams(options) {
-    if (options.ungrouped && options["group-id"]) {
-        (0, output_1.errorOut)("--ungrouped cannot be combined with --group-id");
-    }
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
+    const { tabIds, groupTitle, groupId, windowId, all } = buildScopeFromOptions(options);
     return {
-        all: Boolean(options.all),
-        windowId: windowValue,
-        groupTitle: options.group,
-        groupId: options.ungrouped ? -1 : (options["group-id"] ? Number(options["group-id"]) : undefined),
-        tabIds: options.tab ? options.tab.map(Number) : undefined,
+        all,
+        windowId,
+        groupTitle,
+        groupId,
+        tabIds,
     };
 }
 // ============================================================================
 // Screenshot Command Parameters
 // ============================================================================
 function buildScreenshotParams(options) {
-    if (options.ungrouped && options["group-id"]) {
-        (0, output_1.errorOut)("--ungrouped cannot be combined with --group-id");
-    }
-    const windowValue = parseWindowScope(options.window, { allowNew: false });
+    const { tabIds, groupTitle, groupId, windowId, all } = buildScopeFromOptions(options);
     const outDir = options.out != null ? String(options.out).trim() : "";
     if (options.out && !outDir) {
         (0, output_1.errorOut)("--out requires a directory path");
     }
     return {
-        all: Boolean(options.all),
-        windowId: windowValue,
-        groupTitle: options.group,
-        groupId: options.ungrouped ? -1 : (options["group-id"] ? Number(options["group-id"]) : undefined),
-        tabIds: options.tab ? options.tab.map(Number) : undefined,
+        all,
+        windowId,
+        groupTitle,
+        groupId,
+        tabIds,
         mode: options.mode,
         format: options.format,
         quality: options.quality != null ? Number(options.quality) : undefined,