feat: add force options for apply commands and enhance pull logic

- Introduced new commands `apply:dev:force`, `apply:stg:force`, and `apply:prod:force` to enable deletions of locally removed resources during the apply process.
- Updated the `apply.ts` script to handle `--force` argument, allowing users to push deletions to the platform.
- Enhanced the pull logic to skip locally deleted resources unless the force option is specified, improving safety and user control.
- Updated error messages and usage instructions to reflect the new functionality.

Author: vtkovapi

package.json

@@ -9,6 +9,9 @@
     "apply:dev": "tsx src/apply.ts dev",
     "apply:stg": "tsx src/apply.ts stg",
     "apply:prod": "tsx src/apply.ts prod",
+    "apply:dev:force": "tsx src/apply.ts dev --force",
+    "apply:stg:force": "tsx src/apply.ts stg --force",
+    "apply:prod:force": "tsx src/apply.ts prod --force",
     "push:dev": "tsx src/push.ts dev",
     "push:stg": "tsx src/push.ts stg",
     "push:prod": "tsx src/push.ts prod",

src/apply.ts

@@ -26,35 +26,45 @@ function runPassthrough(cmd: string): number {
 
 async function main(): Promise<void> {
   const env = process.argv[2];
-  const extraArgs = process.argv.slice(3).join(" ");
+  const allArgs = process.argv.slice(3);
+  const hasForce = allArgs.includes("--force");
+
+  // Pull never gets --force (apply's pull should always preserve local changes/deletions)
+  const pullArgs = allArgs.filter(a => a !== "--force").join(" ");
+  const pushArgs = allArgs.join(" ");
 
   if (!env || !VALID_ENVIRONMENTS.includes(env as typeof VALID_ENVIRONMENTS[number])) {
-    console.error("Usage: npm run apply:dev | apply:stg | apply:prod");
+    console.error("Usage: npm run apply:dev [--force]");
     console.error("");
     console.error("  Pull → Merge → Push (safe bidirectional sync)");
     console.error("");
-    console.error("  Pulls latest platform state, merges with your local");
-    console.error("  changes, and pushes the result back to the platform.");
-    console.error("  Stops on merge conflicts for manual resolution.");
+    console.error("  Pulls latest platform state (preserving local changes),");
+    console.error("  then pushes the result back to the platform.");
+    console.error("");
+    console.error("  --force   Enable deletions: resources you deleted locally");
+    console.error("            will also be deleted from the platform.");
     process.exit(1);
   }
 
   console.log("═══════════════════════════════════════════════════════════════");
   console.log(`🔄 Vapi GitOps Apply - Environment: ${env}`);
   console.log("   Pull → Merge → Push");
+  if (hasForce) {
+    console.log("   ⚠️  Deletions enabled (--force)");
+  }
   console.log("═══════════════════════════════════════════════════════════════\n");
 
-  // Step 1: Pull with merge (forward filters so only matching types are pulled)
-  const pullCmd = `npx tsx src/pull.ts ${env} ${extraArgs}`.trim();
+  // Step 1: Pull (never forced — always preserves local deletions/changes)
+  const pullCmd = `npx tsx src/pull.ts ${env} ${pullArgs}`.trim();
   const pullExit = runPassthrough(pullCmd);
   if (pullExit !== 0) {
     console.error("\n❌ Pull had issues. Resolve conflicts before pushing.");
     process.exit(1);
   }
 
-  // Step 2: Push merged state
+  // Step 2: Push merged state (--force forwarded here for deletions)
   console.log("\n🚀 Pushing merged state to platform...\n");
-  const pushCmd = `npx tsx src/push.ts ${env} ${extraArgs}`.trim();
+  const pushCmd = `npx tsx src/push.ts ${env} ${pushArgs}`.trim();
   const pushExit = runPassthrough(pushCmd);
   if (pushExit !== 0) {
     console.error("\n❌ Push failed!");

src/pull.ts

@@ -466,6 +466,7 @@ export async function pullResourceType(
   resourceType: ResourceType,
   state: StateFile,
   changedFiles?: Set<string>,
+  force?: boolean,
 ): Promise<PullStats> {
   console.log(`\n📥 Pulling ${resourceType}...`);
 
@@ -497,7 +498,7 @@ export async function pullResourceType(
         ?? generateResourceId(resource);
     }
 
-    // Skip files that have been locally modified or deleted (default mode)
+    // Skip files that have been locally modified (git detection)
     if (changedFiles) {
       const folderPath = FOLDER_MAP[resourceType];
       const mdPath = join("resources", folderPath, `${resourceId}.md`);
@@ -509,6 +510,22 @@ export async function pullResourceType(
         continue;
       }
     }
+
+    // Skip resources whose local file was deleted (works without git)
+    // A resource that was previously tracked (in state) but has no local file = intentional deletion
+    if (!force && !isNew) {
+      const folderPath = FOLDER_MAP[resourceType];
+      const dir = join(RESOURCES_DIR, folderPath);
+      const fileExists = existsSync(join(dir, `${resourceId}.md`))
+        || existsSync(join(dir, `${resourceId}.yml`))
+        || existsSync(join(dir, `${resourceId}.yaml`));
+      if (!fileExists) {
+        console.log(`   ⏭️  ${resourceId} (locally deleted, skipping)`);
+        newStateSection[resourceId] = resource.id;
+        skipped++;
+        continue;
+      }
+    }
 
     // Detect platform defaults (orgId is null/missing — read-only, immutable)
     const isPlatformDefault = resource.orgId === null || resource.orgId === undefined;
@@ -600,14 +617,14 @@ async function main(): Promise<void> {
   // e.g. structuredOutputs reference assistants, so assistants must be pulled first.
   const shouldPull = (type: ResourceType) => !typeFilter?.length || typeFilter.includes(type);
 
-  if (shouldPull("tools")) stats.tools = await pullResourceType("tools", state, changedFiles);
-  if (shouldPull("assistants")) stats.assistants = await pullResourceType("assistants", state, changedFiles);
-  if (shouldPull("structuredOutputs")) stats.structuredOutputs = await pullResourceType("structuredOutputs", state, changedFiles);
-  if (shouldPull("squads")) stats.squads = await pullResourceType("squads", state, changedFiles);
-  if (shouldPull("personalities")) stats.personalities = await pullResourceType("personalities", state, changedFiles);
-  if (shouldPull("scenarios")) stats.scenarios = await pullResourceType("scenarios", state, changedFiles);
-  if (shouldPull("simulations")) stats.simulations = await pullResourceType("simulations", state, changedFiles);
-  if (shouldPull("simulationSuites")) stats.simulationSuites = await pullResourceType("simulationSuites", state, changedFiles);
+  if (shouldPull("tools")) stats.tools = await pullResourceType("tools", state, changedFiles, force);
+  if (shouldPull("assistants")) stats.assistants = await pullResourceType("assistants", state, changedFiles, force);
+  if (shouldPull("structuredOutputs")) stats.structuredOutputs = await pullResourceType("structuredOutputs", state, changedFiles, force);
+  if (shouldPull("squads")) stats.squads = await pullResourceType("squads", state, changedFiles, force);
+  if (shouldPull("personalities")) stats.personalities = await pullResourceType("personalities", state, changedFiles, force);
+  if (shouldPull("scenarios")) stats.scenarios = await pullResourceType("scenarios", state, changedFiles, force);
+  if (shouldPull("simulations")) stats.simulations = await pullResourceType("simulations", state, changedFiles, force);
+  if (shouldPull("simulationSuites")) stats.simulationSuites = await pullResourceType("simulationSuites", state, changedFiles, force);
 
   await saveState(state);
 

src/push.ts

@@ -122,7 +122,7 @@ export async function applyStructuredOutput(
   if (existingUuid) {
     const updatePayload = removeExcludedKeys(payload, "structuredOutputs");
     console.log(`  🔄 Updating structured output: ${resourceId} (${existingUuid})`);
-    await vapiRequest("PATCH", `/structured-output/${existingUuid}`, updatePayload);
+    await vapiRequest("PATCH", `/structured-output/${existingUuid}?schemaOverride=true`, updatePayload);
     return existingUuid;
   } else {
     console.log(`  ✨ Creating structured output: ${resourceId}`);

src/resolver.ts

@@ -11,15 +11,21 @@ function isUUID(value: string): boolean {
   return UUID_REGEX.test(value);
 }
 
+// Check if a UUID is tracked in a state section (reverse lookup)
+function isKnownUUID(uuid: string, stateSection: Record<string, string>): boolean {
+  return Object.values(stateSection).includes(uuid);
+}
+
 export function resolveToolId(
   toolId: string,
   state: StateFile
 ): string | null {
-  // Remove comments from YAML (e.g., "transfer-call ## Reference...")
   const cleanId = toolId.split("##")[0]?.trim() ?? "";
 
-  // If already a UUID, return it directly
   if (isUUID(cleanId)) {
+    if (!isKnownUUID(cleanId, state.tools)) {
+      console.warn(`  ⚠️  Untracked tool UUID (possibly deleted): ${cleanId}`);
+    }
     return cleanId;
   }
 
@@ -45,8 +51,10 @@ export function resolveStructuredOutputIds(
     .map((refId: string) => {
       const cleanId = refId.split("##")[0]?.trim() ?? "";
 
-      // If already a UUID, return it directly
       if (isUUID(cleanId)) {
+        if (!isKnownUUID(cleanId, state.structuredOutputs)) {
+          console.warn(`  ⚠️  Untracked structured output UUID (possibly deleted): ${cleanId}`);
+        }
         return cleanId;
       }
 
@@ -66,8 +74,11 @@ export function resolveAssistantId(
 ): string | null {
   const cleanId = assistantId.split("##")[0]?.trim() ?? "";
 
-  // If already a UUID, return it directly
   if (isUUID(cleanId)) {
+    if (!isKnownUUID(cleanId, state.assistants)) {
+      console.warn(`  ⚠️  Untracked assistant UUID (possibly deleted): ${cleanId}`);
+      return null;
+    }
     return cleanId;
   }