address copilot review feedback

Author: shelby-moore

packages/insomnia/src/konnect/sync.ts

@@ -371,78 +371,73 @@ async function syncServiceWorkspace(
   skippedRoutes: SkippedRoute[],
 ): Promise<void> {
   const { pat, controlPlane, project, region, globalEnvironmentId, signal, onProgress } = ctx;
-  const bufferId = await db.bufferChanges();
 
-  try {
-    const serviceName = service.name ?? `Gateway Service ${service.id}`;
-
-    // Upsert workspace for this service
-    let workspace: Workspace;
-    if (existingWorkspace) {
-      if (existingWorkspace.name !== serviceName) {
-        workspace = await insoservices.workspace.update(existingWorkspace, { name: serviceName });
-        counts.services.updated++;
-      } else {
-        workspace = existingWorkspace;
-      }
-    } else {
-      workspace = await insoservices.workspace.create({ parentId: project._id, name: serviceName, scope: 'collection', konnectServiceId: service.id });
-      counts.services.created++;
-    }
-    counts.services.total++;
+  const serviceName = service.name ?? `Gateway Service ${service.id}`;
 
-    // Set project-level env as the active global env for this workspace
-    const workspaceMeta = await insoservices.workspaceMeta.getOrCreateByParentId(workspace._id);
-    if (workspaceMeta.activeGlobalEnvironmentId !== globalEnvironmentId) {
-      await insoservices.workspaceMeta.update(workspaceMeta, { activeGlobalEnvironmentId: globalEnvironmentId });
+  // Upsert workspace for this service
+  let workspace: Workspace;
+  if (existingWorkspace) {
+    if (existingWorkspace.name !== serviceName) {
+      workspace = await insoservices.workspace.update(existingWorkspace, { name: serviceName });
+      counts.services.updated++;
+    } else {
+      workspace = existingWorkspace;
     }
-    await insoservices.cookieJar.getOrCreateForParentId(workspace._id);
+  } else {
+    workspace = await insoservices.workspace.create({ parentId: project._id, name: serviceName, scope: 'collection', konnectServiceId: service.id });
+    counts.services.created++;
+  }
+  counts.services.total++;
 
-    const incomingRoutes = await fetchRoutesForService(pat, controlPlane.id, service.id, region, signal);
-    const existingData = await loadExistingRequestData(workspace._id);
-    const incomingKeys = new Set<string>();
-    const incomingRouteIds = new Set<string>();
+  // Set project-level env as the active global env for this workspace
+  const workspaceMeta = await insoservices.workspaceMeta.getOrCreateByParentId(workspace._id);
+  if (workspaceMeta.activeGlobalEnvironmentId !== globalEnvironmentId) {
+    await insoservices.workspaceMeta.update(workspaceMeta, { activeGlobalEnvironmentId: globalEnvironmentId });
+  }
+  await insoservices.cookieJar.getOrCreateForParentId(workspace._id);
 
-    for (const route of incomingRoutes) {
-      signal?.throwIfAborted();
-      incomingRouteIds.add(route.id);
-      const isL4 = route.protocols.every(p => L4_PROTOCOLS.has(p));
-      const isGrpc = route.protocols.some(p => p === 'grpc' || p === 'grpcs');
-      const isWs = route.protocols.some(p => p === 'ws' || p === 'wss');
+  const incomingRoutes = await fetchRoutesForService(pat, controlPlane.id, service.id, region, signal);
+  const existingData = await loadExistingRequestData(workspace._id);
+  const incomingKeys = new Set<string>();
+  const incomingRouteIds = new Set<string>();
 
-      const routeName = routeDisplayName(route);
+  for (const route of incomingRoutes) {
+    signal?.throwIfAborted();
+    incomingRouteIds.add(route.id);
+    const isL4 = route.protocols.every(p => L4_PROTOCOLS.has(p));
+    const isGrpc = route.protocols.some(p => p === 'grpc' || p === 'grpcs');
+    const isWs = route.protocols.some(p => p === 'ws' || p === 'wss');
 
-      if (isL4) {
-        counts.routes.skipped++;
-        skippedRoutes.push({ routeName, reason: `Unsupported protocol: ${route.protocols.join(', ')}`, serviceName });
-        continue;
-      }
+    const routeName = routeDisplayName(route);
 
-      // Routes matched by SNI cannot be represented — Insomnia derives SNI implicitly
-      // from the URL hostname and has no SNI override.
-      if ((route.snis?.length ?? 0) > 0) {
-        counts.routes.skipped++;
-        skippedRoutes.push({ routeName, reason: 'Route uses SNI matching — unsupported in Insomnia', serviceName });
-        continue;
-      }
+    if (isL4) {
+      counts.routes.skipped++;
+      skippedRoutes.push({ routeName, reason: `Unsupported protocol: ${route.protocols.join(', ')}`, serviceName });
+      continue;
+    }
 
-      if (isGrpc) {
-        await syncGrpcRoute(route, workspace._id, existingData.maps.grpc, counts.routes, incomingKeys);
-      } else {
-        // Host header only applies to HTTP/WS — gRPC uses :authority which Insomnia derives from the URL
-        const headers = [
-          ...(route.hosts?.[0] ? [{ name: 'Host', value: route.hosts[0] }] : []),
-          ...Object.entries(route.headers ?? {}).map(([name, values]) => ({ name, value: values[0] })),
-        ];
-        await (isWs ? syncWsRoute(route, workspace._id, headers, existingData.maps.ws, counts.routes, incomingKeys) : syncHttpRoute(route, workspace._id, headers, existingData.maps.http, counts.routes, incomingKeys));
-      }
+    // Routes matched by SNI cannot be represented — Insomnia derives SNI implicitly
+    // from the URL hostname and has no SNI override.
+    if ((route.snis?.length ?? 0) > 0) {
+      counts.routes.skipped++;
+      skippedRoutes.push({ routeName, reason: 'Route uses SNI matching — unsupported in Insomnia', serviceName });
+      continue;
     }
 
-    await deleteStaleRequests(existingData, incomingKeys, incomingRouteIds, counts.routes);
-    onProgress?.(`Synced ${serviceName} in ${controlPlane.name}`);
-  } finally {
-    await db.flushChanges(bufferId);
+    if (isGrpc) {
+      await syncGrpcRoute(route, workspace._id, existingData.maps.grpc, counts.routes, incomingKeys);
+    } else {
+      // Host header only applies to HTTP/WS — gRPC uses :authority which Insomnia derives from the URL
+      const headers = [
+        ...(route.hosts?.[0] ? [{ name: 'Host', value: route.hosts[0] }] : []),
+        ...Object.entries(route.headers ?? {}).map(([name, values]) => ({ name, value: values[0] })),
+      ];
+      await (isWs ? syncWsRoute(route, workspace._id, headers, existingData.maps.ws, counts.routes, incomingKeys) : syncHttpRoute(route, workspace._id, headers, existingData.maps.http, counts.routes, incomingKeys));
+    }
   }
+
+  await deleteStaleRequests(existingData, incomingKeys, incomingRouteIds, counts.routes);
+  onProgress?.(`Synced ${serviceName} in ${controlPlane.name}`);
 }
 
 /** Upserts the project-level environment workspace and syncs Konnect proxy URL vars into it. Returns the environment id. */
@@ -532,28 +527,33 @@ async function syncControlPlane(
 
   const ctx: ServiceSyncContext = { pat, controlPlane, project, region, globalEnvironmentId, signal, onProgress };
   const CONCURRENCY = 5;
-  for (let i = 0; i < services.length; i += CONCURRENCY) {
-    signal?.throwIfAborted();
-    const batch = services.slice(i, i + CONCURRENCY);
-    const batchResults = await Promise.all(batch.map(async service => {
-      const localCounts = { services: zeroCounts(), routes: zeroCounts() };
-      const localSkipped: SkippedRoute[] = [];
-      await syncServiceWorkspace(ctx, service, existingWorkspaceByServiceId.get(service.id), localCounts, localSkipped);
-      return { counts: localCounts, skipped: localSkipped };
-    }));
-    for (const { counts, skipped } of batchResults) {
-      mergeCounts(acc.serviceCounts, counts.services);
-      mergeCounts(acc.routeCounts, counts.routes);
-      acc.skippedRoutes.push(...skipped);
+  const bufferId = await db.bufferChanges();
+  try {
+    for (let i = 0; i < services.length; i += CONCURRENCY) {
+      signal?.throwIfAborted();
+      const batch = services.slice(i, i + CONCURRENCY);
+      const batchResults = await Promise.all(batch.map(async service => {
+        const localCounts = { services: zeroCounts(), routes: zeroCounts() };
+        const localSkipped: SkippedRoute[] = [];
+        await syncServiceWorkspace(ctx, service, existingWorkspaceByServiceId.get(service.id), localCounts, localSkipped);
+        return { counts: localCounts, skipped: localSkipped };
+      }));
+      for (const { counts, skipped } of batchResults) {
+        mergeCounts(acc.serviceCounts, counts.services);
+        mergeCounts(acc.routeCounts, counts.routes);
+        acc.skippedRoutes.push(...skipped);
+      }
     }
-  }
 
-  // Delete stale workspaces (services removed from this Control Plane)
-  for (const workspace of existingWorkspaces) {
-    if (!incomingServiceIds.has(workspace.konnectServiceId!)) {
-      await insoservices.workspace.remove(workspace);
-      acc.serviceCounts.deleted++;
+    // Delete stale workspaces (services removed from this Control Plane)
+    for (const workspace of existingWorkspaces) {
+      if (!incomingServiceIds.has(workspace.konnectServiceId!)) {
+        await insoservices.workspace.remove(workspace);
+        acc.serviceCounts.deleted++;
+      }
     }
+  } finally {
+    await db.flushChanges(bufferId);
   }
 }
 

packages/insomnia/src/ui/components/project/project-list-sidebar.tsx

@@ -276,7 +276,6 @@ export const ProjectListSidebar = ({
         <Button
           aria-label="Create new Project"
           onPress={onCreateProject}
-          isDisabled={nonKonnectProjects.length === 0}
           className="flex aspect-square h-full items-center justify-center rounded-xs text-sm text-(--color-font) ring-1 ring-transparent transition-all hover:bg-(--hl-xs) focus:ring-(--hl-md) focus:ring-inset aria-pressed:bg-(--hl-sm)"
         >
           <Icon icon="plus-circle" />

packages/insomnia/src/ui/hooks/use-konnect-sync.ts

@@ -59,6 +59,7 @@ export function useKonnectSync(): UseKonnectSyncResult {
       event: SegmentEvent.kongKonnectSyncCompleted,
       properties: {
         success: result.success,
+        cancelled,
         control_planes_total: result.controlPlanes.total,
         control_planes_created: result.controlPlanes.created,
         control_planes_updated: result.controlPlanes.updated,
@@ -73,7 +74,7 @@ export function useKonnectSync(): UseKonnectSyncResult {
         routes_deleted: result.routes.deleted,
         routes_skipped: result.routes.skipped,
         duration_ms: result.durationMs,
-        ...(result.error ? { error: result.error } : {}),
+        ...(!cancelled && result.error ? { error: result.error } : {}),
       },
     });