git-it-done 1.1.0 → 1.1.1

package/dist/utils/repository.d.ts

@@ -0,0 +1,21 @@
+import { GitChanges } from './types/types.js';
+export type GitOperation = 'merge' | 'rebase' | 'am' | 'cherry-pick' | 'revert' | 'bisect';
+export interface AheadBehind {
+    ahead: number;
+    behind: number;
+}
+export interface RepositoryState {
+    branch: string | null;
+    remotes: string[];
+    upstream: string | null;
+    aheadBehind: AheadBehind | null;
+    operation: GitOperation | null;
+    conflicts: string[];
+    changes: GitChanges;
+}
+export declare function parseAheadBehind(output: string): AheadBehind | null;
+export declare function parseConflictFiles(output: string): string[];
+export declare function detectOperation(entries: Set<string>): GitOperation | null;
+export declare function getInProgressOperation(gitDir: string | null): GitOperation | null;
+export declare function getRepositoryState(): RepositoryState;
+export declare function hasLocalChanges(changes: GitChanges): boolean;

package/dist/utils/repository.js

@@ -0,0 +1,60 @@
+import { existsSync } from 'fs';
+import path from 'path';
+import { getChanges } from './getFileChanges.js';
+import { gitCommand, gitOutput } from './gitCommand.js';
+const OPERATION_MARKERS = ['MERGE_HEAD', 'REBASE_HEAD', 'rebase-merge', 'rebase-apply', 'CHERRY_PICK_HEAD', 'REVERT_HEAD', 'BISECT_LOG', 'applying'];
+export function parseAheadBehind(output) {
+    const [ahead, behind] = output.trim().split(/\s+/).map(Number);
+    return Number.isInteger(ahead) && ahead >= 0 && Number.isInteger(behind) && behind >= 0
+        ? { ahead, behind }
+        : null;
+}
+export function parseConflictFiles(output) {
+    return output.split('\0').filter(Boolean);
+}
+export function detectOperation(entries) {
+    if (entries.has('MERGE_HEAD'))
+        return 'merge';
+    if (entries.has('REBASE_HEAD') || entries.has('rebase-merge'))
+        return 'rebase';
+    if (entries.has('rebase-apply'))
+        return entries.has('applying') ? 'am' : 'rebase';
+    if (entries.has('CHERRY_PICK_HEAD'))
+        return 'cherry-pick';
+    if (entries.has('REVERT_HEAD'))
+        return 'revert';
+    if (entries.has('BISECT_LOG'))
+        return 'bisect';
+    return null;
+}
+export function getInProgressOperation(gitDir) {
+    if (!gitDir)
+        return null;
+    const entries = new Set(OPERATION_MARKERS.filter(entry => existsSync(path.join(gitDir, entry))));
+    if (existsSync(path.join(gitDir, 'rebase-apply', 'applying')))
+        entries.add('applying');
+    return detectOperation(entries);
+}
+export function getRepositoryState() {
+    var _a;
+    const branch = gitOutput(['branch', '--show-current']) || null;
+    const remotes = ((_a = gitOutput(['remote'])) !== null && _a !== void 0 ? _a : '').split('\n').filter(Boolean);
+    const upstream = gitOutput(['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}']);
+    // With HEAD on the left, Git emits local-only commits (ahead) first and
+    // upstream-only commits (behind) second.
+    const counts = upstream ? gitOutput(['rev-list', '--left-right', '--count', `HEAD...${upstream}`]) : null;
+    const conflicts = gitCommand(['diff', '--name-only', '--diff-filter=U', '-z']);
+    return {
+        branch,
+        remotes,
+        upstream,
+        aheadBehind: counts ? parseAheadBehind(counts) : null,
+        operation: getInProgressOperation(gitOutput(['rev-parse', '--absolute-git-dir'])),
+        conflicts: conflicts.ok ? parseConflictFiles(conflicts.stdout) : [],
+        changes: getChanges()
+    };
+}
+export function hasLocalChanges(changes) {
+    return changes.staged.length + changes.unstaged.length + changes.untracked.length > 0;
+}
+//# sourceMappingURL=repository.js.map

package/dist/utils/repository.js.map

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

package/dist/utils/setup.d.ts

@@ -0,0 +1,2 @@
+export declare function buildInitialBranchArgs(): string[];
+export declare function runInitialSetup(): Promise<void>;

package/dist/utils/setup.js

@@ -0,0 +1,77 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { writeFileSync } from 'fs';
+import { confirm, isCancel, text } from '@clack/prompts';
+import { gitCommand, gitErrorText, gitOutput } from './gitCommand.js';
+import { runCommitWorkflow } from './commitWorkflow.js';
+import { handlePushToRemote } from './push_to_remote.js';
+import { ui } from './ui.js';
+export function buildInitialBranchArgs() { return ['branch', '-M', 'main']; }
+export function runInitialSetup() {
+    return __awaiter(this, void 0, void 0, function* () {
+        ui.title('Set Up This Folder', '✦');
+        ui.info('This folder is not a Git repository yet. Git-it-Done can set it up safely.');
+        const initialise = yield confirm({ message: 'Initialize Git in this folder?' });
+        if (isCancel(initialise) || !initialise)
+            return;
+        const init = gitCommand(['init']);
+        if (!init.ok)
+            return void ui.error(gitErrorText(init));
+        gitCommand(buildInitialBranchArgs());
+        ui.success('Git initialized on the main branch.');
+        yield ensureIdentity();
+        yield ensureFirstFile();
+        yield runCommitWorkflow();
+        const addRemote = yield confirm({ message: 'Connect a remote repository now?' });
+        if (isCancel(addRemote) || !addRemote)
+            return;
+        const url = yield text({ message: 'Remote URL:', placeholder: 'https://github.com/you/repository.git', validate: value => value.trim() ? undefined : 'A remote URL is required' });
+        if (isCancel(url))
+            return;
+        const result = gitCommand(['remote', 'add', 'origin', url]);
+        if (!result.ok)
+            return void ui.error(gitErrorText(result));
+        ui.success('Remote origin added.');
+        yield handlePushToRemote();
+    });
+}
+function ensureIdentity() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (gitOutput(['config', 'user.name']) && gitOutput(['config', 'user.email']))
+            return;
+        ui.warning('Git author identity is not configured. These settings apply only to this repository.');
+        const name = yield text({ message: 'Your name:', validate: value => value.trim() ? undefined : 'Your name is required' });
+        if (isCancel(name))
+            return;
+        const email = yield text({ message: 'Your email:', placeholder: 'you@example.com', validate: value => value.includes('@') ? undefined : 'Enter a valid email address' });
+        if (isCancel(email))
+            return;
+        const result = gitCommand(['config', 'user.name', name]);
+        const emailResult = gitCommand(['config', 'user.email', email]);
+        if (!result.ok || !emailResult.ok)
+            ui.error(gitErrorText(!result.ok ? result : emailResult));
+        else
+            ui.success('Repository-local Git identity saved.');
+    });
+}
+function ensureFirstFile() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tracked = gitOutput(['ls-files']);
+        const untracked = gitOutput(['ls-files', '--others', '--exclude-standard']);
+        if (tracked || untracked)
+            return;
+        const create = yield confirm({ message: 'This folder is empty. Create a README.md for the initial commit?' });
+        if (isCancel(create) || !create)
+            return;
+        writeFileSync('README.md', '# Project\n');
+        ui.success('Created README.md.');
+    });
+}
+//# sourceMappingURL=setup.js.map

package/dist/utils/setup.js.map

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

package/dist/utils/stash.d.ts

@@ -0,0 +1,2 @@
+export declare function buildStashApplyArgs(ref: string, pop: boolean): string[];
+export declare function manageStash(): Promise<void>;

package/dist/utils/stash.js

@@ -0,0 +1,64 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { confirm, isCancel, select, text } from '@clack/prompts';
+import { gitCommand, gitErrorText, gitOutput } from './gitCommand.js';
+import { getRepositoryState, hasLocalChanges } from './repository.js';
+import { ui } from './ui.js';
+export function buildStashApplyArgs(ref, pop) { return ['stash', pop ? 'pop' : 'apply', ref]; }
+export function manageStash() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const action = yield select({ message: 'Work-saving action:', options: [{ value: 'save', label: 'Save current work to a stash' }, { value: 'apply', label: 'Apply a stash (keep it)' }, { value: 'pop', label: 'Pop a stash (apply and remove)' }, { value: 'drop', label: 'Drop a stash' }, { value: 'list', label: 'List stashes' }] });
+        if (isCancel(action))
+            return;
+        if (action === 'list') {
+            ui.title('Saved Work', '▣');
+            const output = gitOutput(['stash', 'list']);
+            return output ? ui.stashList(output) : ui.warning('No stashes saved.');
+        }
+        if (action === 'save')
+            return void (yield saveStash());
+        yield restoreStash(action);
+    });
+}
+function saveStash() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!hasLocalChanges(getRepositoryState().changes))
+            return void ui.warning('There is no work to stash.');
+        const message = yield text({ message: 'Stash message (optional):', placeholder: 'work in progress' });
+        if (isCancel(message))
+            return;
+        const confirmed = yield confirm({ message: 'Save all tracked and untracked changes to a stash?' });
+        if (isCancel(confirmed) || !confirmed)
+            return;
+        const args = ['stash', 'push', '--include-untracked'];
+        if (message.trim())
+            args.push('-m', message);
+        const result = gitCommand(args);
+        result.ok ? ui.success('Work saved to stash.') : ui.error(gitErrorText(result));
+    });
+}
+function restoreStash(action) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if ((action === 'apply' || action === 'pop') && hasLocalChanges(getRepositoryState().changes))
+            return void ui.warning('Commit or stash your current work before restoring a stash.');
+        const refs = ((_a = gitOutput(['stash', 'list', '--format=%gd'])) !== null && _a !== void 0 ? _a : '').split('\n').filter(Boolean);
+        const ref = yield select({ message: 'Choose a stash:', options: refs.map(value => ({ value, label: value })) });
+        if (isCancel(ref))
+            return;
+        const confirmed = yield confirm({ message: `${action === 'drop' ? 'Permanently drop' : action === 'pop' ? 'Apply and remove' : 'Apply'} ${ref}?` });
+        if (isCancel(confirmed) || !confirmed)
+            return;
+        const args = action === 'drop' ? ['stash', 'drop', ref] : buildStashApplyArgs(ref, action === 'pop');
+        const result = gitCommand(args);
+        result.ok ? ui.success(`Stash ${action} completed.`) : ui.error(gitErrorText(result));
+    });
+}
+//# sourceMappingURL=stash.js.map

package/dist/utils/stash.js.map

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

package/dist/utils/sync.d.ts

@@ -0,0 +1,3 @@
+export declare function buildPullArgs(): string[];
+export declare function buildPushArgs(upstream: string | null, remote?: string, branch?: string): string[];
+export declare function syncWithRemote(): Promise<void>;

package/dist/utils/sync.js

@@ -0,0 +1,55 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { confirm, isCancel, spinner } from '@clack/prompts';
+import chalk from 'chalk';
+import { gitCommand, gitErrorText } from './gitCommand.js';
+import { getRepositoryState, hasLocalChanges } from './repository.js';
+import { syncRecommendation } from './validation.js';
+import { handlePushToRemote } from './push_to_remote.js';
+export function buildPullArgs() { return ['pull', '--ff-only']; }
+export function buildPushArgs(upstream, remote, branch) {
+    return upstream ? ['push'] : ['push', '--set-upstream', remote !== null && remote !== void 0 ? remote : 'origin', branch !== null && branch !== void 0 ? branch : 'HEAD'];
+}
+export function syncWithRemote() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const before = getRepositoryState();
+        if (!before.remotes.length)
+            return void console.log(chalk.yellow('No remote is configured. Add one before syncing.'));
+        const s = spinner();
+        s.start('Fetching remote updates…');
+        const fetched = gitCommand(['fetch', '--prune']);
+        if (!fetched.ok) {
+            s.stop('Fetch failed');
+            console.log(chalk.red(gitErrorText(fetched)));
+            return;
+        }
+        s.stop('Remote state refreshed');
+        const state = getRepositoryState();
+        if (!state.upstream || !state.aheadBehind) {
+            console.log(chalk.yellow('This branch has no upstream. Use “Push current branch” to publish it.'));
+            return;
+        }
+        const recommendation = syncRecommendation(state.aheadBehind);
+        if (recommendation === 'up-to-date')
+            return void console.log(chalk.green('Already up to date.'));
+        if (recommendation === 'inspect')
+            return void console.log(chalk.yellow(`This branch has diverged (${state.aheadBehind.ahead} ahead, ${state.aheadBehind.behind} behind). Inspect and resolve it with Git before syncing.`));
+        if (recommendation === 'push')
+            return void (yield handlePushToRemote());
+        if (hasLocalChanges(state.changes))
+            return void console.log(chalk.yellow('Your working tree has changes. Commit or stash them before pulling to avoid overwriting work.'));
+        const confirmed = yield confirm({ message: `Pull ${state.upstream} with fast-forward only?` });
+        if (isCancel(confirmed) || !confirmed)
+            return;
+        const pulled = gitCommand(buildPullArgs());
+        console.log(pulled.ok ? chalk.green('Pulled successfully.') : chalk.red(`Pull failed:\n${gitErrorText(pulled)}`));
+    });
+}
+//# sourceMappingURL=sync.js.map

package/dist/utils/sync.js.map

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

package/dist/utils/ui.d.ts

@@ -0,0 +1,15 @@
+import { FileChange } from './types/types.js';
+export declare const ui: {
+    title: (title: string, icon: string) => void;
+    section: (title: string, icon?: string) => void;
+    key: (label: string, value: string) => void;
+    success: (message: string) => void;
+    warning: (message: string) => void;
+    error: (message: string) => void;
+    info: (message: string) => void;
+    files: (files: FileChange[]) => void;
+    branchList: (output: string, current: string | null) => void;
+    commitList: (output: string) => void;
+    stashList: (output: string) => void;
+    remoteList: (output: string) => void;
+};

package/dist/utils/ui.js

@@ -0,0 +1,28 @@
+import chalk from 'chalk';
+import { formatFileStatus } from './formatFileStatus.js';
+const line = chalk.hex('#334155')('─'.repeat(58));
+export const ui = {
+    title: (title, icon) => console.log(`\n${chalk.bgHex('#0f3b5d').white.bold(` ${icon}  ${title} `)}\n${line}`),
+    section: (title, icon = '◆') => console.log(`\n${chalk.cyan.bold(`${icon}  ${title}`)} ${chalk.dim('─'.repeat(Math.max(2, 47 - title.length)))}`),
+    key: (label, value) => console.log(`  ${chalk.dim(label.padEnd(15))}${value}`),
+    success: (message) => console.log(`\n${chalk.green.bold('✓  ')}${chalk.green(message)}`),
+    warning: (message) => console.log(`\n${chalk.yellow.bold('!  ')}${chalk.yellow(message)}`),
+    error: (message) => console.log(`\n${chalk.red.bold('✕  ')}${chalk.red(message)}`),
+    info: (message) => console.log(`\n${chalk.blue.bold('i  ')}${chalk.blue(message)}`),
+    files: (files) => files.forEach(({ status, file, from }) => console.log(`  ${formatFileStatus(status).padEnd(22)} ${chalk.white(from ? `${from} ${chalk.dim('→')} ${file}` : file)}`)),
+    branchList: (output, current) => output.split('\n').filter(Boolean).forEach(row => {
+        const active = row.startsWith('*');
+        const text = row.replace(/^\*\s*/, '');
+        console.log(`  ${active ? chalk.green.bold('●') : chalk.dim('○')} ${active ? chalk.cyan.bold(text) : chalk.white(text)}${text === current ? chalk.dim('  current') : ''}`);
+    }),
+    commitList: (output) => output.split('\n').filter(Boolean).forEach(row => {
+        const [hash, ...subject] = row.split(' ');
+        console.log(`  ${chalk.magenta(hash)} ${chalk.white(subject.join(' '))}`);
+    }),
+    stashList: (output) => output.split('\n').filter(Boolean).forEach(row => {
+        const [ref, ...description] = row.split(': ');
+        console.log(`  ${chalk.hex('#f59e0b')(ref)} ${chalk.white(description.join(': '))}`);
+    }),
+    remoteList: (output) => output.split('\n').filter(Boolean).forEach(row => console.log(`  ${chalk.blue('↗')} ${chalk.white(row)}`))
+};
+//# sourceMappingURL=ui.js.map

package/dist/utils/ui.js.map

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

package/dist/utils/validation.d.ts

@@ -0,0 +1,4 @@
+import { AheadBehind } from './repository.js';
+export type SyncRecommendation = 'up-to-date' | 'push' | 'pull' | 'inspect';
+export declare function validateBranchName(name: string): string | undefined;
+export declare function syncRecommendation(counts: AheadBehind): SyncRecommendation;

package/dist/utils/validation.js

@@ -0,0 +1,26 @@
+import { gitCommand } from './gitCommand.js';
+export function validateBranchName(name) {
+    const value = name.trim();
+    if (!value)
+        return 'Branch name is required';
+    if (value.startsWith('-'))
+        return 'Branch names cannot start with a dash';
+    if (/\s/.test(value))
+        return 'Branch names cannot contain spaces';
+    if (value.includes('..'))
+        return 'Branch names cannot contain consecutive dots';
+    if (/[@~^:?*\\[\x00-\x1f]/.test(value) || value.endsWith('.') || value.endsWith('/') || !gitCommand(['check-ref-format', '--branch', value]).ok) {
+        return 'Use a valid Git branch name';
+    }
+    return undefined;
+}
+export function syncRecommendation(counts) {
+    if (counts.ahead === 0 && counts.behind === 0)
+        return 'up-to-date';
+    if (counts.ahead > 0 && counts.behind === 0)
+        return 'push';
+    if (counts.ahead === 0 && counts.behind > 0)
+        return 'pull';
+    return 'inspect';
+}
+//# sourceMappingURL=validation.js.map

package/dist/utils/validation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1B,IAAI,CAAC,KAAK;QAAE,OAAO,yBAAyB,CAAC;IAC7C,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,uCAAuC,CAAC;IAC1E,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,oCAAoC,CAAC;IAClE,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,8CAA8C,CAAC;IAChF,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAChJ,OAAO,6BAA6B,CAAC;IACvC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAmB;IACpD,IAAI,MAAM,CAAC,KAAK,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,YAAY,CAAC;IACnE,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAC3D,IAAI,MAAM,CAAC,KAAK,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,MAAM,CAAC;IAC3D,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/utils/workspace.d.ts

@@ -0,0 +1 @@
+export declare function runWorkspace(): Promise<void>;

package/dist/utils/workspace.js

@@ -0,0 +1,61 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { isCancel, select } from '@clack/prompts';
+import chalk from 'chalk';
+import { manageBranches } from './branches.js';
+import { runCommitWorkflow } from './commitWorkflow.js';
+import { handleInProgressOperation } from './conflicts.js';
+import { inspectRepository, showRepositorySummary } from './inspect.js';
+import { getRepositoryState } from './repository.js';
+import { manageStash } from './stash.js';
+import { syncWithRemote } from './sync.js';
+import { handlePushToRemote } from './push_to_remote.js';
+export function runWorkspace() {
+    return __awaiter(this, void 0, void 0, function* () {
+        let active = true;
+        while (active) {
+            showRepositorySummary();
+            const state = getRepositoryState();
+            const options = state.operation ? [
+                { value: 'conflicts', label: `Resolve ${state.operation} in progress`, hint: state.conflicts.length ? `${state.conflicts.length} unresolved file(s)` : 'review or finish safely' },
+                { value: 'inspect', label: 'Inspect repository', hint: 'Status, recent commits, remotes, and conflicts' },
+                { value: 'exit', label: 'Exit' }
+            ] : [
+                { value: 'commit', label: 'Commit changes', hint: 'Stage files, write a message, and optionally push' },
+                { value: 'sync', label: 'Sync with remote', hint: 'Fetch first, then safely pull or push' },
+                { value: 'push', label: 'Push current branch', hint: 'Publish commits with branch protection warnings' },
+                { value: 'branches', label: 'Manage branches', hint: 'List, switch, or create a branch' },
+                { value: 'stash', label: 'Save or restore work', hint: 'Stash current work and restore it later' },
+                { value: 'inspect', label: 'Inspect repository', hint: 'Status, recent commits, remotes, and conflicts' },
+                { value: 'exit', label: 'Exit' }
+            ];
+            const action = yield select({ message: 'What do you want to do?', options });
+            if (isCancel(action) || action === 'exit')
+                return;
+            console.log('');
+            if (action === 'commit')
+                yield runCommitWorkflow();
+            else if (action === 'sync')
+                yield syncWithRemote();
+            else if (action === 'push')
+                yield handlePushToRemote();
+            else if (action === 'branches')
+                yield manageBranches();
+            else if (action === 'stash')
+                yield manageStash();
+            else if (action === 'inspect')
+                inspectRepository();
+            else if (action === 'conflicts')
+                yield handleInProgressOperation();
+            console.log(chalk.dim('\nReturning to workspace…'));
+        }
+    });
+}
+//# sourceMappingURL=workspace.js.map

package/dist/utils/workspace.js.map

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

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "git-it-done",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Smart auto-commit tool with beautiful CLI interface for streamlined Git workflow",
   "main": "dist/index.js",
   "type": "module",
   "bin": {
-    "git-it-done": "./dist/index.js"
+    "git-it-done": "dist/index.js"
   },
   "scripts": {
     "dev": "ts-node --esm ./src/index.ts",
@@ -36,7 +36,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sidhxntt/Git-Bundle.git",
+    "url": "git+https://github.com/sidhxntt/Git-Bundle.git",
     "directory": "Git-it-Done"
   },
   "bugs": {