git-it-done 1.1.0 → 1.1.1

package/dist/index.js

@@ -11,50 +11,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { intro, outro, cancel } from '@clack/prompts';
 import chalk from 'chalk';
 import { checkGitStatus } from './utils/checkGitStatus.js';
-import { getChanges } from './utils/getFileChanges.js';
-import { displayRepositoryStatus } from './utils/displayStatus.js';
-import { handleFileStaging } from './utils/fileStaging.js';
-import { handleCommitMessage } from './utils/commitMessage.js';
-import { performCommit } from './utils/performCommit.js';
-import { handlePushToRemote } from './utils/push_to_remote.js';
+import { runCommitWorkflow } from './utils/commitWorkflow.js';
+import { runWorkspace } from './utils/workspace.js';
+import { getRepositoryState } from './utils/repository.js';
+import { handleInProgressOperation } from './utils/conflicts.js';
+import { runInitialSetup } from './utils/setup.js';
 import start from './utils/process_interruption.js';
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
+        if (process.argv.slice(2).some(argument => argument === '--help' || argument === '-h')) {
+            console.log(`Git-it-Done — a guided Git workspace\n\nUsage:\n  git-it-done          Open the interactive workspace\n  git-it-done commit   Start the direct commit workflow\n  git-it-done --help   Show this help\n\nChoose actions in the terminal UI; no Git command memorization is required.`);
+            return;
+        }
         console.clear();
         intro(chalk.bgBlue(' Auto Commit Tool '));
         // 1. Validate git repository and configuration
         const gitStatus = checkGitStatus();
         if (!gitStatus.valid) {
+            if (gitStatus.reason === 'Not in a Git repository') {
+                yield runInitialSetup();
+                outro(chalk.green('Setup complete.'));
+                return;
+            }
             cancel(gitStatus.reason);
             process.exit(1);
         }
         (_a = gitStatus.warnings) === null || _a === void 0 ? void 0 : _a.forEach(warning => console.log(chalk.yellow.bold(`\n⚠️  ${warning}`)));
-        // 2. Get current repository changes
-        const changes = getChanges();
-        const allFiles = [...changes.staged, ...changes.unstaged, ...changes.untracked];
-        // 3. Handle no changes case
-        if (allFiles.length === 0) {
-            outro(chalk.green('✨ Working directory is clean. Nothing to commit! 🎉'));
-            process.exit(0);
-        }
-        // 4. Display current repository status
-        displayRepositoryStatus(changes);
-        // 5. Handle file staging if needed
-        const filesToCommit = yield handleFileStaging(changes);
-        if (filesToCommit.length === 0) {
-            outro(chalk.yellow('ℹ️  No files to commit after staging process.'));
-            process.exit(0);
-        }
-        // 6. Handle commit message creation
-        const commitMessage = yield handleCommitMessage(filesToCommit);
-        // 7. Perform the commit
-        const commitSuccess = yield performCommit(commitMessage);
-        if (!commitSuccess) {
-            process.exit(1);
+        if (process.argv[2] === 'commit' && getRepositoryState().operation) {
+            yield handleInProgressOperation();
         }
-        // 8. Handle push to remote
-        yield handlePushToRemote();
+        else if (process.argv[2] === 'commit')
+            yield runCommitWorkflow();
+        else
+            yield runWorkspace();
         outro(chalk.green('🎉 All done!'));
     });
 }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,MAAM,iCAAiC,CAAC;AAEpD,SAAe,IAAI;;;QACjB,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAE1C,+CAA+C;QAC/C,MAAM,SAAS,GAAG,cAAc,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAE3F,oCAAoC;QACpC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAEhF,4BAA4B;QAC5B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,uCAAuC;QACvC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAEjC,mCAAmC;QACnC,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEvD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,+CAA+C,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,oCAAoC;QACpC,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,aAAa,CAAC,CAAC;QAE/D,wBAAwB;QACxB,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,CAAC;QAEzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,2BAA2B;QAC3B,MAAM,kBAAkB,EAAE,CAAC;QAE3B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IACrC,CAAC;CAAA;AAED,KAAK,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,MAAM,iCAAiC,CAAC;AAEpD,SAAe,IAAI;;;QACjB,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,sRAAsR,CAAC,CAAC;YACpS,OAAO;QACT,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAE1C,+CAA+C;QAC/C,MAAM,SAAS,GAAG,cAAc,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,SAAS,CAAC,MAAM,KAAK,yBAAyB,EAAE,CAAC;gBACnD,MAAM,eAAe,EAAE,CAAC;gBACxB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAE3F,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,kBAAkB,EAAE,CAAC,SAAS,EAAE,CAAC;YACnE,MAAM,yBAAyB,EAAE,CAAC;QACpC,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ;YAAE,MAAM,iBAAiB,EAAE,CAAC;;YAC9D,MAAM,YAAY,EAAE,CAAC;QAE1B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IACrC,CAAC;CAAA;AAED,KAAK,CAAC,IAAI,CAAC,CAAC"}

package/dist/utils/branches.d.ts

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

package/dist/utils/branches.js

@@ -0,0 +1,60 @@
+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 { validateBranchName } from './validation.js';
+import { ui } from './ui.js';
+export function buildCreateBranchArgs(name) { return ['switch', '-c', name]; }
+export function manageBranches() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const action = yield select({ message: 'Branch action:', options: [{ value: 'switch', label: 'Switch branch' }, { value: 'create', label: 'Create branch' }, { value: 'list', label: 'List branches' }] });
+        if (isCancel(action))
+            return;
+        if (action === 'list') {
+            ui.title('Branches', '⑂');
+            const output = gitOutput(['branch', '--verbose', '--no-abbrev']);
+            return output ? ui.branchList(output, getRepositoryState().branch) : ui.warning('No branches found.');
+        }
+        if (action === 'create')
+            return void (yield createBranch());
+        yield switchBranch();
+    });
+}
+function createBranch() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const name = yield text({ message: 'New branch name:', placeholder: 'feature/my-change', validate: value => validateBranchName(value) });
+        if (isCancel(name))
+            return;
+        const confirmed = yield confirm({ message: `Create and switch to "${name}"?` });
+        if (isCancel(confirmed) || !confirmed)
+            return;
+        const result = gitCommand(buildCreateBranchArgs(name));
+        result.ok ? ui.success(`Now on ${name}.`) : ui.error(gitErrorText(result));
+    });
+}
+function switchBranch() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const state = getRepositoryState();
+        if (hasLocalChanges(state.changes))
+            return void ui.warning('Commit or stash local changes before switching branches.');
+        const branches = ((_a = gitOutput(['branch', '--format=%(refname:short)'])) !== null && _a !== void 0 ? _a : '').split('\n').filter(Boolean);
+        const target = yield select({ message: 'Switch to:', options: branches.filter(branch => branch !== state.branch).map(branch => ({ value: branch, label: branch })) });
+        if (isCancel(target))
+            return;
+        const confirmed = yield confirm({ message: `Switch to "${target}"?` });
+        if (isCancel(confirmed) || !confirmed)
+            return;
+        const result = gitCommand(['switch', target]);
+        result.ok ? ui.success(`Now on ${target}.`) : ui.error(gitErrorText(result));
+    });
+}
+//# sourceMappingURL=branches.js.map

package/dist/utils/branches.js.map

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

package/dist/utils/checkGitStatus.js

@@ -23,13 +23,11 @@ export function checkGitStatus() {
     if (!gitDir) {
         return { valid: false, reason: 'Not in a Git repository' };
     }
-    // Step 3: Refuse to commit into a half-finished merge/rebase/cherry-pick
+    // An in-progress operation is recoverable from the workspace conflict UI.
     for (const { entry, reason } of IN_PROGRESS) {
         if (existsSync(path.join(gitDir, entry))) {
-            return {
-                valid: false,
-                reason: `${reason}. Finish or abort it first (e.g. \`git merge --abort\`, \`git rebase --abort\`).`
-            };
+            warnings.push(`${reason}. Select “Resolve in-progress operation” for guided recovery.`);
+            break;
         }
     }
     // Step 4: Warn loudly about a detached HEAD (commits there are easy to lose)

package/dist/utils/checkGitStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkGitStatus.js","sourceRoot":"","sources":["../../src/utils/checkGitStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGxD,uDAAuD;AACvD,MAAM,WAAW,GAA6C;IAC5D,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,wBAAwB,EAAE;IACzD,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC3D,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC5D,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,qCAAqC,EAAE;IACxE,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,8BAA8B,EAAE;IACrE,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC3D,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,iCAAiC,EAAE;CACnE,CAAC;AAEF,MAAM,UAAU,cAAc;;IAC5B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,oCAAoC;IACpC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAClC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,qCAAqC,EAAE,CAAC;IACzE,CAAC;IAED,2CAA2C;IAC3C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;IAC7D,CAAC;IAED,yEAAyE;IACzE,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACzC,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,GAAG,MAAM,kFAAkF;aACpG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,MAAA,SAAS,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,mCAAI,SAAS,CAAC;QACtE,QAAQ,CAAC,IAAI,CACX,uBAAuB,IAAI,mGAAmG,CAC/H,CAAC;IACJ,CAAC;IAED,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAEtD,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,gIAAgI;SACzI,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC3E,CAAC"}
+{"version":3,"file":"checkGitStatus.js","sourceRoot":"","sources":["../../src/utils/checkGitStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGxD,uDAAuD;AACvD,MAAM,WAAW,GAA6C;IAC5D,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,wBAAwB,EAAE;IACzD,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC3D,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC5D,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,qCAAqC,EAAE;IACxE,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,8BAA8B,EAAE;IACrE,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC3D,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,iCAAiC,EAAE;CACnE,CAAC;AAEF,MAAM,UAAU,cAAc;;IAC5B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,oCAAoC;IACpC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAClC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,qCAAqC,EAAE,CAAC;IACzE,CAAC;IAED,2CAA2C;IAC3C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;IAC7D,CAAC;IAED,0EAA0E;IAC1E,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACzC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,+DAA+D,CAAC,CAAC;YACxF,MAAM;QACR,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,MAAA,SAAS,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,mCAAI,SAAS,CAAC;QACtE,QAAQ,CAAC,IAAI,CACX,uBAAuB,IAAI,mGAAmG,CAC/H,CAAC;IACJ,CAAC;IAED,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAEtD,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,gIAAgI;SACzI,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC3E,CAAC"}

package/dist/utils/commitWorkflow.d.ts

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

package/dist/utils/commitWorkflow.js

@@ -0,0 +1,33 @@
+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 { outro } from '@clack/prompts';
+import chalk from 'chalk';
+import { getChanges } from './getFileChanges.js';
+import { displayRepositoryStatus } from './displayStatus.js';
+import { handleFileStaging } from './fileStaging.js';
+import { handleCommitMessage } from './commitMessage.js';
+import { performCommit } from './performCommit.js';
+import { handlePushToRemote } from './push_to_remote.js';
+export function runCommitWorkflow() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const changes = getChanges();
+        const allFiles = [...changes.staged, ...changes.unstaged, ...changes.untracked];
+        if (!allFiles.length)
+            return void outro(chalk.green('Working directory is clean. Nothing to commit.'));
+        displayRepositoryStatus(changes);
+        const files = yield handleFileStaging(changes);
+        if (!files.length)
+            return;
+        const message = yield handleCommitMessage(files);
+        if (yield performCommit(message))
+            yield handlePushToRemote();
+    });
+}
+//# sourceMappingURL=commitWorkflow.js.map

package/dist/utils/commitWorkflow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commitWorkflow.js","sourceRoot":"","sources":["../../src/utils/commitWorkflow.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,UAAgB,iBAAiB;;QACrC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAChF,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC,CAAC;QACvG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAC1B,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,MAAM,aAAa,CAAC,OAAO,CAAC;YAAE,MAAM,kBAAkB,EAAE,CAAC;IAC/D,CAAC;CAAA"}

package/dist/utils/conflicts.d.ts

@@ -0,0 +1,7 @@
+import { GitOperation } from './repository.js';
+export interface OperationCommands {
+    continueArgs: string[] | null;
+    abortArgs: string[];
+}
+export declare function operationCommands(operation: GitOperation): OperationCommands;
+export declare function handleInProgressOperation(): Promise<void>;

package/dist/utils/conflicts.js

@@ -0,0 +1,96 @@
+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 { spawnSync } from 'child_process';
+import { confirm, isCancel, select } from '@clack/prompts';
+import chalk from 'chalk';
+import { gitCommand, gitErrorText } from './gitCommand.js';
+import { getRepositoryState } from './repository.js';
+export function operationCommands(operation) {
+    switch (operation) {
+        case 'merge': return { continueArgs: ['commit', '--no-edit'], abortArgs: ['merge', '--abort'] };
+        case 'rebase': return { continueArgs: ['rebase', '--continue'], abortArgs: ['rebase', '--abort'] };
+        case 'am': return { continueArgs: ['am', '--continue'], abortArgs: ['am', '--abort'] };
+        case 'cherry-pick': return { continueArgs: ['cherry-pick', '--continue'], abortArgs: ['cherry-pick', '--abort'] };
+        case 'revert': return { continueArgs: ['revert', '--continue'], abortArgs: ['revert', '--abort'] };
+        case 'bisect': return { continueArgs: null, abortArgs: ['bisect', 'reset'] };
+    }
+}
+function operationLabel(operation) { return operation === 'cherry-pick' ? 'cherry-pick' : operation; }
+export function handleInProgressOperation() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const state = getRepositoryState();
+        if (!state.operation)
+            return void console.log(chalk.green('No merge, rebase, cherry-pick, revert, or bisect is in progress.'));
+        const { operation, conflicts } = state;
+        console.log(chalk.yellow(`\n${operationLabel(operation)} in progress.`));
+        if (conflicts.length)
+            console.log(chalk.red(`Conflicted files:\n${conflicts.map(file => `  • ${file}`).join('\n')}`));
+        else
+            console.log('No unresolved files detected. You can continue or abort the operation.');
+        const commands = operationCommands(operation);
+        const action = yield select({ message: `Resolve ${operationLabel(operation)}:`, options: [
+                ...(conflicts.length ? [{ value: 'edit', label: 'Open a conflicted file in my editor' }, { value: 'resolved', label: 'Mark a resolved file as staged' }] : []),
+                ...(commands.continueArgs ? [{ value: 'continue', label: `Continue ${operationLabel(operation)}` }] : []),
+                { value: 'abort', label: `Abort ${operationLabel(operation)}` },
+                { value: 'back', label: 'Back to workspace' }
+            ] });
+        if (isCancel(action) || action === 'back')
+            return;
+        if (action === 'edit')
+            return void (yield editConflict(conflicts));
+        if (action === 'resolved')
+            return void (yield stageResolved(conflicts));
+        yield finishOperation(operation, action);
+    });
+}
+function editConflict(files) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const file = yield select({ message: 'Open which file?', options: files.map(value => ({ value, label: value })) });
+        if (isCancel(file))
+            return;
+        const editor = process.env.GIT_EDITOR || process.env.VISUAL || process.env.EDITOR;
+        if (!editor)
+            return void console.log(chalk.yellow(`No editor is configured. Resolve ${file} in your editor, then return here to mark it resolved.`));
+        const [command, ...args] = editor.split(/\s+/).filter(Boolean);
+        const result = spawnSync(command, [...args, file], { stdio: 'inherit' });
+        if (result.error)
+            console.log(chalk.red(`Could not open ${command}: ${result.error.message}`));
+        else
+            console.log('Editor closed. Select “Mark a resolved file as staged” after removing conflict markers.');
+    });
+}
+function stageResolved(files) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const file = yield select({ message: 'Which resolved file should be staged?', options: files.map(value => ({ value, label: value })) });
+        if (isCancel(file))
+            return;
+        const confirmed = yield confirm({ message: `Mark ${file} as resolved by staging it?` });
+        if (isCancel(confirmed) || !confirmed)
+            return;
+        const result = gitCommand(['add', '--', file]);
+        console.log(result.ok ? chalk.green(`${file} staged. Resolve remaining files, then continue.`) : chalk.red(gitErrorText(result)));
+    });
+}
+function finishOperation(operation, action) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const state = getRepositoryState();
+        if (action === 'continue' && state.conflicts.length)
+            return void console.log(chalk.yellow('Resolve and stage every conflicted file before continuing.'));
+        const confirmed = yield confirm({ message: `${action === 'abort' ? 'Abort' : 'Continue'} this ${operationLabel(operation)}?` });
+        if (isCancel(confirmed) || !confirmed)
+            return;
+        const commands = operationCommands(operation);
+        if (action === 'continue' && !commands.continueArgs)
+            return;
+        const result = gitCommand(action === 'continue' ? commands.continueArgs : commands.abortArgs);
+        console.log(result.ok ? chalk.green(`${operationLabel(operation)} ${action === 'abort' ? 'aborted' : 'completed'}.`) : chalk.red(gitErrorText(result)));
+    });
+}
+//# sourceMappingURL=conflicts.js.map

package/dist/utils/conflicts.js.map

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

package/dist/utils/displayStatus.js

@@ -1,18 +1,17 @@
-import chalk from 'chalk';
-import { formatFileStatus } from './formatFileStatus.js';
+import { ui } from './ui.js';
 export function displayRepositoryStatus(changes) {
-    console.log(chalk.bold('\n📁 Repository Status:'));
+    ui.title('Repository Status', '◈');
     if (changes.staged.length > 0) {
-        console.log(chalk.green('\nStaged files:'));
-        changes.staged.forEach(({ status, file }) => console.log(`  ${formatFileStatus(status)} ${file}`));
+        ui.section('Staged files', '✓');
+        ui.files(changes.staged);
     }
     if (changes.unstaged.length > 0) {
-        console.log(chalk.yellow('\nUnstaged files:'));
-        changes.unstaged.forEach(({ status, file }) => console.log(`  ${formatFileStatus(status)} ${file}`));
+        ui.section('Unstaged files', '!');
+        ui.files(changes.unstaged);
     }
     if (changes.untracked.length > 0) {
-        console.log(chalk.cyan('\nUntracked files:'));
-        changes.untracked.forEach(({ status, file }) => console.log(`  ${formatFileStatus(status)} ${file}`));
+        ui.section('Untracked files', '?');
+        ui.files(changes.untracked);
     }
 }
 //# sourceMappingURL=displayStatus.js.map

package/dist/utils/displayStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"displayStatus.js","sourceRoot":"","sources":["../../src/utils/displayStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,UAAU,uBAAuB,CAAC,OAAmB;IACzD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAEnD,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC5C,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,gBAAgB,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CACrD,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,gBAAgB,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CACrD,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAC9C,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,gBAAgB,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CACrD,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"displayStatus.js","sourceRoot":"","sources":["../../src/utils/displayStatus.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,MAAM,UAAU,uBAAuB,CAAC,OAAmB;IACzD,EAAE,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAEnC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}

package/dist/utils/help.d.ts

@@ -0,0 +1,7 @@
+export interface HelpEntry {
+    title: string;
+    command: string;
+    description: string;
+}
+export declare function helpEntry(action: string): HelpEntry | undefined;
+export declare function showHelp(): Promise<void>;

package/dist/utils/help.js

@@ -0,0 +1,35 @@
+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 { select, isCancel } from '@clack/prompts';
+import chalk from 'chalk';
+import { ui } from './ui.js';
+const ENTRIES = {
+    commit: { title: 'Commit changes', command: 'git add … && git commit -m "…"', description: 'Stage selected changes and create a commit.' },
+    sync: { title: 'Sync with remote', command: 'git fetch --prune && git pull --ff-only / git push', description: 'Fetch first, then safely bring your branch up to date or publish it.' },
+    push: { title: 'Push current branch', command: 'git push [--set-upstream <remote> <branch>]', description: 'Publish the current branch after a confirmation.' },
+    branches: { title: 'Manage branches', command: 'git branch / git switch / git switch -c <name>', description: 'List, switch, or create branches without deleting or merging them.' },
+    stash: { title: 'Save or restore work', command: 'git stash push / list / apply / pop / drop', description: 'Put work aside and restore it when you are ready.' },
+    conflicts: { title: 'Resolve an in-progress operation', command: 'git add <file> && git merge --continue', description: 'Inspect conflicts, open files in your editor, then continue or abort safely.' },
+    inspect: { title: 'Inspect repository', command: 'git status / log / remote -v', description: 'See a readable summary of repository state and recent activity.' }
+};
+export function helpEntry(action) { return ENTRIES[action]; }
+export function showHelp() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const action = yield select({ message: 'What would you like explained?', options: Object.entries(ENTRIES).map(([value, entry]) => ({ value, label: entry.title, hint: entry.description })) });
+        if (isCancel(action))
+            return;
+        const entry = helpEntry(action);
+        if (entry) {
+            ui.title(entry.title, '?');
+            console.log(`${chalk.white(entry.description)}\n\n${chalk.dim('NATIVE GIT')}  ${chalk.magenta(entry.command)}`);
+        }
+    });
+}
+//# sourceMappingURL=help.js.map

package/dist/utils/help.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/utils/help.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAI7B,MAAM,OAAO,GAA8B;IACzC,MAAM,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,gCAAgC,EAAE,WAAW,EAAE,6CAA6C,EAAE;IAC1I,IAAI,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,oDAAoD,EAAE,WAAW,EAAE,sEAAsE,EAAE;IACvL,IAAI,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,6CAA6C,EAAE,WAAW,EAAE,kDAAkD,EAAE;IAC/J,QAAQ,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,gDAAgD,EAAE,WAAW,EAAE,oEAAoE,EAAE;IACpL,KAAK,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE,OAAO,EAAE,4CAA4C,EAAE,WAAW,EAAE,mDAAmD,EAAE;IACjK,SAAS,EAAE,EAAE,KAAK,EAAE,kCAAkC,EAAE,OAAO,EAAE,wCAAwC,EAAE,WAAW,EAAE,8EAA8E,EAAE;IACxM,OAAO,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,8BAA8B,EAAE,WAAW,EAAE,iEAAiE,EAAE;CAClK,CAAC;AAEF,MAAM,UAAU,SAAS,CAAC,MAAc,IAA2B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAE5F,MAAM,UAAgB,QAAQ;;QAC5B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,OAAO,EAAE,gCAAgC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/L,IAAI,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO;QAC7B,MAAM,KAAK,GAAG,SAAS,CAAC,MAAgB,CAAC,CAAC;QAC1C,IAAI,KAAK,EAAE,CAAC;YAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAAC,CAAC;IAC7J,CAAC;CAAA"}

package/dist/utils/inspect.d.ts

@@ -0,0 +1,2 @@
+export declare function showRepositorySummary(): void;
+export declare function inspectRepository(): void;

package/dist/utils/inspect.js

@@ -0,0 +1,37 @@
+import chalk from 'chalk';
+import { getRepositoryState, hasLocalChanges } from './repository.js';
+import { gitOutput } from './gitCommand.js';
+import { ui } from './ui.js';
+export function showRepositorySummary() {
+    var _a, _b;
+    const state = getRepositoryState();
+    const fileCount = state.changes.staged.length + state.changes.unstaged.length + state.changes.untracked.length;
+    ui.title('Repository Overview', '◈');
+    ui.key('BRANCH', chalk.cyan.bold((_a = state.branch) !== null && _a !== void 0 ? _a : 'detached HEAD'));
+    ui.key('WORKING TREE', hasLocalChanges(state.changes) ? chalk.yellow(`${fileCount} changed file(s)`) : chalk.green('clean'));
+    ui.key('REMOTE', chalk.blue((_b = state.upstream) !== null && _b !== void 0 ? _b : (state.remotes[0] ? `${state.remotes[0]} (no upstream)` : 'none configured')));
+    if (state.aheadBehind)
+        ui.key('SYNC', chalk.magenta(`${state.aheadBehind.ahead} ahead  ·  ${state.aheadBehind.behind} behind`));
+    if (state.operation)
+        ui.warning(`${state.operation} is in progress${state.conflicts.length ? ` — ${state.conflicts.length} conflict(s)` : ''}`);
+}
+export function inspectRepository() {
+    var _a, _b;
+    const state = getRepositoryState();
+    showRepositorySummary();
+    const recent = (_a = gitOutput(['log', '-5', '--oneline'])) !== null && _a !== void 0 ? _a : '';
+    if (recent) {
+        ui.section('Recent commits', '↳');
+        ui.commitList(recent);
+    }
+    const remotes = (_b = gitOutput(['remote', '-v'])) !== null && _b !== void 0 ? _b : '';
+    if (remotes) {
+        ui.section('Remotes', '↗');
+        ui.remoteList(remotes);
+    }
+    if (state.conflicts.length) {
+        ui.section('Conflicted files', '✕');
+        state.conflicts.forEach(file => console.log(`  ${chalk.red('✕')} ${chalk.white(file)}`));
+    }
+}
+//# sourceMappingURL=inspect.js.map

package/dist/utils/inspect.js.map

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

package/dist/utils/push_to_remote.d.ts

@@ -1 +1,15 @@
+interface PushTarget {
+    branch: string;
+    remote: string;
+    /** Upstream ref as `<remote>/<branch>`, or null when none is configured. */
+    upstream: string | null;
+}
+export declare function parseUpstream(upstream: string, remotes: string[]): {
+    remote: string;
+    branch: string;
+} | null;
+export declare function resolvePushTarget(currentBranch: string, upstream: string | null, remotes: string[]): PushTarget | null;
+/** Always name the reviewed remote and branch; user push.default settings must not redirect it. */
+export declare function buildPushArgs(upstream: string | null, remote: string, branch: string): string[];
 export declare function handlePushToRemote(): Promise<void>;
+export {};

package/dist/utils/push_to_remote.js

@@ -11,6 +11,29 @@ import { confirm, spinner, isCancel } from '@clack/prompts';
 import chalk from 'chalk';
 import { gitCommand, gitErrorText, gitOutput } from './gitCommand.js';
 const PROTECTED_BRANCHES = new Set(['main', 'master', 'production', 'release']);
+export function parseUpstream(upstream, remotes) {
+    const remote = remotes
+        .filter(candidate => upstream.startsWith(`${candidate}/`))
+        .sort((a, b) => b.length - a.length)[0];
+    if (!remote)
+        return null;
+    const branch = upstream.slice(remote.length + 1);
+    return branch ? { remote, branch } : null;
+}
+export function resolvePushTarget(currentBranch, upstream, remotes) {
+    if (upstream) {
+        const target = parseUpstream(upstream, remotes);
+        return target ? { branch: target.branch, remote: target.remote, upstream } : null;
+    }
+    const remote = remotes.includes('origin') ? 'origin' : remotes[0];
+    return remote ? { branch: currentBranch, remote, upstream: null } : null;
+}
+/** Always name the reviewed remote and branch; user push.default settings must not redirect it. */
+export function buildPushArgs(upstream, remote, branch) {
+    return upstream
+        ? ['push', remote, `HEAD:${branch}`]
+        : ['push', '--set-upstream', remote, `HEAD:${branch}`];
+}
 export function handlePushToRemote() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -25,18 +48,21 @@ export function handlePushToRemote() {
             return;
         }
         const upstream = gitOutput(['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}']);
-        const remote = upstream ? upstream.split('/')[0] : remotes.includes('origin') ? 'origin' : remotes[0];
-        const target = { branch, remote, upstream };
-        if (PROTECTED_BRANCHES.has(branch.toLowerCase())) {
-            console.log(chalk.yellow.bold(`\n⚠️  You are about to push directly to "${branch}".`));
+        const target = resolvePushTarget(branch, upstream, remotes);
+        if (!target) {
+            console.log(chalk.yellow('Your configured upstream remote no longer exists. Repair it with `git branch --unset-upstream` or configure a valid remote before pushing.'));
+            return;
+        }
+        if (PROTECTED_BRANCHES.has(target.branch.toLowerCase())) {
+            console.log(chalk.yellow.bold(`\n⚠️  You are about to push directly to "${target.branch}".`));
         }
         if (!upstream) {
-            console.log(chalk.yellow(`ℹ️  "${branch}" has no upstream; it will be created as ${remote}/${branch}.`));
+            console.log(chalk.yellow(`ℹ️  "${branch}" has no upstream; it will be created as ${target.remote}/${target.branch}.`));
         }
         const shouldPush = yield confirm({
             message: upstream
                 ? `Push to ${upstream}?`
-                : `Push to ${remote}/${branch} and set it as upstream?`
+                : `Push to ${target.remote}/${target.branch} and set it as upstream?`
         });
         if (isCancel(shouldPush) || !shouldPush) {
             return;
@@ -47,9 +73,7 @@ export function handlePushToRemote() {
 function executePush(target) {
     const pushSpinner = spinner();
     pushSpinner.start(`Pushing to ${target.remote}/${target.branch}...`);
-    const args = target.upstream
-        ? ['push']
-        : ['push', '--set-upstream', target.remote, target.branch];
+    const args = buildPushArgs(target.upstream, target.remote, target.branch);
     const result = gitCommand(args);
     if (result.ok) {
         pushSpinner.stop('🚀 Changes pushed successfully!');

package/dist/utils/push_to_remote.js.map

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