@bretwardjames/ghp-cli 0.1.4 → 0.1.7

package/README.md

@@ -2,10 +2,18 @@
 
 GitHub Projects CLI - manage project boards from your terminal.
 
+Part of the [GHP Tools](https://github.com/bretwardjames/ghp-core) suite. Works alongside the [VS Code/Cursor extension](https://github.com/bretwardjames/vscode-gh-projects) for a complete GitHub Projects workflow.
+
 ## Installation
 
+**Quick install (CLI + VS Code extension):**
+```bash
+curl -fsSL https://raw.githubusercontent.com/bretwardjames/ghp-core/main/install.sh | bash
+```
+
+**CLI only:**
 ```bash
-npm install -g ghp-cli
+npm install -g @bretwardjames/ghp-cli
 ```
 
 ## Quick Start
@@ -33,6 +41,7 @@ ghp add "Fix login bug"
 ghp work
 ghp work --status "In Progress"
 ghp work --hide-done
+ghp work --group priority          # Group by field
 
 # Project board
 ghp plan
@@ -54,6 +63,9 @@ ghp add --list-templates           # List available templates
 ghp open 123
 ghp open 123 --browser             # Open in browser
 
+# Edit issue description
+ghp edit 123                       # Opens in $EDITOR
+
 # Add comment
 ghp comment 123 -m "Fixed in latest commit"
 ghp comment 123                    # Opens editor
@@ -87,24 +99,45 @@ ghp link-branch 123
 
 # Unlink branch
 ghp unlink-branch 123
+
+# Sync active label with current branch
+ghp sync
 ```
 
-### Configuration
+## Configuration
+
+ghp-cli uses a layered config system (like VS Code):
+
+| Layer | Path | Purpose |
+|-------|------|---------|
+| **Workspace** | `.ghp/config.json` | Team settings (commit this) |
+| **User** | `~/.config/ghp-cli/config.json` | Personal overrides |
+
+Settings merge: defaults → workspace → user
+
+### Config Commands
 
 ```bash
-# View config
-ghp config --list
+# View merged config with sources
+ghp config --show
 
-# Edit config file
-ghp config --edit
+# Edit user config (opens $EDITOR)
+ghp config
 
-# Set individual values
-ghp config mainBranch main
-```
+# Edit workspace config (shared with team)
+ghp config -w
 
-## Configuration
+# Get/set individual values
+ghp config mainBranch
+ghp config mainBranch develop
+ghp config mainBranch develop -w   # Set in workspace config
+
+# Sync from VS Code/Cursor settings
+ghp config sync
+ghp config sync -w                 # Sync to workspace config
+```
 
-Config file: `~/.config/ghp-cli/config.json`
+### Config File Format
 
 ```json
 {
@@ -157,6 +190,20 @@ Filter by any field:
 --slice Size=Small         # Custom project fields
 ```
 
+### Syncing with VS Code
+
+If you use the VS Code extension, you can sync shared settings:
+
+```bash
+ghp config sync
+```
+
+This imports `ghProjects.*` settings from your Cursor or VS Code configuration:
+- `ghProjects.mainBranch` → `mainBranch`
+- `ghProjects.branchNamePattern` → `branchPattern`
+- `ghProjects.startWorkingStatus` → `startWorkingStatus`
+- `ghProjects.prMergedStatus` → `doneStatus`
+
 ## Issue Templates
 
 Place templates in `.github/ISSUE_TEMPLATE/` in your repo. When creating issues, you can:
@@ -171,6 +218,11 @@ Place templates in `.github/ISSUE_TEMPLATE/` in your repo. When creating issues,
 - GitHub account with Projects access
 - `gh` CLI recommended (for auth token)
 
+## Related
+
+- [ghp-core](https://github.com/bretwardjames/ghp-core) - Shared library and install script
+- [vscode-gh-projects](https://github.com/bretwardjames/vscode-gh-projects) - VS Code/Cursor extension
+
 ## License
 
 MIT

package/dist/branch-linker.d.ts

@@ -1,37 +1,48 @@
 /**
- * CLI-specific branch linker with file-based storage.
+ * CLI-specific branch linker that uses GitHub issue bodies for storage.
  *
- * This module wraps the core BranchLinker with a file-based StorageAdapter
- * that stores links in ~/.config/ghp-cli/branch-links.json
+ * Links are stored as hidden HTML comments in issue bodies:
+ * <!-- ghp-branch: feature/my-branch -->
+ *
+ * This allows links to be shared between CLI and VSCode extension.
  */
-import { BranchLinker, type StorageAdapter, type BranchLink } from '@bretwardjames/ghp-core';
+import { type RepoInfo } from '@bretwardjames/ghp-core';
 /**
- * File-based storage adapter for CLI usage
+ * Link a branch to an issue by storing the link in the issue body.
  */
-declare const fileStorageAdapter: StorageAdapter;
-declare const linker: BranchLinker;
+export declare function linkBranch(repo: RepoInfo, issueNumber: number, branch: string): Promise<boolean>;
 /**
- * Create a link between a branch and an issue.
- * Backwards-compatible function signature for existing CLI code.
+ * Remove the branch link from an issue.
+ * @returns true if a link was removed, false if no link existed
  */
-export declare function linkBranch(branch: string, issueNumber: number, issueTitle: string, itemId: string, repo: string): void;
+export declare function unlinkBranch(repo: RepoInfo, issueNumber: number): Promise<boolean>;
 /**
- * Remove the link for an issue.
- * @returns true if a link was removed, false if no link existed
+ * Get the branch linked to an issue by reading the issue body.
  */
-export declare function unlinkBranch(repo: string, issueNumber: number): boolean;
+export declare function getBranchForIssue(repo: RepoInfo, issueNumber: number): Promise<string | null>;
 /**
- * Get the branch linked to an issue.
+ * Extract issue number from a branch name.
+ * Supports common patterns:
+ * - user/123-feature-name
+ * - feature/123-something
+ * - 123-fix-bug
+ * - fix-123-something
  */
-export declare function getBranchForIssue(repo: string, issueNumber: number): string | null;
+export declare function extractIssueNumberFromBranch(branchName: string): number | null;
 /**
- * Get the full link info for a branch.
+ * Result of finding an issue for a branch.
  */
-export declare function getIssueForBranch(repo: string, branch: string): BranchLink | null;
+export interface BranchIssueLink {
+    issueNumber: number;
+    issueTitle: string;
+    branch: string;
+}
 /**
- * Get all links for a repository.
+ * Find the issue linked to a branch.
+ * This first extracts the issue number from the branch name pattern,
+ * then verifies the link exists in the issue body.
+ *
+ * @returns Issue info if found and verified, null otherwise
  */
-export declare function getAllLinksForRepo(repo: string): BranchLink[];
-export type { BranchLink } from '@bretwardjames/ghp-core';
-export { linker, fileStorageAdapter };
+export declare function getIssueForBranch(repo: RepoInfo, branchName: string): Promise<BranchIssueLink | null>;
 //# sourceMappingURL=branch-linker.d.ts.map

package/dist/branch-linker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-linker.d.ts","sourceRoot":"","sources":["../src/branch-linker.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EACH,YAAY,EACZ,KAAK,cAAc,EACnB,KAAK,UAAU,EAClB,MAAM,yBAAyB,CAAC;AAKjC;;GAEG;AACH,QAAA,MAAM,kBAAkB,EAAE,cAmBzB,CAAC;AAGF,QAAA,MAAM,MAAM,cAAuC,CAAC;AAEpD;;;GAGG;AACH,wBAAgB,UAAU,CACtB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACb,IAAI,CAIN;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAcvE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIlF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAGjF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,CAG7D;AAGD,YAAY,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAG1D,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"branch-linker.d.ts","sourceRoot":"","sources":["../src/branch-linker.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAIH,KAAK,QAAQ,EAChB,MAAM,yBAAyB,CAAC;AAGjC;;GAEG;AACH,wBAAsB,UAAU,CAC5B,IAAI,EAAE,QAAQ,EACd,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,QAAQ,EACd,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACnC,IAAI,EAAE,QAAQ,EACd,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQxB;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAgB9E;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACnC,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CA4BjC"}

package/dist/branch-linker.js

@@ -1,86 +1,116 @@
 /**
- * CLI-specific branch linker with file-based storage.
+ * CLI-specific branch linker that uses GitHub issue bodies for storage.
  *
- * This module wraps the core BranchLinker with a file-based StorageAdapter
- * that stores links in ~/.config/ghp-cli/branch-links.json
- */
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
-import { homedir } from 'os';
-import { join } from 'path';
-import { BranchLinker, } from '@bretwardjames/ghp-core';
-const DATA_DIR = join(homedir(), '.config', 'ghp-cli');
-const LINKS_FILE = join(DATA_DIR, 'branch-links.json');
-/**
- * File-based storage adapter for CLI usage
+ * Links are stored as hidden HTML comments in issue bodies:
+ * <!-- ghp-branch: feature/my-branch -->
+ *
+ * This allows links to be shared between CLI and VSCode extension.
  */
-const fileStorageAdapter = {
-    load() {
-        try {
-            if (existsSync(LINKS_FILE)) {
-                const data = readFileSync(LINKS_FILE, 'utf-8');
-                return JSON.parse(data);
-            }
-        }
-        catch {
-            // Ignore errors, return empty array
-        }
-        return [];
-    },
-    save(links) {
-        if (!existsSync(DATA_DIR)) {
-            mkdirSync(DATA_DIR, { recursive: true });
-        }
-        writeFileSync(LINKS_FILE, JSON.stringify(links, null, 2));
-    },
-};
-// Create singleton linker instance
-const linker = new BranchLinker(fileStorageAdapter);
+import { parseBranchLink, setBranchLinkInBody, removeBranchLinkFromBody, } from '@bretwardjames/ghp-core';
+import { api } from './github-api.js';
 /**
- * Create a link between a branch and an issue.
- * Backwards-compatible function signature for existing CLI code.
+ * Link a branch to an issue by storing the link in the issue body.
  */
-export function linkBranch(branch, issueNumber, issueTitle, itemId, repo) {
-    // Use sync-like behavior for backwards compatibility
-    // The file adapter is synchronous so this works
-    linker.link(branch, issueNumber, issueTitle, itemId, repo);
+export async function linkBranch(repo, issueNumber, branch) {
+    try {
+        const details = await api.getIssueDetails(repo, issueNumber);
+        const currentBody = details?.body ?? '';
+        const newBody = setBranchLinkInBody(currentBody, branch);
+        return await api.updateIssueBody(repo, issueNumber, newBody);
+    }
+    catch (error) {
+        console.error('Failed to link branch:', error);
+        return false;
+    }
 }
 /**
- * Remove the link for an issue.
+ * Remove the branch link from an issue.
  * @returns true if a link was removed, false if no link existed
  */
-export function unlinkBranch(repo, issueNumber) {
-    // Load, filter, and save synchronously for backwards compatibility
-    const adapter = fileStorageAdapter;
-    const links = adapter.load();
-    const filtered = links.filter(l => !(l.repo === repo && l.issueNumber === issueNumber));
-    if (filtered.length === links.length) {
+export async function unlinkBranch(repo, issueNumber) {
+    try {
+        const details = await api.getIssueDetails(repo, issueNumber);
+        const currentBody = details?.body ?? '';
+        // Check if there's a link to remove
+        if (!parseBranchLink(currentBody)) {
+            return false;
+        }
+        const newBody = removeBranchLinkFromBody(currentBody);
+        return await api.updateIssueBody(repo, issueNumber, newBody);
+    }
+    catch (error) {
+        console.error('Failed to unlink branch:', error);
         return false;
     }
-    adapter.save(filtered);
-    return true;
 }
 /**
- * Get the branch linked to an issue.
+ * Get the branch linked to an issue by reading the issue body.
  */
-export function getBranchForIssue(repo, issueNumber) {
-    const links = fileStorageAdapter.load();
-    const link = links.find(l => l.repo === repo && l.issueNumber === issueNumber);
-    return link?.branch || null;
+export async function getBranchForIssue(repo, issueNumber) {
+    try {
+        const details = await api.getIssueDetails(repo, issueNumber);
+        return parseBranchLink(details?.body);
+    }
+    catch (error) {
+        console.error('Failed to get branch for issue:', error);
+        return null;
+    }
 }
 /**
- * Get the full link info for a branch.
+ * Extract issue number from a branch name.
+ * Supports common patterns:
+ * - user/123-feature-name
+ * - feature/123-something
+ * - 123-fix-bug
+ * - fix-123-something
  */
-export function getIssueForBranch(repo, branch) {
-    const links = fileStorageAdapter.load();
-    return links.find(l => l.repo === repo && l.branch === branch) || null;
+export function extractIssueNumberFromBranch(branchName) {
+    const patterns = [
+        /\/(\d+)-/, // user/123-title
+        /^(\d+)-/, // 123-title
+        /-(\d+)-/, // feature-123-title
+        /[/#](\d+)$/, // ends with #123 or /123
+    ];
+    for (const pattern of patterns) {
+        const match = branchName.match(pattern);
+        if (match) {
+            return parseInt(match[1], 10);
+        }
+    }
+    return null;
 }
 /**
- * Get all links for a repository.
+ * Find the issue linked to a branch.
+ * This first extracts the issue number from the branch name pattern,
+ * then verifies the link exists in the issue body.
+ *
+ * @returns Issue info if found and verified, null otherwise
  */
-export function getAllLinksForRepo(repo) {
-    const links = fileStorageAdapter.load();
-    return links.filter(l => l.repo === repo);
+export async function getIssueForBranch(repo, branchName) {
+    // First, try to extract issue number from branch name
+    const issueNumber = extractIssueNumberFromBranch(branchName);
+    if (!issueNumber) {
+        return null;
+    }
+    try {
+        // Get issue details to verify and get title
+        const details = await api.getIssueDetails(repo, issueNumber);
+        if (!details) {
+            return null;
+        }
+        // Check if this issue has a link to this branch
+        const linkedBranch = parseBranchLink(details.body);
+        // If not explicitly linked, still return info based on branch naming convention
+        // This allows workflows that rely on branch naming patterns to work
+        return {
+            issueNumber,
+            issueTitle: details.title,
+            branch: linkedBranch === branchName ? branchName : branchName,
+        };
+    }
+    catch (error) {
+        console.error('Failed to verify issue for branch:', error);
+        return null;
+    }
 }
-// Also export the linker instance and adapter for advanced usage
-export { linker, fileStorageAdapter };
 //# sourceMappingURL=branch-linker.js.map

package/dist/branch-linker.js.map

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

package/dist/commands/config.d.ts

@@ -1,5 +1,11 @@
+export declare function configSyncCommand(options?: {
+    workspace?: boolean;
+    user?: boolean;
+}): Promise<void>;
 export declare function configCommand(key?: string, value?: string, options?: {
-    list?: boolean;
+    show?: boolean;
     edit?: boolean;
+    workspace?: boolean;
+    user?: boolean;
 }): Promise<void>;
 //# sourceMappingURL=config.d.ts.map

package/dist/commands/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAyDA,wBAAsB,aAAa,CAC/B,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GACjD,OAAO,CAAC,IAAI,CAAC,CA8Cf"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AA4FA,wBAAsB,iBAAiB,CACnC,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GACtD,OAAO,CAAC,IAAI,CAAC,CAiDf;AAED,wBAAsB,aAAa,CAC/B,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GACtF,OAAO,CAAC,IAAI,CAAC,CA+Gf"}

package/dist/commands/config.js

@@ -1,10 +1,47 @@
 import { existsSync, writeFileSync, mkdirSync } from 'fs';
 import { spawn } from 'child_process';
 import { dirname } from 'path';
-import { getConfig, setConfig, listConfig, CONFIG_KEYS, getConfigPath } from '../config.js';
+import chalk from 'chalk';
+import { getConfig, setConfig, getFullConfigWithSources, CONFIG_KEYS, getConfigPath, getWorkspaceConfigPath, getUserConfigPath, syncFromVSCode, getVSCodeSettingsPaths } from '../config.js';
+const SOURCE_LABELS = {
+    'default': chalk.dim('(default)'),
+    'workspace': chalk.cyan('(workspace)'),
+    'user': chalk.green('(user)'),
+};
 function isValidKey(key) {
     return CONFIG_KEYS.includes(key);
 }
+function resolveScope(options) {
+    if (options.workspace)
+        return 'workspace';
+    return 'user';
+}
+function formatShortcut(shortcut, indent = '') {
+    if (shortcut.status) {
+        const statusVal = Array.isArray(shortcut.status)
+            ? shortcut.status.join(', ')
+            : shortcut.status;
+        console.log(`${indent}status: ${statusVal}`);
+    }
+    if (shortcut.mine)
+        console.log(`${indent}mine: true`);
+    if (shortcut.unassigned)
+        console.log(`${indent}unassigned: true`);
+    if (shortcut.project)
+        console.log(`${indent}project: ${shortcut.project}`);
+    if (shortcut.sort)
+        console.log(`${indent}sort: ${shortcut.sort}`);
+    if (shortcut.slice && shortcut.slice.length > 0) {
+        console.log(`${indent}slice: ${shortcut.slice.join(', ')}`);
+    }
+    // Show other properties that might exist (like list, all, group)
+    const knownKeys = ['status', 'mine', 'unassigned', 'project', 'sort', 'slice'];
+    for (const [key, value] of Object.entries(shortcut)) {
+        if (!knownKeys.includes(key) && value !== undefined) {
+            console.log(`${indent}${key}: ${value}`);
+        }
+    }
+}
 const CONFIG_TEMPLATE = `{
   "_comment": "ghp-cli configuration - see https://github.com/your/ghp-cli for docs",
 
@@ -49,34 +86,119 @@ function openInEditor(filePath) {
         console.log(`Config file is at: ${filePath}`);
     });
 }
-export async function configCommand(key, value, options = {}) {
-    if (options.edit) {
-        const configPath = getConfigPath();
-        // Create config with template if it doesn't exist
-        if (!existsSync(configPath)) {
-            mkdirSync(dirname(configPath), { recursive: true });
-            writeFileSync(configPath, CONFIG_TEMPLATE);
-            console.log(`Created config file: ${configPath}`);
+export async function configSyncCommand(options = {}) {
+    const scope = resolveScope(options);
+    console.log(chalk.bold('Syncing from VS Code/Cursor settings...'));
+    console.log();
+    const paths = getVSCodeSettingsPaths();
+    console.log(chalk.dim('Looking for settings in:'));
+    console.log(chalk.dim(`  Workspace: ${paths.workspace || '(not in git repo)'}`));
+    console.log(chalk.dim(`  Cursor:    ${paths.cursorUser}`));
+    console.log(chalk.dim(`  VS Code:   ${paths.codeUser}`));
+    console.log();
+    const result = syncFromVSCode(scope);
+    // Report any parse errors
+    if (result.errors.length > 0) {
+        for (const error of result.errors) {
+            console.log(chalk.yellow(`Warning: ${error}`));
         }
-        openInEditor(configPath);
-        return;
+        console.log();
     }
-    if (options.list || (!key && !value)) {
-        const config = listConfig();
-        console.log('\nConfiguration:');
-        console.log('─'.repeat(40));
-        for (const [k, v] of Object.entries(config)) {
-            console.log(`  ${k}: ${v || '(not set)'}`);
+    if (result.synced.length === 0) {
+        if (result.skipped.length > 0) {
+            console.log(chalk.yellow('No syncable settings found.'));
+            console.log(chalk.dim(`Found ${result.skipped.length} extension-only setting(s): ${result.skipped.join(', ')}`));
+            console.log();
+            console.log(chalk.dim('Syncable settings: mainBranch, branchNamePattern, startWorkingStatus, prMergedStatus'));
         }
-        console.log('\nAvailable keys:', CONFIG_KEYS.join(', '));
+        else {
+            console.log(chalk.yellow('No ghProjects.* settings found to sync.'));
+            console.log(chalk.dim('Make sure you have settings like ghProjects.mainBranch in your editor.'));
+        }
+        return;
+    }
+    console.log(chalk.green(`Synced ${result.synced.length} setting(s) from ${result.editor}:`));
+    for (const { key, value, source } of result.synced) {
+        const sourceLabel = source === 'workspace' ? chalk.cyan('(workspace)') : chalk.green('(user)');
+        console.log(`  ${key}: ${value} ${sourceLabel}`);
+    }
+    if (result.skipped.length > 0) {
+        console.log();
+        console.log(chalk.dim(`Skipped ${result.skipped.length} extension-only setting(s): ${result.skipped.join(', ')}`));
+    }
+    console.log();
+    console.log(chalk.dim(`Saved to ${scope} config: ${getConfigPath(scope)}`));
+}
+export async function configCommand(key, value, options = {}) {
+    const scope = resolveScope(options);
+    // Handle 'sync' as first argument
+    if (key === 'sync') {
+        await configSyncCommand(options);
         return;
     }
-    if (key && !isValidKey(key)) {
-        console.log(`Unknown config key: "${key}"`);
-        console.log('Available keys:', CONFIG_KEYS.join(', '));
+    // --show: display merged config from all sources with source indicators
+    if (options.show) {
+        const fullConfig = getFullConfigWithSources();
+        console.log('\n' + chalk.bold('Settings:'));
+        console.log('─'.repeat(60));
+        for (const [key, { value, source }] of Object.entries(fullConfig.settings)) {
+            const sourceLabel = SOURCE_LABELS[source];
+            console.log(`  ${key}: ${value || chalk.dim('(not set)')} ${sourceLabel}`);
+        }
+        console.log('\n' + chalk.bold('Defaults:'));
+        console.log('─'.repeat(60));
+        // Plan defaults
+        const planDefaults = fullConfig.defaults.plan;
+        const planSourceLabel = SOURCE_LABELS[planDefaults.source];
+        if (Object.keys(planDefaults.value).length > 0) {
+            console.log(`  ${chalk.cyan('plan')} ${planSourceLabel}`);
+            formatShortcut(planDefaults.value, '    ');
+        }
+        else {
+            console.log(`  ${chalk.cyan('plan')}: ${chalk.dim('(none)')} ${planSourceLabel}`);
+        }
+        // AddIssue defaults
+        const addIssueDefaults = fullConfig.defaults.addIssue;
+        const addIssueSourceLabel = SOURCE_LABELS[addIssueDefaults.source];
+        if (Object.keys(addIssueDefaults.value).length > 0) {
+            console.log(`  ${chalk.cyan('addIssue')} ${addIssueSourceLabel}`);
+            for (const [k, v] of Object.entries(addIssueDefaults.value)) {
+                if (v)
+                    console.log(`    ${k}: ${v}`);
+            }
+        }
+        else {
+            console.log(`  ${chalk.cyan('addIssue')}: ${chalk.dim('(none)')} ${addIssueSourceLabel}`);
+        }
+        console.log('\n' + chalk.bold('Shortcuts:'));
+        console.log('─'.repeat(60));
+        const shortcuts = fullConfig.shortcuts;
+        if (Object.keys(shortcuts).length > 0) {
+            for (const [name, { value, source }] of Object.entries(shortcuts)) {
+                const sourceLabel = SOURCE_LABELS[source];
+                console.log(`  ${chalk.cyan(name)} ${sourceLabel}`);
+                formatShortcut(value, '    ');
+            }
+        }
+        else {
+            console.log(`  ${chalk.dim('(none)')}`);
+        }
+        console.log('\n' + chalk.bold('Config files:'));
+        console.log('─'.repeat(60));
+        console.log(`  User:      ${getUserConfigPath()}`);
+        const workspacePath = getWorkspaceConfigPath();
+        console.log(`  Workspace: ${workspacePath || '(not in a git repository)'}`);
+        console.log('\nUse "ghp config" to edit user config');
+        console.log('Use "ghp config -w" to edit workspace config (shared with team)');
         return;
     }
+    // Get/set specific key
     if (key && !value) {
+        if (!isValidKey(key)) {
+            console.log(`Unknown config key: "${key}"`);
+            console.log('Available keys:', CONFIG_KEYS.join(', '));
+            return;
+        }
         const val = getConfig(key);
         if (val !== undefined) {
             console.log(val);
@@ -87,8 +209,27 @@ export async function configCommand(key, value, options = {}) {
         return;
     }
     if (key && value) {
-        setConfig(key, value);
-        console.log(`Set ${key} = ${value}`);
+        if (!isValidKey(key)) {
+            console.log(`Unknown config key: "${key}"`);
+            console.log('Available keys:', CONFIG_KEYS.join(', '));
+            return;
+        }
+        setConfig(key, value, scope);
+        console.log(`Set ${key} = ${value} (in ${scope} config)`);
+        return;
+    }
+    // Default: open editor (when no key/value provided)
+    const configPath = getConfigPath(scope);
+    if (scope === 'workspace' && configPath === '(not in a git repository)') {
+        console.error('Error: Not in a git repository. Cannot edit workspace config.');
+        return;
+    }
+    // Create config with template if it doesn't exist
+    if (!existsSync(configPath)) {
+        mkdirSync(dirname(configPath), { recursive: true });
+        writeFileSync(configPath, CONFIG_TEMPLATE);
+        console.log(`Created config file: ${configPath}`);
     }
+    openInEditor(configPath);
 }
 //# sourceMappingURL=config.js.map