symphony-github 0.1.0

package/dist/config/index.js

@@ -0,0 +1,357 @@
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'node:fs';
+import { resolve, basename, dirname } from 'node:path';
+import { createHash } from 'node:crypto';
+import YAML from 'yaml';
+import { normalizeLegacyRunMode } from '../runModes.js';
+import { globalConfigPath, worktreesDirPath, reposDirPath, findSymphonyHome } from '../paths.js';
+import { parseSwarmSettings } from '../swarm/config.js';
+const HOME = process.env.HOME || '';
+function expandPath(p) {
+    if (p.startsWith('~/'))
+        return resolve(HOME, p.slice(2));
+    return resolve(p);
+}
+/**
+ * Deep-merge two plain objects. `override` values take precedence.
+ * Arrays are replaced (not concatenated). Nested objects are merged recursively.
+ */
+function deepMerge(base, override) {
+    const result = { ...base };
+    for (const key of Object.keys(override)) {
+        const overVal = override[key];
+        const baseVal = result[key];
+        if (overVal && typeof overVal === 'object' && !Array.isArray(overVal) &&
+            baseVal && typeof baseVal === 'object' && !Array.isArray(baseVal)) {
+            result[key] = deepMerge(baseVal, overVal);
+        }
+        else {
+            result[key] = overVal;
+        }
+    }
+    return result;
+}
+/**
+ * Load and parse a YAML file, returning null if it doesn't exist.
+ */
+function loadYamlFile(filePath) {
+    if (!existsSync(filePath))
+        return null;
+    try {
+        const content = readFileSync(filePath, 'utf-8');
+        const parsed = YAML.parse(content);
+        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+            return parsed;
+        }
+    }
+    catch {
+        // Ignore malformed global config
+    }
+    return null;
+}
+/**
+ * Generate a stable session name from the project root, matching dmux convention:
+ * symphony-{projectName}-{hash8}
+ */
+export function generateSessionName(projectRoot) {
+    const name = basename(projectRoot).replace(/\./g, '-');
+    const hash = createHash('md5').update(projectRoot).digest('hex').slice(0, 8);
+    return `symphony-${name}-${hash}`;
+}
+const DEFAULT_TRIGGER = {
+    mode: 'mention_or_label',
+    labels: ['agent'],
+    mentions: ['@agent'],
+    ignore_labels: ['wontfix'],
+    allowed_author_associations: ['OWNER', 'COLLABORATOR', 'CONTRIBUTOR'],
+    require_assignee: false,
+    skip_if_handled: true,
+    skip_if_open_pr: true,
+    skip_if_claimed: true,
+    claim_label: 'agent:running',
+    done_label: 'agent:done',
+    failed_label: 'agent:failed',
+    include_existing_open_issues: false,
+};
+const DEFAULT_GITHUB_COMMENTS = {
+    verbosity: 'key_updates',
+};
+const VALID_TRIGGER_MODES = [
+    'yolo', 'mention_only', 'label_only',
+    'mention_or_label', 'mention_and_label', 'disabled',
+];
+const VALID_GITHUB_COMMENT_VERBOSITIES = [
+    'full',
+    'without_thinking',
+    'key_updates',
+    'silent',
+];
+const VALID_PROVIDERS = ['claude', 'codex', 'custom'];
+function normalizeRunMode(mode) {
+    return normalizeLegacyRunMode(mode);
+}
+function parseTrigger(raw) {
+    if (!raw)
+        return { ...DEFAULT_TRIGGER };
+    const t = { ...DEFAULT_TRIGGER };
+    if (raw.mode) {
+        if (!VALID_TRIGGER_MODES.includes(raw.mode)) {
+            throw new Error(`Invalid trigger mode: ${raw.mode}`);
+        }
+        t.mode = raw.mode;
+    }
+    if (Array.isArray(raw.labels))
+        t.labels = raw.labels;
+    if (Array.isArray(raw.mentions))
+        t.mentions = raw.mentions;
+    if (Array.isArray(raw.ignore_labels))
+        t.ignore_labels = raw.ignore_labels;
+    if (Array.isArray(raw.allowed_author_associations)) {
+        t.allowed_author_associations = raw.allowed_author_associations;
+    }
+    if (typeof raw.require_assignee === 'boolean')
+        t.require_assignee = raw.require_assignee;
+    if (typeof raw.skip_if_handled === 'boolean')
+        t.skip_if_handled = raw.skip_if_handled;
+    if (typeof raw.skip_if_open_pr === 'boolean')
+        t.skip_if_open_pr = raw.skip_if_open_pr;
+    if (typeof raw.skip_if_claimed === 'boolean')
+        t.skip_if_claimed = raw.skip_if_claimed;
+    if (typeof raw.claim_label === 'string')
+        t.claim_label = raw.claim_label;
+    if (typeof raw.done_label === 'string')
+        t.done_label = raw.done_label;
+    if (typeof raw.failed_label === 'string')
+        t.failed_label = raw.failed_label;
+    if (typeof raw.include_existing_open_issues === 'boolean') {
+        t.include_existing_open_issues = raw.include_existing_open_issues;
+    }
+    return t;
+}
+function parseGitHubComments(raw) {
+    if (!raw)
+        return { ...DEFAULT_GITHUB_COMMENTS };
+    const settings = { ...DEFAULT_GITHUB_COMMENTS };
+    if (raw.verbosity !== undefined) {
+        if (!VALID_GITHUB_COMMENT_VERBOSITIES.includes(raw.verbosity)) {
+            throw new Error(`Invalid GitHub comment verbosity: ${raw.verbosity}`);
+        }
+        settings.verbosity = raw.verbosity;
+    }
+    return settings;
+}
+function parseAgent(name, raw) {
+    if (!raw || typeof raw !== 'object') {
+        throw new Error(`Agent "${name}" must be an object`);
+    }
+    const provider = raw.provider || name;
+    if (!VALID_PROVIDERS.includes(provider) && provider !== name) {
+        // Allow agent names that match provider names
+    }
+    return {
+        provider,
+        model: raw.model,
+        thinking: raw.thinking,
+        permission_mode: raw.permission_mode,
+        create_pr: raw.create_pr || 'ready',
+        push: raw.push !== false,
+        timeout_min: raw.timeout_min || 45,
+        env: raw.env || {},
+        command: raw.command,
+    };
+}
+function parseRepo(raw) {
+    if (typeof raw === 'string') {
+        return { repo: raw };
+    }
+    if (typeof raw === 'object' && raw.repo) {
+        const rs = { repo: raw.repo };
+        if (raw.default_agent)
+            rs.default_agent = raw.default_agent;
+        const normalizedMode = normalizeRunMode(raw.mode);
+        if (normalizedMode)
+            rs.mode = normalizedMode;
+        if (raw.agent_overrides)
+            rs.agent_overrides = raw.agent_overrides;
+        if (raw.trigger)
+            rs.trigger = raw.trigger;
+        return rs;
+    }
+    throw new Error(`Invalid repo entry: ${JSON.stringify(raw)}`);
+}
+export function loadSettings(configPath) {
+    const fullPath = expandPath(configPath);
+    const content = readFileSync(fullPath, 'utf-8');
+    const projectConfig = YAML.parse(content);
+    if (!projectConfig || typeof projectConfig !== 'object') {
+        throw new Error('Config file must contain a YAML object');
+    }
+    // Merge: global (~/.symphony/config.yaml) < project (config.yaml)
+    const globalConfig = loadYamlFile(globalConfigPath());
+    const raw = globalConfig ? deepMerge(globalConfig, projectConfig) : projectConfig;
+    // Parse agents
+    const agents = {};
+    if (raw.agents && typeof raw.agents === 'object') {
+        for (const [name, agentRaw] of Object.entries(raw.agents)) {
+            agents[name] = parseAgent(name, agentRaw);
+        }
+    }
+    // Parse repos
+    const repos = [];
+    if (Array.isArray(raw.repos)) {
+        for (const r of raw.repos) {
+            repos.push(parseRepo(r));
+        }
+    }
+    // Parse routing
+    const routing = {
+        mention_map: raw.routing?.mention_map || {},
+    };
+    // Parse trigger
+    const trigger = parseTrigger(raw.trigger || raw.advanced?.trigger);
+    const github_comments = parseGitHubComments(raw.github_comments);
+    const mode = normalizeRunMode(raw.mode || 'auto_manual_merge');
+    if (!mode) {
+        throw new Error(`Invalid mode: ${raw.mode}`);
+    }
+    const swarm = parseSwarmSettings(raw.swarm);
+    return {
+        version: raw.version || 1,
+        default_agent: raw.default_agent || 'claude',
+        mode,
+        poll_interval_sec: typeof raw.poll_interval_sec === 'number' ? raw.poll_interval_sec : 2,
+        max_concurrent_runs: raw.max_concurrent_runs || 10,
+        clone_root: raw.clone_root ? expandPath(raw.clone_root) : reposDirPath(),
+        worktree_root: raw.worktree_root ? expandPath(raw.worktree_root) : worktreesDirPath(),
+        state_file: raw.state_file ? expandPath(raw.state_file) : resolve(findSymphonyHome(), 'state.json'),
+        runtime_root: raw.runtime_root ? expandPath(raw.runtime_root) : findSymphonyHome(),
+        agents,
+        routing,
+        github_comments,
+        repos,
+        trigger,
+        swarm,
+    };
+}
+export function loadConfigDocument(configPath) {
+    const fullPath = expandPath(configPath);
+    const content = readFileSync(fullPath, 'utf-8');
+    const raw = YAML.parse(content);
+    if (!raw)
+        return {};
+    if (typeof raw !== 'object' || Array.isArray(raw)) {
+        throw new Error('Config file must contain a YAML object');
+    }
+    return raw;
+}
+export function getTriggerForRepo(settings, repo) {
+    const repoSettings = settings.repos.find(r => r.repo === repo);
+    if (repoSettings?.trigger) {
+        return { ...settings.trigger, ...repoSettings.trigger };
+    }
+    return settings.trigger;
+}
+export function getModeForRepo(settings, repo) {
+    const repoSettings = settings.repos.find(r => r.repo === repo);
+    return repoSettings?.mode || settings.mode;
+}
+// ── Onboarding ──
+function unique(values) {
+    return Array.from(new Set(values));
+}
+function normalizeMention(mention) {
+    const trimmed = mention.trim();
+    if (!trimmed)
+        return '';
+    return trimmed.startsWith('@') ? trimmed : `@${trimmed}`;
+}
+export function buildOnboardingConfigYaml(baseConfig, draft) {
+    const config = baseConfig ? structuredClone(baseConfig) : {};
+    config.version ??= 1;
+    config.poll_interval_sec ??= 2;
+    config.max_concurrent_runs ??= 10;
+    config.default_agent = draft.defaultAgent;
+    config.mode = draft.runMode;
+    const existingAgents = config.agents && typeof config.agents === 'object' && !Array.isArray(config.agents)
+        ? config.agents
+        : {};
+    const agentNames = unique([
+        ...draft.configuredAgents,
+        draft.defaultAgent,
+        ...draft.mentionItems.map(item => item.agent),
+    ]).filter(Boolean);
+    config.agents = Object.fromEntries(agentNames.map(agent => {
+        const existing = existingAgents[agent];
+        const nextAgent = existing && typeof existing === 'object' && !Array.isArray(existing)
+            ? structuredClone(existing)
+            : {};
+        nextAgent.provider ??= agent;
+        nextAgent.timeout_min ??= 45;
+        nextAgent.create_pr ??= 'ready';
+        nextAgent.push ??= true;
+        if (draft.automationMode) {
+            nextAgent.permission_mode = draft.automationMode;
+        }
+        return [agent, nextAgent];
+    }));
+    const mentionItems = draft.mentionItems
+        .map(item => ({ mention: normalizeMention(item.mention), agent: item.agent }))
+        .filter(item => item.mention && item.agent);
+    config.routing = config.routing && typeof config.routing === 'object' && !Array.isArray(config.routing)
+        ? structuredClone(config.routing)
+        : {};
+    config.routing.mention_map = Object.fromEntries(mentionItems.map(item => [item.mention, item.agent]));
+    const githubComments = config.github_comments && typeof config.github_comments === 'object' && !Array.isArray(config.github_comments)
+        ? structuredClone(config.github_comments)
+        : {};
+    githubComments.verbosity = draft.githubCommentVerbosity;
+    config.github_comments = githubComments;
+    const existingRepos = Array.isArray(config.repos) ? config.repos : [];
+    const repoEntries = new Map();
+    for (const entry of existingRepos) {
+        if (typeof entry === 'string') {
+            repoEntries.set(entry, entry);
+        }
+        else if (entry && typeof entry === 'object' && typeof entry.repo === 'string') {
+            repoEntries.set(entry.repo, structuredClone(entry));
+        }
+    }
+    config.repos = draft.repos.map(repo => repoEntries.get(repo) ?? repo);
+    const trigger = config.trigger && typeof config.trigger === 'object' && !Array.isArray(config.trigger)
+        ? structuredClone(config.trigger)
+        : {};
+    trigger.mode = draft.triggerMode;
+    trigger.labels = Array.isArray(trigger.labels) && trigger.labels.length > 0 ? trigger.labels : ['agent'];
+    trigger.mentions = mentionItems.map(item => item.mention);
+    trigger.ignore_labels = Array.isArray(trigger.ignore_labels) && trigger.ignore_labels.length > 0
+        ? trigger.ignore_labels
+        : ['wontfix'];
+    trigger.claim_label ??= 'agent:running';
+    trigger.done_label ??= 'agent:done';
+    trigger.failed_label ??= 'agent:failed';
+    trigger.include_existing_open_issues = draft.includeExistingOpenIssues;
+    config.trigger = trigger;
+    if (config.advanced && typeof config.advanced === 'object' && !Array.isArray(config.advanced)) {
+        delete config.advanced.trigger;
+        if (Object.keys(config.advanced).length === 0) {
+            delete config.advanced;
+        }
+    }
+    return YAML.stringify(config);
+}
+/**
+ * Write config YAML to disk and return loaded settings.
+ * Called by the Ink-based Onboarding component when the user confirms.
+ */
+export function writeConfigAndLoad(configPath, yamlContent) {
+    const fullPath = resolve(configPath);
+    const dir = dirname(fullPath);
+    if (!existsSync(dir))
+        mkdirSync(dir, { recursive: true });
+    writeFileSync(fullPath, yamlContent);
+    return loadSettings(fullPath);
+}
+export function writeOnboardingConfigAndLoad(configPath, baseConfig, draft) {
+    const yamlContent = buildOnboardingConfigYaml(baseConfig, draft);
+    return writeConfigAndLoad(configPath, yamlContent);
+}
+//# sourceMappingURL=index.js.map

package/dist/config/index.js.map

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

package/dist/git/merge.d.ts

@@ -0,0 +1,23 @@
+import type { MergeValidationResult } from '../types.js';
+/**
+ * Validate whether a merge can proceed.
+ */
+export declare function validateMerge(worktreePath: string): Promise<MergeValidationResult>;
+/**
+ * Execute a two-phase merge (dmux-style):
+ * Phase 1: Merge main → worktree (get latest, detect conflicts)
+ * Phase 2: Merge worktree → main (bring changes back)
+ */
+export declare function executeTwoPhaseMerge(worktreePath: string, clonePath: string): Promise<{
+    success: boolean;
+    error?: string;
+}>;
+/**
+ * Simple merge of worktree branch back to main within the worktree itself.
+ * Used when we don't need the two-phase approach.
+ */
+export declare function mergeWorktreeToMain(worktreePath: string): Promise<{
+    success: boolean;
+    error?: string;
+}>;
+//# sourceMappingURL=merge.d.ts.map

package/dist/git/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/git/merge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAc,MAAM,aAAa,CAAC;AAErE;;GAEG;AACH,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAqCxF;AAqBD;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0C/C;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiC/C"}

package/dist/git/merge.js

@@ -0,0 +1,131 @@
+import { run, runSafe } from '../utils/shell.js';
+import { getMainBranch, getCurrentBranch, hasUncommittedChanges, getCommitCount } from './utils.js';
+/**
+ * Validate whether a merge can proceed.
+ */
+export async function validateMerge(worktreePath) {
+    const issues = [];
+    const mainBranch = await getMainBranch(worktreePath);
+    const worktreeBranch = await getCurrentBranch(worktreePath);
+    // Check worktree for uncommitted changes
+    if (await hasUncommittedChanges(worktreePath)) {
+        issues.push({
+            type: 'worktree_uncommitted',
+            message: 'Worktree has uncommitted changes',
+        });
+    }
+    // Check if there are commits to merge
+    const commitCount = await getCommitCount(mainBranch, worktreeBranch, worktreePath);
+    if (commitCount === 0) {
+        issues.push({
+            type: 'nothing_to_merge',
+            message: 'No commits to merge',
+        });
+    }
+    // Simulate merge to detect conflicts
+    const conflictResult = await detectMergeConflicts(worktreePath, mainBranch, worktreeBranch);
+    if (conflictResult) {
+        issues.push({
+            type: 'merge_conflict',
+            message: `Merge conflicts detected: ${conflictResult}`,
+        });
+    }
+    return {
+        canMerge: issues.length === 0,
+        issues,
+        mainBranch,
+        worktreeBranch,
+    };
+}
+/**
+ * Detect merge conflicts without touching the filesystem.
+ * Returns conflict description or null if clean.
+ */
+async function detectMergeConflicts(cwd, mainBranch, worktreeBranch) {
+    const result = await runSafe('git', [
+        'merge-tree', '--write-tree', mainBranch, worktreeBranch,
+    ], { cwd });
+    if (result.exitCode !== 0 && result.stderr.includes('CONFLICT')) {
+        return result.stderr;
+    }
+    return null;
+}
+/**
+ * Execute a two-phase merge (dmux-style):
+ * Phase 1: Merge main → worktree (get latest, detect conflicts)
+ * Phase 2: Merge worktree → main (bring changes back)
+ */
+export async function executeTwoPhaseMerge(worktreePath, clonePath) {
+    const mainBranch = await getMainBranch(worktreePath);
+    const worktreeBranch = await getCurrentBranch(worktreePath);
+    // Phase 1: Merge main into worktree
+    const phase1 = await runSafe('git', ['merge', mainBranch, '--no-edit'], { cwd: worktreePath });
+    if (phase1.exitCode !== 0) {
+        // Check if it's a conflict
+        if (phase1.stderr.includes('CONFLICT') || phase1.stdout.includes('CONFLICT')) {
+            // Abort the merge
+            await runSafe('git', ['merge', '--abort'], { cwd: worktreePath });
+            return {
+                success: false,
+                error: `Merge conflicts when merging ${mainBranch} into ${worktreeBranch}. Manual resolution needed.`,
+            };
+        }
+        return { success: false, error: `Phase 1 merge failed: ${phase1.stderr}` };
+    }
+    // Phase 2: Merge worktree back into main (from the clone/main repo)
+    // First, checkout main in the clone
+    const phase2Checkout = await runSafe('git', ['checkout', mainBranch], { cwd: clonePath });
+    if (phase2Checkout.exitCode !== 0) {
+        // Try with bare repo approach
+        const mergeResult = await runSafe('git', [
+            'merge', '--ff-only', worktreeBranch,
+        ], { cwd: clonePath });
+        if (mergeResult.exitCode !== 0) {
+            return { success: false, error: `Phase 2 merge failed: ${mergeResult.stderr}` };
+        }
+    }
+    else {
+        const mergeResult = await runSafe('git', [
+            'merge', '--ff-only', worktreeBranch,
+        ], { cwd: clonePath });
+        if (mergeResult.exitCode !== 0) {
+            return { success: false, error: `Phase 2 fast-forward failed: ${mergeResult.stderr}` };
+        }
+    }
+    return { success: true };
+}
+/**
+ * Simple merge of worktree branch back to main within the worktree itself.
+ * Used when we don't need the two-phase approach.
+ */
+export async function mergeWorktreeToMain(worktreePath) {
+    const mainBranch = await getMainBranch(worktreePath);
+    const worktreeBranch = await getCurrentBranch(worktreePath);
+    // Stash any uncommitted changes
+    const hasChanges = await hasUncommittedChanges(worktreePath);
+    if (hasChanges) {
+        await run('git', ['stash'], { cwd: worktreePath });
+    }
+    // Checkout main
+    const checkout = await runSafe('git', ['checkout', mainBranch], { cwd: worktreePath });
+    if (checkout.exitCode !== 0) {
+        return { success: false, error: `Cannot checkout ${mainBranch}: ${checkout.stderr}` };
+    }
+    // Merge
+    const merge = await runSafe('git', ['merge', worktreeBranch, '--no-edit'], { cwd: worktreePath });
+    if (merge.exitCode !== 0) {
+        // Abort and go back
+        await runSafe('git', ['merge', '--abort'], { cwd: worktreePath });
+        await runSafe('git', ['checkout', worktreeBranch], { cwd: worktreePath });
+        if (hasChanges)
+            await runSafe('git', ['stash', 'pop'], { cwd: worktreePath });
+        return { success: false, error: `Merge failed: ${merge.stderr}` };
+    }
+    // Go back to worktree branch
+    await runSafe('git', ['checkout', worktreeBranch], { cwd: worktreePath });
+    if (hasChanges) {
+        await runSafe('git', ['stash', 'pop'], { cwd: worktreePath });
+    }
+    return { success: true };
+}
+//# sourceMappingURL=merge.js.map

package/dist/git/merge.js.map

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

package/dist/git/utils.d.ts

@@ -0,0 +1,34 @@
+export declare function getMainBranch(cwd: string): Promise<string>;
+export declare function getCurrentBranch(cwd: string): Promise<string>;
+export declare function branchExists(branch: string, cwd: string): Promise<boolean>;
+export declare function hasUncommittedChanges(cwd: string): Promise<boolean>;
+export declare function getConflictedFiles(cwd: string): Promise<string[]>;
+export declare function getHeadSha(cwd: string): Promise<string>;
+export declare function getCommitCount(from: string, to: string, cwd: string): Promise<number>;
+export declare function hasDiffBetweenRefs(from: string, to: string, cwd: string): Promise<boolean>;
+export declare function getChangedFiles(from: string, to: string, cwd: string): Promise<string[]>;
+export declare function hasCommittedChanges(from: string, to: string, cwd: string): Promise<boolean>;
+export declare function getGitRoot(cwd: string): Promise<string>;
+export declare function isGitWorktree(path: string): Promise<boolean>;
+export declare function fetchOrigin(cwd: string): Promise<{
+    ok: boolean;
+    detail?: string;
+}>;
+export declare function resolveBranchRef(cwd: string, branch: string): Promise<string | undefined>;
+export declare function fetchBranchRef(cwd: string, remote: string, branch: string): Promise<{
+    ref?: string;
+    detail?: string;
+}>;
+export declare function findUnresolvedMergeMarkers(cwd: string): Promise<string[]>;
+export declare function pushBranch(branch: string, cwd: string): Promise<{
+    ok: boolean;
+    detail?: string;
+}>;
+export declare function stageAll(cwd: string): Promise<void>;
+export declare function commit(message: string, cwd: string): Promise<void>;
+export declare function getDiffStats(baseSha: string, cwd: string): Promise<{
+    added: number;
+    removed: number;
+}>;
+export declare function isValidBranchName(name: string): boolean;
+//# sourceMappingURL=utils.d.ts.map

package/dist/git/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/git/utils.ts"],"names":[],"mappings":"AAIA,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAchE;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEnE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGhF;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOzE;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAIvE;AAiBD,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE7D;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK3F;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEhG;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW9F;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGjG;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE7D;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASlE;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAaxF;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB/F;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqC5C;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAkB/E;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAa3C;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzD;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAExE;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB7C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD"}