kubrickcode · kubrickcode · Nov 19, 2025 · Nov 19, 2025 · Nov 19, 2025
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/eslint.config.js b/src/eslint.config.js
@@ -5,7 +5,7 @@ import tseslint from "typescript-eslint";
 
 export default [
   {
-    ignores: ["**/out/**", "**/__mocks__/**", "**/*.config.*", "**/node_modules/**", "**/view/**", "**/coverage/**"],
+    ignores: ["**/out/**", "**/__mocks__/**", "**/*.config.*", "**/node_modules/**", "**/coverage/**", "**/dist/**", "**/view/**"],
   },
   js.configs.recommended,
   ...tseslint.configs.recommended,

diff --git a/src/extension/view-dist/assets/index-iXByG0Qx.js b/src/extension/view-dist/assets/index-iXByG0Qx.js
diff --git a/src/extension/view-dist/index.html b/src/extension/view-dist/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React + TS</title>
-    <script type="module" crossorigin src="/assets/index-iXByG0Qx.js"></script>
+    <script type="module" crossorigin src="/assets/index-5D6F7MIX.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DaHakWf7.css">
   </head>
   <body>

diff --git a/src/internal/command-executor.ts b/src/internal/command-executor.ts
@@ -3,12 +3,7 @@ import { ButtonConfig } from "../pkg/types";
 import { MESSAGES } from "../shared/constants";
 import { TerminalExecutor, QuickPickCreator } from "./adapters";
 import { findMatchingShortcut } from "./keyboard-layout-converter";
-
-export type QuickPickItem = {
-  command: ButtonConfig;
-  description: string;
-  label: string;
-};
+import { QuickPickItem, createQuickPickItems, createButtonId } from "./utils/ui-items";
 
 export type QuickPickConfig = {
   items: QuickPickItem[];
@@ -118,14 +113,6 @@ export const createQuickPickWithShortcuts = (
   quickPick.show();
 };
 
-export const createQuickPickItems = (commands: ButtonConfig[]): QuickPickItem[] => {
-  return commands.map((cmd) => ({
-    command: cmd,
-    description: cmd.command || "",
-    label: cmd.shortcut ? `${cmd.name} (${cmd.shortcut})` : cmd.name,
-  }));
-};
-
 export const executeTerminalCommand = (
   button: ButtonConfig,
   terminalExecutor: TerminalExecutor
@@ -194,7 +181,7 @@ export const executeCommandsRecursively = (
   parentPath = ""
 ): void => {
   commands.forEach((cmd, index) => {
-    const buttonId = parentPath ? `${parentPath}>${cmd.name}[${index}]` : `${cmd.name}[${index}]`;
+    const buttonId = createButtonId(cmd.name, index, parentPath);
 
     if (cmd.group && cmd.executeAll) {
       executeCommandsRecursively(cmd.group, terminalExecutor, buttonId);

diff --git a/src/internal/providers/command-tree-provider.ts b/src/internal/providers/command-tree-provider.ts
@@ -1,88 +1,7 @@
 import * as vscode from "vscode";
-import { ButtonConfig } from "../../pkg/types";
 import { ConfigReader, TerminalExecutor } from "../adapters";
-
-export class CommandTreeItem extends vscode.TreeItem {
-  public readonly buttonName: string;
-  public readonly commandString: string;
-  public readonly terminalName?: string;
-  public readonly useVsCodeApi: boolean;
-
-  constructor(
-    label: string,
-    commandString: string,
-    useVsCodeApi: boolean = false,
-    terminalName?: string,
-    buttonName?: string
-  ) {
-    super(label, vscode.TreeItemCollapsibleState.None);
-    this.commandString = commandString;
-    this.useVsCodeApi = useVsCodeApi;
-    this.terminalName = terminalName;
-    this.buttonName = buttonName || label;
-    this.tooltip = commandString;
-    this.contextValue = "command";
-    this.command = {
-      arguments: [this],
-      command: "quickCommandButtons.executeFromTree",
-      title: "Execute",
-    };
-  }
-}
-
-export class GroupTreeItem extends vscode.TreeItem {
-  constructor(
-    public readonly label: string,
-    public readonly commands: ButtonConfig[]
-  ) {
-    super(label, vscode.TreeItemCollapsibleState.Collapsed);
-    this.tooltip = `${commands.length} commands`;
-    this.contextValue = "group";
-    this.iconPath = new vscode.ThemeIcon("folder");
-  }
-}
-
-type TreeItem = CommandTreeItem | GroupTreeItem;
-
-export const createTreeItemsFromGroup = (commands: ButtonConfig[], parentPath = ""): TreeItem[] => {
-  return commands.map((cmd, index) => {
-    const buttonId = parentPath ? `${parentPath}>${cmd.name}[${index}]` : `${cmd.name}[${index}]`;
-
-    if (cmd.group) {
-      return new GroupTreeItem(cmd.name, cmd.group);
-    }
-
-    return new CommandTreeItem(
-      cmd.name,
-      cmd.command || "",
-      cmd.useVsCodeApi || false,
-      cmd.terminalName,
-      buttonId
-    );
-  });
-};
-
-export const createRootTreeItems = (buttons: ButtonConfig[]): TreeItem[] => {
-  return buttons.map((button, index) => {
-    const buttonId = `${button.name}[${index}]`;
-
-    if (button.group) {
-      return new GroupTreeItem(button.name, button.group);
-    }
-
-    if (button.command) {
-      return new CommandTreeItem(
-        button.name,
-        button.command,
-        button.useVsCodeApi || false,
-        button.terminalName,
-        buttonId
-      );
-    }
-
-    return new CommandTreeItem(button.name, "", false, undefined, buttonId);
-  });
-};
+import { CommandTreeItem, GroupTreeItem, TreeItem, createTreeItems } from "../utils/ui-items";
+export { CommandTreeItem, GroupTreeItem };
 
 export class CommandTreeProvider implements vscode.TreeDataProvider<TreeItem> {
   private _onDidChangeTreeData = new vscode.EventEmitter<TreeItem | undefined | null | void>();
@@ -103,7 +22,7 @@ export class CommandTreeProvider implements vscode.TreeDataProvider<TreeItem> {
     }
 
     if (element instanceof GroupTreeItem) {
-      return Promise.resolve(createTreeItemsFromGroup(element.commands, element.label));
+      return Promise.resolve(createTreeItems(element.commands, element.label));
     }
 
     return Promise.resolve([]);
@@ -117,6 +36,6 @@ export class CommandTreeProvider implements vscode.TreeDataProvider<TreeItem> {
 
   private getRootItems = (): TreeItem[] => {
     const buttons = this.configReader.getButtons();
-    return createRootTreeItems(buttons);
+    return createTreeItems(buttons);
   };
 }
diff --git a/src/internal/show-all-commands.ts b/src/internal/show-all-commands.ts
@@ -1,18 +1,8 @@
 import * as vscode from "vscode";
-import { ButtonConfig } from "../pkg/types";
 import { MESSAGES } from "../shared/constants";
 import { ConfigReader, QuickPickCreator, TerminalExecutor } from "./adapters";
-import { createQuickPickWithShortcuts, QuickPickItem } from "./command-executor";
-
-export const createQuickPickItemsFromButtons = (buttons: ButtonConfig[]): QuickPickItem[] => {
-  return buttons.map((button) => ({
-    command: button,
-    description: button.group
-      ? MESSAGES.INFO.commandsCount(button.group.length)
-      : button.command || "",
-    label: button.shortcut ? `${button.name} (${button.shortcut})` : button.name,
-  }));
-};
+import { createQuickPickWithShortcuts } from "./command-executor";
+import { createQuickPickItems } from "./utils/ui-items";
 
 export const createShowAllCommandsCommand = (
   configReader: ConfigReader,
@@ -27,7 +17,7 @@ export const createShowAllCommandsCommand = (
       return;
     }
 
-    const items = createQuickPickItemsFromButtons(buttons);
+    const items = createQuickPickItems(buttons, true);
 
     createQuickPickWithShortcuts(
       {

diff --git a/src/internal/utils/ui-items.ts b/src/internal/utils/ui-items.ts
@@ -0,0 +1,108 @@
+import * as vscode from "vscode";
+import { ButtonConfig } from "../../pkg/types";
+import { MESSAGES } from "../../shared/constants";
+
+export type QuickPickItem = {
+  command: ButtonConfig;
+  description: string;
+  label: string;
+};
+
+export type TreeItem = CommandTreeItem | GroupTreeItem;
+
+export class CommandTreeItem extends vscode.TreeItem {
+  public readonly buttonName: string;
+  public readonly commandString: string;
+  public readonly terminalName?: string;
+  public readonly useVsCodeApi: boolean;
+
+  constructor(
+    label: string,
+    commandString: string,
+    useVsCodeApi: boolean = false,
+    terminalName?: string,
+    buttonName?: string
+  ) {
+    super(label, vscode.TreeItemCollapsibleState.None);
+    this.commandString = commandString;
+    this.useVsCodeApi = useVsCodeApi;
+    this.terminalName = terminalName;
+    this.buttonName = buttonName || label;
+    this.tooltip = commandString;
+    this.contextValue = "command";
+    this.command = {
+      arguments: [this],
+      command: "quickCommandButtons.executeFromTree",
+      title: "Execute",
+    };
+  }
+}
+
+export class GroupTreeItem extends vscode.TreeItem {
+  constructor(
+    public readonly label: string,
+    public readonly commands: ButtonConfig[]
+  ) {
+    super(label, vscode.TreeItemCollapsibleState.Collapsed);
+    this.tooltip = `${commands.length} commands`;
+    this.contextValue = "group";
+    this.iconPath = new vscode.ThemeIcon("folder");
+  }
+}
+
+export const createButtonId = (
+  buttonName: string,
+  index: number,
+  parentPath: string = ""
+): string => {
+  return parentPath ? `${parentPath}>${buttonName}[${index}]` : `${buttonName}[${index}]`;
+};
+
+export const createQuickPickItem = (
+  button: ButtonConfig,
+  includeCommandCount: boolean = false
+): QuickPickItem => {
+  const description =
+    button.group && includeCommandCount
+      ? MESSAGES.INFO.commandsCount(button.group.length)
+      : button.command || "";
+
+  const label = button.shortcut ? `${button.name} (${button.shortcut})` : button.name;
+
+  return {
+    command: button,
+    description,
+    label,
+  };
+};
+
+export const createQuickPickItems = (
+  buttons: ButtonConfig[],
+  includeCommandCount: boolean = false
+): QuickPickItem[] => {
+  return buttons.map((button) => createQuickPickItem(button, includeCommandCount));
+};
+
+export const createTreeItem = (
+  button: ButtonConfig,
+  index: number,
+  parentPath: string = ""
+): TreeItem => {
+  const buttonId = createButtonId(button.name, index, parentPath);
+
+  if (button.group) {
+    return new GroupTreeItem(button.name, button.group);
+  }
+
+  return new CommandTreeItem(
+    button.name,
+    button.command || "",
+    button.useVsCodeApi || false,
+    button.terminalName,
+    buttonId
+  );
+};
+
+export const createTreeItems = (buttons: ButtonConfig[], parentPath: string = ""): TreeItem[] => {
+  return buttons.map((button, index) => createTreeItem(button, index, parentPath));
+};
diff --git a/src/tests/command-executor.spec.ts b/src/tests/command-executor.spec.ts
@@ -1,11 +1,11 @@
 import {
-  validateShortcuts,
-  findShortcutItem,
   determineButtonExecutionType,
-  createQuickPickItems,
-  executeTerminalCommand,
   executeCommandsRecursively,
+  executeTerminalCommand,
+  findShortcutItem,
+  validateShortcuts,
 } from "../internal/command-executor";
+import { createQuickPickItems } from "../internal/utils/ui-items";
 import { ButtonConfig } from "../pkg/types";
 
 describe("command-executor", () => {