avil13-co 2.5.0 → 2.5.1

package/dist/commands/get-branches.d.ts

@@ -3,5 +3,5 @@ export declare enum BranchesType {
     Merged = 1,
     NotMerged = 2
 }
-/** Remote origin refs are also offered for checkout/merge; deletion is local only. */
+/** Remote refs retain their remote prefix; deletion is local only. */
 export declare function getBranches(type: BranchesType, localOnly?: boolean): Promise<string[]>;

package/dist/commands/get-branches.js

@@ -8,7 +8,7 @@ var BranchesType;
     BranchesType[BranchesType["Merged"] = 1] = "Merged";
     BranchesType[BranchesType["NotMerged"] = 2] = "NotMerged";
 })(BranchesType = exports.BranchesType || (exports.BranchesType = {}));
-/** Remote origin refs are also offered for checkout/merge; deletion is local only. */
+/** Remote refs retain their remote prefix; deletion is local only. */
 async function getBranches(type, localOnly = false) {
     const args = ['branch', '--format=%(refname)'];
     if (!localOnly)
@@ -22,7 +22,7 @@ async function getBranches(type, localOnly = false) {
             .map(name => name.trim())
             .filter(name => name && !/^refs\/remotes\/.+\/HEAD$/.test(name))
             .map(name => name.replace(/^refs\/heads\//, '')
-            .replace(/^refs\/remotes\/(?:origin\/)?/, '')))];
+            .replace(/^refs\/remotes\//, '')))];
     if (!branches.length)
         throw new Error('No branches found.');
     return branches;

package/dist/prompt.js

@@ -7,7 +7,16 @@ exports.prompt = void 0;
 const inquirer_1 = __importDefault(require("inquirer"));
 const terminal_1 = require("./terminal");
 function prompt(questions) {
-    const result = inquirer_1.default.prompt(questions);
+    // Bright yellow uses the terminal palette and keeps Inquirer's bold styling.
+    const styleQuestion = (question) => {
+        if (!process.stdout.isTTY || typeof question.message !== 'string')
+            return question;
+        return { ...question, message: `\x1b[93m${question.message}\x1b[39m` };
+    };
+    const styledQuestions = Array.isArray(questions)
+        ? questions.map(styleQuestion)
+        : styleQuestion(questions);
+    const result = inquirer_1.default.prompt(styledQuestions);
     // Inquirer 8 re-sends SIGINT asynchronously and may exit before Node handles
     // it. Handle readline's raw-mode Ctrl+C synchronously instead.
     const ui = result.ui;

package/dist/terminal.js

@@ -5,7 +5,9 @@ exports.installInterruptHandler = exports.finishTerminal = exports.print = expor
 let active = false;
 let messages = [];
 function startTerminal() {
-    active = Boolean(process.stdout.isTTY && process.stdin.isTTY);
+    // Temporarily disable the alternate screen; keep ordinary terminal output.
+    // active = Boolean(process.stdout.isTTY && process.stdin.isTTY);
+    active = false;
     messages = [];
     if (active)
         process.stdout.write('\x1b[?1049h');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avil13-co",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "",
   "main": "dist/index.js",
   "public": true,

package/src/__tests__/commands.spec.ts

@@ -49,11 +49,14 @@ describe('Git commands', () => {
     expect(git('branch', '--show-current')).toBe(branch);
   });
 
-  it('preserves local origin-prefixed branches and deduplicates origin remote refs', async () => {
+  it('preserves remote prefixes and distinguishes local and remote branches', async () => {
     git('branch', 'origin/local');
     git('update-ref', 'refs/remotes/origin/main', 'HEAD');
+    git('update-ref', 'refs/remotes/upstream/main', 'HEAD');
     git('symbolic-ref', 'refs/remotes/origin/HEAD', 'refs/remotes/origin/main');
-    expect(await getBranches(BranchesType.All)).toEqual(['main', 'origin/local']);
+    expect(await getBranches(BranchesType.All)).toEqual([
+      'main', 'origin/local', 'origin/main', 'upstream/main',
+    ]);
   });
 
   it('excludes remote refs from deletion candidates', async () => {

package/src/__tests__/prompt.spec.ts

@@ -0,0 +1,27 @@
+import { afterEach, expect, it, vi } from 'vitest';
+import inquirer from 'inquirer';
+import { prompt } from '../prompt';
+
+const descriptor = Object.getOwnPropertyDescriptor(process.stdout, 'isTTY');
+
+afterEach(() => {
+  vi.restoreAllMocks();
+  if (descriptor) Object.defineProperty(process.stdout, 'isTTY', descriptor);
+  else delete (process.stdout as any).isTTY;
+});
+
+it.each([true, false])('styles prompt headings only in a terminal (TTY=%s)', async isTTY => {
+  Object.defineProperty(process.stdout, 'isTTY', { value: isTTY, configurable: true });
+  const spy = vi.spyOn(inquirer, 'prompt').mockResolvedValue({ branch: 'main' });
+  const question = { name: 'branch', message: 'Select branch' };
+  const expected = {
+    ...question,
+    message: isTTY ? '\x1b[93mSelect branch\x1b[39m' : 'Select branch',
+  };
+
+  await prompt(question);
+  expect(spy).toHaveBeenLastCalledWith(expected);
+  await prompt([question]);
+  expect(spy).toHaveBeenLastCalledWith([expected]);
+  expect(question.message).toBe('Select branch');
+});

package/src/commands/get-branches.ts

@@ -6,7 +6,7 @@ export enum BranchesType {
   NotMerged,
 }
 
-/** Remote origin refs are also offered for checkout/merge; deletion is local only. */
+/** Remote refs retain their remote prefix; deletion is local only. */
 export async function getBranches(type: BranchesType, localOnly = false): Promise<string[]> {
   const args = ['branch', '--format=%(refname)'];
   if (!localOnly) args.push('--all');
@@ -18,7 +18,7 @@ export async function getBranches(type: BranchesType, localOnly = false): Promis
     .map(name => name.trim())
     .filter(name => name && !/^refs\/remotes\/.+\/HEAD$/.test(name))
     .map(name => name.replace(/^refs\/heads\//, '')
-      .replace(/^refs\/remotes\/(?:origin\/)?/, '')))];
+      .replace(/^refs\/remotes\//, '')))];
   if (!branches.length) throw new Error('No branches found.');
   return branches;
 }

package/src/prompt.ts

@@ -2,7 +2,15 @@ import inquirer, { Answers, QuestionCollection } from 'inquirer';
 import { finishTerminal } from './terminal';
 
 export function prompt<T extends Answers = Answers>(questions: QuestionCollection<T>): Promise<T> {
-  const result = inquirer.prompt<T>(questions);
+  // Bright yellow uses the terminal palette and keeps Inquirer's bold styling.
+  const styleQuestion = (question: any) => {
+    if (!process.stdout.isTTY || typeof question.message !== 'string') return question;
+    return { ...question, message: `\x1b[93m${question.message}\x1b[39m` };
+  };
+  const styledQuestions = Array.isArray(questions)
+    ? questions.map(styleQuestion)
+    : styleQuestion(questions);
+  const result = inquirer.prompt<T>(styledQuestions);
   // Inquirer 8 re-sends SIGINT asynchronously and may exit before Node handles
   // it. Handle readline's raw-mode Ctrl+C synchronously instead.
   const ui = result.ui as any;

package/src/terminal.ts

@@ -3,7 +3,9 @@ let active = false;
 let messages: string[] = [];
 
 export function startTerminal() {
-  active = Boolean(process.stdout.isTTY && process.stdin.isTTY);
+  // Temporarily disable the alternate screen; keep ordinary terminal output.
+  // active = Boolean(process.stdout.isTTY && process.stdin.isTTY);
+  active = false;
   messages = [];
   if (active) process.stdout.write('\x1b[?1049h');
 }