@haystackeditor/cli 0.8.1 → 0.10.0

package/dist/utils/git.js

@@ -0,0 +1,302 @@
+/**
+ * Git utilities for haystack submit command.
+ *
+ * Provides functions for git operations: branch management, push, remote parsing.
+ */
+import { execSync } from 'child_process';
+// Re-export findGitRoot from hooks for consistency
+export { findGitRoot } from './hooks.js';
+// ============================================================================
+// Branch operations
+// ============================================================================
+/**
+ * Get the current branch name
+ */
+export function getCurrentBranch() {
+    try {
+        return execSync('git rev-parse --abbrev-ref HEAD', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+    }
+    catch {
+        throw new Error('Failed to get current branch. Are you in a git repository?');
+    }
+}
+/**
+ * Get the default branch (main or master)
+ */
+export function getDefaultBranch() {
+    try {
+        // Try to get from remote HEAD
+        const remoteHead = execSync('git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null || echo ""', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        if (remoteHead) {
+            // refs/remotes/origin/main -> main
+            return remoteHead.replace('refs/remotes/origin/', '');
+        }
+        // Fallback: check if main or master exists
+        const branches = execSync('git branch -r', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        if (branches.includes('origin/main'))
+            return 'main';
+        if (branches.includes('origin/master'))
+            return 'master';
+        return 'main'; // Default fallback
+    }
+    catch {
+        return 'main';
+    }
+}
+/**
+ * Check if working directory has uncommitted changes
+ */
+export function hasUncommittedChanges() {
+    try {
+        const status = execSync('git status --porcelain', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        return status.length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if current branch has unpushed commits
+ */
+export function hasUnpushedCommits() {
+    try {
+        const currentBranch = getCurrentBranch();
+        const unpushed = execSync(`git log origin/${currentBranch}..HEAD --oneline 2>/dev/null || echo ""`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        return unpushed.length > 0;
+    }
+    catch {
+        // Branch may not have an upstream, assume there are commits to push
+        return true;
+    }
+}
+/**
+ * Get comprehensive branch info
+ */
+export function getBranchInfo() {
+    return {
+        currentBranch: getCurrentBranch(),
+        defaultBranch: getDefaultBranch(),
+        isClean: !hasUncommittedChanges(),
+        hasUncommittedChanges: hasUncommittedChanges(),
+        hasUnpushedCommits: hasUnpushedCommits(),
+    };
+}
+/**
+ * Create a new branch from current HEAD
+ */
+export function createBranch(branchName) {
+    try {
+        execSync(`git checkout -b "${branchName}"`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        if (message.includes('already exists')) {
+            throw new Error(`Branch '${branchName}' already exists`);
+        }
+        throw new Error(`Failed to create branch: ${message}`);
+    }
+}
+/**
+ * Check if a branch exists locally
+ */
+export function branchExists(branchName) {
+    try {
+        execSync(`git rev-parse --verify "${branchName}" 2>/dev/null`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if a branch exists on remote
+ */
+export function remoteBranchExists(remoteName, branchName) {
+    try {
+        execSync(`git ls-remote --heads ${remoteName} ${branchName}`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Checkout an existing branch
+ */
+export function checkoutBranch(branchName) {
+    try {
+        execSync(`git checkout "${branchName}"`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        throw new Error(`Failed to checkout branch: ${message}`);
+    }
+}
+// ============================================================================
+// Push operations
+// ============================================================================
+/**
+ * Push current branch to remote with upstream tracking
+ */
+export function pushBranch(remoteName, branchName) {
+    try {
+        execSync(`git push -u ${remoteName} "${branchName}"`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        if (message.includes('permission denied') || message.includes('403')) {
+            throw new Error('Permission denied. Check your GitHub credentials.');
+        }
+        if (message.includes('remote rejected')) {
+            throw new Error('Remote rejected the push. The branch may be protected.');
+        }
+        throw new Error(`Failed to push: ${message}`);
+    }
+}
+// ============================================================================
+// Remote operations
+// ============================================================================
+/**
+ * Parse remote URL to extract owner and repo
+ * Supports both SSH and HTTPS URLs
+ */
+export function parseRemoteUrl(remoteName = 'origin') {
+    try {
+        const url = execSync(`git remote get-url ${remoteName}`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        // SSH format: git@github.com:owner/repo.git
+        const sshMatch = url.match(/git@github\.com:([^/]+)\/(.+?)(?:\.git)?$/);
+        if (sshMatch) {
+            return {
+                owner: sshMatch[1],
+                repo: sshMatch[2],
+                remoteName,
+            };
+        }
+        // HTTPS format: https://github.com/owner/repo.git
+        const httpsMatch = url.match(/https?:\/\/github\.com\/([^/]+)\/(.+?)(?:\.git)?$/);
+        if (httpsMatch) {
+            return {
+                owner: httpsMatch[1],
+                repo: httpsMatch[2],
+                remoteName,
+            };
+        }
+        throw new Error(`Unsupported remote URL format: ${url}`);
+    }
+    catch (err) {
+        if (err instanceof Error && err.message.includes('Unsupported')) {
+            throw err;
+        }
+        throw new Error(`Failed to get remote URL for '${remoteName}'`);
+    }
+}
+// ============================================================================
+// Commit operations
+// ============================================================================
+/**
+ * Get the last commit message (first line only)
+ */
+export function getLastCommitMessage() {
+    try {
+        return execSync('git log -1 --format=%s', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+    }
+    catch {
+        return 'Update';
+    }
+}
+/**
+ * Get the last commit SHA (short)
+ */
+export function getLastCommitSha() {
+    try {
+        return execSync('git rev-parse --short HEAD', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+    }
+    catch {
+        return '';
+    }
+}
+/**
+ * Get full commit messages (subject + body) for all commits since base branch.
+ * Returns the combined log, or empty string if no commits or on error.
+ */
+export function getCommitMessagesSinceBase(baseBranch) {
+    try {
+        // Use origin/<base> to compare against remote base branch
+        const mergeBase = execSync(`git merge-base origin/${baseBranch} HEAD`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        if (!mergeBase)
+            return '';
+        return execSync(`git log ${mergeBase}..HEAD --format=%B --reverse`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+    }
+    catch {
+        // Fallback: try just the last commit's full message
+        try {
+            return execSync('git log -1 --format=%B', {
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            }).trim();
+        }
+        catch {
+            return '';
+        }
+    }
+}
+/**
+ * Get the number of commits ahead of base branch
+ */
+export function getCommitsAhead(baseBranch) {
+    try {
+        const output = execSync(`git rev-list --count ${baseBranch}..HEAD`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        return parseInt(output, 10) || 0;
+    }
+    catch {
+        return 0;
+    }
+}

package/dist/utils/github-api.d.ts

@@ -0,0 +1,83 @@
+/**
+ * GitHub API utilities for haystack submit command.
+ *
+ * Provides functions for creating PRs, managing labels, etc.
+ */
+export interface CreatePROptions {
+    owner: string;
+    repo: string;
+    title: string;
+    head: string;
+    base: string;
+    body?: string;
+    draft?: boolean;
+}
+export interface PRResponse {
+    number: number;
+    html_url: string;
+    title: string;
+    state: string;
+    head: {
+        ref: string;
+    };
+    base: {
+        ref: string;
+    };
+}
+export interface LabelInfo {
+    name: string;
+    color: string;
+    description?: string;
+}
+export declare const HAYSTACK_LABELS: Record<string, LabelInfo>;
+/**
+ * Get stored GitHub token, throw if not authenticated
+ */
+export declare function requireGitHubAuth(): Promise<string>;
+/**
+ * Create a pull request
+ */
+export declare function createPullRequest(options: CreatePROptions): Promise<PRResponse>;
+/**
+ * Check if a PR already exists for a branch
+ */
+export declare function findExistingPR(owner: string, repo: string, head: string): Promise<PRResponse | null>;
+/**
+ * Add labels to an issue/PR
+ */
+export declare function addLabelsToIssue(owner: string, repo: string, issueNumber: number, labels: string[]): Promise<void>;
+/**
+ * Get all labels from an issue/PR
+ */
+export declare function getLabelsFromIssue(owner: string, repo: string, issueNumber: number): Promise<string[]>;
+/**
+ * Remove a label from an issue/PR
+ */
+export declare function removeLabelFromIssue(owner: string, repo: string, issueNumber: number, labelName: string): Promise<void>;
+/**
+ * Check if a label exists in the repo
+ */
+export declare function labelExists(owner: string, repo: string, labelName: string): Promise<boolean>;
+/**
+ * Create a label in the repo
+ */
+export declare function createLabel(owner: string, repo: string, label: LabelInfo): Promise<void>;
+/**
+ * Ensure all required Haystack labels exist in the repo
+ */
+export declare function ensureHaystackLabels(owner: string, repo: string, labelNames: string[]): Promise<void>;
+/**
+ * Request reviewers on a pull request
+ */
+export declare function requestReviewers(owner: string, repo: string, prNumber: number, reviewers: string[]): Promise<void>;
+/**
+ * Get the authenticated user's info
+ */
+export declare function getCurrentUser(): Promise<{
+    login: string;
+    id: number;
+}>;
+/**
+ * Check if user has push access to a repo
+ */
+export declare function hasPushAccess(owner: string, repo: string): Promise<boolean>;

package/dist/utils/github-api.js

@@ -0,0 +1,266 @@
+/**
+ * GitHub API utilities for haystack submit command.
+ *
+ * Provides functions for creating PRs, managing labels, etc.
+ */
+import { loadToken } from '../commands/login.js';
+const GITHUB_API_BASE = 'https://api.github.com';
+// Label definitions for Haystack workflow
+export const HAYSTACK_LABELS = {
+    'haystack:auto-merge': {
+        name: 'haystack:auto-merge',
+        color: '0E8A16', // Green
+        description: 'Auto-merge after Haystack approval',
+    },
+    'haystack:needs-review': {
+        name: 'haystack:needs-review',
+        color: 'FBCA04', // Yellow
+        description: 'Requires Haystack review',
+    },
+    'haystack:ready-to-merge': {
+        name: 'haystack:ready-to-merge',
+        color: '2EA44F', // GitHub green
+        description: 'Passed Haystack analysis, ready to merge',
+    },
+};
+// ============================================================================
+// Authentication
+// ============================================================================
+/**
+ * Get stored GitHub token, throw if not authenticated
+ */
+export async function requireGitHubAuth() {
+    const token = await loadToken();
+    if (!token) {
+        throw new Error('Not logged in. Run `haystack login` first.');
+    }
+    return token;
+}
+// ============================================================================
+// API helpers
+// ============================================================================
+/**
+ * Make an authenticated GitHub API request
+ */
+async function githubApiRequest(method, path, token, body) {
+    const url = `${GITHUB_API_BASE}${path}`;
+    const response = await fetch(url, {
+        method,
+        headers: {
+            Authorization: `Bearer ${token}`,
+            Accept: 'application/vnd.github.v3+json',
+            'Content-Type': 'application/json',
+            'User-Agent': 'Haystack-CLI',
+        },
+        body: body ? JSON.stringify(body) : undefined,
+    });
+    return response;
+}
+/**
+ * Handle API errors consistently
+ */
+async function handleApiError(response, context) {
+    if (response.status === 401) {
+        throw new Error('GitHub token expired or invalid. Run `haystack login` again.');
+    }
+    if (response.status === 403) {
+        const rateLimitRemaining = response.headers.get('x-ratelimit-remaining');
+        if (rateLimitRemaining === '0') {
+            throw new Error('GitHub API rate limit exceeded. Please wait and try again.');
+        }
+        throw new Error(`Permission denied: ${context}`);
+    }
+    if (response.status === 404) {
+        throw new Error(`Not found: ${context}`);
+    }
+    if (response.status === 422) {
+        const data = await response.json().catch(() => ({}));
+        const errorMsg = data.errors?.[0]?.message || data.message || 'Validation failed';
+        throw new Error(`GitHub API error: ${errorMsg}`);
+    }
+    const data = await response.json().catch(() => ({}));
+    throw new Error(data.message || `GitHub API error (${response.status}): ${context}`);
+}
+// ============================================================================
+// Pull Request operations
+// ============================================================================
+/**
+ * Create a pull request
+ */
+export async function createPullRequest(options) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('POST', `/repos/${options.owner}/${options.repo}/pulls`, token, {
+        title: options.title,
+        head: options.head,
+        base: options.base,
+        body: options.body || '',
+        draft: options.draft || false,
+    });
+    if (!response.ok) {
+        // GitHub returns 500 when creating a PR from a branch that was the head
+        // of a recently merged PR. Check for this case and give an actionable error.
+        if (response.status >= 500) {
+            const mergedPR = await findMergedPRForBranch(options.owner, options.repo, options.head, token);
+            if (mergedPR) {
+                throw new Error(`Branch "${options.head}" was already used for merged PR #${mergedPR.number}. ` +
+                    `Push to a new branch name and try again.`);
+            }
+        }
+        await handleApiError(response, `creating PR in ${options.owner}/${options.repo}`);
+    }
+    return response.json();
+}
+/**
+ * Check if a merged PR exists for a given branch (used for diagnosing 500s on PR creation).
+ *
+ * Only searches the exact qualified head (owner:branch). We intentionally do NOT
+ * fall back to a bare branch name because that can match a different fork's branch
+ * and produce a misleading "branch already used" diagnosis.
+ *
+ * Returns null if the lookup fails (5xx, network error) so the caller falls through
+ * to the generic error handler rather than surfacing a wrong diagnosis.
+ */
+async function findMergedPRForBranch(owner, repo, head, token) {
+    const headParam = head.includes(':') ? head : `${owner}:${head}`;
+    try {
+        const response = await githubApiRequest('GET', `/repos/${owner}/${repo}/pulls?head=${encodeURIComponent(headParam)}&state=closed`, token);
+        if (!response.ok) {
+            console.error(`[github-api] Merged-PR lookup failed (head=${headParam}): HTTP ${response.status}`);
+            return null;
+        }
+        const prs = await response.json();
+        return prs.find((pr) => pr.merged_at) ?? null;
+    }
+    catch (err) {
+        console.error(`[github-api] Merged-PR lookup error (head=${headParam}): ${err}`);
+        return null;
+    }
+}
+/**
+ * Check if a PR already exists for a branch
+ */
+export async function findExistingPR(owner, repo, head) {
+    const token = await requireGitHubAuth();
+    // head format should be "owner:branch" for cross-repo or just "branch" for same-repo
+    const headParam = head.includes(':') ? head : `${owner}:${head}`;
+    const response = await githubApiRequest('GET', `/repos/${owner}/${repo}/pulls?head=${encodeURIComponent(headParam)}&state=open`, token);
+    if (!response.ok) {
+        if (response.status === 404)
+            return null;
+        await handleApiError(response, `checking for existing PR`);
+    }
+    const prs = await response.json();
+    return prs.length > 0 ? prs[0] : null;
+}
+// ============================================================================
+// Label operations
+// ============================================================================
+/**
+ * Add labels to an issue/PR
+ */
+export async function addLabelsToIssue(owner, repo, issueNumber, labels) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('POST', `/repos/${owner}/${repo}/issues/${issueNumber}/labels`, token, { labels });
+    if (!response.ok) {
+        await handleApiError(response, `adding labels to PR #${issueNumber}`);
+    }
+}
+/**
+ * Get all labels from an issue/PR
+ */
+export async function getLabelsFromIssue(owner, repo, issueNumber) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('GET', `/repos/${owner}/${repo}/issues/${issueNumber}/labels`, token);
+    if (!response.ok) {
+        await handleApiError(response, `getting labels from PR #${issueNumber}`);
+    }
+    const labels = await response.json();
+    return labels.map((l) => l.name);
+}
+/**
+ * Remove a label from an issue/PR
+ */
+export async function removeLabelFromIssue(owner, repo, issueNumber, labelName) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('DELETE', `/repos/${owner}/${repo}/issues/${issueNumber}/labels/${encodeURIComponent(labelName)}`, token);
+    // 404 is fine - label wasn't on the issue
+    if (!response.ok && response.status !== 404) {
+        await handleApiError(response, `removing label '${labelName}' from PR #${issueNumber}`);
+    }
+}
+/**
+ * Check if a label exists in the repo
+ */
+export async function labelExists(owner, repo, labelName) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('GET', `/repos/${owner}/${repo}/labels/${encodeURIComponent(labelName)}`, token);
+    return response.ok;
+}
+/**
+ * Create a label in the repo
+ */
+export async function createLabel(owner, repo, label) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('POST', `/repos/${owner}/${repo}/labels`, token, {
+        name: label.name,
+        color: label.color,
+        description: label.description,
+    });
+    if (!response.ok && response.status !== 422) {
+        // 422 means label already exists, which is fine
+        await handleApiError(response, `creating label '${label.name}'`);
+    }
+}
+/**
+ * Ensure all required Haystack labels exist in the repo
+ */
+export async function ensureHaystackLabels(owner, repo, labelNames) {
+    for (const name of labelNames) {
+        const labelInfo = HAYSTACK_LABELS[name];
+        if (!labelInfo)
+            continue;
+        const exists = await labelExists(owner, repo, name);
+        if (!exists) {
+            await createLabel(owner, repo, labelInfo);
+        }
+    }
+}
+// ============================================================================
+// Review request operations
+// ============================================================================
+/**
+ * Request reviewers on a pull request
+ */
+export async function requestReviewers(owner, repo, prNumber, reviewers) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('POST', `/repos/${owner}/${repo}/pulls/${prNumber}/requested_reviewers`, token, { reviewers });
+    if (!response.ok) {
+        await handleApiError(response, `requesting reviewers on PR #${prNumber}`);
+    }
+}
+// ============================================================================
+// User operations
+// ============================================================================
+/**
+ * Get the authenticated user's info
+ */
+export async function getCurrentUser() {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('GET', '/user', token);
+    if (!response.ok) {
+        await handleApiError(response, 'getting current user');
+    }
+    return response.json();
+}
+/**
+ * Check if user has push access to a repo
+ */
+export async function hasPushAccess(owner, repo) {
+    const token = await requireGitHubAuth();
+    const response = await githubApiRequest('GET', `/repos/${owner}/${repo}`, token);
+    if (!response.ok) {
+        return false;
+    }
+    const data = await response.json();
+    return data.permissions?.push === true;
+}

package/dist/utils/pending-state.d.ts

@@ -0,0 +1,40 @@
+/**
+ * Pending submit state persistence.
+ *
+ * Manages `.haystack/pending-submit.json` in the git root directory.
+ * This file persists across CLI sessions so that analysis results
+ * can be retrieved after disconnection.
+ */
+import type { AnalysisVerdict } from './analysis-api.js';
+export interface PendingSubmit {
+    version: 1;
+    prNumber: number;
+    prUrl: string;
+    owner: string;
+    repo: string;
+    branch: string;
+    baseBranch: string;
+    submittedAt: string;
+    status: 'polling' | 'completed' | 'failed' | 'stale';
+    analysisResult?: AnalysisVerdict;
+    resolvedAt?: string;
+    autoFix?: boolean;
+    autoFixStatus?: 'pending' | 'fixing' | 'fixed' | 'failed' | 'timed_out';
+}
+/**
+ * Save pending submit state to disk.
+ */
+export declare function savePendingSubmit(state: PendingSubmit, gitRoot?: string): void;
+/**
+ * Load pending submit state from disk.
+ * Returns null if no pending state exists or if it's stale.
+ */
+export declare function loadPendingSubmit(gitRoot?: string): PendingSubmit | null;
+/**
+ * Clear pending submit state (delete the file).
+ */
+export declare function clearPendingSubmit(gitRoot?: string): void;
+/**
+ * Update the status and optionally the analysis result of a pending submit.
+ */
+export declare function updatePendingSubmit(updates: Partial<Pick<PendingSubmit, 'status' | 'analysisResult' | 'resolvedAt'>>, gitRoot?: string): void;