gitcoach-cli 1.0.1 → 1.0.3

package/dist/services/copilot-service.js

@@ -235,10 +235,10 @@ class CopilotService {
             };
         }
         try {
-            const prompt = `You are a Git expert assistant. Answer this Git question clearly and concisely. If it involves commands, show the exact command to use.
-
-Question: ${question}
-
+            const prompt = `You are a Git expert assistant. Answer this Git question clearly and concisely. If it involves commands, show the exact command to use.
+
+Question: ${question}
+
 Provide a helpful answer in 2-4 sentences. If relevant, include the Git command.`;
             const { stdout, stderr } = await executeCommand(`copilot -p "${this.escapeForShell(prompt)}" -s`, 45000);
             const answer = this.parseAnswer(stdout, stderr);
@@ -273,13 +273,13 @@ Provide a helpful answer in 2-4 sentences. If relevant, include the Git command.
         }
         try {
             const commandContext = command ? `Command executed: ${command}\n` : '';
-            const prompt = `You are a Git expert. Explain this Git error simply and provide a solution.
-
-${commandContext}Error message: ${errorMessage}
-
-1. Explain what this error means in simple terms (1 sentence)
-2. Provide the solution or command to fix it (1-2 sentences)
-
+            const prompt = `You are a Git expert. Explain this Git error simply and provide a solution.
+
+${commandContext}Error message: ${errorMessage}
+
+1. Explain what this error means in simple terms (1 sentence)
+2. Provide the solution or command to fix it (1-2 sentences)
+
 Be concise and practical.`;
             const { stdout, stderr } = await executeCommand(`copilot -p "${this.escapeForShell(prompt)}" -s`, 45000);
             const explanation = this.parseAnswer(stdout, stderr);

package/dist/services/git-service.d.ts

@@ -32,6 +32,7 @@ declare class GitService {
     getCurrentBranch(): Promise<string | null>;
     isDetachedHead(): Promise<boolean>;
     getBranches(): Promise<BranchInfo[]>;
+    getLocalBranches(): Promise<BranchInfo[]>;
     getStagedFiles(): Promise<string[]>;
     getUnstagedFiles(): Promise<string[]>;
     hasUncommittedChanges(): Promise<boolean>;
@@ -55,6 +56,9 @@ declare class GitService {
     checkout(branch: string): Promise<void>;
     createBranch(name: string, checkout?: boolean): Promise<void>;
     deleteBranch(name: string, force?: boolean): Promise<void>;
+    merge(branch: string): Promise<void>;
+    hasConflicts(): Promise<boolean>;
+    getConflictedFiles(): Promise<string[]>;
     getLog(maxCount?: number): Promise<CommitInfo[]>;
     getRemotes(): Promise<string[]>;
     hasRemote(): Promise<boolean>;

package/dist/services/git-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-service.d.ts","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-service.d.ts","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,YAAY,EAA4B,UAAU,EAAE,MAAM,YAAY,CAAC;AAEtG,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,cAAM,UAAU;IACd,OAAO,CAAC,GAAG,CAAY;gBAEX,QAAQ,CAAC,EAAE,MAAM;IAI7B,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIjC,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAS7B,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC;IAgB/B,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAIrC,gBAAgB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAK1C,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAKlC,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAgBpC,gBAAgB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAmBzC,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKnC,gBAAgB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKrC,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKzC,OAAO,CAAC,MAAM,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAOjD,cAAc,CAAC,MAAM,GAAE,OAAe,GAAG,OAAO,CAAC,UAAU,CAAC;IAO5D,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKxC,IAAI,CAAC,MAAM,GAAE,MAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe,EAAE,WAAW,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3H;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAiB5C;;;OAGG;IACG,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAiBzC,IAAI,CAAC,MAAM,GAAE,MAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnE,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAKhC,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKvC,MAAM,CAAC,QAAQ,GAAE,MAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAUpD,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAK/B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAK7B,KAAK,CAAC,MAAM,GAAE,MAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,KAAK,CAAC,IAAI,GAAE,MAAM,GAAG,OAAO,GAAG,MAAgB,EAAE,GAAG,GAAE,MAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,UAAU,CAAC,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,SAAS,CAAC,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMjC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAInE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOhE;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC;AAC3C,eAAe,UAAU,CAAC"}

package/dist/services/git-service.js

@@ -54,6 +54,22 @@ class GitService {
         }
         return branches;
     }
+    async getLocalBranches() {
+        const summary = await this.git.branch();
+        const branches = [];
+        for (const [name, data] of Object.entries(summary.branches)) {
+            // Filter out remote branches (start with remotes/ or contain /)
+            if (!name.startsWith('remotes/') && !name.includes('/')) {
+                branches.push({
+                    name,
+                    current: data.current,
+                    commit: data.commit,
+                    label: data.label
+                });
+            }
+        }
+        return branches;
+    }
     async getStagedFiles() {
         const status = await this.git.status();
         return [...status.staged, ...status.created];
@@ -161,6 +177,17 @@ class GitService {
         const options = force ? ['-D', name] : ['-d', name];
         await this.git.branch(options);
     }
+    async merge(branch) {
+        await this.git.merge([branch]);
+    }
+    async hasConflicts() {
+        const status = await this.git.status();
+        return status.conflicted.length > 0;
+    }
+    async getConflictedFiles() {
+        const status = await this.git.status();
+        return status.conflicted;
+    }
     async getLog(maxCount = 10) {
         const log = await this.git.log({ maxCount });
         return log.all.map(entry => ({

package/dist/services/git-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-service.js","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-service.js","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"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"}

package/dist/ui/components/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../src/ui/components/prompt.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,CAAC;IACT,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC7B;AAED,wBAAsB,YAAY,CAAC,CAAC,EAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,GACzB,OAAO,CAAC,CAAC,CAAC,CAYZ;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,GAC7C,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAsB,cAAc,CAAC,CAAC,EACpC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,GAC3B,OAAO,CAAC,CAAC,EAAE,CAAC,CAYd;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAQjB"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../src/ui/components/prompt.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,CAAC;IACT,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC7B;AAED,wBAAsB,YAAY,CAAC,CAAC,EAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,GACzB,OAAO,CAAC,CAAC,CAAC,CAYZ;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,GAC7C,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,OAAO,CAAC,CAiBlB;AAED,wBAAsB,cAAc,CAAC,CAAC,EACpC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,GAC3B,OAAO,CAAC,CAAC,EAAE,CAAC,CAYd;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAQjB"}

package/dist/ui/components/prompt.js

@@ -1,5 +1,6 @@
-import { select, input, confirm, checkbox, editor } from '@inquirer/prompts';
+import { select, input, checkbox, editor } from '@inquirer/prompts';
 import { getTheme } from '../themes/index.js';
+import { t } from '../../i18n/index.js';
 export async function promptSelect(message, choices) {
     const theme = getTheme();
     return select({
@@ -27,10 +28,19 @@ export async function promptInput(message, defaultValue, validate) {
 }
 export async function promptConfirm(message, defaultValue = false) {
     const theme = getTheme();
-    return confirm({
-        message: theme.primary(message),
-        default: defaultValue
+    const yesLabel = t('prompts.yes');
+    const noLabel = t('prompts.no');
+    const yesKey = t('prompts.yesKey');
+    const noKey = t('prompts.noKey');
+    const result = await select({
+        message: `${theme.primary(message)} (${yesKey}/${noKey})`,
+        choices: [
+            { name: yesLabel, value: true },
+            { name: noLabel, value: false }
+        ],
+        default: defaultValue ? 0 : 1
     });
+    return result;
 }
 export async function promptCheckbox(message, choices) {
     const theme = getTheme();

package/dist/ui/components/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/ui/components/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,KAAK,EACL,OAAO,EACP,QAAQ,EACR,MAAM,EACP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAgB9C,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAe,EACf,OAA0B;IAE1B,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,OAAO,MAAM,CAAC;QACZ,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACzB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,QAAQ,EAAE,CAAC,CAAC,QAAQ;SACrB,CAAC,CAAC;KACJ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAe,EACf,YAAqB,EACrB,QAA8C;IAE9C,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC;QACzB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/B,OAAO,EAAE,YAAY;QACrB,QAAQ;KACT,CAAC,CAAC;IAEH,iEAAiE;IACjE,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAe,EACf,eAAwB,KAAK;IAE7B,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,OAAO,OAAO,CAAC;QACb,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/B,OAAO,EAAE,YAAY;KACtB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,OAA4B;IAE5B,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,OAAO,QAAQ,CAAC;QACd,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACzB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;SACrB,CAAC,CAAC;KACJ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAe,EACf,YAAqB;IAErB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,OAAO,MAAM,CAAC;QACZ,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/B,OAAO,EAAE,YAAY;KACtB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe;IAEf,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,4EAA4E;IAC5E,mEAAmE;IACnE,OAAO,KAAK,CAAC;QACX,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;KAChC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/ui/components/prompt.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/branch-menu.d.ts

@@ -1,4 +1,4 @@
-export type BranchAction = 'list' | 'create' | 'switch' | 'delete' | 'back';
+export type BranchAction = 'list' | 'create' | 'switch' | 'merge' | 'delete' | 'back';
 export interface BranchResult {
     action: BranchAction;
     branch?: string;

package/dist/ui/menus/branch-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE5E,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CAsC5D"}
+{"version":3,"file":"branch-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEtF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CA0C5D"}

package/dist/ui/menus/branch-menu.js

@@ -1,7 +1,7 @@
 import { t } from '../../i18n/index.js';
 import { getTheme } from '../themes/index.js';
 import { promptSelect, promptInput, promptConfirm } from '../components/prompt.js';
-import { successBox, warningBox, errorBox } from '../components/box.js';
+import { successBox, warningBox, errorBox, infoBox } from '../components/box.js';
 import { branchTable } from '../components/table.js';
 import { withSpinner } from '../components/spinner.js';
 import { gitService } from '../../services/git-service.js';
@@ -18,6 +18,7 @@ export async function showBranchMenu() {
             { name: t('commands.branch.list'), value: 'list' },
             { name: t('commands.branch.create'), value: 'create' },
             { name: t('commands.branch.switch'), value: 'switch' },
+            { name: t('commands.branch.merge'), value: 'merge' },
             { name: t('commands.branch.delete'), value: 'delete' },
             { name: t('menu.back'), value: 'back' }
         ]);
@@ -28,6 +29,8 @@ export async function showBranchMenu() {
                 return await createBranch();
             case 'switch':
                 return await switchBranch();
+            case 'merge':
+                return await mergeBranch();
             case 'delete':
                 return await deleteBranch();
             case 'back':
@@ -42,8 +45,8 @@ export async function showBranchMenu() {
 }
 async function listBranches() {
     const theme = getTheme();
-    logger.command('git branch -a');
-    const branches = await gitService.getBranches();
+    logger.command('git branch');
+    const branches = await gitService.getLocalBranches();
     logger.raw('\n' + theme.subtitle(t('commands.branch.list')) + '\n');
     logger.raw(branchTable(branches));
     return { action: 'list', success: true };
@@ -73,7 +76,7 @@ async function createBranch() {
 }
 async function switchBranch() {
     const theme = getTheme();
-    const branches = await gitService.getBranches();
+    const branches = await gitService.getLocalBranches();
     // Filter out current branch
     const otherBranches = branches.filter(b => !b.current);
     if (otherBranches.length === 0) {
@@ -107,7 +110,7 @@ async function switchBranch() {
 }
 async function deleteBranch() {
     const theme = getTheme();
-    const branches = await gitService.getBranches();
+    const branches = await gitService.getLocalBranches();
     // Filter out current branch
     const deletableBranches = branches.filter(b => !b.current);
     if (deletableBranches.length === 0) {
@@ -138,4 +141,57 @@ async function deleteBranch() {
     logger.raw('\n' + successBox(t('commands.branch.deleteSuccess', { branch: selectedBranch }), t('success.title')));
     return { action: 'delete', branch: selectedBranch, success: true };
 }
+async function mergeBranch() {
+    const theme = getTheme();
+    const currentBranch = await gitService.getCurrentBranch();
+    const branches = await gitService.getLocalBranches();
+    // Filter out current branch
+    const otherBranches = branches.filter(b => !b.current);
+    if (otherBranches.length === 0) {
+        logger.raw(warningBox(t('commands.branch.noOtherBranches') || 'No other branches available'));
+        return { action: 'merge', success: false };
+    }
+    // Show educational explanation
+    logger.raw('\n' + infoBox(t('commands.branch.mergeExplain', { branch: currentBranch || 'current' }), t('commands.branch.merge')));
+    const selectedBranch = await promptSelect(t('commands.branch.selectToMerge') || 'Select branch to merge:', otherBranches.map(b => ({
+        name: theme.branchName(b.name, false),
+        value: b.name
+    })));
+    // Show command and confirm
+    const commandPreview = `git merge ${selectedBranch}`;
+    logger.raw(theme.textMuted(`\n${t('commands.branch.willExecute') || 'Will execute:'} ${commandPreview}\n`));
+    const confirmMerge = await promptConfirm(t('commands.branch.mergeConfirm', { branch: selectedBranch }), true);
+    if (!confirmMerge) {
+        return { action: 'merge', success: false };
+    }
+    logger.command(commandPreview);
+    try {
+        await withSpinner(t('commands.branch.merging', { branch: selectedBranch }) || `Merging ${selectedBranch}...`, async () => {
+            await gitService.merge(selectedBranch);
+        }, t('commands.branch.mergeSuccess', { branch: selectedBranch }));
+        // Check for conflicts after merge
+        const hasConflicts = await gitService.hasConflicts();
+        if (hasConflicts) {
+            const conflictedFiles = await gitService.getConflictedFiles();
+            logger.raw('\n' + errorBox(t('commands.branch.mergeConflicts') || 'Merge conflicts detected!', t('warnings.title')));
+            logger.raw(theme.warning(t('commands.branch.conflictedFiles') || 'Conflicted files:'));
+            conflictedFiles.forEach(f => logger.raw(theme.file(f, 'conflict')));
+            return { action: 'merge', branch: selectedBranch, success: false };
+        }
+        logger.raw('\n' + successBox(t('commands.branch.mergeSuccess', { branch: selectedBranch }), t('success.title')));
+        return { action: 'merge', branch: selectedBranch, success: true };
+    }
+    catch (error) {
+        // Check if it's a merge conflict
+        const hasConflicts = await gitService.hasConflicts();
+        if (hasConflicts) {
+            const conflictedFiles = await gitService.getConflictedFiles();
+            logger.raw('\n' + errorBox(t('commands.branch.mergeConflicts') || 'Merge conflicts detected!', t('warnings.title')));
+            logger.raw(theme.warning(t('commands.branch.conflictedFiles') || 'Conflicted files:'));
+            conflictedFiles.forEach(f => logger.raw(theme.file(f, 'conflict')));
+            return { action: 'merge', branch: selectedBranch, success: false };
+        }
+        throw error;
+    }
+}
 //# sourceMappingURL=branch-menu.js.map

package/dist/ui/menus/branch-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"branch-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/commit-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commit-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CAsJ5D"}
+{"version":3,"file":"commit-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CAmK5D"}

package/dist/ui/menus/commit-menu.js

@@ -1,7 +1,7 @@
 import { t } from '../../i18n/index.js';
 import { getTheme } from '../themes/index.js';
 import { promptInput, promptConfirm, promptSelect } from '../components/prompt.js';
-import { successBox, warningBox, infoBox } from '../components/box.js';
+import { successBox, warningBox, infoBox, errorBox } from '../components/box.js';
 import { withSpinner, createSpinner } from '../components/spinner.js';
 import { gitService } from '../../services/git-service.js';
 import { copilotService } from '../../services/copilot-service.js';
@@ -13,6 +13,15 @@ export async function showCommitMenu() {
     const theme = getTheme();
     logger.raw('\n' + theme.title(t('commands.commit.title')) + '\n');
     try {
+        // Check for merge conflicts first
+        const hasConflicts = await gitService.hasConflicts();
+        if (hasConflicts) {
+            const conflictedFiles = await gitService.getConflictedFiles();
+            logger.raw(errorBox(t('commands.commit.conflictsDetected') || 'Merge conflicts detected! Resolve them before committing.', t('errors.title')));
+            logger.raw(theme.warning(t('commands.commit.conflictedFiles') || 'Conflicted files:'));
+            conflictedFiles.forEach(f => logger.raw(theme.file(f, 'conflict')));
+            return { committed: false };
+        }
         // Validate we can commit
         const validation = await preventionService.validateCommit();
         if (!validation.canProceed) {

package/dist/ui/menus/commit-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commit-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/detached-head-menu.d.ts

@@ -0,0 +1,4 @@
+export type DetachedHeadAction = 'createBranch' | 'returnToMain' | 'stashAndReturn' | 'ignore';
+export declare function showDetachedHeadMenu(): Promise<DetachedHeadAction>;
+export declare function handleDetachedHead(action: DetachedHeadAction): Promise<boolean>;
+//# sourceMappingURL=detached-head-menu.d.ts.map

package/dist/ui/menus/detached-head-menu.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detached-head-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/detached-head-menu.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG,cAAc,GAAG,gBAAgB,GAAG,QAAQ,CAAC;AAE/F,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAgBxE;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmHrF"}

package/dist/ui/menus/detached-head-menu.js

@@ -0,0 +1,97 @@
+import { t } from '../../i18n/index.js';
+import { getTheme } from '../themes/index.js';
+import { promptSelect, promptInput, promptConfirm } from '../components/prompt.js';
+import { warningBox, successBox } from '../components/box.js';
+import { withSpinner } from '../components/spinner.js';
+import { gitService } from '../../services/git-service.js';
+import { userConfig } from '../../config/user-config.js';
+import { isValidBranchName } from '../../utils/validators.js';
+import { logger } from '../../utils/logger.js';
+export async function showDetachedHeadMenu() {
+    // Show educational warning
+    logger.raw('\n' + warningBox(t('detachedHead.explanation'), t('detachedHead.title')));
+    const choices = [
+        { name: t('detachedHead.createBranch'), value: 'createBranch' },
+        { name: t('detachedHead.returnToMain'), value: 'returnToMain' },
+        { name: t('detachedHead.stashAndReturn'), value: 'stashAndReturn' },
+        { name: t('detachedHead.ignore'), value: 'ignore' }
+    ];
+    return promptSelect(t('detachedHead.selectAction'), choices);
+}
+export async function handleDetachedHead(action) {
+    const theme = getTheme();
+    const defaultBranch = userConfig.getDefaultBranch() || 'main';
+    try {
+        switch (action) {
+            case 'createBranch': {
+                const branchName = await promptInput(t('detachedHead.enterBranchName'), '', (value) => {
+                    if (!isValidBranchName(value)) {
+                        return 'Invalid branch name';
+                    }
+                    return true;
+                });
+                if (!branchName) {
+                    return false;
+                }
+                const command = `git checkout -b ${branchName}`;
+                logger.command(command);
+                logger.raw(theme.textMuted(t('detachedHead.commandExecuted', { command })));
+                await withSpinner(`Creating branch ${branchName}...`, async () => {
+                    await gitService.createBranch(branchName, true);
+                }, t('detachedHead.branchCreated', { branch: branchName }));
+                logger.raw('\n' + successBox(t('detachedHead.branchCreated', { branch: branchName }), t('success.title')));
+                return true;
+            }
+            case 'returnToMain': {
+                // Check for uncommitted changes
+                const hasChanges = await gitService.hasUncommittedChanges();
+                if (hasChanges) {
+                    logger.raw(warningBox(t('warnings.uncommittedChanges'), t('warnings.title')));
+                    const proceed = await promptConfirm(t('prompts.continue'), false);
+                    if (!proceed) {
+                        return false;
+                    }
+                }
+                const command = `git checkout ${defaultBranch}`;
+                logger.command(command);
+                logger.raw(theme.textMuted(t('detachedHead.commandExecuted', { command })));
+                await withSpinner(`Switching to ${defaultBranch}...`, async () => {
+                    await gitService.checkout(defaultBranch);
+                }, t('detachedHead.returnedToMain', { branch: defaultBranch }));
+                logger.raw('\n' + successBox(t('detachedHead.returnedToMain', { branch: defaultBranch }), t('success.title')));
+                return true;
+            }
+            case 'stashAndReturn': {
+                // Check if there are changes to stash
+                const hasChanges = await gitService.hasUncommittedChanges();
+                if (hasChanges) {
+                    // Stash the changes
+                    const stashCommand = 'git stash';
+                    logger.command(stashCommand);
+                    await gitService.stash('Detached HEAD changes');
+                }
+                // Checkout default branch
+                const checkoutCommand = `git checkout ${defaultBranch}`;
+                logger.command(checkoutCommand);
+                await withSpinner(`Switching to ${defaultBranch}...`, async () => {
+                    await gitService.checkout(defaultBranch);
+                }, t('detachedHead.returnedToMain', { branch: defaultBranch }));
+                // Pop the stash if we stashed something
+                if (hasChanges) {
+                    logger.command('git stash pop');
+                    await gitService.stashPop();
+                }
+                logger.raw('\n' + successBox(t('detachedHead.stashedAndReturned', { branch: defaultBranch }), t('success.title')));
+                return true;
+            }
+            case 'ignore':
+            default:
+                return true;
+        }
+    }
+    catch (error) {
+        logger.error(t('errors.generic', { message: error instanceof Error ? error.message : 'Unknown error' }));
+        return false;
+    }
+}
+//# sourceMappingURL=detached-head-menu.js.map

package/dist/ui/menus/detached-head-menu.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detached-head-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/detached-head-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI/C,MAAM,CAAC,KAAK,UAAU,oBAAoB;IAExC,2BAA2B;IAC3B,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,0BAA0B,CAAC,EAC7B,CAAC,CAAC,oBAAoB,CAAC,CACxB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG;QACd,EAAE,IAAI,EAAE,CAAC,CAAC,2BAA2B,CAAC,EAAE,KAAK,EAAE,cAAoC,EAAE;QACrF,EAAE,IAAI,EAAE,CAAC,CAAC,2BAA2B,CAAC,EAAE,KAAK,EAAE,cAAoC,EAAE;QACrF,EAAE,IAAI,EAAE,CAAC,CAAC,6BAA6B,CAAC,EAAE,KAAK,EAAE,gBAAsC,EAAE;QACzF,EAAE,IAAI,EAAE,CAAC,CAAC,qBAAqB,CAAC,EAAE,KAAK,EAAE,QAA8B,EAAE;KAC1E,CAAC;IAEF,OAAO,YAAY,CAAC,CAAC,CAAC,2BAA2B,CAAC,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAA0B;IACjE,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,IAAI,MAAM,CAAC;IAE9D,IAAI,CAAC;QACH,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,MAAM,UAAU,GAAG,MAAM,WAAW,CAClC,CAAC,CAAC,8BAA8B,CAAC,EACjC,EAAE,EACF,CAAC,KAAK,EAAE,EAAE;oBACR,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC9B,OAAO,qBAAqB,CAAC;oBAC/B,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CACF,CAAC;gBAEF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,MAAM,OAAO,GAAG,mBAAmB,UAAU,EAAE,CAAC;gBAChD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;gBAE5E,MAAM,WAAW,CACf,mBAAmB,UAAU,KAAK,EAClC,KAAK,IAAI,EAAE;oBACT,MAAM,UAAU,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBAClD,CAAC,EACD,CAAC,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CACxD,CAAC;gBAEF,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EACvD,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,gCAAgC;gBAChC,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;gBAC5D,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;oBAC9E,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC,CAAC;oBAClE,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;gBAED,MAAM,OAAO,GAAG,gBAAgB,aAAa,EAAE,CAAC;gBAChD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;gBAE5E,MAAM,WAAW,CACf,gBAAgB,aAAa,KAAK,EAClC,KAAK,IAAI,EAAE;oBACT,MAAM,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC3C,CAAC,EACD,CAAC,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAC5D,CAAC;gBAEF,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EAC3D,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,gBAAgB,CAAC,CAAC,CAAC;gBACtB,sCAAsC;gBACtC,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;gBAE5D,IAAI,UAAU,EAAE,CAAC;oBACf,oBAAoB;oBACpB,MAAM,YAAY,GAAG,WAAW,CAAC;oBACjC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;oBAC7B,MAAM,UAAU,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAClD,CAAC;gBAED,0BAA0B;gBAC1B,MAAM,eAAe,GAAG,gBAAgB,aAAa,EAAE,CAAC;gBACxD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;gBAEhC,MAAM,WAAW,CACf,gBAAgB,aAAa,KAAK,EAClC,KAAK,IAAI,EAAE;oBACT,MAAM,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC3C,CAAC,EACD,CAAC,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAC5D,CAAC;gBAEF,wCAAwC;gBACxC,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAChC,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC9B,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,iCAAiC,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EAC/D,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,QAAQ,CAAC;YACd;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;QACzG,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/ui/menus/help-menu.js

@@ -114,7 +114,7 @@ function showQuickReference() {
 function showAbout() {
     const theme = getTheme();
     logger.raw('\n' + theme.title('About GitCoach') + '\n');
-    logger.raw(theme.textBold('GitCoach v1.0.0'));
+    logger.raw(theme.textBold('GitCoach v1.0.2'));
     logger.raw(t('app.tagline') || 'Your AI-Powered Git Coach');
     logger.raw('');
     logger.raw(t('help.aboutDesc') || 'GitCoach is an interactive CLI tool that helps developers master Git');

package/dist/ui/menus/main-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/main-menu.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,KAAK,GACL,QAAQ,GACR,MAAM,GACN,MAAM,GACN,QAAQ,GACR,MAAM,GACN,SAAS,GACT,OAAO,GACP,QAAQ,GACR,OAAO,GACP,MAAM,GACN,MAAM,CAAC;AAEX,wBAAsB,YAAY,IAAI,OAAO,CAAC,cAAc,CAAC,CAsE5D;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAkEtD"}
+{"version":3,"file":"main-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/main-menu.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,KAAK,GACL,QAAQ,GACR,MAAM,GACN,MAAM,GACN,QAAQ,GACR,MAAM,GACN,SAAS,GACT,OAAO,GACP,QAAQ,GACR,OAAO,GACP,MAAM,GACN,MAAM,CAAC;AAEX,wBAAsB,YAAY,IAAI,OAAO,CAAC,cAAc,CAAC,CAmF5D;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAkEtD"}

package/dist/ui/menus/main-menu.js

@@ -3,11 +3,27 @@ import { getTheme } from '../themes/index.js';
 import { banner, infoBox } from '../components/box.js';
 import { promptSelect } from '../components/prompt.js';
 import { analysisService } from '../../services/analysis-service.js';
+import { gitService } from '../../services/git-service.js';
 import { logger } from '../../utils/logger.js';
+import { APP_VERSION } from '../../utils/version.js';
+import { showDetachedHeadMenu, handleDetachedHead } from './detached-head-menu.js';
 export async function showMainMenu() {
     const theme = getTheme();
+    // Check for detached HEAD state
+    try {
+        const isDetached = await gitService.isDetachedHead();
+        if (isDetached) {
+            const action = await showDetachedHeadMenu();
+            if (action !== 'ignore') {
+                await handleDetachedHead(action);
+            }
+        }
+    }
+    catch {
+        // Ignore errors checking detached state
+    }
     // Show ASCII art banner
-    logger.raw(banner('1.0.0', t('app.tagline')));
+    logger.raw(banner(APP_VERSION, t('app.tagline')));
     // Show quick status if available
     try {
         const quickStatus = await analysisService.getQuickStatus();