zedx 0.6.0 → 0.7.0

package/dist/add.js

@@ -1,8 +1,8 @@
-import fs from 'fs-extra';
 import path from 'path';
-import ejs from 'ejs';
 import { fileURLToPath } from 'url';
 import * as p from '@clack/prompts';
+import ejs from 'ejs';
+import fs from 'fs-extra';
 import color from 'picocolors';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -18,7 +18,10 @@ function tomlGet(content, key) {
     return match?.[1];
 }
 function slugify(name) {
-    return name.toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-]/g, '');
+    return name
+        .toLowerCase()
+        .replace(/\s+/g, '-')
+        .replace(/[^a-z0-9-]/g, '');
 }
 export async function addTheme(callerDir, themeName) {
     p.intro(`${color.bgBlue(color.bold(' zedx add theme '))} ${color.blue('Adding a theme to your extension…')}`);
@@ -29,9 +32,9 @@ export async function addTheme(callerDir, themeName) {
     }
     const tomlContent = await fs.readFile(tomlPath, 'utf-8');
     const extensionId = tomlGet(tomlContent, 'id') ?? 'extension';
-    const author = tomlGet(tomlContent, 'authors')
-        ?? tomlContent.match(/^authors\s*=\s*\["([^"]+)"\]/m)?.[1]
-        ?? '';
+    const author = tomlGet(tomlContent, 'authors') ??
+        tomlContent.match(/^authors\s*=\s*\["([^"]+)"\]/m)?.[1] ??
+        '';
     const appearance = await p.select({
         message: 'Appearance:',
         options: [
@@ -55,7 +58,12 @@ export async function addTheme(callerDir, themeName) {
         process.exit(1);
     }
     await fs.ensureDir(themesDir);
-    const themeJson = await renderTemplate(path.join(TEMPLATE_DIR, 'theme/theme.json.ejs'), { id: extensionId, author, themeName, appearances });
+    const themeJson = await renderTemplate(path.join(TEMPLATE_DIR, 'theme/theme.json.ejs'), {
+        id: extensionId,
+        author,
+        themeName,
+        appearances,
+    });
     await fs.writeFile(themePath, themeJson);
     p.log.success(`Created ${color.cyan(`themes/${themeFile}`)}`);
     p.outro(`${color.green('✓')} Theme added.\n` +
@@ -70,8 +78,8 @@ export async function addLanguage(callerDir, languageId) {
     }
     const tomlContent = await fs.readFile(tomlPath, 'utf-8');
     // Check for duplicate
-    const alreadyExists = new RegExp(`^\\[grammars\\.${languageId}\\]`, 'm').test(tomlContent)
-        || new RegExp(`^#\\s*\\[grammars\\.${languageId}\\]`, 'm').test(tomlContent);
+    const alreadyExists = new RegExp(`^\\[grammars\\.${languageId}\\]`, 'm').test(tomlContent) ||
+        new RegExp(`^#\\s*\\[grammars\\.${languageId}\\]`, 'm').test(tomlContent);
     if (alreadyExists) {
         p.log.error(color.red(`Language "${languageId}" already exists in extension.toml.`));
         process.exit(1);

package/dist/check.js

@@ -1,6 +1,6 @@
-import fs from 'fs-extra';
 import path from 'path';
 import * as p from '@clack/prompts';
+import fs from 'fs-extra';
 import color from 'picocolors';
 // Minimal TOML key extraction — handles `key = "value"` and `key = ["a", "b"]`
 function tomlGet(content, key) {
@@ -175,7 +175,7 @@ export async function runCheck(callerDir) {
                 if (!tomlHasUncommentedKey(configContent, 'path_suffixes')) {
                     configIssues.push({
                         file: `languages/${langId}/config.toml`,
-                        message: 'path_suffixes is not set — files won\'t be associated with this language',
+                        message: "path_suffixes is not set — files won't be associated with this language",
                         hint: 'Uncomment and fill in path_suffixes (e.g., ["myl"])',
                     });
                 }
@@ -183,7 +183,7 @@ export async function runCheck(callerDir) {
                 if (!tomlHasUncommentedKey(configContent, 'line_comments')) {
                     configIssues.push({
                         file: `languages/${langId}/config.toml`,
-                        message: 'line_comments is not set — toggle-comment keybind won\'t work',
+                        message: "line_comments is not set — toggle-comment keybind won't work",
                         hint: 'Uncomment and set line_comments (e.g., ["// "])',
                     });
                 }
@@ -209,7 +209,7 @@ export async function runCheck(callerDir) {
                     highlightIssues.push({
                         file: `languages/${langId}/highlights.scm`,
                         message: 'Only scaffold starter patterns present — no real grammar queries added yet',
-                        hint: 'Add tree-sitter queries matching your language\'s grammar node types',
+                        hint: "Add tree-sitter queries matching your language's grammar node types",
                     });
                 }
             }

package/dist/daemon.js

@@ -1,8 +1,8 @@
+import { execSync } from 'child_process';
 import os from 'os';
 import path from 'path';
-import fs from 'fs-extra';
-import { execSync } from 'child_process';
 import * as p from '@clack/prompts';
+import fs from 'fs-extra';
 import color from 'picocolors';
 import { resolveZedPaths } from './zed-paths.js';
 const LAUNCHD_LABEL = 'dev.zedx.sync';
@@ -17,7 +17,9 @@ function resolveZedxBinary() {
         if (bin)
             return bin;
     }
-    catch { /* fall through */ }
+    catch {
+        /* fall through */
+    }
     return `${process.execPath} ${process.argv[1]}`;
 }
 function unsupportedPlatform() {
@@ -25,9 +27,7 @@ function unsupportedPlatform() {
     process.exit(1);
 }
 function buildPlist(zedxBin, watchPaths) {
-    const watchEntries = watchPaths
-        .map((wp) => `        <string>${wp}</string>`)
-        .join('\n');
+    const watchEntries = watchPaths.map(wp => `        <string>${wp}</string>`).join('\n');
     return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -68,7 +68,9 @@ async function installMacos(zedxBin, watchPaths) {
     try {
         execSync(`launchctl unload "${LAUNCHD_PLIST_PATH}" 2>/dev/null`, { stdio: 'pipe' });
     }
-    catch { /* not loaded yet */ }
+    catch {
+        /* not loaded yet */
+    }
     execSync(`launchctl load "${LAUNCHD_PLIST_PATH}"`);
     p.log.success(`Daemon installed: ${color.dim(LAUNCHD_PLIST_PATH)}`);
     p.log.info(`Logs: ${color.dim(`${os.homedir()}/Library/Logs/zedx-sync.log`)}`);
@@ -82,7 +84,9 @@ async function uninstallMacos() {
     try {
         execSync(`launchctl unload "${LAUNCHD_PLIST_PATH}"`, { stdio: 'pipe' });
     }
-    catch { /* already unloaded */ }
+    catch {
+        /* already unloaded */
+    }
     await fs.remove(LAUNCHD_PLIST_PATH);
     p.log.success('Daemon uninstalled.');
 }
@@ -103,9 +107,7 @@ WantedBy=default.target
 `;
 }
 function buildSystemdPath(watchPaths) {
-    const pathChangedEntries = watchPaths
-        .map((wp) => `PathChanged=${wp}`)
-        .join('\n');
+    const pathChangedEntries = watchPaths.map(wp => `PathChanged=${wp}`).join('\n');
     return `[Unit]
 Description=Watch Zed config files for zedx sync
 
@@ -138,7 +140,9 @@ async function uninstallLinux() {
     try {
         execSync(`systemctl --user disable --now ${SYSTEMD_SERVICE_NAME}.path`, { stdio: 'pipe' });
     }
-    catch { /* already inactive */ }
+    catch {
+        /* already inactive */
+    }
     if (serviceExists)
         await fs.remove(SYSTEMD_SERVICE_PATH);
     if (pathExists)

package/dist/generator.js

@@ -1,7 +1,7 @@
-import fs from 'fs-extra';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
+import fs from 'fs-extra';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const isDev = __dirname.includes('/src/');
@@ -17,13 +17,13 @@ export async function generateExtension(options, targetDir) {
         ...options,
         grammarRepo: options.grammarRepo || '',
         grammarRev: options.grammarRev || '',
-        languageName: options.languageName || 'My Language'
+        languageName: options.languageName || 'My Language',
     };
     const extToml = await renderTemplate(path.join(TEMPLATE_DIR, 'base/extension.toml.ejs'), extData);
     await fs.writeFile(path.join(targetDir, 'extension.toml'), extToml);
     const readmeData = {
         ...extData,
-        languageId: options.languageId || 'my-language'
+        languageId: options.languageId || 'my-language',
     };
     const readme = await renderTemplate(path.join(TEMPLATE_DIR, 'base/readme.md.ejs'), readmeData);
     await fs.writeFile(path.join(targetDir, 'README.md'), readme);
@@ -47,7 +47,7 @@ async function generateTheme(options, targetDir) {
     const themeData = {
         ...options,
         themeName: options.themeName || 'My Theme',
-        appearances
+        appearances,
     };
     const themeJson = await renderTemplate(path.join(TEMPLATE_DIR, 'theme/theme.json.ejs'), themeData);
     await fs.writeFile(path.join(themeDir, `${options.id}.json`), themeJson);
@@ -58,7 +58,7 @@ async function generateLanguage(options, targetDir) {
     const data = {
         ...options,
         pathSuffixes: options.pathSuffixes || [],
-        lineComments: options.lineComments || ['//', '#']
+        lineComments: options.lineComments || ['//', '#'],
     };
     const configToml = await renderTemplate(path.join(TEMPLATE_DIR, 'language/config.toml.ejs'), data);
     await fs.writeFile(path.join(languageDir, 'config.toml'), configToml);
@@ -71,7 +71,7 @@ async function generateLanguage(options, targetDir) {
         'overrides.scm',
         'textobjects.scm',
         'redactions.scm',
-        'runnables.scm'
+        'runnables.scm',
     ];
     for (const file of queryFiles) {
         const templatePath = path.join(TEMPLATE_DIR, 'language', file);

package/dist/index.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import path from 'path';
 import * as p from '@clack/prompts';
-import color from 'picocolors';
 import { Command } from 'commander';
 import fs from 'fs-extra';
-import { promptUser, promptThemeDetails, promptLanguageDetails } from './prompts.js';
-import { generateExtension } from './generator.js';
-import { runCheck } from './check.js';
+import color from 'picocolors';
 import { addTheme, addLanguage } from './add.js';
-import { syncInit, runSync, syncStatus } from './sync.js';
+import { runCheck } from './check.js';
 import { syncInstall, syncUninstall } from './daemon.js';
+import { generateExtension } from './generator.js';
+import { promptUser, promptThemeDetails, promptLanguageDetails } from './prompts.js';
+import { syncInit, runSync, syncStatus } from './sync.js';
 function bumpVersion(version, type) {
     const [major, minor, patch] = version.split('.').map(Number);
     switch (type) {

package/dist/prompts.js

@@ -5,7 +5,7 @@ export async function promptUser() {
     const nameDefault = 'my-zed-extension';
     const name = await p.text({
         message: 'Project name:',
-        placeholder: nameDefault
+        placeholder: nameDefault,
     });
     if (p.isCancel(name)) {
         p.cancel('Cancelled.');
@@ -21,7 +21,7 @@ export async function promptUser() {
                 return 'ID cannot contain spaces';
             if (value && value !== value.toLowerCase())
                 return 'ID must be lowercase';
-        }
+        },
     });
     if (p.isCancel(id)) {
         p.cancel('Cancelled.');
@@ -31,7 +31,7 @@ export async function promptUser() {
     const descriptionDefault = 'A Zed extension';
     const description = await p.text({
         message: 'Description:',
-        placeholder: descriptionDefault
+        placeholder: descriptionDefault,
     });
     if (p.isCancel(description)) {
         p.cancel('Cancelled.');
@@ -44,7 +44,7 @@ export async function promptUser() {
         validate: (value) => {
             if (!value || value.length === 0)
                 return 'Author is required';
-        }
+        },
     });
     if (p.isCancel(author)) {
         p.cancel('Cancelled.');
@@ -53,7 +53,7 @@ export async function promptUser() {
     const repositoryDefault = `https://github.com/username/${idValue}.git`;
     const repository = await p.text({
         message: 'GitHub repository URL:',
-        initialValue: repositoryDefault
+        initialValue: repositoryDefault,
     });
     if (p.isCancel(repository)) {
         p.cancel('Cancelled.');
@@ -69,9 +69,9 @@ export async function promptUser() {
             { value: 'GPL-3.0', label: 'GNU GPLv3' },
             { value: 'LGPL-3.0', label: 'GNU LGPLv3' },
             { value: 'MIT', label: 'MIT' },
-            { value: 'Zlib', label: 'zlib' }
+            { value: 'Zlib', label: 'zlib' },
         ],
-        initialValue: 'MIT'
+        initialValue: 'MIT',
     });
     if (p.isCancel(license)) {
         p.cancel('Cancelled.');
@@ -81,9 +81,13 @@ export async function promptUser() {
         message: 'What do you want to include in your extension?',
         options: [
             { value: 'theme', label: 'Theme', hint: 'Color scheme for the editor' },
-            { value: 'language', label: 'Language', hint: 'Syntax highlighting, indentation, etc.' }
+            {
+                value: 'language',
+                label: 'Language',
+                hint: 'Syntax highlighting, indentation, etc.',
+            },
         ],
-        required: true
+        required: true,
     });
     if (p.isCancel(extensionTypes)) {
         p.cancel('Cancelled.');
@@ -96,14 +100,14 @@ export async function promptUser() {
         author: String(author),
         repository: repositoryValue,
         license: license,
-        types: extensionTypes
+        types: extensionTypes,
     };
     return options;
 }
 export async function promptThemeDetails() {
     const themeName = await p.text({
         message: 'Theme name:',
-        placeholder: 'My Theme'
+        placeholder: 'My Theme',
     });
     if (p.isCancel(themeName)) {
         p.cancel('Cancelled.');
@@ -114,9 +118,9 @@ export async function promptThemeDetails() {
         options: [
             { value: 'dark', label: 'Dark' },
             { value: 'light', label: 'Light' },
-            { value: 'both', label: 'Both (Dark & Light)' }
+            { value: 'both', label: 'Both (Dark & Light)' },
         ],
-        initialValue: 'dark'
+        initialValue: 'dark',
     });
     if (p.isCancel(appearance)) {
         p.cancel('Cancelled.');
@@ -124,13 +128,13 @@ export async function promptThemeDetails() {
     }
     return {
         themeName: String(themeName),
-        appearance: appearance
+        appearance: appearance,
     };
 }
 export async function promptLanguageDetails() {
     const languageName = await p.text({
         message: 'Language name:',
-        placeholder: 'My Language'
+        placeholder: 'My Language',
     });
     if (p.isCancel(languageName)) {
         p.cancel('Cancelled.');
@@ -138,7 +142,7 @@ export async function promptLanguageDetails() {
     }
     const result = {
         languageName: String(languageName),
-        languageId: String(languageName).toLowerCase().replace(/\s+/g, '-')
+        languageId: String(languageName).toLowerCase().replace(/\s+/g, '-'),
     };
     return result;
 }

package/dist/sync.js

@@ -1,7 +1,7 @@
 import os from 'os';
 import path from 'path';
-import fs from 'fs-extra';
 import * as p from '@clack/prompts';
+import fs from 'fs-extra';
 import color from 'picocolors';
 import simpleGit from 'simple-git';
 import { resolveZedPaths } from './zed-paths.js';
@@ -16,7 +16,9 @@ async function readSyncConfig() {
 async function requireSyncConfig() {
     const config = await readSyncConfig();
     if (!config) {
-        p.log.error(color.red('No sync config found. Run ') + color.cyan('zedx sync init') + color.red(' first.'));
+        p.log.error(color.red('No sync config found. Run ') +
+            color.cyan('zedx sync init') +
+            color.red(' first.'));
         process.exit(1);
     }
     return config;
@@ -35,6 +37,26 @@ async function withTempDir(fn) {
         await fs.remove(tmp);
     }
 }
+// Prepare settings.json for pushing to the repo by stripping auto_install_extensions.
+// That field is derived from extensions/index.json on pull, so storing it in the
+// remote would create stale/conflicting data across machines.
+async function prepareSettingsForPush(localSettingsPath, repoSettingsPath) {
+    const raw = await fs.readFile(localSettingsPath, 'utf-8');
+    const stripped = raw.replace(/\/\/[^\n]*/g, '');
+    let settingsObj = {};
+    try {
+        settingsObj = JSON.parse(stripped);
+    }
+    catch {
+        // If we can't parse it (e.g. complex comments), push as-is
+        await fs.ensureDir(path.dirname(repoSettingsPath));
+        await fs.copy(localSettingsPath, repoSettingsPath, { overwrite: true });
+        return;
+    }
+    delete settingsObj['auto_install_extensions'];
+    await fs.ensureDir(path.dirname(repoSettingsPath));
+    await fs.writeFile(repoSettingsPath, JSON.stringify(settingsObj, null, 4), 'utf-8');
+}
 // Extension merge helper
 async function applyRemoteSettings(repoSettings, repoExtensions, localSettingsPath, silent = false) {
     // Backup existing settings
@@ -48,7 +70,7 @@ async function applyRemoteSettings(repoSettings, repoExtensions, localSettingsPa
     if (await fs.pathExists(repoExtensions)) {
         try {
             const indexJson = (await fs.readJson(repoExtensions));
-            const extensionIds = Object.keys(indexJson.extensions ?? {}).filter((id) => !indexJson.extensions[id]?.dev);
+            const extensionIds = Object.keys(indexJson.extensions ?? {}).filter(id => !indexJson.extensions[id]?.dev);
             if (extensionIds.length > 0) {
                 const stripped = settingsJson.replace(/\/\/[^\n]*/g, '');
                 let settingsObj = {};
@@ -59,12 +81,23 @@ async function applyRemoteSettings(repoSettings, repoExtensions, localSettingsPa
                     if (!silent)
                         p.log.warn(color.yellow('Could not parse settings.json — skipping extension merge.'));
                 }
-                const autoInstall = {};
+                // Preserve any existing entries (e.g. false entries for "never install"),
+                // then add true for every extension recorded in index.json.
+                const existing = typeof settingsObj['auto_install_extensions'] === 'object' &&
+                    settingsObj['auto_install_extensions'] !== null
+                    ? settingsObj['auto_install_extensions']
+                    : {};
+                const autoInstall = { ...existing };
                 for (const id of extensionIds) {
-                    autoInstall[id] = true;
+                    // Only set to true if there is no explicit user preference already
+                    if (!(id in autoInstall)) {
+                        autoInstall[id] = true;
+                    }
                 }
                 settingsObj['auto_install_extensions'] = autoInstall;
                 settingsJson = JSON.stringify(settingsObj, null, 4);
+                if (!silent)
+                    p.log.info(`Injected ${color.cyan(String(extensionIds.length))} extension(s) into ${color.dim('auto_install_extensions')}`);
             }
         }
         catch {
@@ -104,13 +137,13 @@ export async function syncStatus() {
             {
                 repoPath: path.join(tmp, 'settings.json'),
                 localPath: zedPaths.settings,
-                label: 'settings.json'
+                label: 'settings.json',
             },
             {
                 repoPath: path.join(tmp, 'extensions', 'index.json'),
                 localPath: zedPaths.extensions,
-                label: 'extensions/index.json'
-            }
+                label: 'extensions/index.json',
+            },
         ];
         for (const file of files) {
             const localExists = await fs.pathExists(file.localPath);
@@ -157,13 +190,13 @@ export async function syncInit() {
     const repo = await p.text({
         message: 'GitHub repo URL (SSH or HTTPS)',
         placeholder: 'https://github.com/you/zed-config.git',
-        validate: (v) => {
+        validate: v => {
             if (!v.trim())
                 return 'Repo URL is required';
             if (!v.startsWith('https://') && !v.startsWith('git@')) {
                 return 'Must be a valid HTTPS or SSH git URL';
             }
-        }
+        },
     });
     if (p.isCancel(repo)) {
         p.cancel('Cancelled.');
@@ -172,7 +205,7 @@ export async function syncInit() {
     const branch = await p.text({
         message: 'Branch name',
         placeholder: 'main',
-        defaultValue: 'main'
+        defaultValue: 'main',
     });
     if (p.isCancel(branch)) {
         p.cancel('Cancelled.');
@@ -190,7 +223,7 @@ export async function syncInit() {
     }
     const config = {
         syncRepo: repo.trim(),
-        branch: (branch || 'main').trim()
+        branch: (branch || 'main').trim(),
     };
     await writeSyncConfig(config);
     p.outro(`${color.green('✓')} Sync config saved to ${color.cyan(ZEDX_CONFIG_PATH)}\n\n` +
@@ -215,7 +248,7 @@ export async function runSync(opts = {}) {
         success: (msg) => {
             if (!silent)
                 p.log.success(msg);
-        }
+        },
     };
     if (!silent)
         p.intro(color.bold('zedx sync'));
@@ -225,7 +258,7 @@ export async function runSync(opts = {}) {
     const spinner = silent
         ? {
             start: (m) => console.error(`[zedx] ${m}`),
-            stop: (m) => console.error(`[zedx] ${m}`)
+            stop: (m) => console.error(`[zedx] ${m}`),
         }
         : p.spinner();
     await withTempDir(async (tmp) => {
@@ -249,13 +282,13 @@ export async function runSync(opts = {}) {
             {
                 repoPath: path.join(tmp, 'settings.json'),
                 localPath: zedPaths.settings,
-                label: 'settings.json'
+                label: 'settings.json',
             },
             {
                 repoPath: path.join(tmp, 'extensions', 'index.json'),
                 localPath: zedPaths.extensions,
-                label: 'extensions/index.json'
-            }
+                label: 'extensions/index.json',
+            },
         ];
         let anyChanges = false;
         for (const file of files) {
@@ -269,8 +302,13 @@ export async function runSync(opts = {}) {
             // Remote doesn't have it yet — push local
             if (localExists && !remoteFileExists) {
                 log.info(`${file.label}: ${color.green('pushing')} (not in remote yet)`);
-                await fs.ensureDir(path.dirname(file.repoPath));
-                await fs.copy(file.localPath, file.repoPath, { overwrite: 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;
                 continue;
             }
@@ -295,14 +333,21 @@ export async function runSync(opts = {}) {
             }
             // Detect which side changed since last sync via mtime
             const localMtime = (await fs.stat(file.localPath)).mtime;
-            const remoteMtime = remoteFileExists ? (await fs.stat(file.repoPath)).mtime : new Date(0);
+            const remoteMtime = remoteFileExists
+                ? (await fs.stat(file.repoPath)).mtime
+                : new Date(0);
             const localChanged = !lastSync || localMtime > lastSync;
             const remoteChanged = !lastSync || remoteMtime > lastSync;
             if (localChanged && !remoteChanged) {
                 // Only local changed → push
                 log.info(`${file.label}: ${color.green('pushing')} (local is newer)`);
-                await fs.ensureDir(path.dirname(file.repoPath));
-                await fs.copy(file.localPath, file.repoPath, { overwrite: 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 (remoteChanged && !localChanged) {
@@ -321,26 +366,31 @@ export async function runSync(opts = {}) {
                 if (silent) {
                     // Daemon can't prompt — local wins, will be pushed
                     log.warn(`${file.label}: conflict detected in unattended mode — keeping local.`);
-                    await fs.ensureDir(path.dirname(file.repoPath));
-                    await fs.copy(file.localPath, file.repoPath, { overwrite: 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 {
-                    p.log.warn(color.yellow(`${file.label}: both local and remote changed.`));
+                    p.log.warn(color.yellow(`conflict between local and remote ${file.label}`));
                     const choice = await p.select({
                         message: `Which version of ${color.bold(file.label)} should win?`,
                         options: [
                             {
                                 value: 'local',
                                 label: 'Keep local',
-                                hint: `modified ${localMtime.toLocaleString()}`
+                                hint: `modified ${localMtime.toLocaleString()}`,
                             },
                             {
                                 value: 'remote',
                                 label: 'Use remote',
-                                hint: `modified ${remoteMtime.toLocaleString()}`
-                            }
-                        ]
+                                hint: `modified ${remoteMtime.toLocaleString()}`,
+                            },
+                        ],
                     });
                     if (p.isCancel(choice)) {
                         p.cancel('Cancelled.');
@@ -348,8 +398,13 @@ export async function runSync(opts = {}) {
                     }
                     if (choice === 'local') {
                         p.log.info(`${file.label}: ${color.green('keeping local, will push')}`);
-                        await fs.ensureDir(path.dirname(file.repoPath));
-                        await fs.copy(file.localPath, file.repoPath, { overwrite: 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 {

package/package.json

@@ -1,56 +1,59 @@
 {
   "name": "zedx",
-  "version": "0.6.0",
-  "description": "Boilerplate generator for Zed Edittor extensions.",
-  "type": "module",
-  "main": "dist/index.js",
-  "bin": {
-    "zedx": "dist/index.js"
-  },
-  "files": [
-    "dist"
-  ],
+  "version": "0.7.0",
+  "description": "Scaffold Zed Editor extensions and sync your settings across machines.",
   "keywords": [
-    "zed",
-    "zed-editor",
-    "extension",
     "boilerplate",
-    "scaffold"
+    "extension",
+    "scaffold",
+    "zed",
+    "zed-editor"
   ],
+  "homepage": "https://github.com/tahayvr/zedx#readme",
+  "license": "Apache-2.0",
   "author": "Taha Nejad <taha@noiserandom.com>",
   "repository": {
     "type": "git",
     "url": "https://github.com/tahayvr/zedx.git"
   },
-  "homepage": "https://github.com/tahayvr/zedx#readme",
-  "license": "Apache-2.0",
+  "bin": {
+    "zedx": "dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "main": "dist/index.js",
   "publishConfig": {
     "access": "public"
   },
-  "engines": {
-    "node": ">=18"
+  "dependencies": {
+    "@clack/prompts": "^0.10.1",
+    "commander": "^14.0.3",
+    "ejs": "^4.0.1",
+    "fs-extra": "^11.3.3",
+    "picocolors": "^1.1.1",
+    "simple-git": "^3.33.0"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.5",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^25.2.3",
+    "oxfmt": "^0.42.0",
     "oxlint": "^1.57.0",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "dependencies": {
-    "@clack/prompts": "^0.10.1",
-    "commander": "^14.0.3",
-    "ejs": "^4.0.1",
-    "fs-extra": "^11.3.3",
-    "picocolors": "^1.1.1",
-    "simple-git": "^3.33.0"
+  "engines": {
+    "node": ">=18"
   },
   "scripts": {
     "build": "tsc && cp -r src/templates dist/",
     "start": "node dist/index.js",
     "dev": "tsx src/index.ts",
     "lint": "oxlint",
-    "lint:fix": "oxlint --fix"
+    "lint:fix": "oxlint --fix",
+    "fmt": "oxfmt",
+    "fmt:check": "oxfmt --check"
   }
 }