gitpt 1.4.0 → 1.7.2

package/dist/commands/hook/index.js

@@ -0,0 +1,68 @@
+import { git } from "../../services/git/index.js";
+import { generateCommitMessage } from "../commit/generateCommitMessage.js";
+import { prepareCommitContext } from "../commit/summarizeDiff.js";
+import chalk from "chalk";
+import { spawnSync } from "child_process";
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
+import { join } from "path";
+//#region src/commands/hook/index.ts
+var HOOK_MARKER = "gitpt-hook";
+var HOOK_SCRIPT = `#!/bin/sh
+# ${HOOK_MARKER} (prepare-commit-msg) — managed by GitPT. Remove: gitpt hook uninstall
+command -v gitpt >/dev/null 2>&1 && gitpt hook run "$1" "$2" || true
+`;
+var resolveHooksDir = () => {
+	const result = spawnSync("git", [
+		"rev-parse",
+		"--git-path",
+		"hooks"
+	], { encoding: "utf-8" });
+	if (result.status !== 0) throw new Error("Not a git repository.");
+	return result.stdout.trim();
+};
+var hookInstallCommand = async (options = {}) => {
+	const hookPath = join(resolveHooksDir(), "prepare-commit-msg");
+	if (existsSync(hookPath)) {
+		if (!readFileSync(hookPath, "utf-8").includes(HOOK_MARKER) && !options.force) {
+			console.error(chalk.red(`A prepare-commit-msg hook already exists at ${hookPath}.`));
+			console.error(chalk.gray("Remove it, or re-run with --force, to install the GitPT hook."));
+			process.exit(1);
+		}
+	}
+	mkdirSync(join(hookPath, ".."), { recursive: true });
+	writeFileSync(hookPath, HOOK_SCRIPT, { mode: 493 });
+	console.log(chalk.green(`✓ Installed GitPT hook at ${hookPath}.`));
+	console.log(chalk.gray("`git commit` (without -m) now prefills an AI-generated message."));
+};
+var hookUninstallCommand = async () => {
+	const hookPath = join(resolveHooksDir(), "prepare-commit-msg");
+	if (!existsSync(hookPath)) {
+		console.log(chalk.gray("No prepare-commit-msg hook to remove."));
+		return;
+	}
+	if (!readFileSync(hookPath, "utf-8").includes(HOOK_MARKER)) {
+		console.error(chalk.red("The prepare-commit-msg hook isn't managed by GitPT — leaving it untouched."));
+		process.exit(1);
+	}
+	rmSync(hookPath);
+	console.log(chalk.green("✓ Removed GitPT prepare-commit-msg hook."));
+};
+var SKIP_SOURCES = /* @__PURE__ */ new Set([
+	"message",
+	"merge",
+	"squash",
+	"commit"
+]);
+var hookRunCommand = async (msgFile, source) => {
+	try {
+		if (!msgFile) return;
+		if (source && SKIP_SOURCES.has(source)) return;
+		const diff = git.getStagedChanges();
+		if (!diff || !diff.trim()) return;
+		const message = (await generateCommitMessage(await prepareCommitContext(diff))).trim();
+		if (!message) return;
+		writeFileSync(msgFile, `${message}\n\n${existsSync(msgFile) ? readFileSync(msgFile, "utf-8") : ""}`);
+	} catch {}
+};
+//#endregion
+export { hookInstallCommand, hookRunCommand, hookUninstallCommand };

package/dist/commands/middleware/capabilitiesMiddleware/ghCapability.js

@@ -1,23 +1,23 @@
+import { gh } from "../../../services/gh/index.js";
 import chalk from "chalk";
 import { execSync } from "child_process";
-import { gh } from "../../../services/gh/index.js";
-export const ghCapability = () => {
-    if (!gh.isAvailable()) {
-        console.error(chalk.red("GitHub CLI (gh) is not installed or available in PATH"));
-        console.log(chalk.yellow("Please install GitHub CLI from https://cli.github.com/"));
-        process.exit(1);
-    }
-    // Check if user is authenticated with GitHub CLI
-    try {
-        const authStatus = execSync("gh auth status -h github.com 2>&1 || true").toString();
-        if (authStatus.includes("not logged")) {
-            console.error(chalk.red("Error: You are not authenticated with GitHub CLI."));
-            console.log(chalk.yellow("Please run `gh auth login` to authenticate."));
-            process.exit(1);
-        }
-    }
-    catch (error) {
-        console.log(chalk.yellow("Warning: Could not verify GitHub CLI authentication."));
-        console.log(chalk.yellow("If PR creation fails, please run `gh auth login` first."));
-    }
+//#region src/commands/middleware/capabilitiesMiddleware/ghCapability.ts
+var ghCapability = () => {
+	if (!gh.isAvailable()) {
+		console.error(chalk.red("GitHub CLI (gh) is not installed or available in PATH"));
+		console.log(chalk.yellow("Please install GitHub CLI from https://cli.github.com/"));
+		process.exit(1);
+	}
+	try {
+		if (execSync("gh auth status -h github.com 2>&1 || true").toString().includes("not logged")) {
+			console.error(chalk.red("Error: You are not authenticated with GitHub CLI."));
+			console.log(chalk.yellow("Please run `gh auth login` to authenticate."));
+			process.exit(1);
+		}
+	} catch (error) {
+		console.log(chalk.yellow("Warning: Could not verify GitHub CLI authentication."));
+		console.log(chalk.yellow("If PR creation fails, please run `gh auth login` first."));
+	}
 };
+//#endregion
+export { ghCapability };

package/dist/commands/middleware/capabilitiesMiddleware/gitCapability.js

@@ -1,12 +1,15 @@
-import chalk from "chalk";
 import { git } from "../../../services/git/index.js";
-export const gitCapability = () => {
-    if (!git.isAvailable()) {
-        console.error(chalk.red("Git command is not available, install it from https://git-scm.com/"));
-        process.exit(1);
-    }
-    if (!git.isGitRepository()) {
-        console.error(chalk.red("Not a git repository"));
-        process.exit(1);
-    }
+import chalk from "chalk";
+//#region src/commands/middleware/capabilitiesMiddleware/gitCapability.ts
+var gitCapability = () => {
+	if (!git.isAvailable()) {
+		console.error(chalk.red("Git command is not available, install it from https://git-scm.com/"));
+		process.exit(1);
+	}
+	if (!git.isGitRepository()) {
+		console.error(chalk.red("Not a git repository"));
+		process.exit(1);
+	}
 };
+//#endregion
+export { gitCapability };

package/dist/commands/middleware/capabilitiesMiddleware/index.js

@@ -1,15 +1,16 @@
 import { ghCapability } from "./ghCapability.js";
 import { gitCapability } from "./gitCapability.js";
-const capabilities = {
-    git: gitCapability,
-    gh: ghCapability,
+//#region src/commands/middleware/capabilitiesMiddleware/index.ts
+var capabilities = {
+	git: gitCapability,
+	gh: ghCapability
 };
-export const capabilitiesMiddleware = (requiredCapabilities) => {
-    requiredCapabilities.forEach((capabilityKey) => {
-        const resolver = capabilities[capabilityKey];
-        if (!resolver) {
-            throw new Error(`Capability ${capabilityKey} not found`);
-        }
-        resolver();
-    });
+var capabilitiesMiddleware = (requiredCapabilities) => {
+	requiredCapabilities.forEach((capabilityKey) => {
+		const resolver = capabilities[capabilityKey];
+		if (!resolver) throw new Error(`Capability ${capabilityKey} not found`);
+		resolver();
+	});
 };
+//#endregion
+export { capabilitiesMiddleware };

package/dist/commands/middleware/hasStagedChangesMiddleware.js

@@ -1,8 +1,11 @@
-import chalk from "chalk";
 import { git } from "../../services/git/index.js";
-export const hasStagedChangesMiddleware = () => {
-    if (!git.hasStagedChanges()) {
-        console.error(chalk.red("Error: No staged changes"));
-        process.exit(1);
-    }
+import chalk from "chalk";
+//#region src/commands/middleware/hasStagedChangesMiddleware.ts
+var hasStagedChangesMiddleware = () => {
+	if (!git.hasStagedChanges()) {
+		console.error(chalk.red("Error: No staged changes"));
+		process.exit(1);
+	}
 };
+//#endregion
+export { hasStagedChangesMiddleware };

package/dist/commands/middleware/setupMiddleware/defaultModels.js

@@ -0,0 +1,15 @@
+import { isAppleModelAvailable } from "../../../llm/providers/apple/models.js";
+import { AppleProvider } from "../../../llm/providers/apple/index.js";
+//#region src/commands/middleware/setupMiddleware/defaultModels.ts
+var DEFAULT_MODELS = [{
+	id: "apple-foundation-models",
+	label: "Apple Foundation Models (on-device)",
+	isAvailable: () => AppleProvider.isAvailable() && isAppleModelAvailable("system"),
+	config: {
+		provider: "apple",
+		model: "system"
+	}
+}];
+var resolveDefaultModel = () => DEFAULT_MODELS.find((model) => model.isAvailable());
+//#endregion
+export { resolveDefaultModel };

package/dist/commands/middleware/setupMiddleware/index.js

@@ -1,40 +1,68 @@
+import { clearAcceptedDefault, getAcceptedDefault, getConfig, saveConfig, setAcceptedDefault, unsetConfigKey } from "../../../config.js";
+import { PROVIDERS, getProviderClass, validateConfig } from "../../../llm/registry.js";
+import { resolveDefaultModel } from "./defaultModels.js";
+import chalk from "chalk";
 import inquirer from "inquirer";
-import { getConfig, validateConfig } from "../../../config.js";
-import { setupLocalLLM } from "./setupLocalLLM.js";
-import { setupOpenRouter } from "./setupOpenRouter.js";
-export const setupMiddleware = async (options) => {
-    const context = options?.context || "command";
-    // Always get the current config, even if it's empty
-    const existingConfig = getConfig();
-    // If we're running a command, and the config is valid, continue with the command
-    if (context === "command") {
-        const isValidConfig = validateConfig();
-        if (isValidConfig.isValid) {
-            return getConfig();
-        }
-    }
-    // For initial setup or model command, start by selecting the provider
-    const useLocalLLMAnswer = await inquirer.prompt([
-        {
-            type: "list",
-            name: "useLocalLLM",
-            message: "Select LLM provider:",
-            choices: [
-                { name: "OpenRouter (remote)", value: false },
-                { name: "Local LLM", value: true },
-            ],
-            default: existingConfig.provider === "local" ? 1 : 0,
-        },
-    ]);
-    // Update config based on selected provider
-    existingConfig.provider = useLocalLLMAnswer.useLocalLLM
-        ? "local"
-        : "openrouter";
-    // Proceed based on selected provider
-    if (useLocalLLMAnswer.useLocalLLM) {
-        return await setupLocalLLM(existingConfig);
-    }
-    else {
-        return await setupOpenRouter(existingConfig);
-    }
+//#region src/commands/middleware/setupMiddleware/index.ts
+var setupMiddleware = async (options) => {
+	const context = options?.context || "command";
+	const existingConfig = getConfig();
+	const defaultModel = resolveDefaultModel();
+	const acceptedDefault = getAcceptedDefault();
+	const interactive = Boolean(process.stdin.isTTY);
+	const applyDefault = (model) => {
+		saveConfig(model.config);
+		setAcceptedDefault(model.id);
+		return getConfig();
+	};
+	const confirmDefault = async (message) => {
+		const { useDefault } = await inquirer.prompt([{
+			type: "confirm",
+			name: "useDefault",
+			message,
+			default: true
+		}]);
+		return useDefault;
+	};
+	if (context === "command") {
+		if (validateConfig().isValid) {
+			if (!acceptedDefault) return getConfig();
+			if (!defaultModel || defaultModel.id === acceptedDefault) return getConfig();
+			if (!interactive || await confirmDefault(`The recommended default changed to ${defaultModel.label}. Use it?`)) {
+				const result = applyDefault(defaultModel);
+				if (interactive) console.log(chalk.green(`✓ Now using ${defaultModel.label}.`));
+				return result;
+			}
+			return getConfig();
+		}
+		if (!existingConfig.provider && defaultModel) {
+			if (!interactive) return applyDefault(defaultModel);
+			if (await confirmDefault(`No model configured. Use ${defaultModel.label} by default?`)) {
+				const result = applyDefault(defaultModel);
+				console.log(chalk.green(`✓ Using ${defaultModel.label}. Run 'gitpt model' to change.`));
+				return result;
+			}
+		} else if (!interactive) throw new Error("GitPT is not configured. Run 'gitpt setup' in an interactive terminal.");
+	}
+	clearAcceptedDefault();
+	const providerChoices = PROVIDERS.filter((p) => p.isAvailable()).map((p) => ({
+		name: p.label,
+		value: p.id
+	}));
+	existingConfig.provider = (await inquirer.prompt([{
+		type: "list",
+		name: "provider",
+		message: "Select LLM provider:",
+		choices: providerChoices,
+		default: Math.max(providerChoices.findIndex((c) => c.value === existingConfig.provider), 0)
+	}])).provider;
+	if (existingConfig.provider !== "local") {
+		delete existingConfig.contextWindow;
+		unsetConfigKey("contextWindow");
+	}
+	const spec = getProviderClass(existingConfig.provider);
+	if (!spec) throw new Error(`Unknown provider: ${existingConfig.provider ?? "(none)"}.`);
+	return spec.setup(existingConfig);
 };
+//#endregion
+export { setupMiddleware };

package/dist/commands/model.js

@@ -1,6 +1,9 @@
-import chalk from "chalk";
 import { setupMiddleware } from "./middleware/setupMiddleware/index.js";
-export const modelCommand = async () => {
-    console.log(chalk.blue("GitPT Model Selection"));
-    await setupMiddleware({ context: "model" });
+import chalk from "chalk";
+//#region src/commands/model.ts
+var modelCommand = async () => {
+	console.log(chalk.blue("GitPT Model Selection"));
+	await setupMiddleware({ context: "model" });
 };
+//#endregion
+export { modelCommand };

package/dist/commands/passthroughArgs.js

@@ -0,0 +1,11 @@
+//#region src/commands/passthroughArgs.ts
+/**
+* Extra tokens the user passed to a GitPT command that aren't GitPT's own
+* options (e.g. --allow-empty, --amend) — to forward to the wrapped git command.
+* Commander leaves these in `command.args`; we drop the command's own name in
+* case it leaks in. Shared so every command forwards passthrough flags the same
+* way.
+*/
+var passthroughArgs = (command) => (command.args ?? []).filter((arg) => arg !== command.name());
+//#endregion
+export { passthroughArgs };

package/dist/commands/pr/context/systemPrompt.js

@@ -1,4 +1,5 @@
-export const systemPrompt = `
+//#region src/commands/pr/context/systemPrompt.ts
+var systemPrompt = `
 You are a helpful assistant that generates clear, informative GitHub pull request titles and descriptions.
 
 For the title:
@@ -16,3 +17,5 @@ For the description:
 Format the description in Markdown with sections.
 Do not include "PR" or "Pull Request" in the title.
 `;
+//#endregion
+export { systemPrompt };

package/dist/commands/pr/context/userPrompt.js

@@ -1,4 +1,5 @@
-export const userPrompt = (context) => `
+//#region src/commands/pr/context/userPrompt.ts
+var userPrompt = (context) => `
 Generate a pull request title and description for the following changes:
 
 ${context}
@@ -20,3 +21,5 @@ This PR adds user authentication using JWT tokens.
 2. Login with the new user credentials
 3. Use the returned token to access protected endpoints
 `;
+//#endregion
+export { userPrompt };

package/dist/commands/pr/generatePRDetails.js

@@ -1,35 +1,29 @@
-import chalk from "chalk";
-import { getConfig } from "../../config.js";
-import { getLLMClient } from "../../llm/index.js";
+import { getProvider } from "../../llm/registry.js";
 import { systemPrompt } from "./context/systemPrompt.js";
 import { userPrompt } from "./context/userPrompt.js";
 import { getPRContext } from "./getPRContext.js";
-export const generatePRDetails = async () => {
-    const { model } = getConfig();
-    const context = getPRContext().join("\n\n");
-    const userPromptWithContext = userPrompt(context);
-    const llmClient = getLLMClient();
-    try {
-        const response = await llmClient.chat.completions.create({
-            model: model,
-            messages: [
-                { role: "system", content: systemPrompt },
-                { role: "user", content: userPromptWithContext },
-            ],
-            max_completion_tokens: 1000,
-        });
-        const result = response.choices[0].message?.content?.trim();
-        if (!result) {
-            throw new Error("No response from LLM");
-        }
-        const titleMatch = result.match(/Title:\s*(.+?)(?:\n|$)/);
-        const descMatch = result.match(/Description:\s*\n([\s\S]+)$/);
-        const title = titleMatch ? titleMatch[1].trim() : "";
-        const body = descMatch ? descMatch[1].trim() : result;
-        return { title, body };
-    }
-    catch (error) {
-        console.error(chalk.red("Error generating PR details:"), error);
-        throw new Error("Failed to generate PR details");
-    }
+import chalk from "chalk";
+//#region src/commands/pr/generatePRDetails.ts
+var generatePRDetails = async () => {
+	const context = getPRContext().join("\n\n");
+	try {
+		const provider = getProvider();
+		const result = (await provider.complete({
+			system: systemPrompt,
+			user: userPrompt(context),
+			maxTokens: provider.maxOutputTokens
+		})).trim();
+		if (!result) throw new Error("No response from LLM");
+		const titleMatch = result.match(/Title:\s*(.+?)(?:\n|$)/);
+		const descMatch = result.match(/Description:\s*\n([\s\S]+)$/);
+		return {
+			title: titleMatch ? titleMatch[1].trim() : "",
+			body: descMatch ? descMatch[1].trim() : result
+		};
+	} catch (error) {
+		console.error(chalk.red("Error generating PR details:"), error);
+		throw new Error("Failed to generate PR details");
+	}
 };
+//#endregion
+export { generatePRDetails };

package/dist/commands/pr/getPRContext.js

@@ -1,65 +1,40 @@
+import { git } from "../../services/git/index.js";
 import chalk from "chalk";
 import { execSync } from "child_process";
-import { git } from "../../services/git/index.js";
-export const getPRContext = () => {
-    const currentBranch = git.getCurrentBranch();
-    const baseBranch = git.getDefaultBranch();
-    // Get context for PR
-    const commitMessages = git.getCommitsSinceBaseBranch(baseBranch);
-    const changedFiles = git.getChangedFiles(baseBranch);
-    // Check if we have any content to work with
-    if (commitMessages.length === 0 && changedFiles.length === 0) {
-        console.log(chalk.yellow("No commits or changed files detected."));
-        console.log(chalk.yellow("Will attempt to generate PR details using branch name and repository context."));
-    }
-    // Get additional context from repository
-    let repoName = "";
-    let repoDescription = "";
-    try {
-        // Try to get repo information from GitHub CLI
-        const repoInfo = JSON.parse(execSync("gh repo view --json name,description").toString().trim());
-        repoName = repoInfo.name || "";
-        repoDescription = repoInfo.description || "";
-    }
-    catch (error) {
-        // Continue without this info
-    }
-    console.log(chalk.blue("Generating PR title and description..."));
-    // Build a rich context for the AI
-    let contextSections = [
-        `Branch: ${currentBranch}`,
-        `Base branch: ${baseBranch}`,
-    ];
-    // Add repository info if available
-    if (repoName) {
-        contextSections.push(`Repository: ${repoName}`);
-    }
-    if (repoDescription) {
-        contextSections.push(`Repository description: ${repoDescription}`);
-    }
-    // Add commit messages if available
-    if (commitMessages.length > 0) {
-        contextSections.push("Commit messages in this branch:", commitMessages.map((msg) => `- ${msg}`).join("\n"));
-    }
-    else {
-        contextSections.push("No commit messages available.");
-        // Try to extract intent from branch name if no commits
-        if (currentBranch.includes("/")) {
-            const branchParts = currentBranch.split("/");
-            const branchType = branchParts[0]; // e.g., "feature", "fix", "chore"
-            const branchDescription = branchParts
-                .slice(1)
-                .join("/")
-                .replace(/-/g, " ");
-            contextSections.push("Branch name analysis:", `Type: ${branchType}`, `Description: ${branchDescription}`);
-        }
-    }
-    // Add changed files if available
-    if (changedFiles.length > 0) {
-        contextSections.push("Files changed in this branch:", changedFiles.map((file) => `- ${file}`).join("\n"));
-    }
-    else {
-        contextSections.push("No file changes detected.");
-    }
-    return contextSections;
+//#region src/commands/pr/getPRContext.ts
+var getPRContext = () => {
+	const currentBranch = git.getCurrentBranch();
+	const baseBranch = git.getDefaultBranch();
+	const commitMessages = git.getCommitsSinceBaseBranch(baseBranch);
+	const changedFiles = git.getChangedFiles(baseBranch);
+	if (commitMessages.length === 0 && changedFiles.length === 0) {
+		console.log(chalk.yellow("No commits or changed files detected."));
+		console.log(chalk.yellow("Will attempt to generate PR details using branch name and repository context."));
+	}
+	let repoName = "";
+	let repoDescription = "";
+	try {
+		const repoInfo = JSON.parse(execSync("gh repo view --json name,description").toString().trim());
+		repoName = repoInfo.name || "";
+		repoDescription = repoInfo.description || "";
+	} catch (error) {}
+	console.log(chalk.blue("Generating PR title and description..."));
+	let contextSections = [`Branch: ${currentBranch}`, `Base branch: ${baseBranch}`];
+	if (repoName) contextSections.push(`Repository: ${repoName}`);
+	if (repoDescription) contextSections.push(`Repository description: ${repoDescription}`);
+	if (commitMessages.length > 0) contextSections.push("Commit messages in this branch:", commitMessages.map((msg) => `- ${msg}`).join("\n"));
+	else {
+		contextSections.push("No commit messages available.");
+		if (currentBranch.includes("/")) {
+			const branchParts = currentBranch.split("/");
+			const branchType = branchParts[0];
+			const branchDescription = branchParts.slice(1).join("/").replace(/-/g, " ");
+			contextSections.push("Branch name analysis:", `Type: ${branchType}`, `Description: ${branchDescription}`);
+		}
+	}
+	if (changedFiles.length > 0) contextSections.push("Files changed in this branch:", changedFiles.map((file) => `- ${file}`).join("\n"));
+	else contextSections.push("No file changes detected.");
+	return contextSections;
 };
+//#endregion
+export { getPRContext };