@codemieai/cdk 0.1.450 → 0.1.452

package/dist/cli/index.js

@@ -938,7 +938,7 @@ var init_backupTransformers = __esm({
 
 // package.json
 var package_default = {
-  version: "0.1.450"};
+  version: "0.1.452"};
 var appConfigSchema = z.object({
   rootDir: z.string(),
   codemieConfig: z.string(),
@@ -2886,6 +2886,54 @@ function sortAssistantsByDependencies(assistants) {
   }
   return sorted;
 }
+async function syncAssistantSkills(client, assistantId, desiredSkillIds) {
+  let currentSkills = [];
+  try {
+    currentSkills = await client.skills.getAssistantSkills(assistantId);
+  } catch (fetchError) {
+    logger.warn(`  \u26A0\uFE0F  Could not fetch current skills for assistant ${assistantId}, treating as empty`);
+    logger.debug(`     ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`);
+  }
+  const currentIds = new Set(currentSkills.map((s) => s.id));
+  const desiredIds = new Set(desiredSkillIds);
+  const toAttach = desiredSkillIds.filter((id) => !currentIds.has(id));
+  const toDetach = currentSkills.filter((s) => !desiredIds.has(s.id)).map((s) => s.id);
+  if (toAttach.length === 0 && toDetach.length === 0) {
+    return;
+  }
+  if (toAttach.length > 0) {
+    logger.info(`  Attaching ${toAttach.length} skill(s)...`);
+    for (const skillId of toAttach) {
+      try {
+        await client.skills.attachToAssistant(assistantId, skillId);
+        logger.info(`    \u2713 Attached skill ${skillId}`);
+      } catch (attachError) {
+        const msg = attachError instanceof Error ? attachError.message : String(attachError);
+        if (msg.includes("already attached") || msg.includes("already exists")) {
+          logger.info(`    \u2713 Skill ${skillId} already attached`);
+        } else {
+          throw attachError;
+        }
+      }
+    }
+  }
+  if (toDetach.length > 0) {
+    logger.info(`  Detaching ${toDetach.length} skill(s)...`);
+    for (const skillId of toDetach) {
+      try {
+        await client.skills.detachFromAssistant(assistantId, skillId);
+        logger.info(`    \u2713 Detached skill ${skillId}`);
+      } catch (detachError) {
+        const msg = detachError instanceof Error ? detachError.message : String(detachError);
+        if (msg.includes("not found") || msg.includes("not attached")) {
+          logger.info(`    \u2713 Skill ${skillId} already detached`);
+        } else {
+          throw detachError;
+        }
+      }
+    }
+  }
+}
 async function deployAssistants(config, client, loader, stateManager) {
   const stats = { created: 0, updated: 0, unchanged: 0, failed: 0 };
   if (!config.resources.assistants) {
@@ -2956,11 +3004,11 @@ async function deployAssistants(config, client, loader, stateManager) {
       const assistantWithResolved = {
         ...assistant,
         assistant_ids: resolvedAssistantIds,
-        context: resolvedContext,
-        skill_ids: resolvedSkillIds
+        context: resolvedContext
       };
       const apiParams = assistantResourceToCreateParams(assistantWithResolved, config.project.name, promptContent);
       const existingState = stateManager.getAssistantState(assistant.name);
+      let deployedAssistantId = null;
       if (existingState) {
         const existsOnPlatform = await checkAssistantExists(client, assistant.name, stateManager);
         if (existsOnPlatform) {
@@ -2975,9 +3023,11 @@ async function deployAssistants(config, client, loader, stateManager) {
             await client.assistants.update(existingState.id, apiParams);
             logger.info(`\u2713 Updated assistant: ${assistant.name} (${existingState.id})`);
             stateManager.updateAssistantState(assistant.name, existingState.id, promptContent, assistant, buildConfig);
+            deployedAssistantId = existingState.id;
             stats.updated++;
           } else {
             logger.info(`  \u2713 No changes detected (ID: ${existingState.id})`);
+            deployedAssistantId = existingState.id;
             stats.unchanged++;
           }
         } else {
@@ -3018,6 +3068,7 @@ async function deployAssistants(config, client, loader, stateManager) {
             stats.updated++;
           }
           stateManager.updateAssistantState(assistant.name, assistantId, promptContent, assistant, buildConfig);
+          deployedAssistantId = assistantId;
         }
       } else {
         logger.info(`  Creating new assistant...`);
@@ -3056,6 +3107,10 @@ async function deployAssistants(config, client, loader, stateManager) {
           stats.updated++;
         }
         stateManager.updateAssistantState(assistant.name, assistantId, promptContent, assistant, buildConfig);
+        deployedAssistantId = assistantId;
+      }
+      if (deployedAssistantId && assistant.skills !== void 0) {
+        await syncAssistantSkills(client, deployedAssistantId, resolvedSkillIds);
       }
       logger.info("");
     } catch (error) {
@@ -3517,19 +3572,7 @@ async function deployResources(options) {
       if (process.env.SAMPLE_DEPLOY === "1") {
         logger.info("\n\u{1F50E} SAMPLE_DEPLOY=1 -> Skipping orphan deletion (simulation / partial deploy mode)\n");
       } else if (prune) {
-        logger.info("\n\u{1F5D1}\uFE0F  Deleting orphaned resources (removed from config)...\n");
-        const cleanupResult = await cleanupManager.deleteOrphanedResources(orphaned);
-        deleted = cleanupResult.deleted.assistants.length + cleanupResult.deleted.datasources.length + cleanupResult.deleted.workflows.length + cleanupResult.deleted.skills.length;
-        if (deleted > 0) {
-          logger.info(`
-\u2713 Deleted ${deleted} orphaned resource(s)
-`);
-        }
-        if (cleanupResult.errors.length > 0) {
-          logger.info(`
-\u26A0\uFE0F  ${cleanupResult.errors.length} error(s) during cleanup
-`);
-        }
+        logger.info("\n\u23F3 Orphaned resources will be deleted after deployment (to allow skill detachment first)\n");
       } else {
         logger.info("\n\u26A0\uFE0F  Orphaned resources found but not deleted.");
         logger.info("   Use --prune flag to delete them.\n");
@@ -3561,6 +3604,21 @@ async function deployResources(options) {
     updated += workflowStats.updated;
     unchanged += workflowStats.unchanged;
     failed += workflowStats.failed;
+    if (totalOrphaned > 0 && prune && process.env.SAMPLE_DEPLOY !== "1") {
+      logger.info("\u{1F5D1}\uFE0F  Deleting orphaned resources (removed from config)...\n");
+      const cleanupResult = await cleanupManager.deleteOrphanedResources(orphaned);
+      deleted = cleanupResult.deleted.assistants.length + cleanupResult.deleted.datasources.length + cleanupResult.deleted.workflows.length + cleanupResult.deleted.skills.length;
+      if (deleted > 0) {
+        logger.info(`
+\u2713 Deleted ${deleted} orphaned resource(s)
+`);
+      }
+      if (cleanupResult.errors.length > 0) {
+        logger.info(`
+\u26A0\uFE0F  ${cleanupResult.errors.length} error(s) during cleanup
+`);
+      }
+    }
     logger.info("=".repeat(50));
     logger.info("\u{1F4CA} Deployment Summary:\n");
     logger.info(`  \u2705 Created: ${created}`);
@@ -4374,13 +4432,30 @@ async function previewAssistants(assistants, loader, stateManager, client) {
       "assistant",
       (name) => stateManager.getAssistantState(name),
       () => checkAssistantExists(client, assistant.name, stateManager),
-      () => {
+      async () => {
         const existingState = stateManager.getAssistantState(assistant.name);
-        const hasChanged = existingState ? existingState.promptChecksum !== calculateChecksum(promptContent) || existingState.configChecksum !== configChecksum : false;
+        const configChanged = existingState ? existingState.promptChecksum !== calculateChecksum(promptContent) || existingState.configChecksum !== configChecksum : false;
+        if (configChanged) {
+          return {
+            hasChanged: true,
+            createDetails: `Model: ${assistant.model}`,
+            updateDetails: "Prompt or configuration changed"
+          };
+        }
+        if (existingState?.id && assistant.skills !== void 0) {
+          const desiredSkillIds = resolveDesiredSkillIds(assistant.skills, stateManager);
+          const drifted = await checkSkillAttachmentDrift(client, existingState.id, desiredSkillIds);
+          if (drifted) {
+            return {
+              hasChanged: true,
+              createDetails: `Model: ${assistant.model}`,
+              updateDetails: "Skill attachments out of sync with platform"
+            };
+          }
+        }
         return {
-          hasChanged,
-          createDetails: `Model: ${assistant.model}`,
-          updateDetails: "Prompt or configuration changed"
+          hasChanged: false,
+          createDetails: `Model: ${assistant.model}`
         };
       }
     );
@@ -4388,6 +4463,34 @@ async function previewAssistants(assistants, loader, stateManager, client) {
   }
   return changes;
 }
+function resolveDesiredSkillIds(skillNames, stateManager) {
+  const ids = [];
+  for (const name of skillNames) {
+    const skillState = stateManager.getSkillState(name);
+    if (skillState) {
+      ids.push(skillState.id);
+    }
+  }
+  return ids;
+}
+async function checkSkillAttachmentDrift(client, assistantId, desiredSkillIds) {
+  try {
+    const currentSkills = await client.skills.getAssistantSkills(assistantId);
+    const currentIds = new Set(currentSkills.map((s) => s.id));
+    const desiredIds = new Set(desiredSkillIds);
+    if (currentIds.size !== desiredIds.size) {
+      return true;
+    }
+    for (const id of desiredIds) {
+      if (!currentIds.has(id)) {
+        return true;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
 async function previewDatasources(datasources, stateManager, client) {
   const changes = [];
   for (const datasource of datasources) {

package/dist/index.js

@@ -1925,6 +1925,54 @@ function sortAssistantsByDependencies(assistants) {
   }
   return sorted;
 }
+async function syncAssistantSkills(client, assistantId, desiredSkillIds) {
+  let currentSkills = [];
+  try {
+    currentSkills = await client.skills.getAssistantSkills(assistantId);
+  } catch (fetchError) {
+    logger.warn(`  \u26A0\uFE0F  Could not fetch current skills for assistant ${assistantId}, treating as empty`);
+    logger.debug(`     ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`);
+  }
+  const currentIds = new Set(currentSkills.map((s) => s.id));
+  const desiredIds = new Set(desiredSkillIds);
+  const toAttach = desiredSkillIds.filter((id) => !currentIds.has(id));
+  const toDetach = currentSkills.filter((s) => !desiredIds.has(s.id)).map((s) => s.id);
+  if (toAttach.length === 0 && toDetach.length === 0) {
+    return;
+  }
+  if (toAttach.length > 0) {
+    logger.info(`  Attaching ${toAttach.length} skill(s)...`);
+    for (const skillId of toAttach) {
+      try {
+        await client.skills.attachToAssistant(assistantId, skillId);
+        logger.info(`    \u2713 Attached skill ${skillId}`);
+      } catch (attachError) {
+        const msg = attachError instanceof Error ? attachError.message : String(attachError);
+        if (msg.includes("already attached") || msg.includes("already exists")) {
+          logger.info(`    \u2713 Skill ${skillId} already attached`);
+        } else {
+          throw attachError;
+        }
+      }
+    }
+  }
+  if (toDetach.length > 0) {
+    logger.info(`  Detaching ${toDetach.length} skill(s)...`);
+    for (const skillId of toDetach) {
+      try {
+        await client.skills.detachFromAssistant(assistantId, skillId);
+        logger.info(`    \u2713 Detached skill ${skillId}`);
+      } catch (detachError) {
+        const msg = detachError instanceof Error ? detachError.message : String(detachError);
+        if (msg.includes("not found") || msg.includes("not attached")) {
+          logger.info(`    \u2713 Skill ${skillId} already detached`);
+        } else {
+          throw detachError;
+        }
+      }
+    }
+  }
+}
 async function deployAssistants(config, client, loader, stateManager) {
   const stats = { created: 0, updated: 0, unchanged: 0, failed: 0 };
   if (!config.resources.assistants) {
@@ -1995,11 +2043,11 @@ async function deployAssistants(config, client, loader, stateManager) {
       const assistantWithResolved = {
         ...assistant,
         assistant_ids: resolvedAssistantIds,
-        context: resolvedContext,
-        skill_ids: resolvedSkillIds
+        context: resolvedContext
       };
       const apiParams = assistantResourceToCreateParams(assistantWithResolved, config.project.name, promptContent);
       const existingState = stateManager.getAssistantState(assistant.name);
+      let deployedAssistantId = null;
       if (existingState) {
         const existsOnPlatform = await checkAssistantExists(client, assistant.name, stateManager);
         if (existsOnPlatform) {
@@ -2014,9 +2062,11 @@ async function deployAssistants(config, client, loader, stateManager) {
             await client.assistants.update(existingState.id, apiParams);
             logger.info(`\u2713 Updated assistant: ${assistant.name} (${existingState.id})`);
             stateManager.updateAssistantState(assistant.name, existingState.id, promptContent, assistant, buildConfig);
+            deployedAssistantId = existingState.id;
             stats.updated++;
           } else {
             logger.info(`  \u2713 No changes detected (ID: ${existingState.id})`);
+            deployedAssistantId = existingState.id;
             stats.unchanged++;
           }
         } else {
@@ -2057,6 +2107,7 @@ async function deployAssistants(config, client, loader, stateManager) {
             stats.updated++;
           }
           stateManager.updateAssistantState(assistant.name, assistantId, promptContent, assistant, buildConfig);
+          deployedAssistantId = assistantId;
         }
       } else {
         logger.info(`  Creating new assistant...`);
@@ -2095,6 +2146,10 @@ async function deployAssistants(config, client, loader, stateManager) {
           stats.updated++;
         }
         stateManager.updateAssistantState(assistant.name, assistantId, promptContent, assistant, buildConfig);
+        deployedAssistantId = assistantId;
+      }
+      if (deployedAssistantId && assistant.skills !== void 0) {
+        await syncAssistantSkills(client, deployedAssistantId, resolvedSkillIds);
       }
       logger.info("");
     } catch (error) {
@@ -2556,19 +2611,7 @@ async function deployResources(options) {
       if (process.env.SAMPLE_DEPLOY === "1") {
         logger.info("\n\u{1F50E} SAMPLE_DEPLOY=1 -> Skipping orphan deletion (simulation / partial deploy mode)\n");
       } else if (prune) {
-        logger.info("\n\u{1F5D1}\uFE0F  Deleting orphaned resources (removed from config)...\n");
-        const cleanupResult = await cleanupManager.deleteOrphanedResources(orphaned);
-        deleted = cleanupResult.deleted.assistants.length + cleanupResult.deleted.datasources.length + cleanupResult.deleted.workflows.length + cleanupResult.deleted.skills.length;
-        if (deleted > 0) {
-          logger.info(`
-\u2713 Deleted ${deleted} orphaned resource(s)
-`);
-        }
-        if (cleanupResult.errors.length > 0) {
-          logger.info(`
-\u26A0\uFE0F  ${cleanupResult.errors.length} error(s) during cleanup
-`);
-        }
+        logger.info("\n\u23F3 Orphaned resources will be deleted after deployment (to allow skill detachment first)\n");
       } else {
         logger.info("\n\u26A0\uFE0F  Orphaned resources found but not deleted.");
         logger.info("   Use --prune flag to delete them.\n");
@@ -2600,6 +2643,21 @@ async function deployResources(options) {
     updated += workflowStats.updated;
     unchanged += workflowStats.unchanged;
     failed += workflowStats.failed;
+    if (totalOrphaned > 0 && prune && process.env.SAMPLE_DEPLOY !== "1") {
+      logger.info("\u{1F5D1}\uFE0F  Deleting orphaned resources (removed from config)...\n");
+      const cleanupResult = await cleanupManager.deleteOrphanedResources(orphaned);
+      deleted = cleanupResult.deleted.assistants.length + cleanupResult.deleted.datasources.length + cleanupResult.deleted.workflows.length + cleanupResult.deleted.skills.length;
+      if (deleted > 0) {
+        logger.info(`
+\u2713 Deleted ${deleted} orphaned resource(s)
+`);
+      }
+      if (cleanupResult.errors.length > 0) {
+        logger.info(`
+\u26A0\uFE0F  ${cleanupResult.errors.length} error(s) during cleanup
+`);
+      }
+    }
     logger.info("=".repeat(50));
     logger.info("\u{1F4CA} Deployment Summary:\n");
     logger.info(`  \u2705 Created: ${created}`);
@@ -2977,13 +3035,30 @@ async function previewAssistants(assistants, loader, stateManager, client) {
       "assistant",
       (name) => stateManager.getAssistantState(name),
       () => checkAssistantExists(client, assistant.name, stateManager),
-      () => {
+      async () => {
         const existingState = stateManager.getAssistantState(assistant.name);
-        const hasChanged = existingState ? existingState.promptChecksum !== calculateChecksum(promptContent) || existingState.configChecksum !== configChecksum : false;
+        const configChanged = existingState ? existingState.promptChecksum !== calculateChecksum(promptContent) || existingState.configChecksum !== configChecksum : false;
+        if (configChanged) {
+          return {
+            hasChanged: true,
+            createDetails: `Model: ${assistant.model}`,
+            updateDetails: "Prompt or configuration changed"
+          };
+        }
+        if (existingState?.id && assistant.skills !== void 0) {
+          const desiredSkillIds = resolveDesiredSkillIds(assistant.skills, stateManager);
+          const drifted = await checkSkillAttachmentDrift(client, existingState.id, desiredSkillIds);
+          if (drifted) {
+            return {
+              hasChanged: true,
+              createDetails: `Model: ${assistant.model}`,
+              updateDetails: "Skill attachments out of sync with platform"
+            };
+          }
+        }
         return {
-          hasChanged,
-          createDetails: `Model: ${assistant.model}`,
-          updateDetails: "Prompt or configuration changed"
+          hasChanged: false,
+          createDetails: `Model: ${assistant.model}`
         };
       }
     );
@@ -2991,6 +3066,34 @@ async function previewAssistants(assistants, loader, stateManager, client) {
   }
   return changes;
 }
+function resolveDesiredSkillIds(skillNames, stateManager) {
+  const ids = [];
+  for (const name of skillNames) {
+    const skillState = stateManager.getSkillState(name);
+    if (skillState) {
+      ids.push(skillState.id);
+    }
+  }
+  return ids;
+}
+async function checkSkillAttachmentDrift(client, assistantId, desiredSkillIds) {
+  try {
+    const currentSkills = await client.skills.getAssistantSkills(assistantId);
+    const currentIds = new Set(currentSkills.map((s) => s.id));
+    const desiredIds = new Set(desiredSkillIds);
+    if (currentIds.size !== desiredIds.size) {
+      return true;
+    }
+    for (const id of desiredIds) {
+      if (!currentIds.has(id)) {
+        return true;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
 async function previewDatasources(datasources, stateManager, client) {
   const changes = [];
   for (const datasource of datasources) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemieai/cdk",
-  "version": "0.1.450",
+  "version": "0.1.452",
   "type": "module",
   "description": "Infrastructure as Code solution for managing Codemie AI assistants, datasources, and workflows through declarative YAML configuration",
   "main": "./dist/index.js",