opencode-synced 0.5.0 → 0.6.0

package/dist/sync/apply.js

@@ -1,6 +1,6 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { deepMerge, parseJsonc, pathExists, stripOverrides, writeJsonFile } from './config.js';
+import { deepMerge, hasOwn, parseJsonc, pathExists, stripOverrides, writeJsonFile, } from './config.js';
 import { extractMcpSecrets, hasOverrides, mergeOverrides, stripOverrideKeys, } from './mcp-secrets.js';
 import { normalizePath } from './paths.js';
 export async function syncRepoToLocal(plan, overrides) {
@@ -214,7 +214,7 @@ function isDeepEqual(left, right) {
         if (leftKeys.length !== rightKeys.length)
             return false;
         for (const key of leftKeys) {
-            if (!Object.hasOwn(right, key))
+            if (!hasOwn(right, key))
                 return false;
             if (!isDeepEqual(left[key], right[key])) {
                 return false;

package/dist/sync/config.d.ts

@@ -35,3 +35,5 @@ export declare function writeJsonFile(filePath: string, data: unknown, options?:
     jsonc: boolean;
     mode?: number;
 }): Promise<void>;
+export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
+export declare function hasOwn(target: Record<string, unknown>, key: string): boolean;

package/dist/sync/config.js

@@ -106,31 +106,14 @@ export function stripOverrides(localConfig, overrides, baseConfig) {
     return result;
 }
 export function parseJsonc(content) {
-    const stripped = stripJsonComments(content);
-    return JSON.parse(stripped);
-}
-export async function writeJsonFile(filePath, data, options = { jsonc: false }) {
-    const json = JSON.stringify(data, null, 2);
-    const content = options.jsonc ? `// Generated by opencode-synced\n${json}\n` : `${json}\n`;
-    await fs.writeFile(filePath, content, 'utf8');
-    if (options.mode !== undefined) {
-        await fs.chmod(filePath, options.mode);
-    }
-}
-function isPlainObject(value) {
-    if (!value || typeof value !== 'object')
-        return false;
-    return Object.getPrototypeOf(value) === Object.prototype;
-}
-function stripJsonComments(input) {
     let output = '';
     let inString = false;
     let inSingleLine = false;
     let inMultiLine = false;
     let escapeNext = false;
-    for (let i = 0; i < input.length; i += 1) {
-        const current = input[i];
-        const next = input[i + 1];
+    for (let i = 0; i < content.length; i += 1) {
+        const current = content[i];
+        const next = content[i + 1];
         if (inSingleLine) {
             if (current === '\n') {
                 inSingleLine = false;
@@ -160,7 +143,7 @@ function stripJsonComments(input) {
             }
             continue;
         }
-        if (current === '"' && !inString) {
+        if (current === '"') {
             inString = true;
             output += current;
             continue;
@@ -175,7 +158,33 @@ function stripJsonComments(input) {
             i += 1;
             continue;
         }
+        if (current === ',') {
+            let nextIndex = i + 1;
+            while (nextIndex < content.length && /\s/.test(content[nextIndex])) {
+                nextIndex += 1;
+            }
+            const nextChar = content[nextIndex];
+            if (nextChar === '}' || nextChar === ']') {
+                continue;
+            }
+        }
         output += current;
     }
-    return output;
+    return JSON.parse(output);
+}
+export async function writeJsonFile(filePath, data, options = { jsonc: false }) {
+    const json = JSON.stringify(data, null, 2);
+    const content = options.jsonc ? `// Generated by opencode-synced\n${json}\n` : `${json}\n`;
+    await fs.writeFile(filePath, content, 'utf8');
+    if (options.mode !== undefined) {
+        await fs.chmod(filePath, options.mode);
+    }
+}
+export function isPlainObject(value) {
+    if (!value || typeof value !== 'object')
+        return false;
+    return Object.getPrototypeOf(value) === Object.prototype;
+}
+export function hasOwn(target, key) {
+    return Object.hasOwn(target, key);
 }

package/dist/sync/mcp-secrets.js

@@ -1,4 +1,4 @@
-import { deepMerge } from './config.js';
+import { deepMerge, hasOwn, isPlainObject } from './config.js';
 const ENV_PLACEHOLDER_PATTERN = /\{env:[^}]+\}/i;
 export function extractMcpSecrets(config) {
     const sanitizedConfig = cloneConfig(config);
@@ -88,15 +88,7 @@ function setNestedValue(target, path, value) {
 function getPlainObject(value) {
     return isPlainObject(value) ? value : null;
 }
-function isPlainObject(value) {
-    if (!value || typeof value !== 'object')
-        return false;
-    return Object.getPrototypeOf(value) === Object.prototype;
-}
 function cloneConfig(config) {
-    if (typeof structuredClone === 'function') {
-        return structuredClone(config);
-    }
     return JSON.parse(JSON.stringify(config));
 }
 export function mergeOverrides(base, extra) {
@@ -108,7 +100,7 @@ export function stripOverrideKeys(base, toRemove) {
     }
     const result = { ...base };
     for (const [key, removeValue] of Object.entries(toRemove)) {
-        if (!Object.hasOwn(result, key))
+        if (!hasOwn(result, key))
             continue;
         const currentValue = result[key];
         if (isPlainObject(removeValue) && isPlainObject(currentValue)) {

package/dist/sync/service.js

@@ -10,7 +10,16 @@ export function createSyncService(ctx) {
     const log = createLogger(ctx.client);
     return {
         startupSync: async () => {
-            const config = await loadSyncConfig(locations);
+            let config = null;
+            try {
+                config = await loadSyncConfig(locations);
+            }
+            catch (error) {
+                const message = `Failed to load opencode-synced config: ${formatError(error)}`;
+                log.error(message, { path: locations.syncConfigPath });
+                await showToast(ctx.client, `Failed to load opencode-synced config. Check ${locations.syncConfigPath} for JSON errors.`, 'error');
+                return;
+            }
             if (!config) {
                 await showToast(ctx.client, 'Configure opencode-synced with /sync-init or link to an existing repo with /sync-link', 'info');
                 return;

package/dist/sync/utils.js

@@ -23,9 +23,14 @@ function log(client, level, message, extra) {
     });
 }
 export async function showToast(client, message, variant) {
-    await client.tui.showToast({
-        body: { title: 'opencode-synced plugin', message, variant },
-    });
+    try {
+        await client.tui.showToast({
+            body: { title: 'opencode-synced plugin', message, variant },
+        });
+    }
+    catch {
+        // Ignore toast failures (e.g. headless mode or early startup).
+    }
 }
 export function unwrapData(response) {
     if (!response || typeof response !== 'object')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-synced",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Sync global OpenCode config across machines via GitHub.",
   "author": {
     "name": "Ian Hildebrand"