gitshift 1.0.8 → 2.0.0

package/.github/workflows/publish.yml

@@ -8,7 +8,7 @@ on:
       - package.json
       - package-lock.json
       - src/**
-      - .github/workflows/publish-root.yml
+      - .github/workflows/publish.yml
 
 jobs:
   publish:

package/README.md

@@ -1,6 +1,6 @@
 # GitShift CLI
 
-GitShift CLI helps you create, manage, and switch between GitHub identity profiles from the terminal. It stores profiles locally, updates your global Git config, and can generate SSH keys for each profile when needed.
+GitShift CLI helps you create, manage, and switch between GitHub identity profiles from the terminal. It stores profiles locally, updates your global Git config, can generate SSH keys for each profile when needed, and can import existing SSH keys from your `~/.ssh` folder.
 
 ## Installation
 
@@ -37,6 +37,7 @@ gitshift --help
 - `gitshift current` - Display the active profile.
 - `gitshift use <profile>` - Switch to a saved profile and update global Git user name and email.
 - `gitshift remove <profile>` - Delete a saved profile.
+- `gitshift scan` - Scan your `~/.ssh` folder and import existing SSH keys into new profiles.
 - `gitshift doctor` - Check whether Git, SSH, and GitHub CLI are installed.
 
 ## Example Workflow
@@ -44,6 +45,7 @@ gitshift --help
 ```bash
 gitshift add
 gitshift list
+gitshift scan
 gitshift use personal
 gitshift current
 gitshift doctor
@@ -51,6 +53,8 @@ gitshift doctor
 
 When you create a profile and choose SSH generation, GitShift creates a key under your home directory in `.ssh` using the pattern `gitshift-<profile-name>`.
 
+If you already have SSH keys on your machine, `gitshift scan` will list the available keys, let you pick one, and save it as a new imported profile.
+
 ## How It Works
 
 Profiles are saved locally on your machine using the app's configuration store. Switching profiles updates your global Git identity with:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitshift",
-  "version": "1.0.8",
+  "version": "2.0.0",
   "description": "GitHub Account Switcher CLI",
   "main": "server.js",
   "bin": {
@@ -28,6 +28,7 @@
     "commander": "^15.0.0",
     "conf": "^15.1.0",
     "execa": "^9.6.1",
+    "fast-glob": "^3.3.3",
     "fs-extra": "^11.3.5",
     "ora": "^9.4.0"
   }

package/src/commands/scan.js

@@ -0,0 +1,89 @@
+import path from "path";
+
+import {
+    input,
+    select,
+} from "@inquirer/prompts";
+
+import {
+    findSSHKeys,
+} from "../services/scan.js";
+
+import {
+    getProfiles,
+    saveProfile,
+} from "../services/profile.js";
+
+import {
+    error,
+    info,
+    success,
+} from "../utils/logger.js";
+
+export async function scanCommand() {
+    try {
+        const keys = await findSSHKeys();
+
+        if (!keys.length) {
+            info("No SSH keys found");
+            return;
+        }
+
+        const existing = getProfiles();
+
+        const importedPaths = existing.map((profile) => profile.sshKey);
+
+        const available = keys.filter((key) => !importedPaths.includes(key));
+
+        if (!available.length) {
+            info("All keys already imported");
+            return;
+        }
+
+        const selected = await select({
+            message: "Select SSH Key",
+            choices: available.map((key) => ({
+                name: path.basename(key),
+                value: key,
+            })),
+        });
+
+        const profileName = await input({
+            message: "Profile Name",
+            default: path.basename(selected),
+        });
+
+        const username = await input({
+            message: "GitHub Username",
+        });
+
+        const email = await input({
+            message: "Email",
+        });
+
+        try {
+            saveProfile({
+                name: profileName,
+                username,
+                email,
+                sshKey: selected,
+                source:
+                    "imported",
+            });
+
+            success(`Existing SSH Key Imported "${profileName}"`);
+        } catch (err) {
+            error(err.message);
+        }
+    } catch (err) {
+        if (err && err.name === "ExitPromptError") {
+            // User canceled the prompt (Ctrl+C / SIGINT). Exit gracefully.
+            error("Existing SSH Key Import canceled by user.");
+            process.exitCode = 0;
+            return;
+        }
+
+        error(String(err));
+        process.exitCode = 1;
+    }
+}

package/src/server.js

@@ -9,6 +9,7 @@ import { currentCommand } from "./commands/current.js";
 import { doctorCommand } from "./commands/doctor.js";
 import { listCommand } from "./commands/list.js";
 import { removeCommand } from "./commands/remove.js";
+import { scanCommand } from "./commands/scan.js";
 import { useCommand } from "./commands/use.js";
 
 const require = createRequire(import.meta.url);
@@ -116,6 +117,13 @@ async function main() {
         )
         .action(removeCommand);
 
+    program
+        .command("scan")
+        .description(
+            "Import existing SSH keys"
+        )
+        .action(scanCommand);
+
     program
         .command("doctor")
         .description(

package/src/services/scan.js

@@ -0,0 +1,36 @@
+import fg from "fast-glob";
+import fs from "fs-extra";
+import os from "os";
+import path from "path";
+
+export async function findSSHKeys() {
+    const sshDir = path.join(os.homedir(), ".ssh");
+
+    const exists =
+        await fs.pathExists(sshDir);
+
+    if (!exists) {
+        return [];
+    }
+
+    const files = await fg("*", {
+        cwd: sshDir,
+        absolute: true,
+        onlyFiles: true,
+    });
+
+    return files.filter((file) => {
+        const name = path.basename(file);
+
+        if (
+            name.endsWith(".pub") ||
+            name === "config" ||
+            name === "known_hosts" ||
+            name === "authorized_keys"
+        ) {
+            return false;
+        }
+
+        return true;
+    });
+}

package/src/services/ssh.js

@@ -51,4 +51,23 @@ export async function generateSSHKey(
     ]);
 
     return keyPath;
+}
+
+export async function getPublicKey(
+    privateKeyPath
+) {
+    const publicKey =
+        `${privateKeyPath}.pub`;
+
+    const exists =
+        await fs.pathExists(publicKey);
+
+    if (!exists) {
+        return null;
+    }
+
+    return fs.readFile(
+        publicKey,
+        "utf8"
+    );
 }