fix: fixed syncthing bugs and fixed test runner bug

Author: kevinwang5658

scripts/run-tests.ts

@@ -123,6 +123,10 @@ async function launchPersistentVm(operatingSystem: string) {
 
   const { data: ipAddr } = await testSpawn(`tart ip ${newVmName}`);
   await testSpawn(`sshpass -p "admin" rsync -avz -e 'ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' --exclude 'node_modules' --exclude '.git' --exclude 'dist' --exclude '.fleet' ${process.cwd()} admin@${ipAddr}:~`);
+  if (operatingSystem === 'darwin') {
+    await testSpawn(`tart exec ${newVmName} ${shell} -i -c "mv ~/.zprofile ~/.zshenv"`);
+  }
+
   await testSpawn(`tart exec ${newVmName} ${shell} -i -c "cd ~/codify-homebrew-plugin && npm ci"`);
   console.log('Finished installing dependencies. Start tests in a new terminal window.');
 

src/resources/syncthing/syncthing-device.ts

@@ -18,7 +18,7 @@ const schema = z
     deviceId: z
       .string()
       .describe('The Syncthing device ID (e.g. XXXXXXX-XXXXXXX-XXXXXXX-XXXXXXX-XXXXXXX-XXXXXXX-XXXXXXX-XXXXXXX)'),
-    name: z
+    deviceName: z
       .string()
       .optional()
       .describe('Human-readable label for this device'),
@@ -79,7 +79,7 @@ export class SyncthingDeviceResource extends Resource<SyncthingDeviceConfig> {
         identifyingParameters: ['deviceId'],
       },
       parameterSettings: {
-        name: { type: 'string', canModify: true },
+        deviceName: { type: 'string', canModify: true },
         addresses: { type: 'array', canModify: true },
         autoAcceptFolders: { type: 'boolean', canModify: true },
         paused: { type: 'boolean', canModify: true },
@@ -107,10 +107,10 @@ export class SyncthingDeviceResource extends Resource<SyncthingDeviceConfig> {
 
   async create(plan: CreatePlan<SyncthingDeviceConfig>): Promise<void> {
     const $ = getPty();
-    const { deviceId, name, addresses, autoAcceptFolders, paused, compression, maxSendKbps, maxRecvKbps } =
+    const { deviceId, deviceName, addresses, autoAcceptFolders, paused, compression, maxSendKbps, maxRecvKbps } =
       plan.desiredConfig;
 
-    const args = buildDeviceAddArgs({ deviceId, name, addresses, autoAcceptFolders, paused, compression, maxSendKbps, maxRecvKbps });
+    const args = buildDeviceAddArgs({ deviceId, deviceName, addresses, autoAcceptFolders, paused, compression, maxSendKbps, maxRecvKbps });
     await $.spawn(`syncthing cli config devices add ${args}`, { interactive: true });
   }
 
@@ -150,19 +150,14 @@ export class SyncthingDeviceResource extends Resource<SyncthingDeviceConfig> {
       return null;
     }
 
-    let ids: string[];
-    try {
-      ids = JSON.parse(listData) as string[];
-    } catch {
-      return null;
-    }
+    const ids = listData.split('\n').map((s) => s.trim()).filter(Boolean);
 
     if (!ids.includes(deviceId)) {
       return null;
     }
 
     // Fetch the full device configuration
-    const { status, data } = await $.spawnSafe(`syncthing cli config devices ${deviceId}`);
+    const { status, data } = await $.spawnSafe(`syncthing cli config devices ${deviceId} dump-json`);
     if (status !== SpawnStatus.SUCCESS) {
       return null;
     }
@@ -180,7 +175,7 @@ export class SyncthingDeviceResource extends Resource<SyncthingDeviceConfig> {
 function deviceFromRaw(raw: RawDevice): Partial<SyncthingDeviceConfig> {
   return {
     deviceId: raw.deviceID,
-    name: raw.name || undefined,
+    deviceName: raw.name || undefined,
     addresses: raw.addresses,
     compression: raw.compression as SyncthingDeviceConfig['compression'],
     autoAcceptFolders: raw.autoAcceptFolders,
@@ -192,7 +187,7 @@ function deviceFromRaw(raw: RawDevice): Partial<SyncthingDeviceConfig> {
 
 function deviceOptionCliPath(key: keyof SyncthingDeviceConfig): string | undefined {
   const map: Partial<Record<keyof SyncthingDeviceConfig, string>> = {
-    name: 'name',
+    deviceName: 'name',
     autoAcceptFolders: 'autoAcceptFolders',
     paused: 'paused',
     compression: 'compression',
@@ -206,7 +201,7 @@ function buildDeviceAddArgs(config: Partial<SyncthingDeviceConfig>): string {
   const parts: string[] = [];
 
   if (config.deviceId) parts.push(`--device-id ${config.deviceId}`);
-  if (config.name) parts.push(`--name "${config.name}"`);
+  if (config.deviceName) parts.push(`--name "${config.deviceName}"`);
   if (config.addresses?.length) parts.push(`--addresses ${config.addresses.join(',')}`);
   if (config.autoAcceptFolders !== undefined)
     parts.push(`--auto-accept-folders=${config.autoAcceptFolders}`);

src/resources/syncthing/syncthing-folder.ts

@@ -5,9 +5,9 @@ import {
   ParameterChange,
   Resource,
   ResourceSettings,
-  SpawnStatus,
   getPty,
   z,
+  SpawnStatus,
 } from '@codifycli/plugin-core';
 import { OS } from '@codifycli/schemas';
 
@@ -162,27 +162,7 @@ export class SyncthingFolderResource extends Resource<SyncthingFolderConfig> {
   private async fetchFolder(folderId: string): Promise<RawFolder | null> {
     const $ = getPty();
 
-    // Verify the folder ID exists in the configured list
-    const { status: listStatus, data: listData } = await $.spawnSafe(
-      'syncthing cli config folders list'
-    );
-    if (listStatus !== SpawnStatus.SUCCESS) {
-      return null;
-    }
-
-    let ids: string[];
-    try {
-      ids = JSON.parse(listData) as string[];
-    } catch {
-      return null;
-    }
-
-    if (!ids.includes(folderId)) {
-      return null;
-    }
-
-    // Fetch the full folder configuration
-    const { status, data } = await $.spawnSafe(`syncthing cli config folders ${folderId}`);
+    const { status, data } = await $.spawnSafe(`syncthing cli config folders ${folderId} dump-json`);
     if (status !== SpawnStatus.SUCCESS) {
       return null;
     }

test/syncthing/syncthing.test.ts

@@ -155,8 +155,7 @@ describe('Syncthing resource integration tests', async () => {
           const listResult = await testSpawn('syncthing cli config folders list');
           expect(listResult.status).toBe(SpawnStatus.SUCCESS);
 
-          const ids: string[] = JSON.parse(listResult.data);
-          expect(ids).toContain('codify-test');
+          expect(listResult.data).toContain('codify-test');
         },
         validateDestroy: async () => {
           expect(await testSpawn('which syncthing')).toMatchObject({
@@ -173,7 +172,7 @@ describe('Syncthing resource integration tests', async () => {
 
   it('Can add and remove a remote device', { timeout: 300_000 }, async () => {
     // Use a deterministic but fictitious device ID that Syncthing will accept
-    const testDeviceId = 'AAAAAAA-BBBBBBB-CCCCCCC-DDDDDDD-EEEEEEE-FFFFFFF-GGGGGGG-HHHHHHH';
+    const testDeviceId = 'MFZWI3D-BONSGYC-YLTMRWG-C43ENR5-QXGZDMM-FZWI3DP-BONSGYY-LTMRWAD';
 
     await PluginTester.fullTest(
       pluginPath,
@@ -182,7 +181,7 @@ describe('Syncthing resource integration tests', async () => {
         {
           type: 'syncthing-device',
           deviceId: testDeviceId,
-          name: 'Codify Test Device',
+          deviceName: 'Codify Test Device',
           addresses: ['dynamic'],
           autoAcceptFolders: false,
           compression: 'metadata',
@@ -193,8 +192,7 @@ describe('Syncthing resource integration tests', async () => {
           const listResult = await testSpawn('syncthing cli config devices list');
           expect(listResult.status).toBe(SpawnStatus.SUCCESS);
 
-          const ids: string[] = JSON.parse(listResult.data);
-          expect(ids).toContain(testDeviceId);
+          expect(listResult.data).toContain(testDeviceId);
         },
         validateDestroy: async () => {
           expect(await testSpawn('which syncthing')).toMatchObject({