devchain-cli 0.9.1 → 0.10.0

package/dist/server/modules/projects/services/main-project-bootstrap.service.d.ts

@@ -0,0 +1,11 @@
+import { OnApplicationBootstrap } from '@nestjs/common';
+import { StorageService } from '../../storage/interfaces/storage.interface';
+export declare class MainProjectBootstrapService implements OnApplicationBootstrap {
+    private readonly storage;
+    private mainProjectId;
+    constructor(storage: StorageService);
+    onApplicationBootstrap(): Promise<void>;
+    getMainProjectId(): string | null;
+    ensureMainProjectId(): Promise<string | null>;
+    private deriveMainProjectName;
+}

package/dist/server/modules/projects/services/main-project-bootstrap.service.js

@@ -0,0 +1,76 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MainProjectBootstrapService = void 0;
+const common_1 = require("@nestjs/common");
+const path_1 = require("path");
+const env_config_1 = require("../../../common/config/env.config");
+const logger_1 = require("../../../common/logging/logger");
+const storage_interface_1 = require("../../storage/interfaces/storage.interface");
+const logger = (0, logger_1.createLogger)('MainProjectBootstrapService');
+let MainProjectBootstrapService = class MainProjectBootstrapService {
+    constructor(storage) {
+        this.storage = storage;
+        this.mainProjectId = null;
+    }
+    async onApplicationBootstrap() {
+        await this.ensureMainProjectId();
+    }
+    getMainProjectId() {
+        return this.mainProjectId;
+    }
+    async ensureMainProjectId() {
+        if (this.mainProjectId) {
+            return this.mainProjectId;
+        }
+        const env = (0, env_config_1.getEnvConfig)();
+        if (env.DEVCHAIN_MODE !== 'main') {
+            this.mainProjectId = null;
+            return null;
+        }
+        const repoRoot = (0, path_1.resolve)(env.REPO_ROOT ?? process.cwd());
+        const projects = await this.storage.listProjects({ limit: 1000, offset: 0 });
+        const byRepoRoot = projects.items.find((project) => (0, path_1.resolve)(project.rootPath) === repoRoot);
+        if (byRepoRoot) {
+            this.mainProjectId = byRepoRoot.id;
+            logger.info({ projectId: byRepoRoot.id, projectName: byRepoRoot.name, repoRoot }, 'Using existing main project for current repository root');
+            return this.mainProjectId;
+        }
+        if (projects.total > 0 && projects.items.length > 0) {
+            this.mainProjectId = projects.items[0].id;
+            logger.info({ projectId: this.mainProjectId, repoRoot }, 'Using existing project as main merge target');
+            return this.mainProjectId;
+        }
+        const created = await this.storage.createProject({
+            name: this.deriveMainProjectName(repoRoot),
+            description: 'Auto-created main project for merged worktree epics',
+            rootPath: repoRoot,
+            isTemplate: false,
+        });
+        this.mainProjectId = created.id;
+        logger.info({ projectId: created.id, projectName: created.name, repoRoot }, 'Created main project bootstrap target');
+        return this.mainProjectId;
+    }
+    deriveMainProjectName(repoRoot) {
+        const name = (0, path_1.basename)(repoRoot).trim();
+        return name.length > 0 ? name : 'Main';
+    }
+};
+exports.MainProjectBootstrapService = MainProjectBootstrapService;
+exports.MainProjectBootstrapService = MainProjectBootstrapService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(storage_interface_1.STORAGE_SERVICE)),
+    __metadata("design:paramtypes", [Object])
+], MainProjectBootstrapService);
+//# sourceMappingURL=main-project-bootstrap.service.js.map

package/dist/server/modules/projects/services/main-project-bootstrap.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"main-project-bootstrap.service.js","sourceRoot":"","sources":["../../../../src/modules/projects/services/main-project-bootstrap.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/projects/services/projects.service.d.ts

@@ -13,6 +13,7 @@ export interface CreateFromTemplateInput {
     name: string;
     description?: string | null;
     rootPath: string;
+    projectId?: string;
     slug?: string;
     version?: string | null;
     templatePath?: string;
@@ -137,6 +138,10 @@ export declare class ProjectsService {
             position: number;
             priority: number;
         }[];
+        providerSettings?: {
+            name: string;
+            autoCompactThreshold: number | null;
+        }[] | undefined;
         projectSettings?: {
             initialPromptTitle?: string;
             autoCleanStatusLabels?: string[];
@@ -319,6 +324,9 @@ export declare class ProjectsService {
             name: string;
         };
         familySlug?: string | null;
+        providerConfigs?: Array<{
+            providerName: string;
+        }>;
     }>, templateAgents: Array<{
         id?: string;
         name: string;

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

@@ -23,9 +23,9 @@ const logger_1 = require("../../../common/logging/logger");
 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 shared_1 = require("@devchain/shared");
 const unified_template_service_1 = require("../../registry/services/unified-template.service");
+const templates_directory_1 = require("../../../common/templates-directory");
 const logger = (0, logger_1.createLogger)('ProjectsService');
 let ProjectsService = class ProjectsService {
     constructor(storage, sessions, settings, watchersService, watcherRunner, unifiedTemplateService) {
@@ -37,24 +37,12 @@ let ProjectsService = class ProjectsService {
         this.unifiedTemplateService = unifiedTemplateService;
     }
     findTemplatesDirectory() {
-        const env = (0, env_config_1.getEnvConfig)();
-        if (env.TEMPLATES_DIR) {
-            if ((0, fs_1.existsSync)(env.TEMPLATES_DIR)) {
-                logger.debug({ path: env.TEMPLATES_DIR }, 'Using TEMPLATES_DIR from environment');
-                return env.TEMPLATES_DIR;
-            }
-            logger.warn({ path: env.TEMPLATES_DIR }, 'TEMPLATES_DIR set but path does not exist');
-        }
-        const possibleTemplatePaths = [
-            (0, path_1.join)(__dirname, '..', '..', '..', '..', 'templates'),
-            (0, path_1.join)(process.cwd(), 'apps', 'local-app', 'templates'),
-        ];
-        for (const path of possibleTemplatePaths) {
-            if ((0, fs_1.existsSync)(path)) {
-                logger.debug({ path }, 'Found templates directory');
-                return path;
-            }
+        const templatesDir = (0, templates_directory_1.resolveTemplatesDirectory)(__dirname);
+        if (templatesDir) {
+            logger.debug({ path: templatesDir }, 'Found templates directory');
+            return templatesDir;
         }
+        logger.warn('Templates directory not found in known locations');
         return null;
     }
     async listTemplates() {
@@ -143,26 +131,48 @@ let ProjectsService = class ProjectsService {
         }
         const familyResult = await this.computeFamilyAlternatives(payload.profiles, payload.agents);
         const needsMapping = familyResult.alternatives.some((alt) => !alt.defaultProviderAvailable);
-        if (needsMapping && !input.familyProviderMappings) {
+        let effectiveFamilyProviderMappings = input.familyProviderMappings;
+        if (needsMapping && !effectiveFamilyProviderMappings) {
+            const autoMappings = {};
+            let canAutoSelect = familyResult.canImport;
+            for (const alt of familyResult.alternatives) {
+                if (!alt.defaultProviderAvailable) {
+                    if (alt.availableProviders.length === 1) {
+                        autoMappings[alt.familySlug] = alt.availableProviders[0];
+                    }
+                    else {
+                        canAutoSelect = false;
+                    }
+                }
+            }
+            if (canAutoSelect) {
+                effectiveFamilyProviderMappings = autoMappings;
+                logger.info({ autoMappings }, 'Auto-selected provider mappings for single-alternative families');
+            }
+            else {
+                return {
+                    success: false,
+                    providerMappingRequired: {
+                        missingProviders: familyResult.missingProviders,
+                        familyAlternatives: familyResult.alternatives,
+                        canImport: familyResult.canImport,
+                    },
+                };
+            }
+        }
+        if (!familyResult.canImport) {
             return {
                 success: false,
                 providerMappingRequired: {
                     missingProviders: familyResult.missingProviders,
                     familyAlternatives: familyResult.alternatives,
-                    canImport: familyResult.canImport,
+                    canImport: false,
                 },
             };
         }
-        if (!familyResult.canImport) {
-            throw new error_types_1.ValidationError('Cannot import: some profile families have no available providers', {
-                hint: 'Install the required providers or use a different template',
-                missingProviders: familyResult.missingProviders,
-                familyAlternatives: familyResult.alternatives,
-            });
-        }
         const providerNames = new Set((payload.profiles ?? []).map((p) => p.provider.name.trim().toLowerCase()));
         const { available } = await this.resolveProviders(providerNames);
-        const selectedProfilesByFamily = this.selectProfilesForFamilies(payload.profiles, payload.agents, input.familyProviderMappings, available);
+        const selectedProfilesByFamily = this.selectProfilesForFamilies(payload.profiles, payload.agents, effectiveFamilyProviderMappings, available);
         const templatePayload = {
             prompts: payload.prompts.map((p) => ({
                 id: p.id,
@@ -205,12 +215,21 @@ let ProjectsService = class ProjectsService {
             })),
             initialPrompt: payload.initialPrompt,
         };
-        const result = await this.storage.createProjectWithTemplate({
-            name: input.name,
-            description: input.description ?? null,
-            rootPath: input.rootPath,
-            isTemplate: false,
-        }, templatePayload);
+        const result = input.projectId
+            ? await this.storage.createProjectWithTemplate({
+                name: input.name,
+                description: input.description ?? null,
+                rootPath: input.rootPath,
+                isTemplate: false,
+            }, templatePayload, {
+                projectId: input.projectId,
+            })
+            : await this.storage.createProjectWithTemplate({
+                name: input.name,
+                description: input.description ?? null,
+                rootPath: input.rootPath,
+                isTemplate: false,
+            }, templatePayload);
         const { agentNameToId: agentNameToNewId, profileNameToId: profileNameToNewId } = this.buildNameToIdMaps(templatePayload, result.mappings);
         const configLookupMap = new Map();
         for (const prof of selectedProfilesByFamily.profilesToCreate) {
@@ -274,7 +293,19 @@ let ProjectsService = class ProjectsService {
                 logger.debug({ agentName: a.name, providerConfigId }, 'Updated agent with providerConfigId');
             }
             else {
-                logger.warn({ agentName: a.name, providerConfigName: agentWithConfig.providerConfigName }, 'Provider config not found for agent in createFromTemplate');
+                const fallbackKey = Array.from(configLookupMap.keys()).find((key) => key.startsWith(`${newProfileId}:`));
+                if (fallbackKey) {
+                    const fallbackConfigId = configLookupMap.get(fallbackKey);
+                    await this.storage.updateAgent(newAgentId, { providerConfigId: fallbackConfigId });
+                    logger.warn({
+                        agentName: a.name,
+                        providerConfigName: agentWithConfig.providerConfigName,
+                        fallbackConfigId,
+                    }, 'Agent providerConfigName unavailable, fell back to first available config');
+                }
+                else {
+                    logger.warn({ agentName: a.name, providerConfigName: agentWithConfig.providerConfigName }, 'No provider config available for agent in createFromTemplate');
+                }
             }
         }
         for (const [newProfileId, { profileName, configNames }] of profilesWithProviderConfigs) {
@@ -282,8 +313,13 @@ let ProjectsService = class ProjectsService {
             for (const existingConfig of existingConfigs) {
                 const isFromProviderConfigs = configNames.has(existingConfig.name.trim().toLowerCase());
                 if (!isFromProviderConfigs && existingConfig.name === profileName) {
-                    await this.storage.deleteProfileProviderConfig(existingConfig.id);
-                    logger.debug({ profileName, configId: existingConfig.id }, 'Deleted duplicate config created by storage layer');
+                    try {
+                        await this.storage.deleteProfileProviderConfig(existingConfig.id);
+                        logger.debug({ profileName, configId: existingConfig.id }, 'Deleted duplicate config created by storage layer');
+                    }
+                    catch {
+                        logger.debug({ profileName, configId: existingConfig.id }, 'Skipped deleting default config — still referenced by agents');
+                    }
                 }
             }
         }
@@ -588,6 +624,15 @@ let ProjectsService = class ProjectsService {
             position: s.position,
             priority: s.priority,
         }));
+        const providerSettings = [];
+        for (const prov of providersMap.values()) {
+            if (prov.autoCompactThreshold != null) {
+                providerSettings.push({
+                    name: prov.name,
+                    autoCompactThreshold: prov.autoCompactThreshold,
+                });
+            }
+        }
         const existingMetadata = this.settings.getProjectTemplateMetadata(projectId);
         const manifest = {
             slug: existingMetadata?.templateSlug || this.slugify(project.name),
@@ -609,6 +654,7 @@ let ProjectsService = class ProjectsService {
                 ? { promptId: initialPrompt.id, title: initialPrompt.title }
                 : null,
             ...(Object.keys(projectSettings).length > 0 && { projectSettings }),
+            ...(providerSettings.length > 0 && { providerSettings }),
             watchers,
             subscribers,
             ...(presetsOverride !== undefined
@@ -1120,6 +1166,27 @@ let ProjectsService = class ProjectsService {
                 await this.settings.clearProjectPresets(input.projectId);
                 logger.info({ projectId: input.projectId }, 'Presets cleared during import (template has none)');
             }
+            const importedProviderSettings = payload.providerSettings;
+            if (importedProviderSettings && importedProviderSettings.length > 0) {
+                const allProviders = await this.storage.listProviders();
+                const providersByName = new Map(allProviders.items.map((p) => [p.name.trim().toLowerCase(), p]));
+                for (const setting of importedProviderSettings) {
+                    const localProvider = providersByName.get(setting.name.trim().toLowerCase());
+                    if (!localProvider) {
+                        continue;
+                    }
+                    if (localProvider.autoCompactThreshold != null) {
+                        logger.debug({ providerName: setting.name, existing: localProvider.autoCompactThreshold }, 'Skipping providerSettings import: local threshold already set');
+                        continue;
+                    }
+                    if (setting.autoCompactThreshold != null) {
+                        await this.storage.updateProvider(localProvider.id, {
+                            autoCompactThreshold: setting.autoCompactThreshold,
+                        });
+                        logger.info({ providerName: setting.name, threshold: setting.autoCompactThreshold }, 'Applied autoCompactThreshold from template import');
+                    }
+                }
+            }
             return {
                 success: true,
                 mode: 'replace',
@@ -1207,6 +1274,17 @@ let ProjectsService = class ProjectsService {
                 familyMap.set(providerName, []);
             }
             familyMap.get(providerName).push(prof.name);
+            if (prof.providerConfigs) {
+                for (const config of prof.providerConfigs) {
+                    const configProviderName = config.providerName.trim().toLowerCase();
+                    if (!familyMap.has(configProviderName)) {
+                        familyMap.set(configProviderName, []);
+                    }
+                    if (!familyMap.get(configProviderName).includes(prof.name)) {
+                        familyMap.get(configProviderName).push(prof.name);
+                    }
+                }
+            }
         }
         const alternatives = [];
         const allMissingProviders = new Set();