devchain-cli 0.3.1 → 0.4.0

package/dist/server/modules/projects/services/projects.service.js

@@ -24,124 +24,17 @@ const error_types_1 = require("../../../common/errors/error-types");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const env_config_1 = require("../../../common/config/env.config");
-const zod_1 = require("zod");
+const shared_1 = require("@devchain/shared");
+const unified_template_service_1 = require("../../registry/services/unified-template.service");
 const logger = (0, logger_1.createLogger)('ProjectsService');
-const ExportSchema = zod_1.z
-    .object({
-    version: zod_1.z.number().optional().default(1),
-    exportedAt: zod_1.z.string().optional(),
-    prompts: zod_1.z
-        .array(zod_1.z.object({
-        id: zod_1.z.string().uuid().optional(),
-        title: zod_1.z.string().min(1),
-        content: zod_1.z.string().default(''),
-        version: zod_1.z.number().optional(),
-        tags: zod_1.z.array(zod_1.z.string()).optional().default([]),
-    }))
-        .optional()
-        .default([]),
-    profiles: zod_1.z
-        .array(zod_1.z.object({
-        id: zod_1.z.string().uuid().optional(),
-        name: zod_1.z.string().min(1),
-        provider: zod_1.z.object({ id: zod_1.z.string().optional(), name: zod_1.z.string().min(1) }),
-        options: zod_1.z.unknown().nullable().optional(),
-        instructions: zod_1.z.string().nullable().optional(),
-        temperature: zod_1.z.number().nullable().optional(),
-        maxTokens: zod_1.z.number().int().nullable().optional(),
-    }))
-        .optional()
-        .default([]),
-    agents: zod_1.z
-        .array(zod_1.z.object({
-        id: zod_1.z.string().uuid().optional(),
-        name: zod_1.z.string().min(1),
-        profileId: zod_1.z.string().uuid().optional(),
-        description: zod_1.z.string().nullable().optional(),
-    }))
-        .optional()
-        .default([]),
-    statuses: zod_1.z
-        .array(zod_1.z.object({
-        id: zod_1.z.string().uuid().optional(),
-        label: zod_1.z.string().min(1),
-        color: zod_1.z.string().min(1),
-        position: zod_1.z.number().int(),
-        mcpHidden: zod_1.z.boolean().optional().default(false),
-    }))
-        .optional()
-        .default([]),
-    initialPrompt: zod_1.z
-        .object({ promptId: zod_1.z.string().uuid().optional(), title: zod_1.z.string().optional() })
-        .nullable()
-        .optional(),
-    projectSettings: zod_1.z
-        .object({
-        initialPromptTitle: zod_1.z.string().optional(),
-        autoCleanStatusLabels: zod_1.z.array(zod_1.z.string()).optional(),
-        epicAssignedTemplate: zod_1.z.string().optional(),
-    })
-        .optional(),
-    watchers: zod_1.z
-        .array(zod_1.z.object({
-        id: zod_1.z.string().uuid().optional(),
-        name: zod_1.z.string().min(1),
-        description: zod_1.z.string().nullable().optional(),
-        enabled: zod_1.z.boolean(),
-        scope: zod_1.z.enum(['all', 'agent', 'profile', 'provider']),
-        scopeFilterName: zod_1.z.string().nullable().optional(),
-        pollIntervalMs: zod_1.z.number().int(),
-        viewportLines: zod_1.z.number().int(),
-        condition: zod_1.z.object({
-            type: zod_1.z.enum(['contains', 'regex', 'not_contains']),
-            pattern: zod_1.z.string(),
-            flags: zod_1.z.string().optional(),
-        }),
-        cooldownMs: zod_1.z.number().int(),
-        cooldownMode: zod_1.z.enum(['time', 'until_clear']),
-        eventName: zod_1.z.string(),
-    }))
-        .optional()
-        .default([]),
-    subscribers: zod_1.z
-        .array(zod_1.z.object({
-        id: zod_1.z.string().uuid().optional(),
-        name: zod_1.z.string().min(1),
-        description: zod_1.z.string().nullable().optional(),
-        enabled: zod_1.z.boolean(),
-        eventName: zod_1.z.string(),
-        eventFilter: zod_1.z
-            .object({
-            field: zod_1.z.string(),
-            operator: zod_1.z.enum(['equals', 'contains', 'regex']),
-            value: zod_1.z.string(),
-        })
-            .nullable()
-            .optional(),
-        actionType: zod_1.z.string(),
-        actionInputs: zod_1.z.record(zod_1.z.string(), zod_1.z.object({
-            source: zod_1.z.enum(['event_field', 'custom']),
-            eventField: zod_1.z.string().optional(),
-            customValue: zod_1.z.string().optional(),
-        })),
-        delayMs: zod_1.z.number().int(),
-        cooldownMs: zod_1.z.number().int(),
-        retryOnError: zod_1.z.boolean(),
-        groupName: zod_1.z.string().nullable().optional(),
-        position: zod_1.z.number().int().optional().default(0),
-        priority: zod_1.z.number().int().optional().default(0),
-    }))
-        .optional()
-        .default([]),
-})
-    .strict();
 let ProjectsService = class ProjectsService {
-    constructor(storage, sessions, settings, watchersService, watcherRunner) {
+    constructor(storage, sessions, settings, watchersService, watcherRunner, unifiedTemplateService) {
         this.storage = storage;
         this.sessions = sessions;
         this.settings = settings;
         this.watchersService = watchersService;
         this.watcherRunner = watcherRunner;
+        this.unifiedTemplateService = unifiedTemplateService;
     }
     findTemplatesDirectory() {
         const env = (0, env_config_1.getEnvConfig)();
@@ -169,8 +62,7 @@ let ProjectsService = class ProjectsService {
         const templatesDir = this.findTemplatesDirectory();
         if (!templatesDir) {
             logger.error('Templates directory not found');
-            throw new common_1.InternalServerErrorException({
-                message: 'Templates directory not found',
+            throw new error_types_1.StorageError('Templates directory not found', {
                 hint: 'Templates directory is not available in this deployment',
             });
         }
@@ -186,8 +78,7 @@ let ProjectsService = class ProjectsService {
         }
         catch (error) {
             logger.error({ error, templatesDir }, 'Failed to read templates directory');
-            throw new common_1.InternalServerErrorException({
-                message: 'Failed to read templates directory',
+            throw new error_types_1.StorageError('Failed to read templates directory', {
                 hint: 'Error accessing templates',
             });
         }
@@ -196,8 +87,7 @@ let ProjectsService = class ProjectsService {
         logger.info({ templateId }, 'getTemplateContent');
         const templatesDir = this.findTemplatesDirectory();
         if (!templatesDir) {
-            throw new common_1.InternalServerErrorException({
-                message: 'Templates directory not found',
+            throw new error_types_1.StorageError('Templates directory not found', {
                 hint: 'Templates directory is not available in this deployment',
             });
         }
@@ -220,68 +110,28 @@ let ProjectsService = class ProjectsService {
         }
         catch (error) {
             logger.error({ error, templatePath }, 'Failed to read template file');
-            throw new common_1.InternalServerErrorException({
-                message: 'Failed to read template file',
+            throw new error_types_1.StorageError('Failed to read template file', {
                 hint: 'Template file exists but cannot be read or parsed',
             });
         }
     }
     async createFromTemplate(input) {
         logger.info({ input }, 'createFromTemplate');
-        const templatesDir = this.findTemplatesDirectory();
-        if (!templatesDir) {
-            throw new common_1.InternalServerErrorException({
-                message: 'Templates directory not found',
-                hint: 'Templates directory is not available in this deployment',
-            });
-        }
-        const TEMPLATE_ID_REGEX = /^[a-zA-Z0-9_-]+$/;
-        if (!TEMPLATE_ID_REGEX.test(input.templateId)) {
-            throw new error_types_1.ValidationError('Invalid template ID: must contain only alphanumeric characters, hyphens, and underscores', { templateId: input.templateId });
-        }
-        const resolvedTemplatesDir = (0, path_1.resolve)(templatesDir);
-        const templatePath = (0, path_1.resolve)(templatesDir, `${input.templateId}.json`);
-        if (!templatePath.startsWith(resolvedTemplatesDir + path_1.sep)) {
-            logger.warn({ templateId: input.templateId, templatePath, templatesDir: resolvedTemplatesDir }, 'Path traversal attempt detected');
-            throw new error_types_1.ValidationError('Invalid template ID: path traversal not allowed', {
-                templateId: input.templateId,
-            });
-        }
-        if (!(0, fs_1.existsSync)(templatePath)) {
-            throw new error_types_1.NotFoundError('Template', input.templateId);
-        }
-        let templateContent;
-        try {
-            templateContent = (0, fs_1.readFileSync)(templatePath, 'utf-8');
-        }
-        catch (error) {
-            logger.error({ error, templatePath }, 'Failed to read template file');
-            throw new common_1.InternalServerErrorException({
-                message: 'Failed to read template file',
-                hint: 'Template file exists but cannot be read',
-            });
-        }
+        const templateResult = await this.unifiedTemplateService.getTemplate(input.slug, input.version ?? undefined);
         let payload;
         try {
-            payload = ExportSchema.parse(JSON.parse(templateContent));
+            payload = shared_1.ExportSchema.parse(templateResult.content);
         }
         catch (error) {
-            logger.error({ error, templateId: input.templateId }, 'Invalid template format');
-            throw new common_1.BadRequestException({
-                message: 'Invalid template format',
+            logger.error({ error, slug: input.slug, version: input.version }, 'Invalid template format');
+            throw new error_types_1.ValidationError('Invalid template format', {
                 hint: 'Template file does not match expected export schema',
             });
         }
         const providerNames = new Set((payload.profiles ?? []).map((p) => p.provider.name.trim().toLowerCase()));
-        const providers = await this.storage.listProviders();
-        const available = new Map();
-        for (const prov of providers.items) {
-            available.set(prov.name.trim().toLowerCase(), prov.id);
-        }
-        const missingProviders = Array.from(providerNames).filter((n) => !available.has(n));
+        const { available, missing: missingProviders } = await this.resolveProviders(providerNames);
         if (missingProviders.length > 0) {
-            throw new common_1.BadRequestException({
-                message: 'Import aborted: missing providers',
+            throw new error_types_1.ValidationError('Import aborted: missing providers', {
                 missingProviders,
                 hint: 'Install/configure providers by name before creating project from template.',
             });
@@ -297,25 +147,13 @@ let ProjectsService = class ProjectsService {
             profiles: payload.profiles.map((prof) => {
                 const providerId = available.get(prof.provider.name.trim().toLowerCase());
                 if (!providerId) {
-                    throw new common_1.BadRequestException({ message: `Provider not found: ${prof.provider.name}` });
-                }
-                let optionsStr = null;
-                if (typeof prof.options === 'string') {
-                    optionsStr = prof.options;
-                }
-                else if (prof.options && typeof prof.options === 'object') {
-                    try {
-                        optionsStr = JSON.stringify(prof.options);
-                    }
-                    catch {
-                        optionsStr = null;
-                    }
+                    throw new error_types_1.NotFoundError('Provider', prof.provider.name);
                 }
                 return {
                     id: prof.id,
                     name: prof.name,
                     providerId,
-                    options: optionsStr,
+                    options: this.normalizeProfileOptions(prof.options),
                     instructions: prof.instructions ?? null,
                     temperature: prof.temperature ?? null,
                     maxTokens: prof.maxTokens ?? null,
@@ -342,115 +180,81 @@ let ProjectsService = class ProjectsService {
             rootPath: input.rootPath,
             isTemplate: false,
         }, templatePayload);
-        let initialPromptSet = false;
-        if (payload.initialPrompt) {
-            let targetPromptId = null;
-            if (payload.initialPrompt.title) {
-                const oldId = Object.keys(result.mappings.promptIdMap).find((oldId) => payload.prompts.some((p) => p.id === oldId &&
-                    p.title.trim().toLowerCase() === payload.initialPrompt.title.trim().toLowerCase()));
-                if (oldId) {
-                    targetPromptId = result.mappings.promptIdMap[oldId];
-                }
-            }
-            if (!targetPromptId && payload.initialPrompt.promptId) {
-                const mapped = result.mappings.promptIdMap[payload.initialPrompt.promptId];
-                if (mapped)
-                    targetPromptId = mapped;
-            }
-            await this.settings.updateSettings({
-                projectId: result.project.id,
-                initialSessionPromptId: targetPromptId ?? null,
-            });
-            initialPromptSet = Boolean(targetPromptId);
-        }
-        if (payload.projectSettings) {
-            const ps = payload.projectSettings;
-            if (ps.initialPromptTitle) {
-                const promptByTitle = payload.prompts.find((p) => p.title.toLowerCase() === ps.initialPromptTitle.toLowerCase());
-                if (promptByTitle?.id) {
-                    const mappedPromptId = result.mappings.promptIdMap[promptByTitle.id];
-                    if (mappedPromptId) {
-                        await this.settings.updateSettings({
-                            projectId: result.project.id,
-                            initialSessionPromptId: mappedPromptId,
-                        });
-                        initialPromptSet = true;
-                        logger.info({ projectId: result.project.id, promptTitle: ps.initialPromptTitle }, 'Applied initial prompt from projectSettings');
-                    }
-                }
-            }
-            if (ps.autoCleanStatusLabels && ps.autoCleanStatusLabels.length > 0) {
-                const statusLabelMap = new Map(templatePayload.statuses.map((s) => [s.label.toLowerCase(), s.id]));
-                const autoCleanStatusIds = ps.autoCleanStatusLabels
-                    .map((label) => {
-                    const templateId = statusLabelMap.get(label.toLowerCase());
-                    return templateId ? result.mappings.statusIdMap[templateId] : undefined;
-                })
-                    .filter((id) => !!id);
-                if (autoCleanStatusIds.length > 0) {
-                    const currentSettings = this.settings.getSettings();
-                    const existingAutoClean = currentSettings.autoClean?.statusIds ?? {};
-                    await this.settings.updateSettings({
-                        autoClean: {
-                            statusIds: { ...existingAutoClean, [result.project.id]: autoCleanStatusIds },
-                        },
-                    });
-                    logger.info({ projectId: result.project.id, autoCleanStatusIds }, 'Applied autoClean statuses from projectSettings');
-                }
-            }
-            else {
-                const archiveTemplateStatus = templatePayload.statuses.find((s) => s.label.toLowerCase() === 'archive');
-                if (archiveTemplateStatus?.id) {
-                    const archiveNewId = result.mappings.statusIdMap[archiveTemplateStatus.id];
-                    if (archiveNewId) {
-                        const currentSettings = this.settings.getSettings();
-                        const existingAutoClean = currentSettings.autoClean?.statusIds ?? {};
-                        await this.settings.updateSettings({
-                            autoClean: {
-                                statusIds: { ...existingAutoClean, [result.project.id]: [archiveNewId] },
-                            },
-                        });
-                        logger.info({ projectId: result.project.id, archiveStatusId: archiveNewId }, 'Auto-configured Archive status for auto-clean (fallback)');
-                    }
-                }
-            }
-            if (ps.epicAssignedTemplate) {
-                await this.settings.updateSettings({
-                    events: {
-                        epicAssigned: { template: ps.epicAssignedTemplate },
-                    },
-                });
-                logger.info({ projectId: result.project.id }, 'Applied epicAssigned template from projectSettings');
-            }
-        }
-        else {
-            const archiveTemplateStatus = templatePayload.statuses.find((s) => s.label.toLowerCase() === 'archive');
-            if (archiveTemplateStatus?.id) {
-                const archiveNewId = result.mappings.statusIdMap[archiveTemplateStatus.id];
-                if (archiveNewId) {
-                    const currentSettings = this.settings.getSettings();
-                    const existingAutoClean = currentSettings.autoClean?.statusIds ?? {};
-                    await this.settings.updateSettings({
-                        autoClean: {
-                            statusIds: { ...existingAutoClean, [result.project.id]: [archiveNewId] },
-                        },
-                    });
-                    logger.info({ projectId: result.project.id, archiveStatusId: archiveNewId }, 'Auto-configured Archive status for auto-clean');
-                }
-            }
-        }
+        const { agentNameToId: agentNameToNewId, profileNameToId: profileNameToNewId } = this.buildNameToIdMaps(templatePayload, result.mappings);
+        let mergedInitialPromptTitle;
+        if (payload.initialPrompt?.title) {
+            mergedInitialPromptTitle = payload.initialPrompt.title;
+        }
+        else if (payload.initialPrompt?.promptId) {
+            const matchingPrompt = payload.prompts.find((p) => p.id === payload.initialPrompt.promptId);
+            if (matchingPrompt) {
+                mergedInitialPromptTitle = matchingPrompt.title;
+            }
+        }
+        else if (payload.projectSettings?.initialPromptTitle) {
+            mergedInitialPromptTitle = payload.projectSettings.initialPromptTitle;
+        }
+        const mergedSettings = payload.projectSettings
+            ? { ...payload.projectSettings, initialPromptTitle: mergedInitialPromptTitle }
+            : mergedInitialPromptTitle
+                ? { initialPromptTitle: mergedInitialPromptTitle }
+                : undefined;
+        const promptTitleToId = new Map();
+        for (const p of payload.prompts) {
+            if (p.id && result.mappings.promptIdMap[p.id]) {
+                promptTitleToId.set(p.title.toLowerCase(), result.mappings.promptIdMap[p.id]);
+            }
+        }
+        const statusLabelToId = new Map();
+        for (const s of templatePayload.statuses) {
+            if (s.id && result.mappings.statusIdMap[s.id]) {
+                statusLabelToId.set(s.label.toLowerCase(), result.mappings.statusIdMap[s.id]);
+            }
+        }
+        const archiveTemplateStatus = templatePayload.statuses.find((s) => s.label.toLowerCase() === 'archive');
+        const archiveStatusId = archiveTemplateStatus?.id
+            ? (result.mappings.statusIdMap[archiveTemplateStatus.id] ?? null)
+            : null;
+        const settingsResult = await this.applyProjectSettings(result.project.id, mergedSettings, { promptTitleToId, statusLabelToId }, archiveStatusId);
+        const initialPromptSet = settingsResult.initialPromptSet;
+        const { created: watchersCreated } = await this.createWatchersFromPayload(result.project.id, payload.watchers, {
+            agentNameToId: agentNameToNewId,
+            profileNameToId: profileNameToNewId,
+            providerNameToId: available,
+        });
+        const { created: subscribersCreated } = await this.createSubscribersFromPayload(result.project.id, payload.subscribers);
+        const registryConfig = this.settings.getRegistryConfig();
+        await this.settings.setProjectTemplateMetadata(result.project.id, {
+            templateSlug: input.slug,
+            source: templateResult.source,
+            installedVersion: templateResult.version,
+            registryUrl: templateResult.source === 'registry' ? registryConfig.url : null,
+            installedAt: new Date().toISOString(),
+        });
+        logger.info({
+            projectId: result.project.id,
+            slug: input.slug,
+            source: templateResult.source,
+            version: templateResult.version,
+        }, 'Template metadata set for project');
         return {
             success: true,
             project: result.project,
-            imported: result.imported,
+            imported: {
+                ...result.imported,
+                watchers: watchersCreated,
+                subscribers: subscribersCreated,
+            },
             mappings: result.mappings,
             initialPromptSet,
             message: 'Project created from template successfully.',
         };
     }
-    async exportProject(projectId) {
+    async exportProject(projectId, opts) {
         logger.info({ projectId }, 'exportProject');
-        const [promptsRes, profilesRes, agentsRes, statusesRes, initialPrompt, settings, watchersRes, subscribersRes,] = await Promise.all([
+        const { manifestOverrides } = opts ?? {};
+        const [project, promptsRes, profilesRes, agentsRes, statusesRes, initialPrompt, settings, watchersRes, subscribersRes,] = await Promise.all([
+            this.storage.getProject(projectId),
             this.storage.listPrompts({ projectId, limit: 1000, offset: 0 }),
             this.storage.listAgentProfiles({ projectId, limit: 1000, offset: 0 }),
             this.storage.listAgents(projectId, { limit: 1000, offset: 0 }),
@@ -557,6 +361,10 @@ let ProjectsService = class ProjectsService {
         if (epicAssignedTemplate) {
             projectSettings.epicAssignedTemplate = epicAssignedTemplate;
         }
+        const poolSettings = settings.messagePool?.projects?.[projectId];
+        if (poolSettings && Object.keys(poolSettings).length > 0) {
+            projectSettings.messagePoolSettings = poolSettings;
+        }
         const watchers = await Promise.all(watchersRes.map(async (w) => {
             let scopeFilterName = null;
             if (w.scopeFilterId) {
@@ -614,7 +422,17 @@ let ProjectsService = class ProjectsService {
             position: s.position,
             priority: s.priority,
         }));
+        const existingMetadata = this.settings.getProjectTemplateMetadata(projectId);
+        const manifest = {
+            slug: existingMetadata?.templateSlug || this.slugify(project.name),
+            name: project.name,
+            description: project.description || null,
+            version: existingMetadata?.installedVersion || '1.0.0',
+            ...manifestOverrides,
+            publishedAt: new Date().toISOString(),
+        };
         const exportPayload = {
+            _manifest: manifest,
             version: 1,
             exportedAt: new Date().toISOString(),
             prompts,
@@ -633,14 +451,9 @@ let ProjectsService = class ProjectsService {
     async importProject(input) {
         logger.info({ projectId: input.projectId, dryRun: input.dryRun }, 'importProject');
         const isDryRun = input.dryRun ?? false;
-        const payload = ExportSchema.parse(input.payload ?? {});
+        const payload = shared_1.ExportSchema.parse(input.payload ?? {});
         const providerNames = new Set((payload.profiles ?? []).map((p) => p.provider.name.trim().toLowerCase()));
-        const providers = await this.storage.listProviders();
-        const available = new Map();
-        for (const prov of providers.items) {
-            available.set(prov.name.trim().toLowerCase(), prov.id);
-        }
-        const missingProviders = Array.from(providerNames).filter((n) => !available.has(n));
+        const { available, missing: missingProviders } = await this.resolveProviders(providerNames);
         const [existingPrompts, existingProfiles, existingAgents, existingStatuses, existingWatchers, existingSubscribers,] = await Promise.all([
             this.storage.listPrompts({ projectId: input.projectId, limit: 10000, offset: 0 }),
             this.storage.listAgentProfiles({ projectId: input.projectId, limit: 10000, offset: 0 }),
@@ -695,16 +508,14 @@ let ProjectsService = class ProjectsService {
             };
         }
         if (missingProviders.length > 0) {
-            throw new common_1.BadRequestException({
-                message: 'Import aborted: missing providers',
+            throw new error_types_1.ValidationError('Import aborted: missing providers', {
                 missingProviders,
                 hint: 'Install/configure providers by name before importing profiles.',
             });
         }
         const activeSessions = this.sessions.getActiveSessionsForProject(input.projectId);
         if (activeSessions.length > 0) {
-            throw new common_1.BadRequestException({
-                message: 'Import aborted: active agent sessions detected',
+            throw new error_types_1.ConflictError('Import aborted: active agent sessions detected', {
                 activeSessions: activeSessions.map((s) => ({ id: s.id, agentId: s.agentId })),
                 hint: 'Terminate all running sessions for this project before importing.',
             });
@@ -804,45 +615,29 @@ let ProjectsService = class ProjectsService {
                     promptIdMap[p.id] = created.id;
                 createdPrompts.push({ id: created.id, title: created.title });
             }
-            const profileNameToNewId = new Map();
             for (const prof of payload.profiles) {
                 const providerId = available.get(prof.provider.name.trim().toLowerCase());
                 if (!providerId) {
-                    throw new common_1.BadRequestException({ message: `Provider not found: ${prof.provider.name}` });
-                }
-                let optionsStr = null;
-                if (typeof prof.options === 'string') {
-                    optionsStr = prof.options;
-                }
-                else if (prof.options && typeof prof.options === 'object') {
-                    try {
-                        optionsStr = JSON.stringify(prof.options);
-                    }
-                    catch {
-                        optionsStr = null;
-                    }
+                    throw new error_types_1.NotFoundError('Provider', prof.provider.name);
                 }
                 const created = await this.storage.createAgentProfile({
                     projectId: input.projectId,
                     name: prof.name,
                     providerId,
-                    options: optionsStr ?? null,
+                    options: this.normalizeProfileOptions(prof.options),
                     systemPrompt: null,
                     instructions: prof.instructions ?? null,
                     temperature: prof.temperature ?? null,
                     maxTokens: prof.maxTokens ?? null,
                 });
-                if (prof.id)
-                    profileIdMap[prof.id] = created.id;
-                profileNameToNewId.set(prof.name.trim().toLowerCase(), created.id);
+                const profKey = prof.id || `name:${prof.name.trim().toLowerCase()}`;
+                profileIdMap[profKey] = created.id;
             }
-            const agentNameToNewId = new Map();
             for (const a of payload.agents) {
                 const oldProfileId = a.profileId ?? '';
                 const newProfileId = oldProfileId && profileIdMap[oldProfileId] ? profileIdMap[oldProfileId] : undefined;
                 if (!newProfileId) {
-                    throw new common_1.BadRequestException({
-                        message: `Profile mapping missing for agent ${a.name}`,
+                    throw new error_types_1.ValidationError(`Profile mapping missing for agent ${a.name}`, {
                         profileId: oldProfileId || null,
                     });
                 }
@@ -852,75 +647,26 @@ let ProjectsService = class ProjectsService {
                     profileId: newProfileId,
                     description: a.description ?? null,
                 });
-                if (a.id)
-                    agentIdMap[a.id] = created.id;
-                agentNameToNewId.set(a.name.trim().toLowerCase(), created.id);
-            }
-            const watcherIdMap = {};
-            for (const w of payload.watchers) {
-                let scopeFilterId = null;
-                if (w.scopeFilterName && w.scope !== 'all') {
-                    const scopeFilterNameLower = w.scopeFilterName.trim().toLowerCase();
-                    switch (w.scope) {
-                        case 'agent': {
-                            scopeFilterId = agentNameToNewId.get(scopeFilterNameLower) ?? null;
-                            break;
-                        }
-                        case 'profile': {
-                            scopeFilterId = profileNameToNewId.get(scopeFilterNameLower) ?? null;
-                            break;
-                        }
-                        case 'provider': {
-                            const provider = providers.items.find((p) => p.name.trim().toLowerCase() === scopeFilterNameLower);
-                            scopeFilterId = provider?.id ?? null;
-                            break;
-                        }
-                    }
-                    if (!scopeFilterId) {
-                        logger.warn({ watcherName: w.name, scope: w.scope, scopeFilterName: w.scopeFilterName }, 'Could not resolve scope filter, setting scope to "all"');
-                    }
-                }
-                const created = await this.storage.createWatcher({
-                    projectId: input.projectId,
-                    name: w.name,
-                    description: w.description ?? null,
-                    enabled: w.enabled,
-                    scope: scopeFilterId ? w.scope : 'all',
-                    scopeFilterId,
-                    pollIntervalMs: w.pollIntervalMs,
-                    viewportLines: w.viewportLines,
-                    condition: w.condition,
-                    cooldownMs: w.cooldownMs,
-                    cooldownMode: w.cooldownMode,
-                    eventName: w.eventName,
-                });
-                if (w.id)
-                    watcherIdMap[w.id] = created.id;
-                if (created.enabled) {
-                    await this.watcherRunner.startWatcher(created);
-                }
-            }
-            const subscriberIdMap = {};
-            for (const s of payload.subscribers) {
-                const created = await this.storage.createSubscriber({
-                    projectId: input.projectId,
-                    name: s.name,
-                    description: s.description ?? null,
-                    enabled: s.enabled,
-                    eventName: s.eventName,
-                    eventFilter: s.eventFilter ?? null,
-                    actionType: s.actionType,
-                    actionInputs: s.actionInputs,
-                    delayMs: s.delayMs,
-                    cooldownMs: s.cooldownMs,
-                    retryOnError: s.retryOnError,
-                    groupName: s.groupName ?? null,
-                    position: s.position ?? 0,
-                    priority: s.priority ?? 0,
-                });
-                if (s.id)
-                    subscriberIdMap[s.id] = created.id;
+                const agentKey = a.id || `name:${a.name.trim().toLowerCase()}`;
+                agentIdMap[agentKey] = created.id;
             }
+            const augmentedPayload = {
+                agents: payload.agents.map((a) => ({
+                    ...a,
+                    id: a.id || `name:${a.name.trim().toLowerCase()}`,
+                })),
+                profiles: payload.profiles.map((p) => ({
+                    ...p,
+                    id: p.id || `name:${p.name.trim().toLowerCase()}`,
+                })),
+            };
+            const { agentNameToId: agentNameToNewId, profileNameToId: profileNameToNewId } = this.buildNameToIdMaps(augmentedPayload, { agentIdMap, profileIdMap });
+            const { watcherIdMap } = await this.createWatchersFromPayload(input.projectId, payload.watchers, {
+                agentNameToId: agentNameToNewId,
+                profileNameToId: profileNameToNewId,
+                providerNameToId: available,
+            });
+            const { subscriberIdMap } = await this.createSubscribersFromPayload(input.projectId, payload.subscribers);
             logger.info({
                 watchersCreated: payload.watchers.length,
                 subscribersCreated: payload.subscribers.length,
@@ -952,62 +698,31 @@ let ProjectsService = class ProjectsService {
                 }
             }
             logger.info({ epicsRemapped, epicsCleared }, 'Epic agent references updated after import');
-            let initialPromptSet = false;
-            if (payload.initialPrompt) {
-                let targetPromptId = null;
-                if (payload.initialPrompt.title) {
-                    const match = createdPrompts.find((cp) => cp.title.trim().toLowerCase() === payload.initialPrompt.title.trim().toLowerCase());
-                    if (match)
-                        targetPromptId = match.id;
-                }
-                if (!targetPromptId && payload.initialPrompt.promptId) {
-                    const mapped = promptIdMap[payload.initialPrompt.promptId];
-                    if (mapped)
-                        targetPromptId = mapped;
-                }
-                await this.settings.updateSettings({
-                    projectId: input.projectId,
-                    initialSessionPromptId: targetPromptId ?? null,
-                });
-                initialPromptSet = Boolean(targetPromptId);
-            }
-            if (payload.projectSettings) {
-                const ps = payload.projectSettings;
-                if (ps.initialPromptTitle) {
-                    const matchByTitle = createdPrompts.find((cp) => cp.title.toLowerCase() === ps.initialPromptTitle.toLowerCase());
-                    if (matchByTitle) {
-                        await this.settings.updateSettings({
-                            projectId: input.projectId,
-                            initialSessionPromptId: matchByTitle.id,
-                        });
-                        initialPromptSet = true;
-                        logger.info({ projectId: input.projectId, promptTitle: ps.initialPromptTitle }, 'Applied initial prompt from projectSettings');
-                    }
-                }
-                if (ps.autoCleanStatusLabels && ps.autoCleanStatusLabels.length > 0) {
-                    const autoCleanStatusIds = ps.autoCleanStatusLabels
-                        .map((label) => templateLabelToStatusId.get(label.toLowerCase()))
-                        .filter((id) => !!id);
-                    if (autoCleanStatusIds.length > 0) {
-                        const currentSettings = this.settings.getSettings();
-                        const existingAutoClean = currentSettings.autoClean?.statusIds ?? {};
-                        await this.settings.updateSettings({
-                            autoClean: {
-                                statusIds: { ...existingAutoClean, [input.projectId]: autoCleanStatusIds },
-                            },
-                        });
-                        logger.info({ projectId: input.projectId, autoCleanStatusIds }, 'Applied autoClean statuses from projectSettings');
-                    }
-                }
-                if (ps.epicAssignedTemplate) {
-                    await this.settings.updateSettings({
-                        events: {
-                            epicAssigned: { template: ps.epicAssignedTemplate },
-                        },
-                    });
-                    logger.info({ projectId: input.projectId }, 'Applied epicAssigned template from projectSettings');
+            let mergedInitialPromptTitle;
+            if (payload.initialPrompt?.title) {
+                mergedInitialPromptTitle = payload.initialPrompt.title;
+            }
+            else if (payload.initialPrompt?.promptId) {
+                const matchingPrompt = payload.prompts.find((p) => p.id === payload.initialPrompt.promptId);
+                if (matchingPrompt) {
+                    mergedInitialPromptTitle = matchingPrompt.title;
                 }
             }
+            else if (payload.projectSettings?.initialPromptTitle) {
+                mergedInitialPromptTitle = payload.projectSettings.initialPromptTitle;
+            }
+            const mergedSettings = payload.projectSettings
+                ? { ...payload.projectSettings, initialPromptTitle: mergedInitialPromptTitle }
+                : mergedInitialPromptTitle
+                    ? { initialPromptTitle: mergedInitialPromptTitle }
+                    : undefined;
+            const promptTitleToId = new Map();
+            for (const cp of createdPrompts) {
+                promptTitleToId.set(cp.title.toLowerCase(), cp.id);
+            }
+            const archiveStatusId = templateLabelToStatusId.get('archive') ?? null;
+            const settingsResult = await this.applyProjectSettings(input.projectId, mergedSettings, { promptTitleToId, statusLabelToId: templateLabelToStatusId }, archiveStatusId);
+            const initialPromptSet = settingsResult.initialPromptSet;
             return {
                 success: true,
                 mode: 'replace',
@@ -1051,8 +766,210 @@ let ProjectsService = class ProjectsService {
         catch (error) {
             logger.error({ error, projectId: input.projectId }, 'Import failed');
             const message = this.getImportErrorMessage(error);
-            throw new common_1.BadRequestException({ message });
+            throw new error_types_1.StorageError(message);
+        }
+    }
+    async resolveProviders(providerNames) {
+        const providers = await this.storage.listProviders();
+        const available = new Map();
+        for (const prov of providers.items) {
+            available.set(prov.name.trim().toLowerCase(), prov.id);
+        }
+        const missing = Array.from(providerNames).filter((n) => !available.has(n));
+        return { available, missing };
+    }
+    buildNameToIdMaps(payload, mappings) {
+        const agentNameToId = new Map();
+        for (const a of payload.agents) {
+            if (a.id && mappings.agentIdMap[a.id]) {
+                const nameLower = a.name.trim().toLowerCase();
+                if (agentNameToId.has(nameLower)) {
+                    logger.warn({
+                        name: a.name,
+                        existingId: agentNameToId.get(nameLower),
+                        newId: mappings.agentIdMap[a.id],
+                    }, 'Duplicate agent name detected, using last occurrence');
+                }
+                agentNameToId.set(nameLower, mappings.agentIdMap[a.id]);
+            }
+        }
+        const profileNameToId = new Map();
+        for (const prof of payload.profiles) {
+            if (prof.id && mappings.profileIdMap[prof.id]) {
+                const nameLower = prof.name.trim().toLowerCase();
+                if (profileNameToId.has(nameLower)) {
+                    logger.warn({
+                        name: prof.name,
+                        existingId: profileNameToId.get(nameLower),
+                        newId: mappings.profileIdMap[prof.id],
+                    }, 'Duplicate profile name detected, using last occurrence');
+                }
+                profileNameToId.set(nameLower, mappings.profileIdMap[prof.id]);
+            }
         }
+        return { agentNameToId, profileNameToId };
+    }
+    async createWatchersFromPayload(projectId, watchers, maps) {
+        const watcherIdMap = {};
+        let created = 0;
+        for (const w of watchers) {
+            let scopeFilterId = null;
+            if (w.scopeFilterName && w.scope !== 'all') {
+                const scopeFilterNameLower = w.scopeFilterName.trim().toLowerCase();
+                switch (w.scope) {
+                    case 'agent': {
+                        scopeFilterId = maps.agentNameToId.get(scopeFilterNameLower) ?? null;
+                        break;
+                    }
+                    case 'profile': {
+                        scopeFilterId = maps.profileNameToId.get(scopeFilterNameLower) ?? null;
+                        break;
+                    }
+                    case 'provider': {
+                        scopeFilterId = maps.providerNameToId.get(scopeFilterNameLower) ?? null;
+                        break;
+                    }
+                }
+                if (!scopeFilterId) {
+                    logger.warn({ projectId, watcherName: w.name, scope: w.scope, scopeFilterName: w.scopeFilterName }, 'Could not resolve scope filter, setting scope to "all"');
+                }
+            }
+            try {
+                const createdWatcher = await this.watchersService.createWatcher({
+                    projectId,
+                    name: w.name,
+                    description: w.description ?? null,
+                    enabled: w.enabled,
+                    scope: scopeFilterId ? w.scope : 'all',
+                    scopeFilterId,
+                    pollIntervalMs: w.pollIntervalMs,
+                    viewportLines: w.viewportLines,
+                    condition: w.condition,
+                    cooldownMs: w.cooldownMs,
+                    cooldownMode: w.cooldownMode,
+                    eventName: w.eventName,
+                });
+                if (w.id)
+                    watcherIdMap[w.id] = createdWatcher.id;
+                created++;
+            }
+            catch (error) {
+                if (error instanceof Error &&
+                    error.message.includes('UNIQUE constraint failed') &&
+                    error.message.includes('event_name')) {
+                    throw new error_types_1.ConflictError(`Duplicate watcher eventName: "${w.eventName}"`, {
+                        hint: 'Each watcher must have a unique eventName within the project.',
+                    });
+                }
+                throw error;
+            }
+        }
+        return { created, watcherIdMap };
+    }
+    async createSubscribersFromPayload(projectId, subscribers) {
+        const subscriberIdMap = {};
+        let created = 0;
+        for (const s of subscribers) {
+            const createdSubscriber = await this.storage.createSubscriber({
+                projectId,
+                name: s.name,
+                description: s.description ?? null,
+                enabled: s.enabled,
+                eventName: s.eventName,
+                eventFilter: s.eventFilter ?? null,
+                actionType: s.actionType,
+                actionInputs: s.actionInputs,
+                delayMs: s.delayMs,
+                cooldownMs: s.cooldownMs,
+                retryOnError: s.retryOnError,
+                groupName: s.groupName ?? null,
+                position: s.position ?? 0,
+                priority: s.priority ?? 0,
+            });
+            if (s.id)
+                subscriberIdMap[s.id] = createdSubscriber.id;
+            created++;
+        }
+        return { created, subscriberIdMap };
+    }
+    async applyProjectSettings(projectId, projectSettings, maps, archiveStatusId) {
+        let initialPromptSet = false;
+        if (projectSettings) {
+            const ps = projectSettings;
+            if (ps.initialPromptTitle) {
+                const promptId = maps.promptTitleToId.get(ps.initialPromptTitle.toLowerCase());
+                if (promptId) {
+                    await this.settings.updateSettings({
+                        projectId,
+                        initialSessionPromptId: promptId,
+                    });
+                    initialPromptSet = true;
+                    logger.info({ projectId, promptTitle: ps.initialPromptTitle }, 'Applied initial prompt from projectSettings');
+                }
+            }
+            if (ps.autoCleanStatusLabels && ps.autoCleanStatusLabels.length > 0) {
+                const autoCleanStatusIds = ps.autoCleanStatusLabels
+                    .map((label) => maps.statusLabelToId.get(label.toLowerCase()))
+                    .filter((id) => !!id);
+                if (autoCleanStatusIds.length > 0) {
+                    const currentSettings = this.settings.getSettings();
+                    const existingAutoClean = currentSettings.autoClean?.statusIds ?? {};
+                    await this.settings.updateSettings({
+                        autoClean: {
+                            statusIds: { ...existingAutoClean, [projectId]: autoCleanStatusIds },
+                        },
+                    });
+                    logger.info({ projectId, autoCleanStatusIds }, 'Applied autoClean statuses from projectSettings');
+                }
+            }
+            else if (archiveStatusId) {
+                const currentSettings = this.settings.getSettings();
+                const existingAutoClean = currentSettings.autoClean?.statusIds ?? {};
+                await this.settings.updateSettings({
+                    autoClean: {
+                        statusIds: { ...existingAutoClean, [projectId]: [archiveStatusId] },
+                    },
+                });
+                logger.info({ projectId, archiveStatusId }, 'Auto-configured Archive status for auto-clean (fallback)');
+            }
+            if (ps.epicAssignedTemplate) {
+                await this.settings.updateSettings({
+                    events: {
+                        epicAssigned: { template: ps.epicAssignedTemplate },
+                    },
+                });
+                logger.info({ projectId }, 'Applied epicAssigned template from projectSettings');
+            }
+            if (ps.messagePoolSettings) {
+                await this.settings.setProjectPoolSettings(projectId, ps.messagePoolSettings);
+                logger.info({ projectId, poolSettings: ps.messagePoolSettings }, 'Applied message pool settings from projectSettings');
+            }
+        }
+        else if (archiveStatusId) {
+            const currentSettings = this.settings.getSettings();
+            const existingAutoClean = currentSettings.autoClean?.statusIds ?? {};
+            await this.settings.updateSettings({
+                autoClean: {
+                    statusIds: { ...existingAutoClean, [projectId]: [archiveStatusId] },
+                },
+            });
+            logger.info({ projectId, archiveStatusId }, 'Auto-configured Archive status for auto-clean');
+        }
+        return { initialPromptSet };
+    }
+    normalizeProfileOptions(options) {
+        if (typeof options === 'string') {
+            return options;
+        }
+        if (options && typeof options === 'object') {
+            try {
+                return JSON.stringify(options);
+            }
+            catch {
+                return null;
+            }
+        }
+        return null;
     }
     getImportErrorMessage(error) {
         const errorCode = error?.code;
@@ -1076,6 +993,12 @@ let ProjectsService = class ProjectsService {
         }
         return 'Import failed: An unexpected error occurred.';
     }
+    slugify(name) {
+        return name
+            .toLowerCase()
+            .replace(/[^a-z0-9]+/g, '-')
+            .replace(/(^-|-$)/g, '');
+    }
 };
 exports.ProjectsService = ProjectsService;
 exports.ProjectsService = ProjectsService = __decorate([
@@ -1084,6 +1007,7 @@ exports.ProjectsService = ProjectsService = __decorate([
     __metadata("design:paramtypes", [Object, sessions_service_1.SessionsService,
         settings_service_1.SettingsService,
         watchers_service_1.WatchersService,
-        watcher_runner_service_1.WatcherRunnerService])
+        watcher_runner_service_1.WatcherRunnerService,
+        unified_template_service_1.UnifiedTemplateService])
 ], ProjectsService);
 //# sourceMappingURL=projects.service.js.map