@samaksh/git-worker 0.2.1 → 0.2.2

package/dist/cli/index.js

@@ -7,7 +7,7 @@ const program = new Command();
 program
     .name("git-worker")
     .description("Safe, composable CLI/TUI for applying reviewed file changes across many Git branches")
-    .version("0.2.1")
+    .version("0.2.2")
     .option("-r, --repo <path>", "Repository path or remote URL (default: current directory)")
     .option("-c, --cached", "Select from previously cloned and cached repositories")
     .option("-b, --branch <pattern>", "Branch pattern — glob (uat/*) or regex (/uat.*/)")

package/dist/services/workspace/manager.js

@@ -6,7 +6,7 @@ import { join, resolve, normalize } from "path";
 import { simpleGit, CheckRepoActions } from "simple-git";
 import { homedir } from "os";
 import { createHash } from "crypto";
-const GIT_WORKER_VERSION = "0.2.1";
+const GIT_WORKER_VERSION = "0.2.2";
 const LOCK_FILE = ".git-worker-lock";
 /**
  * Extract a human-readable repository name from a remote URL or file path.

package/dist/stages/select.js

@@ -100,6 +100,11 @@ export const selectTargetsStage = async (context, deps) => {
                     label: `➜ Confirm and proceed with ${selectedCount} branch(es)`,
                     hint: "proceed to target file selection",
                 });
+                options.push({
+                    value: "pattern",
+                    label: "🔍 Filter by pattern or regex",
+                    hint: "glob (uat/*) or regex (/uat.*/)",
+                });
                 options.push({
                     value: "list",
                     label: "📋 Select from branch list",
@@ -113,13 +118,13 @@ export const selectTargetsStage = async (context, deps) => {
                     value: "invert",
                     label: `🔄 Invert selection (i) — select other ${totalCount - selectedCount} branch(es)`,
                 });
+            }
+            else {
                 options.push({
                     value: "pattern",
                     label: "🔍 Filter by pattern or regex",
-                    hint: "glob (uat/*) or regex (/uat.*/)",
+                    hint: "glob (uat/*) or regex (/uat.*/) — then select/review",
                 });
-            }
-            else {
                 options.push({
                     value: "list",
                     label: "📋 Select from branch list",
@@ -134,11 +139,6 @@ export const selectTargetsStage = async (context, deps) => {
                     value: "invert",
                     label: `🔄 Invert selection (i) — select all ${totalCount} branches`,
                 });
-                options.push({
-                    value: "pattern",
-                    label: "🔍 Filter by pattern or regex",
-                    hint: "glob (uat/*) or regex (/uat.*/)",
-                });
             }
             const previewText = selectedCount > 0
                 ? `${selectedCount} of ${totalCount} selected: ${chalk.cyan(Array.from(selectedNames).slice(0, 3).join(", ") +
@@ -188,7 +188,6 @@ export const selectTargetsStage = async (context, deps) => {
                     clack.log.warn(`Pattern '${pattern}' matched 0 of ${totalCount} branches.`);
                     continue;
                 }
-                selectedNames = new Set(matched.map((b) => b.name));
                 statusLine("ok", `Pattern '${pattern}' matched ${matched.length} branch(es):`);
                 for (const b of matched.slice(0, 5)) {
                     console.log(chalk.gray(`    • ${b.name}`));
@@ -196,25 +195,117 @@ export const selectTargetsStage = async (context, deps) => {
                 if (matched.length > 5) {
                     console.log(chalk.gray(`    ... and ${matched.length - 5} more`));
                 }
-                continue;
-            }
-            if (choice === "list") {
+                // Open interactive checkbox selection with the filtered branches
                 try {
                     const { picked } = await inquirer.prompt([
                         {
                             type: "checkbox",
                             name: "picked",
-                            message: "Select branches to process:",
+                            message: `Select from matched branches (${pattern}):`,
                             pageSize: 15,
-                            choices: allBranches.map((b) => ({
+                            choices: matched.map((b) => ({
                                 name: `${b.name} (${b.isRemote ? `remote/${b.remote}` : "local"} ${b.sha.slice(0, 8)})`,
                                 value: b.name,
-                                checked: selectedNames.has(b.name),
+                                checked: true,
                             })),
                         },
                     ]);
                     selectedNames = new Set(picked);
                     statusLine("ok", `Selection updated: ${selectedNames.size} branch(es) selected`);
+                    if (selectedNames.size > 0) {
+                        const proceed = await clack.confirm({
+                            message: `Proceed with ${selectedNames.size} selected branch(es)?`,
+                            initialValue: true,
+                        });
+                        if (!clack.isCancel(proceed) && proceed) {
+                            break;
+                        }
+                    }
+                    continue;
+                }
+                catch (e) {
+                    if (e.isTtyError ||
+                        e.name === "ExitPromptError" ||
+                        e.message?.includes("force closed") ||
+                        e.message?.includes("User force closed")) {
+                        return err(inputCancelledError("Branch selection cancelled"));
+                    }
+                    continue;
+                }
+            }
+            if (choice === "list") {
+                try {
+                    const FILTER_ACTION = "__ACTION_FILTER_PATTERN__";
+                    const choices = [
+                        {
+                            name: chalk.cyan("🔍 [Filter this list by pattern / regex...]"),
+                            value: FILTER_ACTION,
+                            checked: false,
+                        },
+                        new inquirer.Separator(),
+                        ...allBranches.map((b) => ({
+                            name: `${b.name} (${b.isRemote ? `remote/${b.remote}` : "local"} ${b.sha.slice(0, 8)})`,
+                            value: b.name,
+                            checked: selectedNames.has(b.name),
+                        })),
+                    ];
+                    const { picked } = await inquirer.prompt([
+                        {
+                            type: "checkbox",
+                            name: "picked",
+                            message: "Select branches to process:",
+                            pageSize: 15,
+                            choices,
+                        },
+                    ]);
+                    if (picked.includes(FILTER_ACTION)) {
+                        const patternInput = await clack.text({
+                            message: "Enter glob pattern (e.g. uat/*) or regex (e.g. /uat.*/):",
+                            placeholder: "/uat.*/ or uat/*",
+                            validate: (v) => {
+                                if (!v || v.trim().length === 0) {
+                                    return "Please enter a pattern or regex";
+                                }
+                            },
+                        });
+                        if (!clack.isCancel(patternInput)) {
+                            const pattern = patternInput.trim();
+                            const matched = allBranches.filter((b) => matchesBranchPattern(b.name, pattern));
+                            if (matched.length === 0) {
+                                clack.log.warn(`Pattern '${pattern}' matched 0 of ${totalCount} branches.`);
+                            }
+                            else {
+                                const { subPicked } = await inquirer.prompt([
+                                    {
+                                        type: "checkbox",
+                                        name: "subPicked",
+                                        message: `Select from matched branches (${pattern}):`,
+                                        pageSize: 15,
+                                        choices: matched.map((b) => ({
+                                            name: `${b.name} (${b.isRemote ? `remote/${b.remote}` : "local"} ${b.sha.slice(0, 8)})`,
+                                            value: b.name,
+                                            checked: true,
+                                        })),
+                                    },
+                                ]);
+                                selectedNames = new Set(subPicked);
+                                statusLine("ok", `Selection updated: ${selectedNames.size} branch(es) selected`);
+                                if (selectedNames.size > 0) {
+                                    const proceed = await clack.confirm({
+                                        message: `Proceed with ${selectedNames.size} selected branch(es)?`,
+                                        initialValue: true,
+                                    });
+                                    if (!clack.isCancel(proceed) && proceed) {
+                                        break;
+                                    }
+                                }
+                                continue;
+                            }
+                        }
+                    }
+                    const actualPicked = picked.filter((p) => p !== FILTER_ACTION);
+                    selectedNames = new Set(actualPicked);
+                    statusLine("ok", `Selection updated: ${selectedNames.size} branch(es) selected`);
                     continue;
                 }
                 catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samaksh/git-worker",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Safe, composable TypeScript CLI/TUI for applying reviewed file changes across many Git branches",
   "type": "module",
   "main": "dist/index.js",
@@ -17,6 +17,9 @@
     "README.md",
     "docs"
   ],
+  "licenses": [
+    "MIT"
+  ],
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build",