lettactl 0.5.7 → 0.5.9

package/dist/commands/apply-template.d.ts

@@ -0,0 +1,12 @@
+import { FleetParser } from '../lib/fleet-parser';
+/**
+ * Template mode: apply a template config to all existing agents matching a glob pattern.
+ * Uses MERGE semantics - adds/updates resources but doesn't remove existing ones.
+ */
+export declare function applyTemplateMode(options: {
+    file: string;
+    match: string;
+    dryRun?: boolean;
+    root?: string;
+}, config: any, parser: FleetParser, command: any): Promise<void>;
+//# sourceMappingURL=apply-template.d.ts.map

package/dist/commands/apply-template.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-template.d.ts","sourceRoot":"","sources":["../../src/commands/apply-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AASlD;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EACzE,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,IAAI,CAAC,CA4Hf"}

package/dist/commands/apply-template.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyTemplateMode = applyTemplateMode;
+const letta_client_1 = require("../lib/letta-client");
+const block_manager_1 = require("../lib/block-manager");
+const diff_engine_1 = require("../lib/diff-engine");
+const file_content_tracker_1 = require("../lib/file-content-tracker");
+const output_formatter_1 = require("../lib/output-formatter");
+const spinner_1 = require("../lib/spinner");
+const minimatch_1 = require("minimatch");
+/**
+ * Template mode: apply a template config to all existing agents matching a glob pattern.
+ * Uses MERGE semantics - adds/updates resources but doesn't remove existing ones.
+ */
+async function applyTemplateMode(options, config, parser, command) {
+    const verbose = command.parent?.opts().verbose || false;
+    const spinnerEnabled = (0, spinner_1.getSpinnerEnabled)(command);
+    const pattern = options.match;
+    const findSpinner = (0, spinner_1.createSpinner)(`Finding agents matching "${pattern}"...`, spinnerEnabled).start();
+    // Get all agents from server
+    const client = new letta_client_1.LettaClientWrapper();
+    const allAgentsResponse = await client.listAgents();
+    const allAgents = Array.isArray(allAgentsResponse)
+        ? allAgentsResponse
+        : allAgentsResponse.items || [];
+    // Filter by glob pattern
+    const matchingAgents = allAgents.filter((agent) => (0, minimatch_1.minimatch)(agent.name, pattern));
+    if (matchingAgents.length === 0) {
+        findSpinner.fail(`No agents found matching pattern: ${pattern}`);
+        return;
+    }
+    findSpinner.succeed(`Found ${matchingAgents.length} agents matching "${pattern}"`);
+    matchingAgents.forEach((a) => console.log(`  - ${a.name}`));
+    if (options.dryRun) {
+        console.log('\nDry-run mode: no changes will be made');
+        return;
+    }
+    // Initialize managers
+    const blockManager = new block_manager_1.BlockManager(client);
+    const diffEngine = new diff_engine_1.DiffEngine(client, blockManager, parser.basePath);
+    const fileTracker = new file_content_tracker_1.FileContentTracker(parser.basePath, parser.storageBackend);
+    const createdFolders = new Map();
+    await blockManager.loadExistingBlocks();
+    // Process shared blocks from template
+    const sharedBlockIds = new Map();
+    if (config.shared_blocks?.length) {
+        const blockSpinner = (0, spinner_1.createSpinner)('Processing shared blocks...', spinnerEnabled).start();
+        for (const sharedBlock of config.shared_blocks) {
+            const blockId = await blockManager.getOrCreateSharedBlock(sharedBlock);
+            sharedBlockIds.set(sharedBlock.name, blockId);
+            if (verbose)
+                console.log(`  ${sharedBlock.name} -> ${blockId}`);
+        }
+        blockSpinner.succeed(`Processed ${config.shared_blocks.length} shared blocks`);
+    }
+    // Get template agent config (first agent in config, or use top-level values)
+    const templateAgent = config.agents?.[0];
+    const templateTools = templateAgent?.tools || [];
+    const templateSharedBlocks = templateAgent?.shared_blocks || [];
+    // Generate tool source hashes and register tools
+    const toolSourceHashes = fileTracker.generateToolSourceHashes(templateTools, parser.toolConfigs);
+    const toolNameToId = await parser.registerRequiredTools(config, client, verbose, toolSourceHashes);
+    // Apply template to each matching agent
+    for (const existingAgent of matchingAgents) {
+        const agentSpinner = (0, spinner_1.createSpinner)(`Analyzing ${existingAgent.name}...`, spinnerEnabled).start();
+        try {
+            // Build desired config from template (no memoryBlocks - those are instance-specific)
+            const desiredConfig = {
+                systemPrompt: templateAgent?.system_prompt?.value || '',
+                tools: templateTools,
+                toolSourceHashes,
+                sharedBlocks: templateSharedBlocks,
+            };
+            // Create minimal AgentVersion for diff engine
+            const agentVersion = {
+                id: existingAgent.id,
+                name: existingAgent.name,
+                baseName: existingAgent.name,
+                configHashes: { overall: '', systemPrompt: '', tools: '', model: '', memoryBlocks: '', folders: '', sharedBlocks: '' },
+                version: 'latest',
+                lastUpdated: existingAgent.updated_at || new Date().toISOString()
+            };
+            // Generate update operations
+            const ops = await diffEngine.generateUpdateOperations(agentVersion, desiredConfig, toolNameToId, createdFolders, verbose, sharedBlockIds);
+            // MERGE semantics: clear toRemove arrays (don't remove existing resources)
+            if (ops.tools)
+                ops.tools.toRemove = [];
+            if (ops.blocks)
+                ops.blocks.toRemove = [];
+            if (ops.folders)
+                ops.folders.toDetach = [];
+            // Recalculate operation count after filtering
+            ops.operationCount = 0;
+            if (ops.updateFields)
+                ops.operationCount += Object.keys(ops.updateFields).length;
+            if (ops.tools)
+                ops.operationCount += ops.tools.toAdd.length + ops.tools.toUpdate.length;
+            if (ops.blocks)
+                ops.operationCount += ops.blocks.toAdd.length + ops.blocks.toUpdate.length;
+            if (ops.folders)
+                ops.operationCount += ops.folders.toAttach.length;
+            if (ops.operationCount === 0) {
+                agentSpinner.succeed(`${existingAgent.name}: already up to date`);
+                continue;
+            }
+            agentSpinner.stop();
+            output_formatter_1.OutputFormatter.showAgentUpdateDiff(ops);
+            const updateSpinner = (0, spinner_1.createSpinner)(`Applying updates to ${existingAgent.name}...`, spinnerEnabled).start();
+            await diffEngine.applyUpdateOperations(existingAgent.id, ops, verbose);
+            updateSpinner.succeed(`${existingAgent.name}: updated successfully`);
+        }
+        catch (error) {
+            agentSpinner.fail(`${existingAgent.name}: ${error.message}`);
+        }
+    }
+    console.log('\nTemplate apply completed');
+}
+//# sourceMappingURL=apply-template.js.map

package/dist/commands/apply-template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-template.js","sourceRoot":"","sources":["../../src/commands/apply-template.ts"],"names":[],"mappings":"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"}

package/dist/commands/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"AAcA,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,GAAG,iBAwX1I"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"AAYA,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,GAAG,iBAiL1I"}

package/dist/commands/apply.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyCommand = applyCommand;
 const fleet_parser_1 = require("../lib/fleet-parser");
@@ -40,12 +7,10 @@ const block_manager_1 = require("../lib/block-manager");
 const agent_manager_1 = require("../lib/agent-manager");
 const diff_engine_1 = require("../lib/diff-engine");
 const file_content_tracker_1 = require("../lib/file-content-tracker");
-const output_formatter_1 = require("../lib/output-formatter");
 const spinner_1 = require("../lib/spinner");
 const storage_backend_1 = require("../lib/storage-backend");
-const minimatch_1 = require("minimatch");
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
+const apply_template_1 = require("./apply-template");
+const apply_helpers_1 = require("../lib/apply-helpers");
 async function applyCommand(options, command) {
     const verbose = command.parent?.opts().verbose || false;
     try {
@@ -78,7 +43,7 @@ async function applyCommand(options, command) {
             console.log(`Found ${config.agents.length} agents in configuration`);
         // Template mode: apply config to existing agents matching pattern
         if (options.match) {
-            await applyTemplateMode({ ...options, match: options.match }, config, parser, command);
+            await (0, apply_template_1.applyTemplateMode)({ ...options, match: options.match }, config, parser, command);
             return;
         }
         if (options.dryRun) {
@@ -97,25 +62,16 @@ async function applyCommand(options, command) {
         const agentManager = new agent_manager_1.AgentManager(client);
         const diffEngine = new diff_engine_1.DiffEngine(client, blockManager, parser.basePath);
         const fileTracker = new file_content_tracker_1.FileContentTracker(parser.basePath, parser.storageBackend);
-        const createdFolders = new Map(); // folder name -> folder id
-        // Load existing resources for versioning
+        // Load existing resources
         if (verbose)
             console.log('Loading existing blocks...');
         await blockManager.loadExistingBlocks();
         if (verbose)
             console.log('Loading existing agents...');
         await agentManager.loadExistingAgents();
-        // Process shared blocks first
-        const sharedBlockIds = new Map();
-        if (config.shared_blocks) {
-            if (verbose)
-                console.log('Processing shared blocks...');
-            for (const sharedBlock of config.shared_blocks) {
-                const blockId = await blockManager.getOrCreateSharedBlock(sharedBlock);
-                sharedBlockIds.set(sharedBlock.name, blockId);
-            }
-        }
-        // Generate tool source hashes for all tools in config
+        // Process shared blocks
+        const sharedBlockIds = await (0, apply_helpers_1.processSharedBlocks)(config, blockManager, verbose);
+        // Generate tool source hashes and register tools
         const allToolNames = new Set();
         for (const agent of config.agents) {
             for (const toolName of agent.tools || []) {
@@ -123,69 +79,13 @@ async function applyCommand(options, command) {
             }
         }
         const globalToolSourceHashes = fileTracker.generateToolSourceHashes(Array.from(allToolNames), parser.toolConfigs);
-        // Register required tools
         if (verbose)
             console.log('Registering tools...');
         const toolNameToId = await parser.registerRequiredTools(config, client, verbose, globalToolSourceHashes);
-        // Create/get all folders with duplicate prevention
-        if (verbose)
-            console.log('Processing folders...');
-        const foldersResponse = await client.listFolders();
-        const existingFolders = Array.isArray(foldersResponse) ? foldersResponse : foldersResponse.items || [];
-        for (const agent of config.agents) {
-            if (options.agent && !agent.name.includes(options.agent))
-                continue;
-            if (agent.folders) {
-                for (const folderConfig of agent.folders) {
-                    if (createdFolders.has(folderConfig.name)) {
-                        if (verbose)
-                            console.log(`Using existing folder: ${folderConfig.name}`);
-                        continue;
-                    }
-                    // Check if folder already exists
-                    let folder = existingFolders.find((f) => f.name === folderConfig.name);
-                    if (!folder) {
-                        if (verbose)
-                            console.log(`Creating folder: ${folderConfig.name}`);
-                        folder = await client.createFolder({
-                            name: folderConfig.name,
-                            embedding: agent.embedding || "letta/letta-free"
-                        });
-                        console.log(`Created folder: ${folderConfig.name}`);
-                        createdFolders.set(folderConfig.name, folder.id);
-                        // Upload files only to newly created folders
-                        if (verbose)
-                            console.log(`Uploading ${folderConfig.files.length} files...`);
-                        for (const filePath of folderConfig.files) {
-                            try {
-                                const resolvedPath = path.resolve(parser.basePath, filePath);
-                                if (!fs.existsSync(resolvedPath)) {
-                                    console.warn(`File not found, skipping: ${filePath}`);
-                                    continue;
-                                }
-                                if (verbose)
-                                    console.log(`  Uploading ${filePath}...`);
-                                const fileStream = fs.createReadStream(resolvedPath);
-                                await client.uploadFileToFolder(fileStream, folder.id, path.basename(filePath));
-                                if (verbose)
-                                    console.log(`  Uploaded: ${filePath}`);
-                            }
-                            catch (error) {
-                                console.error(`  Failed to upload ${filePath}:`, error.message);
-                            }
-                        }
-                    }
-                    else {
-                        if (verbose)
-                            console.log(`Using existing folder: ${folderConfig.name}`);
-                        if (verbose)
-                            console.log('  (Skipping file upload - files already exist)');
-                        createdFolders.set(folderConfig.name, folder.id);
-                    }
-                }
-            }
-        }
-        // Create agents with memory blocks
+        // Process folders
+        const createdFolders = await (0, apply_helpers_1.processFolders)(config, client, parser, options, verbose);
+        // Process agents
+        const spinnerEnabled = (0, spinner_1.getSpinnerEnabled)(command);
         if (verbose)
             console.log('Processing agents...');
         for (const agent of config.agents) {
@@ -199,177 +99,68 @@ async function applyCommand(options, command) {
                 console.log(`  Folders: ${agent.folders?.length || 0}`);
             }
             try {
-                // Generate file content hashes for change detection
+                // Generate hashes for change detection
                 const folderContentHashes = fileTracker.generateFolderFileHashes(agent.folders || []);
-                // Generate tool source code hashes for change detection  
                 const toolSourceHashes = fileTracker.generateToolSourceHashes(agent.tools || [], parser.toolConfigs);
-                // Generate memory block file content hashes for change detection
                 const memoryBlockFileHashes = await fileTracker.generateMemoryBlockFileHashes(agent.memory_blocks || []);
-                // Check if agent needs to be created based on complete configuration
-                const { agentName, shouldCreate, existingAgent } = await agentManager.getOrCreateAgentName(agent.name, {
+                // Build agent config
+                const agentConfig = {
                     systemPrompt: agent.system_prompt.value || '',
                     tools: agent.tools || [],
                     toolSourceHashes,
                     model: agent.llm_config?.model,
                     embedding: agent.embedding,
                     contextWindow: agent.llm_config?.context_window,
-                    memoryBlocks: (agent.memory_blocks || []).map(block => ({
+                    memoryBlocks: (agent.memory_blocks || []).map((block) => ({
                         name: block.name,
                         description: block.description,
                         limit: block.limit,
                         value: block.value || ''
                     })),
                     memoryBlockFileHashes,
-                    folders: (agent.folders || []).map(folder => ({
+                    folders: (agent.folders || []).map((folder) => ({
                         name: folder.name,
                         files: folder.files,
                         fileContentHashes: folderContentHashes.get(folder.name) || {}
                     })),
                     sharedBlocks: agent.shared_blocks || []
-                }, verbose);
+                };
+                // Check if agent exists
+                const { agentName, shouldCreate, existingAgent } = await agentManager.getOrCreateAgentName(agent.name, agentConfig, verbose);
                 if (!shouldCreate && existingAgent) {
-                    // Agent exists but may need partial updates  
-                    const agentConfig = {
-                        systemPrompt: agent.system_prompt.value || '',
-                        tools: agent.tools || [],
-                        toolSourceHashes,
-                        model: agent.llm_config?.model,
-                        embedding: agent.embedding,
-                        contextWindow: agent.llm_config?.context_window,
-                        memoryBlocks: (agent.memory_blocks || []).map(block => ({
-                            name: block.name,
-                            description: block.description,
-                            limit: block.limit,
-                            value: block.value || ''
-                        })),
-                        memoryBlockFileHashes,
-                        folders: (agent.folders || []).map(folder => ({
-                            name: folder.name,
-                            files: folder.files,
-                            fileContentHashes: folderContentHashes.get(folder.name) || {}
-                        })),
-                        sharedBlocks: agent.shared_blocks || []
-                    };
-                    // Check if any granular changes are needed
+                    // Check if changes needed
                     const changes = agentManager.getConfigChanges(existingAgent, agentConfig);
                     if (!changes.hasChanges) {
                         console.log(`Agent ${agent.name} already exists and is up to date`);
                         continue;
                     }
-                    // Apply partial updates to preserve conversation history
-                    console.log(`Updating agent ${agent.name}:`);
-                    const spinnerEnabled = (0, spinner_1.getSpinnerEnabled)(command);
-                    const spinner = (0, spinner_1.createSpinner)(`Analyzing changes for ${agent.name}...`, spinnerEnabled).start();
-                    try {
-                        const updateOperations = await diffEngine.generateUpdateOperations(existingAgent, { ...agentConfig, memoryBlockFileHashes }, toolNameToId, createdFolders, verbose, sharedBlockIds);
-                        spinner.stop();
-                        // Show granular diff information
-                        output_formatter_1.OutputFormatter.showAgentUpdateDiff(updateOperations);
-                        const updateSpinner = (0, spinner_1.createSpinner)(`Applying updates to ${agent.name}...`, spinnerEnabled).start();
-                        await diffEngine.applyUpdateOperations(existingAgent.id, updateOperations, verbose);
-                        // Update registry with new hashes
-                        agentManager.updateRegistry(existingAgent.name, agentConfig, existingAgent.id);
-                        updateSpinner.succeed(`Agent ${agent.name} updated successfully (conversation history preserved)`);
-                    }
-                    catch (error) {
-                        spinner.fail(`Failed to update agent ${agent.name}`);
-                        throw error;
-                    }
-                    continue;
-                }
-                // Collect all block IDs (shared + agent-specific)
-                const blockIds = [];
-                // Add shared blocks for this agent
-                if (agent.shared_blocks) {
-                    for (const sharedBlockName of agent.shared_blocks) {
-                        const sharedBlockId = sharedBlockIds.get(sharedBlockName);
-                        if (sharedBlockId) {
-                            blockIds.push(sharedBlockId);
-                            if (verbose)
-                                console.log(`  Using shared block: ${sharedBlockName}`);
-                        }
-                        else {
-                            console.warn(`  Shared block not found: ${sharedBlockName}`);
-                        }
-                    }
-                }
-                // Create agent-specific memory blocks
-                if (agent.memory_blocks) {
-                    for (const block of agent.memory_blocks) {
-                        if (verbose)
-                            console.log(`  Processing memory block: ${block.name}`);
-                        const blockId = await blockManager.getOrCreateAgentBlock(block, agent.name);
-                        blockIds.push(blockId);
-                    }
-                }
-                // Create agent
-                const creationSpinner = (0, spinner_1.createSpinner)(`Creating agent ${agentName}...`, (0, spinner_1.getSpinnerEnabled)(command)).start();
-                try {
-                    // Resolve tool names to IDs
-                    const toolIds = [];
-                    if (agent.tools) {
-                        for (const toolName of agent.tools) {
-                            const toolId = toolNameToId.get(toolName);
-                            if (toolId) {
-                                toolIds.push(toolId);
-                            }
-                            else {
-                                console.warn(`  Tool not found: ${toolName}`);
-                            }
-                        }
-                    }
-                    const createdAgent = await client.createAgent({
-                        name: agentName,
-                        model: agent.llm_config?.model || "google_ai/gemini-2.5-pro",
-                        embedding: agent.embedding || "letta/letta-free",
-                        system: agent.system_prompt.value || '',
-                        block_ids: blockIds,
-                        context_window_limit: agent.llm_config?.context_window || 64000
+                    // Update existing agent
+                    await (0, apply_helpers_1.updateExistingAgent)(agent, existingAgent, agentConfig, {
+                        diffEngine,
+                        agentManager,
+                        toolNameToId,
+                        createdFolders,
+                        sharedBlockIds,
+                        spinnerEnabled,
+                        verbose
                     });
-                    // Attach tools after agent creation (same as update path)
-                    for (const toolId of toolIds) {
-                        if (verbose)
-                            console.log(`  Attaching tool: ${toolId}`);
-                        await client.attachToolToAgent(createdAgent.id, toolId);
-                    }
-                    // Update agent registry with new agent
-                    agentManager.updateRegistry(agentName, {
-                        systemPrompt: agent.system_prompt.value || '',
-                        tools: agent.tools || [],
-                        model: agent.llm_config?.model,
-                        embedding: agent.embedding,
-                        contextWindow: agent.llm_config?.context_window,
-                        memoryBlocks: (agent.memory_blocks || []).map(block => ({
-                            name: block.name,
-                            description: block.description,
-                            limit: block.limit,
-                            value: block.value || ''
-                        })),
-                        folders: agent.folders || [],
-                        sharedBlocks: agent.shared_blocks || []
-                    }, createdAgent.id);
-                    // Attach folders to agent
-                    if (agent.folders) {
-                        for (const folderConfig of agent.folders) {
-                            const folderId = createdFolders.get(folderConfig.name);
-                            if (folderId) {
-                                if (verbose)
-                                    console.log(`  Attaching folder ${folderConfig.name}`);
-                                await client.attachFolderToAgent(createdAgent.id, folderId);
-                                if (verbose)
-                                    console.log(`  Folder attached`);
-                            }
-                        }
-                    }
-                    creationSpinner.succeed(`Agent ${agentName} created successfully`);
                 }
-                catch (error) {
-                    creationSpinner.fail(`Failed to create agent ${agentName}`);
-                    throw error;
+                else {
+                    // Create new agent
+                    await (0, apply_helpers_1.createNewAgent)(agent, agentName, {
+                        client,
+                        blockManager,
+                        agentManager,
+                        toolNameToId,
+                        createdFolders,
+                        sharedBlockIds,
+                        spinnerEnabled,
+                        verbose
+                    });
                 }
             }
             catch (error) {
-                console.error(`Failed to create agent ${agent.name}:`, error.message);
+                console.error(`Failed to process agent ${agent.name}:`, error.message);
                 throw error;
             }
         }
@@ -380,111 +171,4 @@ async function applyCommand(options, command) {
         process.exit(1);
     }
 }
-/**
- * Template mode: apply a template config to all existing agents matching a glob pattern.
- * Uses MERGE semantics - adds/updates resources but doesn't remove existing ones.
- */
-async function applyTemplateMode(options, config, parser, command) {
-    const verbose = command.parent?.opts().verbose || false;
-    const spinnerEnabled = (0, spinner_1.getSpinnerEnabled)(command);
-    const pattern = options.match;
-    const findSpinner = (0, spinner_1.createSpinner)(`Finding agents matching "${pattern}"...`, spinnerEnabled).start();
-    // Get all agents from server
-    const client = new letta_client_1.LettaClientWrapper();
-    const allAgentsResponse = await client.listAgents();
-    const allAgents = Array.isArray(allAgentsResponse)
-        ? allAgentsResponse
-        : allAgentsResponse.items || [];
-    // Filter by glob pattern
-    const matchingAgents = allAgents.filter((agent) => (0, minimatch_1.minimatch)(agent.name, pattern));
-    if (matchingAgents.length === 0) {
-        findSpinner.fail(`No agents found matching pattern: ${pattern}`);
-        return;
-    }
-    findSpinner.succeed(`Found ${matchingAgents.length} agents matching "${pattern}"`);
-    matchingAgents.forEach((a) => console.log(`  - ${a.name}`));
-    if (options.dryRun) {
-        console.log('\nDry-run mode: no changes will be made');
-        return;
-    }
-    // Initialize managers
-    const blockManager = new block_manager_1.BlockManager(client);
-    const diffEngine = new diff_engine_1.DiffEngine(client, blockManager, parser.basePath);
-    const fileTracker = new file_content_tracker_1.FileContentTracker(parser.basePath, parser.storageBackend);
-    const createdFolders = new Map();
-    await blockManager.loadExistingBlocks();
-    // Process shared blocks from template
-    const sharedBlockIds = new Map();
-    if (config.shared_blocks?.length) {
-        const blockSpinner = (0, spinner_1.createSpinner)('Processing shared blocks...', spinnerEnabled).start();
-        for (const sharedBlock of config.shared_blocks) {
-            const blockId = await blockManager.getOrCreateSharedBlock(sharedBlock);
-            sharedBlockIds.set(sharedBlock.name, blockId);
-            if (verbose)
-                console.log(`  ${sharedBlock.name} -> ${blockId}`);
-        }
-        blockSpinner.succeed(`Processed ${config.shared_blocks.length} shared blocks`);
-    }
-    // Get template agent config (first agent in config, or use top-level values)
-    const templateAgent = config.agents?.[0];
-    const templateTools = templateAgent?.tools || [];
-    const templateSharedBlocks = templateAgent?.shared_blocks || [];
-    // Generate tool source hashes and register tools
-    const toolSourceHashes = fileTracker.generateToolSourceHashes(templateTools, parser.toolConfigs);
-    const toolNameToId = await parser.registerRequiredTools(config, client, verbose, toolSourceHashes);
-    // Apply template to each matching agent
-    for (const existingAgent of matchingAgents) {
-        const agentSpinner = (0, spinner_1.createSpinner)(`Analyzing ${existingAgent.name}...`, spinnerEnabled).start();
-        try {
-            // Build desired config from template (no memoryBlocks - those are instance-specific)
-            const desiredConfig = {
-                systemPrompt: templateAgent?.system_prompt?.value || '',
-                tools: templateTools,
-                toolSourceHashes,
-                sharedBlocks: templateSharedBlocks,
-            };
-            // Create minimal AgentVersion for diff engine
-            const agentVersion = {
-                id: existingAgent.id,
-                name: existingAgent.name,
-                baseName: existingAgent.name,
-                configHashes: { overall: '', systemPrompt: '', tools: '', model: '', memoryBlocks: '', folders: '', sharedBlocks: '' },
-                version: 'latest',
-                lastUpdated: existingAgent.updated_at || new Date().toISOString()
-            };
-            // Generate update operations
-            const ops = await diffEngine.generateUpdateOperations(agentVersion, desiredConfig, toolNameToId, createdFolders, verbose, sharedBlockIds);
-            // MERGE semantics: clear toRemove arrays (don't remove existing resources)
-            if (ops.tools)
-                ops.tools.toRemove = [];
-            if (ops.blocks)
-                ops.blocks.toRemove = [];
-            if (ops.folders)
-                ops.folders.toDetach = [];
-            // Recalculate operation count after filtering
-            ops.operationCount = 0;
-            if (ops.updateFields)
-                ops.operationCount += Object.keys(ops.updateFields).length;
-            if (ops.tools)
-                ops.operationCount += ops.tools.toAdd.length + ops.tools.toUpdate.length;
-            if (ops.blocks)
-                ops.operationCount += ops.blocks.toAdd.length + ops.blocks.toUpdate.length;
-            if (ops.folders)
-                ops.operationCount += ops.folders.toAttach.length;
-            if (ops.operationCount === 0) {
-                agentSpinner.succeed(`${existingAgent.name}: already up to date`);
-                continue;
-            }
-            agentSpinner.stop();
-            output_formatter_1.OutputFormatter.showAgentUpdateDiff(ops);
-            const updateSpinner = (0, spinner_1.createSpinner)(`Applying updates to ${existingAgent.name}...`, spinnerEnabled).start();
-            await diffEngine.applyUpdateOperations(existingAgent.id, ops, verbose);
-            updateSpinner.succeed(`${existingAgent.name}: updated successfully`);
-        }
-        catch (error) {
-            agentSpinner.fail(`${existingAgent.name}: ${error.message}`);
-        }
-    }
-    console.log('\nTemplate apply completed');
-}
 //# sourceMappingURL=apply.js.map