zedx 0.8.1 → 0.9.0

package/README.md

@@ -33,7 +33,9 @@ zedx version major   # 1.2.3 → 2.0.0
 
 # Sync Zed settings and extensions via a GitHub repo
 zedx sync init       # Link a GitHub repo as the sync target (run once)
-zedx sync            # Sync local and remote config automatically
+zedx sync            # Sync local and remote config (prompts on conflict)
+zedx sync --local    # Sync, always keeping local on conflict
+zedx sync --remote   # Sync, always using remote on conflict
 zedx sync status     # Show sync state between local config and the remote repo
 zedx sync install    # Install an OS daemon to auto-sync when Zed config changes
 zedx sync uninstall  # Remove the OS daemon

package/dist/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { createRequire } from 'module';
 import path from 'path';
 import * as p from '@clack/prompts';
 import { Command } from 'commander';
@@ -11,7 +12,9 @@ import { generateExtension } from './generator.js';
 import { installDevExtension } from './install.js';
 import { promptUser, promptThemeDetails, promptLanguageDetails } from './prompts.js';
 import { addLsp } from './snippet.js';
-import { syncInit, runSync, syncStatus } from './sync.js';
+import { syncInit, runSync, syncStatus, syncSelect } from './sync.js';
+const require = createRequire(import.meta.url);
+const { version } = require('../package.json');
 function bumpVersion(version, type) {
     const [major, minor, patch] = version.split('.').map(Number);
     switch (type) {
@@ -65,6 +68,7 @@ function printWelcome() {
         ['zedx install', 'Install as a Zed dev extension'],
         ['zedx version <major|minor|patch>', 'Bump extension version'],
         ['zedx sync', 'Sync Zed settings via a git repo'],
+        ['zedx sync select', 'Choose which files to sync interactively'],
         ['zedx sync init', 'Link a git repo as the sync target'],
         ['zedx sync status', 'Show sync state between local and remote'],
         ['zedx sync install', 'Install the OS daemon for auto-sync'],
@@ -74,7 +78,7 @@ function printWelcome() {
     for (const [cmd, desc] of commands) {
         console.log(`  ${color.cyan(cmd.padEnd(38))}${color.dim(desc)}`);
     }
-    console.log(`\n  ${color.dim('Docs:')} ${color.underline(color.blue('https://zed.dev/docs/extensions'))}\n`);
+    console.log(`\n  ${color.dim('Zed Docs:')} ${color.underline(color.blue('https://zed.dev/docs/extensions'))}\n`);
 }
 async function runCreate() {
     const options = await promptUser();
@@ -99,7 +103,7 @@ async function runCreate() {
 }
 async function main() {
     const program = new Command();
-    program.name('zedx').description('The CLI toolkit for Zed Editor.').helpOption(false);
+    program.name('zedx').description('The CLI toolkit for Zed Editor.').version(`zedx v${version}`);
     program
         .command('create')
         .description('Scaffold a new Zed extension')
@@ -156,8 +160,19 @@ async function main() {
     const syncCmd = program
         .command('sync')
         .description('Sync Zed settings and extensions via a GitHub repo')
-        .action(async () => {
-        await runSync();
+        .option('--local', 'On conflict, always keep the local version')
+        .option('--remote', 'On conflict, always use the remote version')
+        .action(async (opts) => {
+        if (opts.local && opts.remote) {
+            p.log.error(color.red('--local and --remote are mutually exclusive.'));
+            process.exit(1);
+        }
+        const conflict = opts.local
+            ? 'local'
+            : opts.remote
+                ? 'remote'
+                : 'prompt';
+        await runSync({ conflict });
     });
     syncCmd
         .command('init')
@@ -171,6 +186,12 @@ async function main() {
         .action(async () => {
         await syncStatus();
     });
+    syncCmd
+        .command('select')
+        .description('Interactively choose which files to sync')
+        .action(async () => {
+        await syncSelect();
+    });
     syncCmd
         .command('install')
         .description('Install the OS daemon to auto-sync when Zed config changes')
@@ -183,10 +204,11 @@ async function main() {
         .action(async () => {
         await syncUninstall();
     });
-    if (process.argv.length <= 2) {
+    const argv = process.argv.filter(arg => arg !== '--');
+    if (argv.length <= 2) {
         printWelcome();
         return;
     }
-    program.parse(process.argv);
+    program.parse(argv);
 }
 main().catch(console.error);

package/dist/snippet.js

@@ -165,5 +165,5 @@ export async function addLsp(callerDir) {
     p.outro(`${color.green('✓')} LSP snippet added.\n\n` +
         `  ${color.dim('1.')} Edit ${color.cyan('src/lib.rs')} — implement ${color.white('language_server_command')}\n` +
         `  ${color.dim('2.')} Edit ${color.cyan('Cargo.toml')} — pin ${color.white('zed_extension_api')} to latest version\n` +
-        `  ${color.dim('3.')} ${color.dim('Docs:')} ${color.underline(color.blue('https://zed.dev/docs/extensions/languages#language-servers'))}`);
+        `  ${color.dim('3.')} ${color.dim('Zed Docs:')} ${color.underline(color.blue('https://zed.dev/docs/extensions/languages#language-servers'))}`);
 }

package/dist/sync.d.ts

@@ -1,5 +1,9 @@
 export declare function syncStatus(): Promise<void>;
 export declare function syncInit(): Promise<void>;
+export type ConflictStrategy = 'local' | 'remote' | 'prompt';
+export declare function syncSelect(): Promise<void>;
 export declare function runSync(opts?: {
     silent?: boolean;
+    conflict?: ConflictStrategy;
+    selectedFiles?: string[];
 }): Promise<void>;

package/dist/sync.js

@@ -231,9 +231,38 @@ export async function syncInit() {
     p.outro(`${color.green('✓')} Sync config saved to ${color.cyan(ZEDX_CONFIG_PATH)}\n\n` +
         `  Run ${color.cyan('zedx sync')} to sync your Zed config.`);
 }
+// zedx sync select
+export async function syncSelect() {
+    console.log('');
+    p.intro(`${color.bgBlue(color.bold(' zedx sync select '))} ${color.blue('Choose which files to sync…')}`);
+    await requireSyncConfig();
+    const allFiles = [
+        {
+            value: 'settings',
+            label: 'settings.json',
+            hint: 'Zed editor settings',
+        },
+        {
+            value: 'extensions',
+            label: 'extensions/index.json',
+            hint: 'Installed extensions list',
+        },
+    ];
+    const selected = await p.multiselect({
+        message: 'Select files to sync',
+        options: allFiles,
+        required: true,
+    });
+    if (p.isCancel(selected)) {
+        p.cancel('Cancelled.');
+        process.exit(0);
+    }
+    const selectedFiles = selected;
+    await runSync({ selectedFiles });
+}
 // zedx sync
 export async function runSync(opts = {}) {
-    const { silent = false } = opts;
+    const { silent = false, conflict = 'prompt', selectedFiles } = opts;
     // In silent mode (daemon/watch), route all UI through plain console.log
     // Interactive conflict prompts fall back to "local wins".
     const log = {
@@ -282,18 +311,23 @@ export async function runSync(opts = {}) {
         }
         // 2. Determine what changed for each file
         const lastSync = config.lastSync ? new Date(config.lastSync) : null;
-        const files = [
+        const allFiles = [
             {
+                key: 'settings',
                 repoPath: path.join(tmp, 'settings.json'),
                 localPath: zedPaths.settings,
                 label: 'settings.json',
             },
             {
+                key: 'extensions',
                 repoPath: path.join(tmp, 'extensions', 'index.json'),
                 localPath: zedPaths.extensions,
                 label: 'extensions/index.json',
             },
         ];
+        const files = selectedFiles
+            ? allFiles.filter(f => selectedFiles.includes(f.key))
+            : allFiles;
         let anyChanges = false;
         for (const file of files) {
             const localExists = await fs.pathExists(file.localPath);
@@ -366,18 +400,20 @@ export async function runSync(opts = {}) {
                 }
             }
             else {
-                // Both changed
-                if (silent) {
+                // Both changed — resolve based on strategy
+                // Determine the effective resolution:
+                //   - explicit --local / --remote flag always wins
+                //   - silent (daemon) mode falls back to local
+                //   - otherwise prompt interactively
+                let resolution;
+                if (conflict === 'local' || conflict === 'remote') {
+                    resolution = conflict;
+                    log.warn(`${file.label}: conflict — using ${color.bold(resolution)} (--${resolution} flag).`);
+                }
+                else if (silent) {
                     // Daemon can't prompt — local wins, will be pushed
+                    resolution = 'local';
                     log.warn(`${file.label}: conflict detected in unattended mode — keeping local.`);
-                    if (file.label === 'settings.json') {
-                        await prepareSettingsForPush(file.localPath, file.repoPath);
-                    }
-                    else {
-                        await fs.ensureDir(path.dirname(file.repoPath));
-                        await fs.copy(file.localPath, file.repoPath, { overwrite: true });
-                    }
-                    anyChanges = true;
                 }
                 else {
                     p.log.warn(color.yellow(`conflict between local and remote ${file.label}`));
@@ -400,26 +436,29 @@ export async function runSync(opts = {}) {
                         p.cancel('Cancelled.');
                         process.exit(0);
                     }
-                    if (choice === 'local') {
+                    resolution = choice;
+                }
+                if (resolution === 'local') {
+                    if (!silent && conflict === 'prompt')
                         p.log.info(`${file.label}: ${color.green('keeping local, will push')}`);
-                        if (file.label === 'settings.json') {
-                            await prepareSettingsForPush(file.localPath, file.repoPath);
-                        }
-                        else {
-                            await fs.ensureDir(path.dirname(file.repoPath));
-                            await fs.copy(file.localPath, file.repoPath, { overwrite: true });
-                        }
-                        anyChanges = true;
+                    if (file.label === 'settings.json') {
+                        await prepareSettingsForPush(file.localPath, file.repoPath);
                     }
                     else {
+                        await fs.ensureDir(path.dirname(file.repoPath));
+                        await fs.copy(file.localPath, file.repoPath, { overwrite: true });
+                    }
+                    anyChanges = true;
+                }
+                else {
+                    if (!silent && conflict === 'prompt')
                         p.log.info(`${file.label}: ${color.cyan('applying remote')}`);
-                        if (file.label === 'settings.json') {
-                            await applyRemoteSettings(file.repoPath, path.join(tmp, 'extensions', 'index.json'), file.localPath, silent);
-                        }
-                        else {
-                            await fs.ensureDir(path.dirname(file.localPath));
-                            await fs.copy(file.repoPath, file.localPath, { overwrite: true });
-                        }
+                    if (file.label === 'settings.json') {
+                        await applyRemoteSettings(file.repoPath, path.join(tmp, 'extensions', 'index.json'), file.localPath, silent);
+                    }
+                    else {
+                        await fs.ensureDir(path.dirname(file.localPath));
+                        await fs.copy(file.repoPath, file.localPath, { overwrite: true });
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zedx",
-    "version": "0.8.1",
+    "version": "0.9.0",
     "description": "Scaffold Zed Editor extensions and sync your settings across machines.",
     "keywords": [
         "boilerplate",