@camaradesuk/git-worktree-tools 1.0.5 → 1.1.1

package/dist/lib/newpr/scenario-handler.test.js

@@ -0,0 +1,250 @@
+import { describe, it, expect } from 'vitest';
+import { getScenarioContext, isPrWorktreeScenario, isExistingBranchAction, shouldBranchFromHead, getScenarioMessageLevel, } from './scenario-handler.js';
+describe('newpr/scenario-handler', () => {
+    const makeGitState = (overrides = {}) => ({
+        worktreeType: 'main_worktree',
+        branchType: 'main',
+        currentBranch: 'main',
+        commitRelationship: 'same',
+        workingTreeStatus: 'clean',
+        localCommits: [],
+        stagedFiles: [],
+        unstagedFiles: [],
+        repoRoot: '/home/user/repo',
+        repoName: 'repo',
+        ...overrides,
+    });
+    describe('getScenarioContext', () => {
+        describe('main_clean_same scenario', () => {
+            it('returns context with empty commit option', () => {
+                const context = getScenarioContext('main_clean_same', makeGitState(), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('No changes detected');
+                expect(context.choices).toHaveLength(2);
+                expect(context.choices[0].action?.action).toBe('empty_commit');
+                expect(context.choices[1].action).toBeNull(); // Cancel
+            });
+        });
+        describe('main_staged_same scenario', () => {
+            it('returns context with commit staged option', () => {
+                const context = getScenarioContext('main_staged_same', makeGitState({ stagedFiles: ['file.ts'] }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('staged changes');
+                expect(context.choices).toHaveLength(3);
+                expect(context.choices[0].action?.action).toBe('commit_staged');
+                expect(context.choices[1].action?.action).toBe('empty_commit');
+            });
+        });
+        describe('main_unstaged_same scenario', () => {
+            it('returns context with commit all option', () => {
+                const context = getScenarioContext('main_unstaged_same', makeGitState({ unstagedFiles: ['file.ts'] }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('unstaged changes');
+                expect(context.choices).toHaveLength(4);
+                expect(context.choices[0].action?.action).toBe('commit_all');
+                expect(context.choices[2].action?.action).toBe('stash_and_empty');
+            });
+        });
+        describe('main_both_same scenario', () => {
+            it('returns context with multiple options', () => {
+                const context = getScenarioContext('main_both_same', makeGitState({ stagedFiles: ['a.ts'], unstagedFiles: ['b.ts'] }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('both staged and unstaged');
+                expect(context.choices).toHaveLength(5);
+                expect(context.choices[0].action?.stashUnstaged).toBe(true);
+            });
+        });
+        describe('main_clean_ahead scenario', () => {
+            it('returns context with use commits option', () => {
+                const context = getScenarioContext('main_clean_ahead', makeGitState({ localCommits: ['abc123'] }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('local commits');
+                expect(context.choices).toHaveLength(4);
+                expect(context.choices[0].action?.action).toBe('use_commits');
+                expect(context.choices[0].action?.branchFrom).toBe('head');
+                expect(context.choices[1].action?.action).toBe('push_then_branch');
+            });
+        });
+        describe('main_changes_ahead scenario', () => {
+            it('returns context with use commits and commit all option', () => {
+                const context = getScenarioContext('main_changes_ahead', makeGitState({ localCommits: ['abc123'], unstagedFiles: ['file.ts'] }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('local commits AND uncommitted changes');
+                expect(context.choices).toHaveLength(4);
+                expect(context.choices[0].action?.action).toBe('use_commits_and_commit_all');
+                expect(context.choices[1].action?.action).toBe('use_commits_and_stash');
+            });
+        });
+        describe('branch_same_as_main scenario', () => {
+            it('returns context with branch name in message', () => {
+                const context = getScenarioContext('branch_same_as_main', makeGitState({ currentBranch: 'feature', branchType: 'other' }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain("'feature'");
+                expect(context.message).toContain('same commit as main');
+                expect(context.choices).toHaveLength(2);
+            });
+            it('uses unknown for null branch', () => {
+                const context = getScenarioContext('branch_same_as_main', makeGitState({ currentBranch: null, branchType: 'other' }), 'main');
+                expect(context.message).toContain("'unknown'");
+            });
+        });
+        describe('branch_ancestor scenario', () => {
+            it('returns context with merged warning', () => {
+                const context = getScenarioContext('branch_ancestor', makeGitState({ currentBranch: 'old-feature', branchType: 'other' }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('already merged');
+                expect(context.choices).toHaveLength(2);
+            });
+        });
+        describe('branch_divergent scenario', () => {
+            it('returns context with create PR for branch option', () => {
+                const context = getScenarioContext('branch_divergent', makeGitState({
+                    currentBranch: 'my-feature',
+                    branchType: 'other',
+                    localCommits: ['abc123'],
+                }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain("'my-feature'");
+                expect(context.choices).toHaveLength(3);
+                expect(context.choices[0].action?.action).toBe('create_pr_for_branch');
+                expect(context.choices[0].label).toContain('my-feature');
+            });
+        });
+        describe('branch_with_changes scenario', () => {
+            it('returns divergent branch options when has local commits', () => {
+                const context = getScenarioContext('branch_with_changes', makeGitState({
+                    currentBranch: 'my-feature',
+                    branchType: 'other',
+                    unstagedFiles: ['file.ts'],
+                    localCommits: ['abc123'],
+                }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.subMessage).toContain('commits not in main');
+                expect(context.choices).toHaveLength(4);
+                expect(context.choices[0].action?.action).toBe('pr_for_branch_commit_all');
+                expect(context.choices[1].action?.action).toBe('pr_for_branch_stash');
+            });
+            it('returns simple options when no local commits', () => {
+                const context = getScenarioContext('branch_with_changes', makeGitState({
+                    currentBranch: 'my-feature',
+                    branchType: 'other',
+                    unstagedFiles: ['file.ts'],
+                    localCommits: [],
+                }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.subMessage).toBeUndefined();
+                expect(context.choices).toHaveLength(4);
+                expect(context.choices[0].action?.action).toBe('commit_all');
+            });
+        });
+        describe('detached_head scenario', () => {
+            it('returns context with branch from detached option', () => {
+                const context = getScenarioContext('detached_head', makeGitState({ branchType: 'detached', currentBranch: null }), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('detached HEAD');
+                expect(context.choices).toHaveLength(3);
+                expect(context.choices[0].action?.action).toBe('branch_from_detached');
+                expect(context.choices[0].action?.branchFrom).toBe('head');
+            });
+        });
+        describe('pr_worktree scenario', () => {
+            it('returns null for delegation', () => {
+                const context = getScenarioContext('pr_worktree', makeGitState(), 'main');
+                expect(context).toBeNull();
+            });
+        });
+        describe('default scenario', () => {
+            it('returns context with empty commit for unhandled scenarios', () => {
+                // Force an unknown scenario value
+                const context = getScenarioContext('unknown_scenario', makeGitState(), 'main');
+                expect(context).not.toBeNull();
+                expect(context.message).toContain('Ready to create PR');
+                expect(context.choices).toHaveLength(2);
+            });
+        });
+    });
+    describe('isPrWorktreeScenario', () => {
+        it('returns true for pr_worktree', () => {
+            expect(isPrWorktreeScenario('pr_worktree')).toBe(true);
+        });
+        it('returns false for other scenarios', () => {
+            expect(isPrWorktreeScenario('main_clean_same')).toBe(false);
+            expect(isPrWorktreeScenario('branch_divergent')).toBe(false);
+        });
+    });
+    describe('isExistingBranchAction', () => {
+        it('returns true for create_pr_for_branch', () => {
+            const action = {
+                action: 'create_pr_for_branch',
+                branchFrom: 'head',
+                stashUnstaged: false,
+            };
+            expect(isExistingBranchAction(action)).toBe(true);
+        });
+        it('returns true for pr_for_branch_commit_all', () => {
+            const action = {
+                action: 'pr_for_branch_commit_all',
+                branchFrom: 'head',
+                stashUnstaged: false,
+            };
+            expect(isExistingBranchAction(action)).toBe(true);
+        });
+        it('returns true for pr_for_branch_stash', () => {
+            const action = {
+                action: 'pr_for_branch_stash',
+                branchFrom: 'head',
+                stashUnstaged: false,
+            };
+            expect(isExistingBranchAction(action)).toBe(true);
+        });
+        it('returns false for other actions', () => {
+            const action = {
+                action: 'empty_commit',
+                branchFrom: 'origin_main',
+                stashUnstaged: false,
+            };
+            expect(isExistingBranchAction(action)).toBe(false);
+        });
+    });
+    describe('shouldBranchFromHead', () => {
+        it('returns true when branchFrom is head', () => {
+            const action = {
+                action: 'use_commits',
+                branchFrom: 'head',
+                stashUnstaged: false,
+            };
+            expect(shouldBranchFromHead(action)).toBe(true);
+        });
+        it('returns false when branchFrom is origin_main', () => {
+            const action = {
+                action: 'empty_commit',
+                branchFrom: 'origin_main',
+                stashUnstaged: false,
+            };
+            expect(shouldBranchFromHead(action)).toBe(false);
+        });
+    });
+    describe('getScenarioMessageLevel', () => {
+        it('returns warning for main_clean_same', () => {
+            expect(getScenarioMessageLevel('main_clean_same')).toBe('warning');
+        });
+        it('returns warning for branch_same_as_main', () => {
+            expect(getScenarioMessageLevel('branch_same_as_main')).toBe('warning');
+        });
+        it('returns warning for branch_ancestor', () => {
+            expect(getScenarioMessageLevel('branch_ancestor')).toBe('warning');
+        });
+        it('returns warning for detached_head', () => {
+            expect(getScenarioMessageLevel('detached_head')).toBe('warning');
+        });
+        it('returns warning for pr_worktree', () => {
+            expect(getScenarioMessageLevel('pr_worktree')).toBe('warning');
+        });
+        it('returns info for other scenarios', () => {
+            expect(getScenarioMessageLevel('main_staged_same')).toBe('info');
+            expect(getScenarioMessageLevel('branch_divergent')).toBe('info');
+            expect(getScenarioMessageLevel('main_clean_ahead')).toBe('info');
+        });
+    });
+});
+//# sourceMappingURL=scenario-handler.test.js.map

package/dist/lib/newpr/scenario-handler.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scenario-handler.test.js","sourceRoot":"","sources":["../../../src/lib/newpr/scenario-handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAI/B,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,MAAM,YAAY,GAAG,CAAC,YAA+B,EAAE,EAAY,EAAE,CAAC,CAAC;QACrE,YAAY,EAAE,eAAe;QAC7B,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,MAAM;QACrB,kBAAkB,EAAE,MAAM;QAC1B,iBAAiB,EAAE,OAAO;QAC1B,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,EAAE;QACf,aAAa,EAAE,EAAE;QACjB,QAAQ,EAAE,iBAAiB;QAC3B,QAAQ,EAAE,MAAM;QAChB,GAAG,SAAS;KACb,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;YACxC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;gBAClD,MAAM,OAAO,GAAG,kBAAkB,CAAC,iBAAiB,EAAE,YAAY,EAAE,EAAE,MAAM,CAAC,CAAC;gBAE9E,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;gBAC1D,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAChE,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS;YAC1D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACzC,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;gBACnD,MAAM,OAAO,GAAG,kBAAkB,CAChC,kBAAkB,EAClB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAC1C,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;gBACrD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBACjE,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAClE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;YAC3C,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;gBAChD,MAAM,OAAO,GAAG,kBAAkB,CAChC,oBAAoB,EACpB,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAC5C,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;gBACvD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC9D,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;YACvC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;gBAC/C,MAAM,OAAO,GAAG,kBAAkB,CAChC,gBAAgB,EAChB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAChE,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;gBAC/D,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACzC,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;gBACjD,MAAM,OAAO,GAAG,kBAAkB,CAChC,kBAAkB,EAClB,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAC1C,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;gBACpD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC/D,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;YAC3C,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;gBAChE,MAAM,OAAO,GAAG,kBAAkB,CAChC,oBAAoB,EACpB,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EACtE,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC;gBAC5E,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;gBAC9E,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAC3E,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;YAC5C,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;gBACrD,MAAM,OAAO,GAAG,kBAAkB,CAChC,qBAAqB,EACrB,YAAY,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,EAC/D,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;gBAC1D,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;gBACtC,MAAM,OAAO,GAAG,kBAAkB,CAChC,qBAAqB,EACrB,YAAY,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,EAC1D,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;YACxC,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;gBAC7C,MAAM,OAAO,GAAG,kBAAkB,CAChC,iBAAiB,EACjB,YAAY,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,EACnE,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;gBACrD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACzC,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBAC1D,MAAM,OAAO,GAAG,kBAAkB,CAChC,kBAAkB,EAClB,YAAY,CAAC;oBACX,aAAa,EAAE,YAAY;oBAC3B,UAAU,EAAE,OAAO;oBACnB,YAAY,EAAE,CAAC,QAAQ,CAAC;iBACzB,CAAC,EACF,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;gBACnD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBACxE,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;YAC5C,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;gBACjE,MAAM,OAAO,GAAG,kBAAkB,CAChC,qBAAqB,EACrB,YAAY,CAAC;oBACX,aAAa,EAAE,YAAY;oBAC3B,UAAU,EAAE,OAAO;oBACnB,aAAa,EAAE,CAAC,SAAS,CAAC;oBAC1B,YAAY,EAAE,CAAC,QAAQ,CAAC;iBACzB,CAAC,EACF,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;gBAC7D,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;gBAC5E,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACzE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;gBACtD,MAAM,OAAO,GAAG,kBAAkB,CAChC,qBAAqB,EACrB,YAAY,CAAC;oBACX,aAAa,EAAE,YAAY;oBAC3B,UAAU,EAAE,OAAO;oBACnB,aAAa,EAAE,CAAC,SAAS,CAAC;oBAC1B,YAAY,EAAE,EAAE;iBACjB,CAAC,EACF,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;gBAC5C,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;YACtC,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBAC1D,MAAM,OAAO,GAAG,kBAAkB,CAChC,eAAe,EACf,YAAY,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAC7D,MAAM,CACP,CAAC;gBAEF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;gBACpD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBACxE,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;YACpC,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;gBACrC,MAAM,OAAO,GAAG,kBAAkB,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,MAAM,CAAC,CAAC;gBAE1E,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC7B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAChC,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;gBACnE,kCAAkC;gBAClC,MAAM,OAAO,GAAG,kBAAkB,CAAC,kBAA8B,EAAE,YAAY,EAAE,EAAE,MAAM,CAAC,CAAC;gBAE3F,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;gBACzD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,MAAM,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5D,MAAM,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,MAAM,GAAgB;gBAC1B,MAAM,EAAE,sBAAsB;gBAC9B,UAAU,EAAE,MAAM;gBAClB,aAAa,EAAE,KAAK;aACrB,CAAC;YACF,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACnD,MAAM,MAAM,GAAgB;gBAC1B,MAAM,EAAE,0BAA0B;gBAClC,UAAU,EAAE,MAAM;gBAClB,aAAa,EAAE,KAAK;aACrB,CAAC;YACF,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,MAAM,MAAM,GAAgB;gBAC1B,MAAM,EAAE,qBAAqB;gBAC7B,UAAU,EAAE,MAAM;gBAClB,aAAa,EAAE,KAAK;aACrB,CAAC;YACF,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACzC,MAAM,MAAM,GAAgB;gBAC1B,MAAM,EAAE,cAAc;gBACtB,UAAU,EAAE,aAAa;gBACzB,aAAa,EAAE,KAAK;aACrB,CAAC;YACF,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,MAAM,MAAM,GAAgB;gBAC1B,MAAM,EAAE,aAAa;gBACrB,UAAU,EAAE,MAAM;gBAClB,aAAa,EAAE,KAAK;aACrB,CAAC;YACF,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,MAAM,MAAM,GAAgB;gBAC1B,MAAM,EAAE,cAAc;gBACtB,UAAU,EAAE,aAAa;gBACzB,aAAa,EAAE,KAAK;aACrB,CAAC;YACF,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,MAAM,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,MAAM,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,MAAM,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACzC,MAAM,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjE,MAAM,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjE,MAAM,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/lib/newpr/types.d.ts

@@ -0,0 +1,76 @@
+/**
+ * newpr types - CLI options and result types
+ */
+/**
+ * CLI operation mode
+ */
+export type Mode = 'new' | 'pr' | 'branch';
+/**
+ * CLI options
+ */
+export interface Options {
+    mode: Mode;
+    description?: string;
+    prNumber?: number;
+    branchName?: string;
+    baseBranch: string;
+    draft: boolean;
+    installDeps: boolean;
+    openEditor: boolean;
+    runWtlink: boolean;
+}
+/**
+ * Branch source for creating new branches
+ */
+export type BranchFrom = 'origin_main' | 'head';
+/**
+ * Action type from scenario handling
+ */
+export type ActionType = 'empty_commit' | 'commit_staged' | 'commit_all' | 'stash_and_empty' | 'use_commits' | 'push_then_branch' | 'use_commits_and_commit_all' | 'use_commits_and_stash' | 'create_pr_for_branch' | 'pr_for_branch_commit_all' | 'pr_for_branch_stash' | 'branch_from_detached';
+/**
+ * State action result from scenario handling
+ */
+export interface StateAction {
+    action: ActionType;
+    branchFrom: BranchFrom;
+    stashUnstaged: boolean;
+}
+/**
+ * Parse result - discriminated union for parseArgs
+ */
+export type ParseResult = {
+    kind: 'success';
+    options: Options;
+} | {
+    kind: 'help';
+} | {
+    kind: 'error';
+    message: string;
+};
+/**
+ * Action execution result
+ */
+export interface ActionResult {
+    success: boolean;
+    stashRef: string | null;
+    message?: string;
+}
+/**
+ * Scenario prompt choice - data structure for prompt options
+ */
+export interface ScenarioChoice {
+    label: string;
+    action: StateAction | null;
+}
+/**
+ * Scenario handler result - either choices to prompt or cancelled
+ */
+export type ScenarioResult = {
+    kind: 'choices';
+    message: string;
+    choices: ScenarioChoice[];
+} | {
+    kind: 'delegate';
+    scenario: string;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/lib/newpr/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/newpr/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,MAAM,MAAM,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,QAAQ,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,MAAM,CAAC;AAEhD;;GAEG;AACH,MAAM,MAAM,UAAU,GAClB,cAAc,GACd,eAAe,GACf,YAAY,GACZ,iBAAiB,GACjB,aAAa,GACb,kBAAkB,GAClB,4BAA4B,GAC5B,uBAAuB,GACvB,sBAAsB,GACtB,0BAA0B,GAC1B,qBAAqB,GACrB,sBAAsB,CAAC;AAE3B;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,cAAc,EAAE,CAAA;CAAE,GAC/D;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dist/lib/newpr/types.js

@@ -0,0 +1,5 @@
+/**
+ * newpr types - CLI options and result types
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/lib/newpr/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/newpr/types.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/lib/state-detection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-detection.d.ts","sourceRoot":"","sources":["../../src/lib/state-detection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAGtE;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,aAAa,GAAG,OAAO,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,QAAQ,GAChB,iBAAiB,GACjB,kBAAkB,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,kBAAkB,GAClB,oBAAoB,GACpB,qBAAqB,GACrB,iBAAiB,GACjB,kBAAkB,GAClB,qBAAqB,GACrB,eAAe,GACf,aAAa,CAAC;AAElB;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CAoBjE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAW7E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,GAAE,MAA4B,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAyBhG;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CA8DxD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CA2BjE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAExD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,GAAE,MAAW,GAAG,MAAM,CAM3E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAM1D"}
+{"version":3,"file":"state-detection.d.ts","sourceRoot":"","sources":["../../src/lib/state-detection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAGtE;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,aAAa,GAAG,OAAO,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,QAAQ,GAChB,iBAAiB,GACjB,kBAAkB,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,kBAAkB,GAClB,oBAAoB,GACpB,qBAAqB,GACrB,iBAAiB,GACjB,kBAAkB,GAClB,qBAAqB,GACrB,eAAe,GACf,aAAa,CAAC;AAElB;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CAoBjE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAW7E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,GAAE,MAA4B,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAyBhG;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAqExD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CA2BjE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAExD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,GAAE,MAAW,GAAG,MAAM,CAM3E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAM1D"}

package/dist/lib/state-detection.js

@@ -75,8 +75,8 @@ export function detectScenario(state) {
     }
     // On main branch scenarios (1-4)
     if (branchType === 'main') {
-        if (commitRelationship === 'same') {
-            // Same as origin/main
+        if (commitRelationship === 'same' || commitRelationship === 'behind') {
+            // Same as origin/main, or behind origin/main (both can branch from origin/main)
             switch (workingTreeStatus) {
                 case 'clean':
                     return 'main_clean_same'; // Scenario 1
@@ -97,7 +97,16 @@ export function detectScenario(state) {
                 return 'main_changes_ahead'; // Scenario 4
             }
         }
-        // Behind or divergent on main - treat like same (unusual state)
+        else if (commitRelationship === 'divergent') {
+            // Divergent from origin/main - has both ahead and behind commits
+            if (workingTreeStatus === 'clean') {
+                return 'main_clean_ahead'; // Treat like ahead for user options
+            }
+            else {
+                return 'main_changes_ahead'; // Scenario 4
+            }
+        }
+        // Fallback (shouldn't reach here)
         return 'main_clean_same';
     }
     // On different branch scenarios (5-8)

package/dist/lib/state-detection.js.map

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