fix: prevent pull collisions from similarly named resources

Stop pull from reusing resource IDs by prefix match and make push treat UUID-to-file mappings with mismatched current names as invalid before apply.

Author: dhruva-vapi

src/pull.ts

@@ -21,7 +21,7 @@ import type { StateFile, ResourceType } from "./types.ts";
 // Types
 // ─────────────────────────────────────────────────────────────────────────────
 
-interface VapiResource {
+export interface VapiResource {
   id: string;
   name?: string;
   [key: string]: unknown;
@@ -245,28 +245,77 @@ function generateResourceId(resource: VapiResource): string {
   return name ? `${slugify(name)}-${shortId}` : `resource-${shortId}`;
 }
 
+export function extractBaseSlug(resourceId: string): string {
+  const match = resourceId.match(/^(.*)-([a-f0-9]{8})$/i);
+  return match?.[1] ?? resourceId;
+}
+
+export function resourceIdMatchesName(
+  resourceId: string,
+  resource: VapiResource,
+): boolean {
+  const name = extractName(resource);
+  if (!name) return true;
+  return extractBaseSlug(resourceId) === slugify(name);
+}
+
+function listExistingResourceIds(resourceType: ResourceType): string[] {
+  const dir = join(RESOURCES_DIR, FOLDER_MAP[resourceType]);
+  if (!existsSync(dir)) return [];
+
+  const walk = (currentDir: string, ids: string[]): string[] => {
+    const entries = readdirSync(currentDir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join(currentDir, entry.name);
+      if (entry.isDirectory()) {
+        walk(fullPath, ids);
+        continue;
+      }
+
+      if (!/\.(yml|yaml|md)$/.test(entry.name)) {
+        continue;
+      }
+
+      const relativePath = relative(dir, fullPath);
+      ids.push(relativePath.replace(/\.(yml|yaml|md)$/, ""));
+    }
+
+    return ids;
+  };
+
+  return walk(dir, []);
+}
+
 // When pulling a new environment, a resource may already exist on disk under a
 // different UUID suffix (e.g., `end-call-tool-8102e715` from dev). Match by
 // name-slug so we reuse the existing file instead of creating a duplicate.
 function findExistingResourceId(
-  resourceType: ResourceType,
+  existingResourceIds: string[],
   resource: VapiResource,
 ): string | undefined {
   const name = extractName(resource);
   if (!name) return undefined;
 
   const nameSlug = slugify(name);
-  const dir = join(RESOURCES_DIR, FOLDER_MAP[resourceType]);
-  if (!existsSync(dir)) return undefined;
-
-  const matches = readdirSync(dir)
-    .filter((f) => /\.(yml|yaml|md)$/.test(f))
-    .map((f) => f.replace(/\.(yml|yaml|md)$/, ""))
-    .filter((id) => id === nameSlug || id.startsWith(nameSlug + "-"));
+  const matches = existingResourceIds.filter(
+    (id) => extractBaseSlug(id) === nameSlug,
+  );
 
   return matches.length === 1 ? matches[0] : undefined;
 }
 
+function removeUuidMappings(
+  stateSection: Record<string, string>,
+  uuid: string,
+  keepResourceId?: string,
+): void {
+  for (const [resourceId, mappedUuid] of Object.entries(stateSection)) {
+    if (mappedUuid === uuid && resourceId !== keepResourceId) {
+      delete stateSection[resourceId];
+    }
+  }
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Resource Processing
 // ─────────────────────────────────────────────────────────────────────────────
@@ -583,6 +632,9 @@ export async function pullResourceType(
   const newStateSection: Record<string, string> = resourceIds?.length
     ? { ...state[resourceType] }
     : {};
+  const existingResourceIds = bootstrap
+    ? []
+    : listExistingResourceIds(resourceType);
 
   let created = 0;
   let updated = 0;
@@ -591,15 +643,23 @@ export async function pullResourceType(
   for (const resource of resources) {
     // Check if we already have this resource in state (by UUID)
     let resourceId = reverseMap.get(resource.id);
-    const isNew = !resourceId;
+    if (resourceId && !resourceIdMatchesName(resourceId, resource)) {
+      delete newStateSection[resourceId];
+      resourceId = undefined;
+    }
 
     if (!resourceId) {
       // Reuse an existing file's resourceId if the name matches (cross-env pull)
       resourceId = bootstrap
         ? generateResourceId(resource)
-        : (findExistingResourceId(resourceType, resource) ??
+        : (findExistingResourceId(existingResourceIds, resource) ??
           generateResourceId(resource));
     }
+    const isNew =
+      !reverseMap.get(resource.id) ||
+      !resourceIdMatchesName(resourceId, resource);
+
+    removeUuidMappings(newStateSection, resource.id, resourceId);
 
     // Skip files that have been locally modified (git detection)
     if (!bootstrap && changedFiles) {

src/push.ts

@@ -8,7 +8,7 @@ import {
 } from "./config.ts";
 import { loadState, saveState } from "./state.ts";
 import { loadResources, loadSingleResource, FOLDER_MAP } from "./resources.ts";
-import { fetchAllResources, runPull } from "./pull.ts";
+import { fetchAllResources, resourceIdMatchesName, runPull } from "./pull.ts";
 import {
   resolveReferences,
   resolveAssistantIds,
@@ -156,14 +156,22 @@ function getMissingCredentialNames(
   return [...names].filter((name) => !credentialMap.has(name));
 }
 
-async function getStaleStateMappings(
+async function getInvalidStateMappings(
   resources: LoadedResources,
   state: StateFile,
-): Promise<Array<{ type: ResourceType; resourceId: string; uuid: string }>> {
-  const staleMappings: Array<{
+): Promise<
+  Array<{
     type: ResourceType;
     resourceId: string;
     uuid: string;
+    reason: "missing_remote" | "name_mismatch";
+  }>
+> {
+  const invalidMappings: Array<{
+    type: ResourceType;
+    resourceId: string;
+    uuid: string;
+    reason: "missing_remote" | "name_mismatch";
   }> = [];
 
   for (const type of getTargetedResourceTypes(resources)) {
@@ -185,18 +193,33 @@ async function getStaleStateMappings(
       continue;
     }
 
-    const remoteIds = new Set(
-      (await fetchAllResources(type)).map((resource) => resource.id),
+    const remoteResources = await fetchAllResources(type);
+    const remoteResourcesById = new Map(
+      remoteResources.map((resource) => [resource.id, resource]),
     );
 
     for (const trackedResource of trackedResources) {
-      if (!remoteIds.has(trackedResource.uuid)) {
-        staleMappings.push({ type, ...trackedResource });
+      const remoteResource = remoteResourcesById.get(trackedResource.uuid);
+      if (!remoteResource) {
+        invalidMappings.push({
+          type,
+          ...trackedResource,
+          reason: "missing_remote",
+        });
+        continue;
+      }
+
+      if (!resourceIdMatchesName(trackedResource.resourceId, remoteResource)) {
+        invalidMappings.push({
+          type,
+          ...trackedResource,
+          reason: "name_mismatch",
+        });
       }
     }
   }
 
-  return staleMappings;
+  return invalidMappings;
 }
 
 async function maybeBootstrapState(
@@ -212,12 +235,12 @@ async function maybeBootstrapState(
   const stateUninitialized =
     Object.keys(state.credentials).length === 0 ||
     targetedTypes.every((type) => Object.keys(state[type]).length === 0);
-  const staleMappings = await getStaleStateMappings(resources, state);
+  const invalidMappings = await getInvalidStateMappings(resources, state);
 
   if (
     !stateUninitialized &&
     missingCredentialNames.length === 0 &&
-    staleMappings.length === 0
+    invalidMappings.length === 0
   ) {
     return state;
   }
@@ -233,9 +256,9 @@ async function maybeBootstrapState(
       `   - Missing credential mappings: ${missingCredentialNames.join(", ")}`,
     );
   }
-  for (const mapping of staleMappings) {
+  for (const mapping of invalidMappings) {
     console.log(
-      `   - Stale ${mapping.type} mapping: ${mapping.resourceId} -> ${mapping.uuid}`,
+      `   - Invalid ${mapping.type} mapping (${mapping.reason}): ${mapping.resourceId} -> ${mapping.uuid}`,
     );
   }