@bretwardjames/ghp-core 0.1.6 → 0.1.7

package/dist/index.cjs

@@ -21,7 +21,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   BranchLinker: () => BranchLinker,
+  CLI_TO_VSCODE_MAP: () => CLI_TO_VSCODE_MAP,
+  DEFAULT_VALUES: () => DEFAULT_VALUES,
   GitHubAPI: () => GitHubAPI,
+  SETTING_DISPLAY_NAMES: () => SETTING_DISPLAY_NAMES,
+  SYNCABLE_KEYS: () => SYNCABLE_KEYS,
+  VSCODE_TO_CLI_MAP: () => VSCODE_TO_CLI_MAP,
   branchExists: () => branchExists,
   buildIssueUrl: () => buildIssueUrl,
   buildOrgProjectUrl: () => buildOrgProjectUrl,
@@ -29,28 +34,39 @@ __export(index_exports, {
   buildPullRequestUrl: () => buildPullRequestUrl,
   buildRepoUrl: () => buildRepoUrl,
   checkoutBranch: () => checkoutBranch,
+  computeSettingsDiff: () => computeSettingsDiff,
   createBranch: () => createBranch,
   detectRepository: () => detectRepository,
   fetchOrigin: () => fetchOrigin,
+  formatConflict: () => formatConflict,
   generateBranchName: () => generateBranchName,
   getAllBranches: () => getAllBranches,
   getCommitsAhead: () => getCommitsAhead,
   getCommitsBehind: () => getCommitsBehind,
   getCurrentBranch: () => getCurrentBranch,
   getDefaultBranch: () => getDefaultBranch,
+  getDiffSummary: () => getDiffSummary,
   getLocalBranches: () => getLocalBranches,
   getRemoteBranches: () => getRemoteBranches,
   getRepositoryRoot: () => getRepositoryRoot,
+  hasDifferences: () => hasDifferences,
   hasUncommittedChanges: () => hasUncommittedChanges,
   isGitRepository: () => isGitRepository,
+  normalizeVSCodeSettings: () => normalizeVSCodeSettings,
   parseBranchLink: () => parseBranchLink,
   parseGitHubUrl: () => parseGitHubUrl,
   parseIssueUrl: () => parseIssueUrl,
   pullLatest: () => pullLatest,
   queries: () => queries_exports,
   removeBranchLinkFromBody: () => removeBranchLinkFromBody,
+  resolveConflicts: () => resolveConflicts,
   sanitizeForBranchName: () => sanitizeForBranchName,
-  setBranchLinkInBody: () => setBranchLinkInBody
+  setBranchLinkInBody: () => setBranchLinkInBody,
+  skip: () => skip,
+  toVSCodeSettings: () => toVSCodeSettings,
+  useCli: () => useCli,
+  useCustom: () => useCustom,
+  useVSCode: () => useVSCode
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -1331,10 +1347,177 @@ async function getDefaultBranch(options = {}) {
   }
   return "master";
 }
+
+// src/sync.ts
+var SYNCABLE_KEYS = [
+  "mainBranch",
+  "branchPattern",
+  "startWorkingStatus",
+  "doneStatus"
+];
+var SETTING_DISPLAY_NAMES = {
+  mainBranch: "Main Branch",
+  branchPattern: "Branch Name Pattern",
+  startWorkingStatus: "Start Working Status",
+  doneStatus: "Done/PR Merged Status"
+};
+var VSCODE_TO_CLI_MAP = {
+  "mainBranch": "mainBranch",
+  "branchNamePattern": "branchPattern",
+  "startWorkingStatus": "startWorkingStatus",
+  "prMergedStatus": "doneStatus"
+};
+var CLI_TO_VSCODE_MAP = {
+  mainBranch: "mainBranch",
+  branchPattern: "branchNamePattern",
+  startWorkingStatus: "startWorkingStatus",
+  doneStatus: "prMergedStatus"
+};
+var DEFAULT_VALUES = {
+  mainBranch: "main",
+  branchPattern: "{user}/{number}-{title}",
+  startWorkingStatus: "In Progress",
+  doneStatus: "Done"
+};
+function normalizeVSCodeSettings(vscodeSettings) {
+  const result = {};
+  for (const [vscodeKey, cliKey] of Object.entries(VSCODE_TO_CLI_MAP)) {
+    const value = vscodeSettings[vscodeKey];
+    if (typeof value === "string" && value.trim() !== "") {
+      result[cliKey] = value;
+    }
+  }
+  return result;
+}
+function toVSCodeSettings(settings, includePrefix = true) {
+  const result = {};
+  const prefix = includePrefix ? "ghProjects." : "";
+  for (const [cliKey, value] of Object.entries(settings)) {
+    if (value !== void 0) {
+      const vscodeKey = CLI_TO_VSCODE_MAP[cliKey];
+      if (vscodeKey) {
+        result[`${prefix}${vscodeKey}`] = value;
+      }
+    }
+  }
+  return result;
+}
+function computeSettingsDiff(cliSettings, vscodeSettings) {
+  const diff = {
+    conflicts: [],
+    matching: [],
+    cliOnly: [],
+    vscodeOnly: []
+  };
+  for (const key of SYNCABLE_KEYS) {
+    const cliValue = cliSettings[key];
+    const vscodeValue = vscodeSettings[key];
+    const cliDefined = cliValue !== void 0 && cliValue !== "";
+    const vscodeDefined = vscodeValue !== void 0 && vscodeValue !== "";
+    if (cliDefined && vscodeDefined) {
+      if (cliValue === vscodeValue) {
+        diff.matching.push({ key, value: cliValue });
+      } else {
+        diff.conflicts.push({
+          key,
+          displayName: SETTING_DISPLAY_NAMES[key],
+          cliValue,
+          vscodeValue
+        });
+      }
+    } else if (cliDefined) {
+      diff.cliOnly.push({ key, value: cliValue });
+    } else if (vscodeDefined) {
+      diff.vscodeOnly.push({ key, value: vscodeValue });
+    }
+  }
+  return diff;
+}
+function hasDifferences(diff) {
+  return diff.conflicts.length > 0 || diff.cliOnly.length > 0 || diff.vscodeOnly.length > 0;
+}
+function resolveConflicts(diff, choices, syncUnique = true) {
+  const cliUpdates = {};
+  const vscodeUpdates = {};
+  for (const conflict of diff.conflicts) {
+    const choice = choices[conflict.key] || { type: "skip" };
+    switch (choice.type) {
+      case "cli":
+        if (conflict.cliValue !== void 0) {
+          vscodeUpdates[conflict.key] = conflict.cliValue;
+        }
+        break;
+      case "vscode":
+        if (conflict.vscodeValue !== void 0) {
+          cliUpdates[conflict.key] = conflict.vscodeValue;
+        }
+        break;
+      case "custom":
+        cliUpdates[conflict.key] = choice.value;
+        vscodeUpdates[conflict.key] = choice.value;
+        break;
+      case "skip":
+        break;
+    }
+  }
+  if (syncUnique) {
+    for (const { key, value } of diff.cliOnly) {
+      vscodeUpdates[key] = value;
+    }
+    for (const { key, value } of diff.vscodeOnly) {
+      cliUpdates[key] = value;
+    }
+  }
+  return {
+    cli: cliUpdates,
+    vscode: toVSCodeSettings(vscodeUpdates, false)
+  };
+}
+function useCli() {
+  return { type: "cli" };
+}
+function useVSCode() {
+  return { type: "vscode" };
+}
+function useCustom(value) {
+  return { type: "custom", value };
+}
+function skip() {
+  return { type: "skip" };
+}
+function formatConflict(conflict) {
+  return `${conflict.displayName}:
+  CLI:    "${conflict.cliValue ?? "(not set)"}"
+  VSCode: "${conflict.vscodeValue ?? "(not set)"}"`;
+}
+function getDiffSummary(diff) {
+  const parts = [];
+  if (diff.conflicts.length > 0) {
+    parts.push(`${diff.conflicts.length} conflicting setting(s)`);
+  }
+  if (diff.cliOnly.length > 0) {
+    parts.push(`${diff.cliOnly.length} CLI-only setting(s)`);
+  }
+  if (diff.vscodeOnly.length > 0) {
+    parts.push(`${diff.vscodeOnly.length} VSCode-only setting(s)`);
+  }
+  if (diff.matching.length > 0) {
+    parts.push(`${diff.matching.length} matching setting(s)`);
+  }
+  if (parts.length === 0) {
+    return "No settings to compare";
+  }
+  return parts.join(", ");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BranchLinker,
+  CLI_TO_VSCODE_MAP,
+  DEFAULT_VALUES,
   GitHubAPI,
+  SETTING_DISPLAY_NAMES,
+  SYNCABLE_KEYS,
+  VSCODE_TO_CLI_MAP,
   branchExists,
   buildIssueUrl,
   buildOrgProjectUrl,
@@ -1342,26 +1525,37 @@ async function getDefaultBranch(options = {}) {
   buildPullRequestUrl,
   buildRepoUrl,
   checkoutBranch,
+  computeSettingsDiff,
   createBranch,
   detectRepository,
   fetchOrigin,
+  formatConflict,
   generateBranchName,
   getAllBranches,
   getCommitsAhead,
   getCommitsBehind,
   getCurrentBranch,
   getDefaultBranch,
+  getDiffSummary,
   getLocalBranches,
   getRemoteBranches,
   getRepositoryRoot,
+  hasDifferences,
   hasUncommittedChanges,
   isGitRepository,
+  normalizeVSCodeSettings,
   parseBranchLink,
   parseGitHubUrl,
   parseIssueUrl,
   pullLatest,
   queries,
   removeBranchLinkFromBody,
+  resolveConflicts,
   sanitizeForBranchName,
-  setBranchLinkInBody
+  setBranchLinkInBody,
+  skip,
+  toVSCodeSettings,
+  useCli,
+  useCustom,
+  useVSCode
 });

package/dist/index.d.cts

@@ -697,6 +697,161 @@ declare function buildProjectUrl(owner: string, projectNumber: number): string;
  */
 declare function buildOrgProjectUrl(org: string, projectNumber: number): string;
 
+/**
+ * Settings Sync Module
+ *
+ * Provides shared logic for bidirectional sync between ghp-cli and VSCode extension.
+ * This module handles the 4 settings that overlap between CLI and VSCode:
+ * - mainBranch
+ * - branchPattern (CLI) / branchNamePattern (VSCode)
+ * - startWorkingStatus
+ * - doneStatus (CLI) / prMergedStatus (VSCode)
+ */
+/**
+ * The canonical setting keys used in sync operations.
+ * These are the CLI key names (used as the canonical form).
+ */
+type SyncableSettingKey = 'mainBranch' | 'branchPattern' | 'startWorkingStatus' | 'doneStatus';
+/**
+ * Settings that can be synced between CLI and VSCode.
+ * Uses CLI key names as the canonical form.
+ */
+interface SyncableSettings {
+    mainBranch?: string;
+    branchPattern?: string;
+    startWorkingStatus?: string;
+    doneStatus?: string;
+}
+/**
+ * A source of settings (CLI or VSCode)
+ */
+type SettingsSource = 'cli' | 'vscode';
+/**
+ * Represents a conflict where a setting has different values in CLI and VSCode
+ */
+interface SettingConflict {
+    key: SyncableSettingKey;
+    displayName: string;
+    cliValue: string | undefined;
+    vscodeValue: string | undefined;
+}
+/**
+ * Result of comparing CLI and VSCode settings
+ */
+interface SettingsDiff {
+    /** Settings that differ between CLI and VSCode */
+    conflicts: SettingConflict[];
+    /** Settings that are the same in both */
+    matching: Array<{
+        key: SyncableSettingKey;
+        value: string;
+    }>;
+    /** Settings only defined in CLI */
+    cliOnly: Array<{
+        key: SyncableSettingKey;
+        value: string;
+    }>;
+    /** Settings only defined in VSCode */
+    vscodeOnly: Array<{
+        key: SyncableSettingKey;
+        value: string;
+    }>;
+}
+/**
+ * User's choice for how to resolve a conflict
+ */
+type ConflictResolution = {
+    type: 'cli';
+} | {
+    type: 'vscode';
+} | {
+    type: 'custom';
+    value: string;
+} | {
+    type: 'skip';
+};
+/**
+ * Map of user choices for each conflicting setting
+ */
+type ConflictChoices = Partial<Record<SyncableSettingKey, ConflictResolution>>;
+/**
+ * Result of resolving conflicts - settings to write to each target
+ */
+interface ResolvedSettings {
+    /** Settings to write to CLI config */
+    cli: SyncableSettings;
+    /** Settings to write to VSCode (using VSCode key names) */
+    vscode: Record<string, string>;
+}
+/**
+ * All syncable setting keys
+ */
+declare const SYNCABLE_KEYS: readonly SyncableSettingKey[];
+/**
+ * Human-readable names for each setting
+ */
+declare const SETTING_DISPLAY_NAMES: Record<SyncableSettingKey, string>;
+/**
+ * Mapping from VSCode setting keys to CLI setting keys
+ */
+declare const VSCODE_TO_CLI_MAP: Record<string, SyncableSettingKey>;
+/**
+ * Mapping from CLI setting keys to VSCode setting keys
+ */
+declare const CLI_TO_VSCODE_MAP: Record<SyncableSettingKey, string>;
+/**
+ * Default values for each setting
+ */
+declare const DEFAULT_VALUES: Record<SyncableSettingKey, string>;
+/**
+ * Convert VSCode settings object to canonical CLI key names
+ */
+declare function normalizeVSCodeSettings(vscodeSettings: Record<string, unknown>): SyncableSettings;
+/**
+ * Convert CLI settings to VSCode key names (with ghProjects. prefix)
+ */
+declare function toVSCodeSettings(settings: SyncableSettings, includePrefix?: boolean): Record<string, string>;
+/**
+ * Compare settings from CLI and VSCode and identify differences
+ */
+declare function computeSettingsDiff(cliSettings: SyncableSettings, vscodeSettings: SyncableSettings): SettingsDiff;
+/**
+ * Check if there are any differences that need syncing
+ */
+declare function hasDifferences(diff: SettingsDiff): boolean;
+/**
+ * Resolve conflicts based on user choices and compute final settings for each target
+ *
+ * @param diff The diff result from computeSettingsDiff
+ * @param choices User's choices for each conflict
+ * @param syncUnique Whether to sync settings that only exist in one source to the other
+ */
+declare function resolveConflicts(diff: SettingsDiff, choices: ConflictChoices, syncUnique?: boolean): ResolvedSettings;
+/**
+ * Helper to create a "use CLI" resolution
+ */
+declare function useCli(): ConflictResolution;
+/**
+ * Helper to create a "use VSCode" resolution
+ */
+declare function useVSCode(): ConflictResolution;
+/**
+ * Helper to create a "custom value" resolution
+ */
+declare function useCustom(value: string): ConflictResolution;
+/**
+ * Helper to create a "skip" resolution
+ */
+declare function skip(): ConflictResolution;
+/**
+ * Format a conflict for display (useful for CLI output)
+ */
+declare function formatConflict(conflict: SettingConflict): string;
+/**
+ * Get a summary of the diff for display
+ */
+declare function getDiffSummary(diff: SettingsDiff): string;
+
 /**
  * GraphQL query strings for GitHub Projects V2 API.
  *
@@ -833,4 +988,4 @@ declare namespace queries {
   export { queries_ADD_COMMENT_MUTATION as ADD_COMMENT_MUTATION, queries_ADD_LABELS_MUTATION as ADD_LABELS_MUTATION, queries_ADD_TO_PROJECT_MUTATION as ADD_TO_PROJECT_MUTATION, queries_COLLABORATORS_QUERY as COLLABORATORS_QUERY, queries_CREATE_ISSUE_MUTATION as CREATE_ISSUE_MUTATION, queries_ISSUES_WITH_LABEL_QUERY as ISSUES_WITH_LABEL_QUERY, queries_ISSUE_AND_LABEL_QUERY as ISSUE_AND_LABEL_QUERY, queries_ISSUE_DETAILS_QUERY as ISSUE_DETAILS_QUERY, queries_ISSUE_FOR_UPDATE_QUERY as ISSUE_FOR_UPDATE_QUERY, queries_ISSUE_NODE_ID_QUERY as ISSUE_NODE_ID_QUERY, queries_ISSUE_TYPES_QUERY as ISSUE_TYPES_QUERY, queries_LABEL_EXISTS_QUERY as LABEL_EXISTS_QUERY, queries_PROJECT_FIELDS_QUERY as PROJECT_FIELDS_QUERY, queries_PROJECT_ITEMS_QUERY as PROJECT_ITEMS_QUERY, queries_PROJECT_VIEWS_QUERY as PROJECT_VIEWS_QUERY, queries_RECENT_ISSUES_QUERY as RECENT_ISSUES_QUERY, queries_REMOVE_LABELS_MUTATION as REMOVE_LABELS_MUTATION, queries_REPOSITORY_ID_QUERY as REPOSITORY_ID_QUERY, queries_REPOSITORY_PROJECTS_QUERY as REPOSITORY_PROJECTS_QUERY, queries_UPDATE_ISSUE_BODY_MUTATION as UPDATE_ISSUE_BODY_MUTATION, queries_UPDATE_ISSUE_MUTATION as UPDATE_ISSUE_MUTATION, queries_UPDATE_ISSUE_TYPE_MUTATION as UPDATE_ISSUE_TYPE_MUTATION, queries_UPDATE_ITEM_FIELD_MUTATION as UPDATE_ITEM_FIELD_MUTATION, queries_UPDATE_ITEM_STATUS_MUTATION as UPDATE_ITEM_STATUS_MUTATION, queries_VIEWER_QUERY as VIEWER_QUERY };
 }
 
-export { type AssigneeInfo, type AuthError, BranchLinker, type Collaborator, type DateFieldValue, type FieldInfo, type FieldValue, type FieldValueConnection, GitHubAPI, type GitHubAPIOptions, type GitOptions, type IssueDetails, type IssueReference, type IterationFieldValue, type LabelInfo, type NumberFieldValue, type Project, type ProjectConfig, type ProjectItem, type ProjectItemContent, type ProjectItemsQueryResponse, type ProjectV2, type ProjectV2Field, type ProjectV2Item, type ProjectV2View, type ProjectWithViews, type ProjectsQueryResponse, type RepoInfo, type SingleSelectFieldValue, type StatusField, type TextFieldValue, type TokenProvider, branchExists, buildIssueUrl, buildOrgProjectUrl, buildProjectUrl, buildPullRequestUrl, buildRepoUrl, checkoutBranch, createBranch, detectRepository, fetchOrigin, generateBranchName, getAllBranches, getCommitsAhead, getCommitsBehind, getCurrentBranch, getDefaultBranch, getLocalBranches, getRemoteBranches, getRepositoryRoot, hasUncommittedChanges, isGitRepository, parseBranchLink, parseGitHubUrl, parseIssueUrl, pullLatest, queries, removeBranchLinkFromBody, sanitizeForBranchName, setBranchLinkInBody };
+export { type AssigneeInfo, type AuthError, BranchLinker, CLI_TO_VSCODE_MAP, type Collaborator, type ConflictChoices, type ConflictResolution, DEFAULT_VALUES, type DateFieldValue, type FieldInfo, type FieldValue, type FieldValueConnection, GitHubAPI, type GitHubAPIOptions, type GitOptions, type IssueDetails, type IssueReference, type IterationFieldValue, type LabelInfo, type NumberFieldValue, type Project, type ProjectConfig, type ProjectItem, type ProjectItemContent, type ProjectItemsQueryResponse, type ProjectV2, type ProjectV2Field, type ProjectV2Item, type ProjectV2View, type ProjectWithViews, type ProjectsQueryResponse, type RepoInfo, type ResolvedSettings, SETTING_DISPLAY_NAMES, SYNCABLE_KEYS, type SettingConflict, type SettingsDiff, type SettingsSource, type SingleSelectFieldValue, type StatusField, type SyncableSettingKey, type SyncableSettings, type TextFieldValue, type TokenProvider, VSCODE_TO_CLI_MAP, branchExists, buildIssueUrl, buildOrgProjectUrl, buildProjectUrl, buildPullRequestUrl, buildRepoUrl, checkoutBranch, computeSettingsDiff, createBranch, detectRepository, fetchOrigin, formatConflict, generateBranchName, getAllBranches, getCommitsAhead, getCommitsBehind, getCurrentBranch, getDefaultBranch, getDiffSummary, getLocalBranches, getRemoteBranches, getRepositoryRoot, hasDifferences, hasUncommittedChanges, isGitRepository, normalizeVSCodeSettings, parseBranchLink, parseGitHubUrl, parseIssueUrl, pullLatest, queries, removeBranchLinkFromBody, resolveConflicts, sanitizeForBranchName, setBranchLinkInBody, skip, toVSCodeSettings, useCli, useCustom, useVSCode };

package/dist/index.d.ts

@@ -697,6 +697,161 @@ declare function buildProjectUrl(owner: string, projectNumber: number): string;
  */
 declare function buildOrgProjectUrl(org: string, projectNumber: number): string;
 
+/**
+ * Settings Sync Module
+ *
+ * Provides shared logic for bidirectional sync between ghp-cli and VSCode extension.
+ * This module handles the 4 settings that overlap between CLI and VSCode:
+ * - mainBranch
+ * - branchPattern (CLI) / branchNamePattern (VSCode)
+ * - startWorkingStatus
+ * - doneStatus (CLI) / prMergedStatus (VSCode)
+ */
+/**
+ * The canonical setting keys used in sync operations.
+ * These are the CLI key names (used as the canonical form).
+ */
+type SyncableSettingKey = 'mainBranch' | 'branchPattern' | 'startWorkingStatus' | 'doneStatus';
+/**
+ * Settings that can be synced between CLI and VSCode.
+ * Uses CLI key names as the canonical form.
+ */
+interface SyncableSettings {
+    mainBranch?: string;
+    branchPattern?: string;
+    startWorkingStatus?: string;
+    doneStatus?: string;
+}
+/**
+ * A source of settings (CLI or VSCode)
+ */
+type SettingsSource = 'cli' | 'vscode';
+/**
+ * Represents a conflict where a setting has different values in CLI and VSCode
+ */
+interface SettingConflict {
+    key: SyncableSettingKey;
+    displayName: string;
+    cliValue: string | undefined;
+    vscodeValue: string | undefined;
+}
+/**
+ * Result of comparing CLI and VSCode settings
+ */
+interface SettingsDiff {
+    /** Settings that differ between CLI and VSCode */
+    conflicts: SettingConflict[];
+    /** Settings that are the same in both */
+    matching: Array<{
+        key: SyncableSettingKey;
+        value: string;
+    }>;
+    /** Settings only defined in CLI */
+    cliOnly: Array<{
+        key: SyncableSettingKey;
+        value: string;
+    }>;
+    /** Settings only defined in VSCode */
+    vscodeOnly: Array<{
+        key: SyncableSettingKey;
+        value: string;
+    }>;
+}
+/**
+ * User's choice for how to resolve a conflict
+ */
+type ConflictResolution = {
+    type: 'cli';
+} | {
+    type: 'vscode';
+} | {
+    type: 'custom';
+    value: string;
+} | {
+    type: 'skip';
+};
+/**
+ * Map of user choices for each conflicting setting
+ */
+type ConflictChoices = Partial<Record<SyncableSettingKey, ConflictResolution>>;
+/**
+ * Result of resolving conflicts - settings to write to each target
+ */
+interface ResolvedSettings {
+    /** Settings to write to CLI config */
+    cli: SyncableSettings;
+    /** Settings to write to VSCode (using VSCode key names) */
+    vscode: Record<string, string>;
+}
+/**
+ * All syncable setting keys
+ */
+declare const SYNCABLE_KEYS: readonly SyncableSettingKey[];
+/**
+ * Human-readable names for each setting
+ */
+declare const SETTING_DISPLAY_NAMES: Record<SyncableSettingKey, string>;
+/**
+ * Mapping from VSCode setting keys to CLI setting keys
+ */
+declare const VSCODE_TO_CLI_MAP: Record<string, SyncableSettingKey>;
+/**
+ * Mapping from CLI setting keys to VSCode setting keys
+ */
+declare const CLI_TO_VSCODE_MAP: Record<SyncableSettingKey, string>;
+/**
+ * Default values for each setting
+ */
+declare const DEFAULT_VALUES: Record<SyncableSettingKey, string>;
+/**
+ * Convert VSCode settings object to canonical CLI key names
+ */
+declare function normalizeVSCodeSettings(vscodeSettings: Record<string, unknown>): SyncableSettings;
+/**
+ * Convert CLI settings to VSCode key names (with ghProjects. prefix)
+ */
+declare function toVSCodeSettings(settings: SyncableSettings, includePrefix?: boolean): Record<string, string>;
+/**
+ * Compare settings from CLI and VSCode and identify differences
+ */
+declare function computeSettingsDiff(cliSettings: SyncableSettings, vscodeSettings: SyncableSettings): SettingsDiff;
+/**
+ * Check if there are any differences that need syncing
+ */
+declare function hasDifferences(diff: SettingsDiff): boolean;
+/**
+ * Resolve conflicts based on user choices and compute final settings for each target
+ *
+ * @param diff The diff result from computeSettingsDiff
+ * @param choices User's choices for each conflict
+ * @param syncUnique Whether to sync settings that only exist in one source to the other
+ */
+declare function resolveConflicts(diff: SettingsDiff, choices: ConflictChoices, syncUnique?: boolean): ResolvedSettings;
+/**
+ * Helper to create a "use CLI" resolution
+ */
+declare function useCli(): ConflictResolution;
+/**
+ * Helper to create a "use VSCode" resolution
+ */
+declare function useVSCode(): ConflictResolution;
+/**
+ * Helper to create a "custom value" resolution
+ */
+declare function useCustom(value: string): ConflictResolution;
+/**
+ * Helper to create a "skip" resolution
+ */
+declare function skip(): ConflictResolution;
+/**
+ * Format a conflict for display (useful for CLI output)
+ */
+declare function formatConflict(conflict: SettingConflict): string;
+/**
+ * Get a summary of the diff for display
+ */
+declare function getDiffSummary(diff: SettingsDiff): string;
+
 /**
  * GraphQL query strings for GitHub Projects V2 API.
  *
@@ -833,4 +988,4 @@ declare namespace queries {
   export { queries_ADD_COMMENT_MUTATION as ADD_COMMENT_MUTATION, queries_ADD_LABELS_MUTATION as ADD_LABELS_MUTATION, queries_ADD_TO_PROJECT_MUTATION as ADD_TO_PROJECT_MUTATION, queries_COLLABORATORS_QUERY as COLLABORATORS_QUERY, queries_CREATE_ISSUE_MUTATION as CREATE_ISSUE_MUTATION, queries_ISSUES_WITH_LABEL_QUERY as ISSUES_WITH_LABEL_QUERY, queries_ISSUE_AND_LABEL_QUERY as ISSUE_AND_LABEL_QUERY, queries_ISSUE_DETAILS_QUERY as ISSUE_DETAILS_QUERY, queries_ISSUE_FOR_UPDATE_QUERY as ISSUE_FOR_UPDATE_QUERY, queries_ISSUE_NODE_ID_QUERY as ISSUE_NODE_ID_QUERY, queries_ISSUE_TYPES_QUERY as ISSUE_TYPES_QUERY, queries_LABEL_EXISTS_QUERY as LABEL_EXISTS_QUERY, queries_PROJECT_FIELDS_QUERY as PROJECT_FIELDS_QUERY, queries_PROJECT_ITEMS_QUERY as PROJECT_ITEMS_QUERY, queries_PROJECT_VIEWS_QUERY as PROJECT_VIEWS_QUERY, queries_RECENT_ISSUES_QUERY as RECENT_ISSUES_QUERY, queries_REMOVE_LABELS_MUTATION as REMOVE_LABELS_MUTATION, queries_REPOSITORY_ID_QUERY as REPOSITORY_ID_QUERY, queries_REPOSITORY_PROJECTS_QUERY as REPOSITORY_PROJECTS_QUERY, queries_UPDATE_ISSUE_BODY_MUTATION as UPDATE_ISSUE_BODY_MUTATION, queries_UPDATE_ISSUE_MUTATION as UPDATE_ISSUE_MUTATION, queries_UPDATE_ISSUE_TYPE_MUTATION as UPDATE_ISSUE_TYPE_MUTATION, queries_UPDATE_ITEM_FIELD_MUTATION as UPDATE_ITEM_FIELD_MUTATION, queries_UPDATE_ITEM_STATUS_MUTATION as UPDATE_ITEM_STATUS_MUTATION, queries_VIEWER_QUERY as VIEWER_QUERY };
 }
 
-export { type AssigneeInfo, type AuthError, BranchLinker, type Collaborator, type DateFieldValue, type FieldInfo, type FieldValue, type FieldValueConnection, GitHubAPI, type GitHubAPIOptions, type GitOptions, type IssueDetails, type IssueReference, type IterationFieldValue, type LabelInfo, type NumberFieldValue, type Project, type ProjectConfig, type ProjectItem, type ProjectItemContent, type ProjectItemsQueryResponse, type ProjectV2, type ProjectV2Field, type ProjectV2Item, type ProjectV2View, type ProjectWithViews, type ProjectsQueryResponse, type RepoInfo, type SingleSelectFieldValue, type StatusField, type TextFieldValue, type TokenProvider, branchExists, buildIssueUrl, buildOrgProjectUrl, buildProjectUrl, buildPullRequestUrl, buildRepoUrl, checkoutBranch, createBranch, detectRepository, fetchOrigin, generateBranchName, getAllBranches, getCommitsAhead, getCommitsBehind, getCurrentBranch, getDefaultBranch, getLocalBranches, getRemoteBranches, getRepositoryRoot, hasUncommittedChanges, isGitRepository, parseBranchLink, parseGitHubUrl, parseIssueUrl, pullLatest, queries, removeBranchLinkFromBody, sanitizeForBranchName, setBranchLinkInBody };
+export { type AssigneeInfo, type AuthError, BranchLinker, CLI_TO_VSCODE_MAP, type Collaborator, type ConflictChoices, type ConflictResolution, DEFAULT_VALUES, type DateFieldValue, type FieldInfo, type FieldValue, type FieldValueConnection, GitHubAPI, type GitHubAPIOptions, type GitOptions, type IssueDetails, type IssueReference, type IterationFieldValue, type LabelInfo, type NumberFieldValue, type Project, type ProjectConfig, type ProjectItem, type ProjectItemContent, type ProjectItemsQueryResponse, type ProjectV2, type ProjectV2Field, type ProjectV2Item, type ProjectV2View, type ProjectWithViews, type ProjectsQueryResponse, type RepoInfo, type ResolvedSettings, SETTING_DISPLAY_NAMES, SYNCABLE_KEYS, type SettingConflict, type SettingsDiff, type SettingsSource, type SingleSelectFieldValue, type StatusField, type SyncableSettingKey, type SyncableSettings, type TextFieldValue, type TokenProvider, VSCODE_TO_CLI_MAP, branchExists, buildIssueUrl, buildOrgProjectUrl, buildProjectUrl, buildPullRequestUrl, buildRepoUrl, checkoutBranch, computeSettingsDiff, createBranch, detectRepository, fetchOrigin, formatConflict, generateBranchName, getAllBranches, getCommitsAhead, getCommitsBehind, getCurrentBranch, getDefaultBranch, getDiffSummary, getLocalBranches, getRemoteBranches, getRepositoryRoot, hasDifferences, hasUncommittedChanges, isGitRepository, normalizeVSCodeSettings, parseBranchLink, parseGitHubUrl, parseIssueUrl, pullLatest, queries, removeBranchLinkFromBody, resolveConflicts, sanitizeForBranchName, setBranchLinkInBody, skip, toVSCodeSettings, useCli, useCustom, useVSCode };

package/dist/index.js

@@ -1281,9 +1281,176 @@ async function getDefaultBranch(options = {}) {
   }
   return "master";
 }
+
+// src/sync.ts
+var SYNCABLE_KEYS = [
+  "mainBranch",
+  "branchPattern",
+  "startWorkingStatus",
+  "doneStatus"
+];
+var SETTING_DISPLAY_NAMES = {
+  mainBranch: "Main Branch",
+  branchPattern: "Branch Name Pattern",
+  startWorkingStatus: "Start Working Status",
+  doneStatus: "Done/PR Merged Status"
+};
+var VSCODE_TO_CLI_MAP = {
+  "mainBranch": "mainBranch",
+  "branchNamePattern": "branchPattern",
+  "startWorkingStatus": "startWorkingStatus",
+  "prMergedStatus": "doneStatus"
+};
+var CLI_TO_VSCODE_MAP = {
+  mainBranch: "mainBranch",
+  branchPattern: "branchNamePattern",
+  startWorkingStatus: "startWorkingStatus",
+  doneStatus: "prMergedStatus"
+};
+var DEFAULT_VALUES = {
+  mainBranch: "main",
+  branchPattern: "{user}/{number}-{title}",
+  startWorkingStatus: "In Progress",
+  doneStatus: "Done"
+};
+function normalizeVSCodeSettings(vscodeSettings) {
+  const result = {};
+  for (const [vscodeKey, cliKey] of Object.entries(VSCODE_TO_CLI_MAP)) {
+    const value = vscodeSettings[vscodeKey];
+    if (typeof value === "string" && value.trim() !== "") {
+      result[cliKey] = value;
+    }
+  }
+  return result;
+}
+function toVSCodeSettings(settings, includePrefix = true) {
+  const result = {};
+  const prefix = includePrefix ? "ghProjects." : "";
+  for (const [cliKey, value] of Object.entries(settings)) {
+    if (value !== void 0) {
+      const vscodeKey = CLI_TO_VSCODE_MAP[cliKey];
+      if (vscodeKey) {
+        result[`${prefix}${vscodeKey}`] = value;
+      }
+    }
+  }
+  return result;
+}
+function computeSettingsDiff(cliSettings, vscodeSettings) {
+  const diff = {
+    conflicts: [],
+    matching: [],
+    cliOnly: [],
+    vscodeOnly: []
+  };
+  for (const key of SYNCABLE_KEYS) {
+    const cliValue = cliSettings[key];
+    const vscodeValue = vscodeSettings[key];
+    const cliDefined = cliValue !== void 0 && cliValue !== "";
+    const vscodeDefined = vscodeValue !== void 0 && vscodeValue !== "";
+    if (cliDefined && vscodeDefined) {
+      if (cliValue === vscodeValue) {
+        diff.matching.push({ key, value: cliValue });
+      } else {
+        diff.conflicts.push({
+          key,
+          displayName: SETTING_DISPLAY_NAMES[key],
+          cliValue,
+          vscodeValue
+        });
+      }
+    } else if (cliDefined) {
+      diff.cliOnly.push({ key, value: cliValue });
+    } else if (vscodeDefined) {
+      diff.vscodeOnly.push({ key, value: vscodeValue });
+    }
+  }
+  return diff;
+}
+function hasDifferences(diff) {
+  return diff.conflicts.length > 0 || diff.cliOnly.length > 0 || diff.vscodeOnly.length > 0;
+}
+function resolveConflicts(diff, choices, syncUnique = true) {
+  const cliUpdates = {};
+  const vscodeUpdates = {};
+  for (const conflict of diff.conflicts) {
+    const choice = choices[conflict.key] || { type: "skip" };
+    switch (choice.type) {
+      case "cli":
+        if (conflict.cliValue !== void 0) {
+          vscodeUpdates[conflict.key] = conflict.cliValue;
+        }
+        break;
+      case "vscode":
+        if (conflict.vscodeValue !== void 0) {
+          cliUpdates[conflict.key] = conflict.vscodeValue;
+        }
+        break;
+      case "custom":
+        cliUpdates[conflict.key] = choice.value;
+        vscodeUpdates[conflict.key] = choice.value;
+        break;
+      case "skip":
+        break;
+    }
+  }
+  if (syncUnique) {
+    for (const { key, value } of diff.cliOnly) {
+      vscodeUpdates[key] = value;
+    }
+    for (const { key, value } of diff.vscodeOnly) {
+      cliUpdates[key] = value;
+    }
+  }
+  return {
+    cli: cliUpdates,
+    vscode: toVSCodeSettings(vscodeUpdates, false)
+  };
+}
+function useCli() {
+  return { type: "cli" };
+}
+function useVSCode() {
+  return { type: "vscode" };
+}
+function useCustom(value) {
+  return { type: "custom", value };
+}
+function skip() {
+  return { type: "skip" };
+}
+function formatConflict(conflict) {
+  return `${conflict.displayName}:
+  CLI:    "${conflict.cliValue ?? "(not set)"}"
+  VSCode: "${conflict.vscodeValue ?? "(not set)"}"`;
+}
+function getDiffSummary(diff) {
+  const parts = [];
+  if (diff.conflicts.length > 0) {
+    parts.push(`${diff.conflicts.length} conflicting setting(s)`);
+  }
+  if (diff.cliOnly.length > 0) {
+    parts.push(`${diff.cliOnly.length} CLI-only setting(s)`);
+  }
+  if (diff.vscodeOnly.length > 0) {
+    parts.push(`${diff.vscodeOnly.length} VSCode-only setting(s)`);
+  }
+  if (diff.matching.length > 0) {
+    parts.push(`${diff.matching.length} matching setting(s)`);
+  }
+  if (parts.length === 0) {
+    return "No settings to compare";
+  }
+  return parts.join(", ");
+}
 export {
   BranchLinker,
+  CLI_TO_VSCODE_MAP,
+  DEFAULT_VALUES,
   GitHubAPI,
+  SETTING_DISPLAY_NAMES,
+  SYNCABLE_KEYS,
+  VSCODE_TO_CLI_MAP,
   branchExists,
   buildIssueUrl,
   buildOrgProjectUrl,
@@ -1291,26 +1458,37 @@ export {
   buildPullRequestUrl,
   buildRepoUrl,
   checkoutBranch,
+  computeSettingsDiff,
   createBranch,
   detectRepository,
   fetchOrigin,
+  formatConflict,
   generateBranchName,
   getAllBranches,
   getCommitsAhead,
   getCommitsBehind,
   getCurrentBranch,
   getDefaultBranch,
+  getDiffSummary,
   getLocalBranches,
   getRemoteBranches,
   getRepositoryRoot,
+  hasDifferences,
   hasUncommittedChanges,
   isGitRepository,
+  normalizeVSCodeSettings,
   parseBranchLink,
   parseGitHubUrl,
   parseIssueUrl,
   pullLatest,
   queries_exports as queries,
   removeBranchLinkFromBody,
+  resolveConflicts,
   sanitizeForBranchName,
-  setBranchLinkInBody
+  setBranchLinkInBody,
+  skip,
+  toVSCodeSettings,
+  useCli,
+  useCustom,
+  useVSCode
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bretwardjames/ghp-core",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Shared core library for GitHub Projects tools",
   "main": "dist/index.cjs",
   "module": "dist/index.js",