@oamm/textor 1.0.12 → 1.0.14

package/dist/index.cjs

@@ -6,6 +6,7 @@ var path = require('path');
 var crypto = require('crypto');
 var child_process = require('child_process');
 var util = require('util');
+var readline = require('readline');
 
 const CONFIG_DIR$1 = '.textor';
 const CONFIG_FILE = 'config.json';
@@ -497,6 +498,8 @@ function normalizeRoute(route) {
 }
 function routeToFilePath(route, options = {}) {
     const { extension = '.astro', mode = 'flat', indexFile = 'index.astro' } = options;
+    if (!route)
+        return null;
     const normalized = normalizeRoute(route);
     if (normalized === '/') {
         return indexFile;
@@ -634,14 +637,6 @@ async function safeDelete(filePath, options = {}) {
     await promises.unlink(filePath);
     return { deleted: true };
 }
-async function ensureNotExists(filePath, force = false) {
-    if (fs.existsSync(filePath)) {
-        if (!force) {
-            throw new Error(`File already exists: ${filePath}\n` +
-                `Use --force to overwrite.`);
-        }
-    }
-}
 async function ensureDir(dirPath) {
     await promises.mkdir(dirPath, { recursive: true });
 }
@@ -715,6 +710,10 @@ async function safeMove(fromPath, toPath, options = {}) {
     if (!fs.existsSync(fromPath)) {
         throw new Error(`Source file not found: ${fromPath}`);
     }
+    if (path.resolve(fromPath) === path.resolve(toPath)) {
+        const content = await promises.readFile(toPath, 'utf-8');
+        return calculateHash(content, normalization);
+    }
     if (fs.existsSync(toPath) && !force) {
         throw new Error(`Destination already exists: ${toPath}\n` +
             `Use --force to overwrite.`);
@@ -1789,29 +1788,35 @@ async function addSectionCommand(route, featurePath, options) {
                 }
             }
         }
-        await ensureNotExists(featureFilePath, options.force);
-        if (shouldCreateIndex)
-            await ensureNotExists(indexFilePath, options.force);
-        if (shouldCreateContext)
-            await ensureNotExists(contextFilePath, options.force);
-        if (shouldCreateHooks)
-            await ensureNotExists(hookFilePath, options.force);
-        if (shouldCreateTests)
-            await ensureNotExists(testFilePath, options.force);
-        if (shouldCreateTypes)
-            await ensureNotExists(typesFilePath, options.force);
-        if (shouldCreateApi)
-            await ensureNotExists(apiFilePath, options.force);
-        if (shouldCreateServices)
-            await ensureNotExists(servicesFilePath, options.force);
-        if (shouldCreateSchemas)
-            await ensureNotExists(schemasFilePath, options.force);
-        if (shouldCreateReadme)
-            await ensureNotExists(readmeFilePath, options.force);
-        if (shouldCreateStories)
-            await ensureNotExists(storiesFilePath, options.force);
-        if (shouldCreateScriptsDir)
-            await ensureNotExists(scriptsIndexPath, options.force);
+        const featureExists = fs.existsSync(featureFilePath);
+        if (featureExists && !options.force) {
+            console.log(`ℹ Feature already exists at ${featureFilePath}. Entering additive mode.`);
+        }
+        // Check sub-items only if not in force mode
+        if (!options.force) {
+            if (shouldCreateIndex && fs.existsSync(indexFilePath))
+                console.log(`  - Skipping existing index: ${indexFilePath}`);
+            if (shouldCreateContext && fs.existsSync(contextFilePath))
+                console.log(`  - Skipping existing context: ${contextFilePath}`);
+            if (shouldCreateHooks && fs.existsSync(hookFilePath))
+                console.log(`  - Skipping existing hook: ${hookFilePath}`);
+            if (shouldCreateTests && fs.existsSync(testFilePath))
+                console.log(`  - Skipping existing test: ${testFilePath}`);
+            if (shouldCreateTypes && fs.existsSync(typesFilePath))
+                console.log(`  - Skipping existing types: ${typesFilePath}`);
+            if (shouldCreateApi && fs.existsSync(apiFilePath))
+                console.log(`  - Skipping existing api: ${apiFilePath}`);
+            if (shouldCreateServices && fs.existsSync(servicesFilePath))
+                console.log(`  - Skipping existing services: ${servicesFilePath}`);
+            if (shouldCreateSchemas && fs.existsSync(schemasFilePath))
+                console.log(`  - Skipping existing schemas: ${schemasFilePath}`);
+            if (shouldCreateReadme && fs.existsSync(readmeFilePath))
+                console.log(`  - Skipping existing readme: ${readmeFilePath}`);
+            if (shouldCreateStories && fs.existsSync(storiesFilePath))
+                console.log(`  - Skipping existing stories: ${storiesFilePath}`);
+            if (shouldCreateScriptsDir && fs.existsSync(scriptsIndexPath))
+                console.log(`  - Skipping existing scripts: ${scriptsIndexPath}`);
+        }
         let layoutImportPath = null;
         const cliProps = options.prop || {};
         const rawLayoutProps = { ...configLayoutProps, ...cliProps };
@@ -1933,15 +1938,17 @@ async function addSectionCommand(route, featurePath, options) {
         if (shouldCreateTypes)
             await ensureDir(typesDirInside);
         const featureSignature = getSignature(config, config.naming.featureExtension === '.astro' ? 'astro' : 'tsx');
-        const featureHash = await writeFileWithSignature(featureFilePath, featureContent, featureSignature, config.hashing?.normalization);
-        await registerFile(featureFilePath, {
-            kind: 'feature',
-            template: 'feature',
-            hash: featureHash,
-            owner: normalizedRoute
-        });
-        writtenFiles.push(featureFilePath);
-        if (shouldCreateScriptsDir) {
+        if (!featureExists || options.force) {
+            const featureHash = await writeFileWithSignature(featureFilePath, featureContent, featureSignature, config.hashing?.normalization);
+            await registerFile(featureFilePath, {
+                kind: 'feature',
+                template: 'feature',
+                hash: featureHash,
+                owner: normalizedRoute
+            });
+            writtenFiles.push(featureFilePath);
+        }
+        if (shouldCreateScriptsDir && (!fs.existsSync(scriptsIndexPath) || options.force)) {
             const hash = await writeFileWithSignature(scriptsIndexPath, generateScriptsIndexTemplate(), getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(scriptsIndexPath, {
                 kind: 'feature-file',
@@ -1951,7 +1958,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(scriptsIndexPath);
         }
-        if (shouldCreateIndex) {
+        if (shouldCreateIndex && (!fs.existsSync(indexFilePath) || options.force)) {
             const indexContent = generateIndexTemplate(featureComponentName, config.naming.featureExtension);
             const hash = await writeFileWithSignature(indexFilePath, indexContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(indexFilePath, {
@@ -1962,7 +1969,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(indexFilePath);
         }
-        if (shouldCreateApi) {
+        if (shouldCreateApi && (!fs.existsSync(apiFilePath) || options.force)) {
             const apiContent = generateApiTemplate(featureComponentName);
             const hash = await writeFileWithSignature(apiFilePath, apiContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(apiFilePath, {
@@ -1973,7 +1980,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(apiFilePath);
         }
-        if (shouldCreateServices) {
+        if (shouldCreateServices && (!fs.existsSync(servicesFilePath) || options.force)) {
             const servicesContent = generateServiceTemplate(featureComponentName);
             const hash = await writeFileWithSignature(servicesFilePath, servicesContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(servicesFilePath, {
@@ -1984,7 +1991,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(servicesFilePath);
         }
-        if (shouldCreateSchemas) {
+        if (shouldCreateSchemas && (!fs.existsSync(schemasFilePath) || options.force)) {
             const schemasContent = generateSchemaTemplate(featureComponentName);
             const hash = await writeFileWithSignature(schemasFilePath, schemasContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(schemasFilePath, {
@@ -1995,7 +2002,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(schemasFilePath);
         }
-        if (shouldCreateHooks) {
+        if (shouldCreateHooks && (!fs.existsSync(hookFilePath) || options.force)) {
             const hookName = getHookFunctionName(featureComponentName);
             const hookContent = generateHookTemplate(featureComponentName, hookName);
             const hash = await writeFileWithSignature(hookFilePath, hookContent, getSignature(config, 'typescript'), config.hashing?.normalization);
@@ -2007,7 +2014,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(hookFilePath);
         }
-        if (shouldCreateContext) {
+        if (shouldCreateContext && (!fs.existsSync(contextFilePath) || options.force)) {
             const contextContent = generateContextTemplate(featureComponentName);
             const hash = await writeFileWithSignature(contextFilePath, contextContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(contextFilePath, {
@@ -2018,7 +2025,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(contextFilePath);
         }
-        if (shouldCreateTests) {
+        if (shouldCreateTests && (!fs.existsSync(testFilePath) || options.force)) {
             const relativeFeaturePath = `./${path.basename(featureFilePath)}`;
             const testContent = generateTestTemplate(featureComponentName, relativeFeaturePath);
             const hash = await writeFileWithSignature(testFilePath, testContent, getSignature(config, 'typescript'), config.hashing?.normalization);
@@ -2030,7 +2037,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(testFilePath);
         }
-        if (shouldCreateTypes) {
+        if (shouldCreateTypes && (!fs.existsSync(typesFilePath) || options.force)) {
             const typesContent = generateTypesTemplate(featureComponentName);
             const hash = await writeFileWithSignature(typesFilePath, typesContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(typesFilePath, {
@@ -2041,7 +2048,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(typesFilePath);
         }
-        if (shouldCreateReadme) {
+        if (shouldCreateReadme && (!fs.existsSync(readmeFilePath) || options.force)) {
             const readmeContent = generateReadmeTemplate(featureComponentName);
             const hash = await writeFileWithSignature(readmeFilePath, readmeContent, getSignature(config, 'astro'), config.hashing?.normalization);
             await registerFile(readmeFilePath, {
@@ -2052,7 +2059,7 @@ async function addSectionCommand(route, featurePath, options) {
             });
             writtenFiles.push(readmeFilePath);
         }
-        if (shouldCreateStories) {
+        if (shouldCreateStories && (!fs.existsSync(storiesFilePath) || options.force)) {
             const relativePath = `./${path.basename(featureFilePath)}`;
             const storiesContent = generateStoriesTemplate(featureComponentName, relativePath);
             const hash = await writeFileWithSignature(storiesFilePath, storiesContent, getSignature(config, 'typescript'), config.hashing?.normalization);
@@ -2350,6 +2357,189 @@ async function updateImportsInFile$1(filePath, oldFilePath, newFilePath) {
     await promises.writeFile(filePath, content, 'utf-8');
 }
 
+/**
+ * Updates relative imports in a file after it has been moved.
+ */
+async function updateImportsInFile(filePath, oldFilePath, newFilePath) {
+    if (!fs.existsSync(filePath))
+        return;
+    let content = await promises.readFile(filePath, 'utf-8');
+    const oldDir = path.dirname(oldFilePath);
+    const newDir = path.dirname(newFilePath);
+    if (oldDir === newDir)
+        return;
+    // Find all relative imports
+    const relativeImportRegex = /from\s+['"](\.\.?\/[^'"]+)['"]/g;
+    let match;
+    const replacements = [];
+    while ((match = relativeImportRegex.exec(content)) !== null) {
+        const relativePath = match[1];
+        const absoluteTarget = path.resolve(oldDir, relativePath);
+        const newRelativePath = getRelativeImportPath(newFilePath, absoluteTarget);
+        replacements.push({
+            full: match[0],
+            oldRel: relativePath,
+            newRel: newRelativePath
+        });
+    }
+    for (const repl of replacements) {
+        content = content.replace(repl.full, `from '${repl.newRel}'`);
+    }
+    await promises.writeFile(filePath, content, 'utf-8');
+}
+/**
+ * Moves a directory and its contents, renaming files and updating internal content/imports.
+ */
+async function moveDirectory(fromPath, toPath, state, config, options = {}) {
+    const { fromName, toName, owner = null, signatures = [] } = options;
+    if (!fs.existsSync(fromPath)) {
+        throw new Error(`Source directory not found: ${fromPath}`);
+    }
+    if (fs.existsSync(toPath) && !options.force) {
+        throw new Error(`Destination already exists: ${toPath}\n` +
+            `Use --force to overwrite.`);
+    }
+    await ensureDir(toPath);
+    const entries = await promises.readdir(fromPath);
+    for (const entry of entries) {
+        let targetEntry = entry;
+        // Rename files if they match the component name
+        if (fromName && toName && fromName !== toName) {
+            if (entry.includes(fromName)) {
+                targetEntry = entry.replace(fromName, toName);
+            }
+        }
+        const fromEntryPath = path.join(fromPath, entry);
+        const toEntryPath = path.join(toPath, targetEntry);
+        const stats = await promises.stat(fromEntryPath);
+        if (stats.isDirectory()) {
+            await moveDirectory(fromEntryPath, toEntryPath, state, config, options);
+        }
+        else {
+            const normalizedFromRelative = path.relative(process.cwd(), fromEntryPath).replace(/\\/g, '/');
+            const fileState = state.files[normalizedFromRelative];
+            const newHash = await safeMove(fromEntryPath, toEntryPath, {
+                force: options.force,
+                expectedHash: fileState?.hash,
+                acceptChanges: options.acceptChanges,
+                normalization: config.hashing?.normalization,
+                owner,
+                actualOwner: fileState?.owner,
+                signatures
+            });
+            // Update internal content (signatures, component names) if renaming
+            if (fromName && toName && fromName !== toName) {
+                let content = await promises.readFile(toEntryPath, 'utf-8');
+                let hasChanged = false;
+                // Simple replacement of component names
+                if (content.includes(fromName)) {
+                    content = content.replace(new RegExp(fromName, 'g'), toName);
+                    hasChanged = true;
+                }
+                // Also handle lowercase class names if any
+                const fromLower = fromName.toLowerCase();
+                const toLower = toName.toLowerCase();
+                if (content.includes(fromLower)) {
+                    content = content.replace(new RegExp(fromLower, 'g'), toLower);
+                    hasChanged = true;
+                }
+                if (hasChanged) {
+                    await promises.writeFile(toEntryPath, content, 'utf-8');
+                    // Re-calculate hash after content update
+                    const updatedHash = calculateHash(content, config.hashing?.normalization);
+                    const normalizedToRelative = path.relative(process.cwd(), toEntryPath).replace(/\\/g, '/');
+                    if (fileState) {
+                        state.files[normalizedToRelative] = { ...fileState, hash: updatedHash };
+                        delete state.files[normalizedFromRelative];
+                    }
+                }
+                else {
+                    // Update state for each file moved normally
+                    const normalizedToRelative = path.relative(process.cwd(), toEntryPath).replace(/\\/g, '/');
+                    if (fileState) {
+                        state.files[normalizedToRelative] = { ...fileState, hash: newHash };
+                        delete state.files[normalizedFromRelative];
+                    }
+                }
+            }
+            else {
+                // Update state for each file moved normally
+                const normalizedToRelative = path.relative(process.cwd(), toEntryPath).replace(/\\/g, '/');
+                if (fileState) {
+                    state.files[normalizedToRelative] = { ...fileState, hash: newHash };
+                    delete state.files[normalizedFromRelative];
+                }
+            }
+        }
+    }
+    const remainingFiles = await promises.readdir(fromPath);
+    if (remainingFiles.length === 0) {
+        await promises.rmdir(fromPath);
+    }
+}
+/**
+ * Scans the project and replaces imports of a moved/renamed item.
+ */
+async function scanAndReplaceImports(config, state, fromInfo, toInfo, options) {
+    const { fromPath: fromItemPath, fromName, type } = fromInfo;
+    const { toPath: toItemPath, toName } = toInfo;
+    const allFiles = new Set();
+    await scanDirectory(process.cwd(), allFiles);
+    const rootPath = resolvePath(config, type === 'component' ? 'components' : 'features');
+    for (const relPath of allFiles) {
+        const fullPath = path.resolve(process.cwd(), relPath);
+        // Skip the moved directory itself
+        const toFullPath = path.resolve(toItemPath);
+        if (fullPath.startsWith(toFullPath))
+            continue;
+        let content = await promises.readFile(fullPath, 'utf-8');
+        let changed = false;
+        const aliasBase = config.importAliases[type === 'component' ? 'components' : 'features'];
+        const ext = type === 'component' ? '' : (config.naming.featureExtension === '.astro' ? '.astro' : '');
+        if (aliasBase) {
+            const oldAlias = `${aliasBase}/${fromItemPath}`;
+            const newAlias = `${aliasBase}/${toItemPath}`;
+            const oldFullImport = `from '${oldAlias}/${fromName}${ext}'`;
+            const newFullImport = `from '${newAlias}/${toName}${ext}'`;
+            if (content.includes(oldFullImport)) {
+                content = content.replace(new RegExp(oldFullImport.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newFullImport);
+                changed = true;
+            }
+            else if (content.includes(oldAlias)) {
+                content = content.replace(new RegExp(oldAlias.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newAlias);
+                changed = true;
+            }
+        }
+        else {
+            const oldDir = path.resolve(rootPath, fromItemPath);
+            const newDir = path.resolve(rootPath, toItemPath);
+            const oldRelPath = getRelativeImportPath(fullPath, oldDir);
+            const newRelPath = getRelativeImportPath(fullPath, newDir);
+            const oldImport = `'${oldRelPath}/${fromName}${ext}'`;
+            const newImport = `'${newRelPath}/${toName}${ext}'`;
+            if (content.includes(oldImport)) {
+                content = content.replace(new RegExp(oldImport.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newImport);
+                changed = true;
+            }
+        }
+        if (fromName !== toName && changed) {
+            content = content.replace(new RegExp(`\\b${fromName}\\b`, 'g'), toName);
+        }
+        if (changed) {
+            if (options.dryRun) {
+                console.log(`  [Scan] Would update imports in ${relPath}`);
+            }
+            else {
+                await promises.writeFile(fullPath, content, 'utf-8');
+                console.log(`  [Scan] Updated imports in ${relPath}`);
+                if (state.files[relPath]) {
+                    state.files[relPath].hash = calculateHash(content, config.hashing?.normalization);
+                }
+            }
+        }
+    }
+}
+
 /**
  * Move a section (route + feature).
  *
@@ -2374,40 +2564,53 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
         let actualFromFeature = fromFeature;
         let actualToRoute = toRoute;
         let actualToFeature = toFeature;
-        // Shift arguments if using state
+        // Shift arguments if using state or if called with fewer arguments
         if (!toRoute && fromRoute && fromFeature) {
             // textor move-section /old-route /new-route
-            const section = findSection(state, fromRoute);
+            actualFromRoute = fromRoute;
+            actualToRoute = fromFeature;
+            actualFromFeature = undefined;
+            actualToFeature = undefined;
+        }
+        // Lookup missing info from state
+        if (actualFromRoute && !actualFromFeature) {
+            const section = findSection(state, actualFromRoute);
             if (section) {
-                actualFromRoute = section.route;
                 actualFromFeature = section.featurePath;
-                actualToRoute = fromFeature; // the second argument was actually the new route
-                actualToFeature = toRoute; // which is null
-                // If toFeature is not provided, try to derive it from the new route
-                if (!actualToFeature && actualToRoute) {
-                    const oldRouteParts = actualFromRoute.split('/').filter(Boolean);
-                    const newRouteParts = actualToRoute.split('/').filter(Boolean);
-                    const oldFeatureParts = actualFromFeature.split('/').filter(Boolean);
-                    // If the feature path starts with the old route parts, replace them
-                    // We compare case-insensitively or via PascalCase to be more helpful
-                    let match = true;
-                    for (let i = 0; i < oldRouteParts.length; i++) {
-                        const routePart = oldRouteParts[i].toLowerCase();
-                        const featurePart = oldFeatureParts[i] ? oldFeatureParts[i].toLowerCase() : null;
-                        if (featurePart !== routePart) {
-                            match = false;
-                            break;
-                        }
-                    }
-                    if (match && oldRouteParts.length > 0) {
-                        actualToFeature = [...newRouteParts, ...oldFeatureParts.slice(oldRouteParts.length)].join('/');
-                    }
-                    else {
-                        // Otherwise just keep it the same
-                        actualToFeature = actualFromFeature;
-                    }
+            }
+        }
+        else if (!actualFromRoute && actualFromFeature) {
+            const section = findSection(state, actualFromFeature);
+            if (section) {
+                actualFromRoute = section.route;
+            }
+        }
+        // If toFeature is not provided, try to derive it from the new route if route moved
+        if (!actualToFeature && actualToRoute && actualFromRoute && actualFromRoute !== actualToRoute && actualFromFeature) {
+            const oldRouteParts = actualFromRoute.split('/').filter(Boolean);
+            const newRouteParts = actualToRoute.split('/').filter(Boolean);
+            const oldFeatureParts = actualFromFeature.split('/').filter(Boolean);
+            let match = true;
+            for (let i = 0; i < oldRouteParts.length; i++) {
+                const routePart = oldRouteParts[i].toLowerCase();
+                const featurePart = oldFeatureParts[i] ? oldFeatureParts[i].toLowerCase() : null;
+                if (featurePart !== routePart) {
+                    match = false;
+                    break;
                 }
             }
+            if (match && oldRouteParts.length > 0) {
+                actualToFeature = [...newRouteParts, ...oldFeatureParts.slice(oldRouteParts.length)].join('/');
+            }
+            else {
+                actualToFeature = actualFromFeature;
+            }
+        }
+        else if (!actualToFeature) {
+            actualToFeature = actualFromFeature;
+        }
+        if (!actualToRoute) {
+            actualToRoute = actualFromRoute;
         }
         const isRouteOnly = options.keepFeature || (!actualToFeature && actualToRoute && !actualFromFeature);
         if (isRouteOnly && !actualToRoute) {
@@ -2432,12 +2635,14 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
             mode: config.routing.mode,
             indexFile: config.routing.indexFile
         });
-        const fromRoutePath = secureJoin(pagesRoot, fromRouteFile);
-        const toRoutePath = secureJoin(pagesRoot, toRouteFile);
+        const fromRoutePath = fromRouteFile ? secureJoin(pagesRoot, fromRouteFile) : null;
+        const toRoutePath = toRouteFile ? secureJoin(pagesRoot, toRouteFile) : null;
         const movedFiles = [];
         if (options.dryRun) {
             console.log('Dry run - would move:');
-            console.log(`  Route: ${fromRoutePath} -> ${toRoutePath}`);
+            if (fromRoutePath && toRoutePath && fromRoutePath !== toRoutePath) {
+                console.log(`  Route: ${fromRoutePath} -> ${toRoutePath}`);
+            }
             if (!isRouteOnly && normalizedFromFeature && normalizedToFeature) {
                 const fromFeaturePath = secureJoin(featuresRoot, normalizedFromFeature);
                 const toFeaturePath = secureJoin(featuresRoot, normalizedToFeature);
@@ -2445,81 +2650,90 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
             }
             return;
         }
-        const normalizedFromRouteRelative = path.relative(process.cwd(), fromRoutePath).replace(/\\/g, '/');
-        const routeFileState = state.files[normalizedFromRouteRelative];
-        const newRouteHash = await safeMove(fromRoutePath, toRoutePath, {
-            force: options.force,
-            expectedHash: routeFileState?.hash,
-            acceptChanges: options.acceptChanges,
-            owner: normalizedFromRoute,
-            actualOwner: routeFileState?.owner,
-            signatures: configSignatures
-        });
-        movedFiles.push({ from: fromRoutePath, to: toRoutePath });
-        // Update state for moved route file
-        const normalizedToRouteRelative = path.relative(process.cwd(), toRoutePath).replace(/\\/g, '/');
-        if (routeFileState) {
-            state.files[normalizedToRouteRelative] = { ...routeFileState, hash: newRouteHash };
-            delete state.files[normalizedFromRouteRelative];
-        }
-        // Update imports in the moved route file
-        const targetFeature = normalizedToFeature || normalizedFromFeature;
-        if (targetFeature) {
-            const fromFeatureDirPath = secureJoin(featuresRoot, normalizedFromFeature);
-            const toFeatureDirPath = secureJoin(featuresRoot, targetFeature);
-            const fromFeatureComponentName = getFeatureComponentName(normalizedFromFeature);
-            const toFeatureComponentName = getFeatureComponentName(targetFeature);
-            // First, update all relative imports in the file because it moved
-            await updateImportsInFile(toRoutePath, fromRoutePath, toRoutePath);
-            let content = await promises.readFile(toRoutePath, 'utf-8');
-            let changed = false;
-            // Update component name in JSX tags
-            if (fromFeatureComponentName !== toFeatureComponentName) {
-                content = content.replace(new RegExp(`<${fromFeatureComponentName}`, 'g'), `<${toFeatureComponentName}`);
-                content = content.replace(new RegExp(`</${fromFeatureComponentName}`, 'g'), `</${toFeatureComponentName}`);
-                changed = true;
+        let normalizedToRouteRelative = null;
+        if (fromRoutePath && toRoutePath) {
+            const normalizedFromRouteRelative = path.relative(process.cwd(), fromRoutePath).replace(/\\/g, '/');
+            const routeFileState = state.files[normalizedFromRouteRelative];
+            const newRouteHash = await safeMove(fromRoutePath, toRoutePath, {
+                force: options.force,
+                expectedHash: routeFileState?.hash,
+                acceptChanges: options.acceptChanges,
+                owner: normalizedFromRoute,
+                actualOwner: routeFileState?.owner,
+                signatures: configSignatures
+            });
+            if (fromRoutePath !== toRoutePath) {
+                movedFiles.push({ from: fromRoutePath, to: toRoutePath });
+            }
+            // Update state for moved route file
+            normalizedToRouteRelative = path.relative(process.cwd(), toRoutePath).replace(/\\/g, '/');
+            if (routeFileState) {
+                state.files[normalizedToRouteRelative] = { ...routeFileState, hash: newRouteHash };
+                if (fromRoutePath !== toRoutePath) {
+                    delete state.files[normalizedFromRouteRelative];
+                }
             }
-            if (config.importAliases.features) {
-                const oldAliasPath = `${config.importAliases.features}/${normalizedFromFeature}`;
-                const newAliasPath = `${config.importAliases.features}/${targetFeature}`;
-                // Flexible regex to match import identifier and path with alias
-                const importRegex = new RegExp(`(import\\s+)(${fromFeatureComponentName})(\\s+from\\s+['"])${oldAliasPath}(/[^'"]+)?(['"])`, 'g');
-                if (importRegex.test(content)) {
-                    content = content.replace(importRegex, (match, p1, p2, p3, subPath, p5) => {
-                        let newSubPath = subPath || '';
-                        if (subPath && subPath.includes(fromFeatureComponentName)) {
-                            newSubPath = subPath.replace(fromFeatureComponentName, toFeatureComponentName);
-                        }
-                        return `${p1}${toFeatureComponentName}${p3}${newAliasPath}${newSubPath}${p5}`;
-                    });
+            // Update imports in the route file (even if it didn't move, as feature might have)
+            const targetFeature = normalizedToFeature || normalizedFromFeature;
+            if (targetFeature && fs.existsSync(toRoutePath)) {
+                const fromFeatureDirPath = secureJoin(featuresRoot, normalizedFromFeature);
+                const toFeatureDirPath = secureJoin(featuresRoot, targetFeature);
+                const fromFeatureComponentName = getFeatureComponentName(normalizedFromFeature);
+                const toFeatureComponentName = getFeatureComponentName(targetFeature);
+                // First, update all relative imports in the file because it moved (or stayed)
+                await updateImportsInFile(toRoutePath, fromRoutePath, toRoutePath);
+                let content = await promises.readFile(toRoutePath, 'utf-8');
+                let changed = false;
+                // Update component name in JSX tags
+                if (fromFeatureComponentName !== toFeatureComponentName) {
+                    content = content.replace(new RegExp(`<${fromFeatureComponentName}`, 'g'), `<${toFeatureComponentName}`);
+                    content = content.replace(new RegExp(`</${fromFeatureComponentName}`, 'g'), `</${toFeatureComponentName}`);
                     changed = true;
                 }
-                else if (content.includes(oldAliasPath)) {
-                    // Fallback for path only replacement
-                    content = content.replace(new RegExp(oldAliasPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newAliasPath);
-                    changed = true;
+                if (config.importAliases.features) {
+                    const oldAliasPath = `${config.importAliases.features}/${normalizedFromFeature}`;
+                    const newAliasPath = `${config.importAliases.features}/${targetFeature}`;
+                    // Flexible regex to match import identifier and path with alias
+                    const importRegex = new RegExp(`(import\\s+)(${fromFeatureComponentName})(\\s+from\\s+['"])${oldAliasPath}(/[^'"]+)?(['"])`, 'g');
+                    if (importRegex.test(content)) {
+                        content = content.replace(importRegex, (match, p1, p2, p3, subPath, p5) => {
+                            let newSubPath = subPath || '';
+                            if (subPath && subPath.includes(fromFeatureComponentName)) {
+                                newSubPath = subPath.replace(fromFeatureComponentName, toFeatureComponentName);
+                            }
+                            return `${p1}${toFeatureComponentName}${p3}${newAliasPath}${newSubPath}${p5}`;
+                        });
+                        changed = true;
+                    }
+                    else if (content.includes(oldAliasPath)) {
+                        // Fallback for path only replacement
+                        content = content.replace(new RegExp(oldAliasPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newAliasPath);
+                        changed = true;
+                    }
                 }
-            }
-            else {
-                const oldRelativeDir = getRelativeImportPath(toRoutePath, fromFeatureDirPath);
-                const newRelativeDir = getRelativeImportPath(toRoutePath, toFeatureDirPath);
-                // Flexible regex for relative imports
-                const relImportRegex = new RegExp(`(import\\s+)(${fromFeatureComponentName})(\\s+from\\s+['"])${oldRelativeDir}(/[^'"]+)?(['"])`, 'g');
-                if (relImportRegex.test(content)) {
-                    content = content.replace(relImportRegex, (match, p1, p2, p3, subPath, p5) => {
-                        let newSubPath = subPath || '';
-                        if (subPath && subPath.includes(fromFeatureComponentName)) {
-                            newSubPath = subPath.replace(fromFeatureComponentName, toFeatureComponentName);
-                        }
-                        return `${p1}${toFeatureComponentName}${p3}${newRelativeDir}${newSubPath}${p5}`;
-                    });
-                    changed = true;
+                else {
+                    const oldRelativeDir = getRelativeImportPath(toRoutePath, fromFeatureDirPath);
+                    const newRelativeDir = getRelativeImportPath(toRoutePath, toFeatureDirPath);
+                    // Flexible regex for relative imports
+                    const relImportRegex = new RegExp(`(import\\s+)(${fromFeatureComponentName})(\\s+from\\s+['"])${oldRelativeDir}(/[^'"]+)?(['"])`, 'g');
+                    if (relImportRegex.test(content)) {
+                        content = content.replace(relImportRegex, (match, p1, p2, p3, subPath, p5) => {
+                            let newSubPath = subPath || '';
+                            if (subPath && subPath.includes(fromFeatureComponentName)) {
+                                newSubPath = subPath.replace(fromFeatureComponentName, toFeatureComponentName);
+                            }
+                            return `${p1}${toFeatureComponentName}${p3}${newRelativeDir}${newSubPath}${p5}`;
+                        });
+                        changed = true;
+                    }
+                }
+                if (changed) {
+                    await promises.writeFile(toRoutePath, content, 'utf-8');
+                    // Update hash in state after changes
+                    if (state.files[normalizedToRouteRelative]) {
+                        state.files[normalizedToRouteRelative].hash = calculateHash(content, config.hashing?.normalization);
+                    }
                 }
-            }
-            if (changed) {
-                await promises.writeFile(toRoutePath, content, 'utf-8');
-                // Update hash in state after changes
-                state.files[normalizedToRouteRelative].hash = calculateHash(content, config.hashing?.normalization);
             }
         }
         if (!isRouteOnly && normalizedFromFeature && normalizedToFeature && normalizedFromFeature !== normalizedToFeature) {
@@ -2541,14 +2755,17 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
         }
         if (options.scan && (normalizedFromFeature || normalizedToFeature)) {
             await scanAndReplaceImports(config, state, {
-                fromFeaturePath: normalizedFromFeature,
-                fromComponentName: getFeatureComponentName(normalizedFromFeature)
+                fromPath: normalizedFromFeature,
+                fromName: getFeatureComponentName(normalizedFromFeature),
+                type: 'feature'
             }, {
-                toFeaturePath: normalizedToFeature || normalizedFromFeature,
-                toComponentName: getFeatureComponentName(normalizedToFeature || normalizedFromFeature)
+                toPath: normalizedToFeature || normalizedFromFeature,
+                toName: getFeatureComponentName(normalizedToFeature || normalizedFromFeature)
             }, options);
         }
-        await cleanupEmptyDirs(path.dirname(fromRoutePath), pagesRoot);
+        if (fromRoutePath && toRoutePath && fromRoutePath !== toRoutePath) {
+            await cleanupEmptyDirs(path.dirname(fromRoutePath), pagesRoot);
+        }
         console.log('✓ Moved:');
         movedFiles.forEach(item => {
             console.log(`  ${item.from}`);
@@ -2556,6 +2773,14 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
         });
         if (movedFiles.length > 0) {
             const existingSection = fromSection;
+            // Update ownership in state if route moved
+            if (normalizedFromRoute && normalizedToRoute && normalizedFromRoute !== normalizedToRoute) {
+                for (const f in state.files) {
+                    if (state.files[f].owner === normalizedFromRoute) {
+                        state.files[f].owner = normalizedToRoute;
+                    }
+                }
+            }
             // Update section data in state
             state.sections = state.sections.filter(s => s.route !== normalizedFromRoute);
             state.sections.push({
@@ -2576,182 +2801,6 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
         throw error;
     }
 }
-async function scanAndReplaceImports(config, state, fromInfo, toInfo, options) {
-    const { fromFeaturePath, fromComponentName } = fromInfo;
-    const { toFeaturePath, toComponentName } = toInfo;
-    const allFiles = new Set();
-    await scanDirectory(process.cwd(), allFiles);
-    const featuresRoot = resolvePath(config, 'features');
-    for (const relPath of allFiles) {
-        const fullPath = path.join(process.cwd(), relPath);
-        // Skip the moved directory itself as it was already handled
-        if (fullPath.startsWith(path.resolve(toFeaturePath)))
-            continue;
-        let content = await promises.readFile(fullPath, 'utf-8');
-        let changed = false;
-        const ext = config.naming.featureExtension === '.astro' ? '.astro' : '';
-        // Handle Aliases
-        if (config.importAliases.features) {
-            const oldAlias = `${config.importAliases.features}/${fromFeaturePath}`;
-            const newAlias = `${config.importAliases.features}/${toFeaturePath}`;
-            // Update component name and path if both changed
-            const oldFullImport = `from '${oldAlias}/${fromComponentName}${ext}'`;
-            const newFullImport = `from '${newAlias}/${toComponentName}${ext}'`;
-            if (content.includes(oldFullImport)) {
-                content = content.replace(new RegExp(oldFullImport.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newFullImport);
-                changed = true;
-            }
-            else if (content.includes(oldAlias)) {
-                content = content.replace(new RegExp(oldAlias.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newAlias);
-                changed = true;
-            }
-        }
-        else {
-            // Handle Relative Imports (more complex)
-            // This is best-effort: we look for imports that resolve to the old feature path
-            const fromFeatureDir = secureJoin(featuresRoot, fromFeaturePath);
-            const toFeatureDir = secureJoin(featuresRoot, toFeaturePath);
-            const oldRelPath = getRelativeImportPath(fullPath, fromFeatureDir);
-            const newRelPath = getRelativeImportPath(fullPath, toFeatureDir);
-            const oldImport = `'${oldRelPath}/${fromComponentName}${ext}'`;
-            const newImport = `'${newRelPath}/${toComponentName}${ext}'`;
-            if (content.includes(oldImport)) {
-                content = content.replace(new RegExp(oldImport.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newImport);
-                changed = true;
-            }
-        }
-        // Update component name in JSX and imports if it changed
-        if (fromComponentName !== toComponentName && changed) {
-            content = content.replace(new RegExp(`\\b${fromComponentName}\\b`, 'g'), toComponentName);
-        }
-        if (changed) {
-            if (options.dryRun) {
-                console.log(`  [Scan] Would update imports in ${relPath}`);
-            }
-            else {
-                await promises.writeFile(fullPath, content, 'utf-8');
-                console.log(`  [Scan] Updated imports in ${relPath}`);
-                // Update state hash if this file is managed
-                if (state.files[relPath]) {
-                    state.files[relPath].hash = calculateHash(content, config.hashing?.normalization);
-                }
-            }
-        }
-    }
-}
-async function moveDirectory(fromPath, toPath, state, config, options = {}) {
-    const { fromName, toName, owner = null } = options;
-    if (!fs.existsSync(fromPath)) {
-        throw new Error(`Source directory not found: ${fromPath}`);
-    }
-    if (fs.existsSync(toPath) && !options.force) {
-        throw new Error(`Destination already exists: ${toPath}\n` +
-            `Use --force to overwrite.`);
-    }
-    await ensureDir(toPath);
-    const entries = await promises.readdir(fromPath);
-    for (const entry of entries) {
-        let targetEntry = entry;
-        // Rename files if they match the component name
-        if (fromName && toName && fromName !== toName) {
-            if (entry.includes(fromName)) {
-                targetEntry = entry.replace(fromName, toName);
-            }
-        }
-        const fromEntryPath = path.join(fromPath, entry);
-        const toEntryPath = path.join(toPath, targetEntry);
-        const stats = await promises.stat(fromEntryPath);
-        if (stats.isDirectory()) {
-            await moveDirectory(fromEntryPath, toEntryPath, state, config, options);
-        }
-        else {
-            const normalizedFromRelative = path.relative(process.cwd(), fromEntryPath).replace(/\\/g, '/');
-            const fileState = state.files[normalizedFromRelative];
-            const newHash = await safeMove(fromEntryPath, toEntryPath, {
-                force: options.force,
-                expectedHash: fileState?.hash,
-                acceptChanges: options.acceptChanges,
-                normalization: config.hashing?.normalization,
-                owner,
-                actualOwner: fileState?.owner
-            });
-            // Update internal content (signatures, component names) if renaming
-            if (fromName && toName && fromName !== toName) {
-                let content = await promises.readFile(toEntryPath, 'utf-8');
-                let hasChanged = false;
-                // Simple replacement of component names
-                if (content.includes(fromName)) {
-                    content = content.replace(new RegExp(fromName, 'g'), toName);
-                    hasChanged = true;
-                }
-                // Also handle lowercase class names if any
-                const fromLower = fromName.toLowerCase();
-                const toLower = toName.toLowerCase();
-                if (content.includes(fromLower)) {
-                    content = content.replace(new RegExp(fromLower, 'g'), toLower);
-                    hasChanged = true;
-                }
-                if (hasChanged) {
-                    await promises.writeFile(toEntryPath, content, 'utf-8');
-                    // Re-calculate hash after content update
-                    const updatedHash = calculateHash(content, config.hashing?.normalization);
-                    const normalizedToRelative = path.relative(process.cwd(), toEntryPath).replace(/\\/g, '/');
-                    if (fileState) {
-                        state.files[normalizedToRelative] = { ...fileState, hash: updatedHash };
-                        delete state.files[normalizedFromRelative];
-                    }
-                }
-                else {
-                    // Update state for each file moved normally
-                    const normalizedToRelative = path.relative(process.cwd(), toEntryPath).replace(/\\/g, '/');
-                    if (fileState) {
-                        state.files[normalizedToRelative] = { ...fileState, hash: newHash };
-                        delete state.files[normalizedFromRelative];
-                    }
-                }
-            }
-            else {
-                // Update state for each file moved normally
-                const normalizedToRelative = path.relative(process.cwd(), toEntryPath).replace(/\\/g, '/');
-                if (fileState) {
-                    state.files[normalizedToRelative] = { ...fileState, hash: newHash };
-                    delete state.files[normalizedFromRelative];
-                }
-            }
-        }
-    }
-    const remainingFiles = await promises.readdir(fromPath);
-    if (remainingFiles.length === 0) {
-        await promises.rmdir(fromPath);
-    }
-}
-async function updateImportsInFile(filePath, oldFilePath, newFilePath) {
-    if (!fs.existsSync(filePath))
-        return;
-    let content = await promises.readFile(filePath, 'utf-8');
-    const oldDir = path.dirname(oldFilePath);
-    const newDir = path.dirname(newFilePath);
-    if (oldDir === newDir)
-        return;
-    // Find all relative imports
-    const relativeImportRegex = /from\s+['"](\.\.?\/[^'"]+)['"]/g;
-    let match;
-    const replacements = [];
-    while ((match = relativeImportRegex.exec(content)) !== null) {
-        const relativePath = match[1];
-        const absoluteTarget = path.resolve(oldDir, relativePath);
-        const newRelativePath = getRelativeImportPath(newFilePath, absoluteTarget);
-        replacements.push({
-            full: match[0],
-            oldRel: relativePath,
-            newRel: newRelativePath
-        });
-    }
-    for (const repl of replacements) {
-        content = content.replace(repl.full, `from '${repl.newRel}'`);
-    }
-    await promises.writeFile(filePath, content, 'utf-8');
-}
 
 async function createComponentCommand(componentName, options) {
     try {
@@ -2823,30 +2872,37 @@ async function createComponentCommand(componentName, options) {
                 console.log(`  Sub-components: ${subComponentsDir}/`);
             return;
         }
-        await ensureNotExists(componentFilePath, options.force);
-        await ensureNotExists(indexFilePath, options.force);
-        if (shouldCreateContext)
-            await ensureNotExists(contextFilePath, options.force);
-        if (shouldCreateHook)
-            await ensureNotExists(hookFilePath, options.force);
-        if (shouldCreateTests)
-            await ensureNotExists(testFilePath, options.force);
-        if (shouldCreateConfig)
-            await ensureNotExists(configFilePath, options.force);
-        if (shouldCreateConstants)
-            await ensureNotExists(constantsFilePath, options.force);
-        if (shouldCreateTypes)
-            await ensureNotExists(typesFilePath, options.force);
-        if (shouldCreateApi)
-            await ensureNotExists(apiFilePath, options.force);
-        if (shouldCreateServices)
-            await ensureNotExists(servicesFilePath, options.force);
-        if (shouldCreateSchemas)
-            await ensureNotExists(schemasFilePath, options.force);
-        if (shouldCreateReadme)
-            await ensureNotExists(readmeFilePath, options.force);
-        if (shouldCreateStories)
-            await ensureNotExists(storiesFilePath, options.force);
+        const componentExists = fs.existsSync(componentFilePath);
+        if (componentExists && !options.force) {
+            console.log(`ℹ Component already exists at ${componentFilePath}. Entering additive mode.`);
+        }
+        // Check sub-items only if not in force mode
+        if (!options.force) {
+            if (fs.existsSync(indexFilePath))
+                console.log(`  - Skipping existing index: ${indexFilePath}`);
+            if (shouldCreateContext && fs.existsSync(contextFilePath))
+                console.log(`  - Skipping existing context: ${contextFilePath}`);
+            if (shouldCreateHook && fs.existsSync(hookFilePath))
+                console.log(`  - Skipping existing hook: ${hookFilePath}`);
+            if (shouldCreateTests && fs.existsSync(testFilePath))
+                console.log(`  - Skipping existing test: ${testFilePath}`);
+            if (shouldCreateConfig && fs.existsSync(configFilePath))
+                console.log(`  - Skipping existing config: ${configFilePath}`);
+            if (shouldCreateConstants && fs.existsSync(constantsFilePath))
+                console.log(`  - Skipping existing constants: ${constantsFilePath}`);
+            if (shouldCreateTypes && fs.existsSync(typesFilePath))
+                console.log(`  - Skipping existing types: ${typesFilePath}`);
+            if (shouldCreateApi && fs.existsSync(apiFilePath))
+                console.log(`  - Skipping existing api: ${apiFilePath}`);
+            if (shouldCreateServices && fs.existsSync(servicesFilePath))
+                console.log(`  - Skipping existing services: ${servicesFilePath}`);
+            if (shouldCreateSchemas && fs.existsSync(schemasFilePath))
+                console.log(`  - Skipping existing schemas: ${schemasFilePath}`);
+            if (shouldCreateReadme && fs.existsSync(readmeFilePath))
+                console.log(`  - Skipping existing readme: ${readmeFilePath}`);
+            if (shouldCreateStories && fs.existsSync(storiesFilePath))
+                console.log(`  - Skipping existing stories: ${storiesFilePath}`);
+        }
         await ensureDir(componentDir);
         if (shouldCreateSubComponentsDir)
             await ensureDir(subComponentsDir);
@@ -2870,24 +2926,29 @@ async function createComponentCommand(componentName, options) {
             await ensureDir(schemasDirInside);
         const componentContent = generateComponentTemplate(normalizedName, framework, config.naming.componentExtension);
         const signature = getSignature(config, config.naming.componentExtension === '.astro' ? 'astro' : 'tsx');
-        const componentHash = await writeFileWithSignature(componentFilePath, componentContent, signature, config.hashing?.normalization);
-        await registerFile(componentFilePath, {
-            kind: 'component',
-            template: 'component',
-            hash: componentHash,
-            owner: normalizedName
-        });
-        const writtenFiles = [componentFilePath];
-        const indexContent = generateIndexTemplate(normalizedName, config.naming.componentExtension);
-        const indexHash = await writeFileWithSignature(indexFilePath, indexContent, getSignature(config, 'typescript'), config.hashing?.normalization);
-        await registerFile(indexFilePath, {
-            kind: 'component-file',
-            template: 'index',
-            hash: indexHash,
-            owner: normalizedName
-        });
-        writtenFiles.push(indexFilePath);
-        if (shouldCreateTypes) {
+        const writtenFiles = [];
+        if (!componentExists || options.force) {
+            const componentHash = await writeFileWithSignature(componentFilePath, componentContent, signature, config.hashing?.normalization);
+            await registerFile(componentFilePath, {
+                kind: 'component',
+                template: 'component',
+                hash: componentHash,
+                owner: normalizedName
+            });
+            writtenFiles.push(componentFilePath);
+        }
+        if (!fs.existsSync(indexFilePath) || options.force) {
+            const indexContent = generateIndexTemplate(normalizedName, config.naming.componentExtension);
+            const indexHash = await writeFileWithSignature(indexFilePath, indexContent, getSignature(config, 'typescript'), config.hashing?.normalization);
+            await registerFile(indexFilePath, {
+                kind: 'component-file',
+                template: 'index',
+                hash: indexHash,
+                owner: normalizedName
+            });
+            writtenFiles.push(indexFilePath);
+        }
+        if (shouldCreateTypes && (!fs.existsSync(typesFilePath) || options.force)) {
             const typesContent = generateTypesTemplate(normalizedName);
             const hash = await writeFileWithSignature(typesFilePath, typesContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(typesFilePath, {
@@ -2898,7 +2959,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(typesFilePath);
         }
-        if (shouldCreateContext) {
+        if (shouldCreateContext && (!fs.existsSync(contextFilePath) || options.force)) {
             const contextContent = generateContextTemplate(normalizedName);
             const hash = await writeFileWithSignature(contextFilePath, contextContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(contextFilePath, {
@@ -2909,7 +2970,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(contextFilePath);
         }
-        if (shouldCreateHook) {
+        if (shouldCreateHook && (!fs.existsSync(hookFilePath) || options.force)) {
             const hookName = getHookFunctionName(normalizedName);
             const hookContent = generateHookTemplate(normalizedName, hookName);
             const hash = await writeFileWithSignature(hookFilePath, hookContent, getSignature(config, 'typescript'), config.hashing?.normalization);
@@ -2921,7 +2982,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(hookFilePath);
         }
-        if (shouldCreateTests) {
+        if (shouldCreateTests && (!fs.existsSync(testFilePath) || options.force)) {
             const relativeComponentPath = `../${normalizedName}${config.naming.componentExtension}`;
             const testContent = generateTestTemplate(normalizedName, relativeComponentPath);
             const hash = await writeFileWithSignature(testFilePath, testContent, getSignature(config, 'typescript'), config.hashing?.normalization);
@@ -2933,7 +2994,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(testFilePath);
         }
-        if (shouldCreateConfig) {
+        if (shouldCreateConfig && (!fs.existsSync(configFilePath) || options.force)) {
             const configContent = generateConfigTemplate(normalizedName);
             const hash = await writeFileWithSignature(configFilePath, configContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(configFilePath, {
@@ -2944,7 +3005,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(configFilePath);
         }
-        if (shouldCreateConstants) {
+        if (shouldCreateConstants && (!fs.existsSync(constantsFilePath) || options.force)) {
             const constantsContent = generateConstantsTemplate(normalizedName);
             const hash = await writeFileWithSignature(constantsFilePath, constantsContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(constantsFilePath, {
@@ -2955,7 +3016,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(constantsFilePath);
         }
-        if (shouldCreateApi) {
+        if (shouldCreateApi && (!fs.existsSync(apiFilePath) || options.force)) {
             const apiContent = generateApiTemplate(normalizedName);
             const hash = await writeFileWithSignature(apiFilePath, apiContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(apiFilePath, {
@@ -2966,7 +3027,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(apiFilePath);
         }
-        if (shouldCreateServices) {
+        if (shouldCreateServices && (!fs.existsSync(servicesFilePath) || options.force)) {
             const servicesContent = generateServiceTemplate(normalizedName);
             const hash = await writeFileWithSignature(servicesFilePath, servicesContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(servicesFilePath, {
@@ -2977,7 +3038,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(servicesFilePath);
         }
-        if (shouldCreateSchemas) {
+        if (shouldCreateSchemas && (!fs.existsSync(schemasFilePath) || options.force)) {
             const schemasContent = generateSchemaTemplate(normalizedName);
             const hash = await writeFileWithSignature(schemasFilePath, schemasContent, getSignature(config, 'typescript'), config.hashing?.normalization);
             await registerFile(schemasFilePath, {
@@ -2988,7 +3049,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(schemasFilePath);
         }
-        if (shouldCreateReadme) {
+        if (shouldCreateReadme && (!fs.existsSync(readmeFilePath) || options.force)) {
             const readmeContent = generateReadmeTemplate(normalizedName);
             const hash = await writeFileWithSignature(readmeFilePath, readmeContent, getSignature(config, 'astro'), config.hashing?.normalization);
             await registerFile(readmeFilePath, {
@@ -2999,7 +3060,7 @@ async function createComponentCommand(componentName, options) {
             });
             writtenFiles.push(readmeFilePath);
         }
-        if (shouldCreateStories) {
+        if (shouldCreateStories && (!fs.existsSync(storiesFilePath) || options.force)) {
             const relativePath = `./${normalizedName}${config.naming.componentExtension}`;
             const storiesContent = generateStoriesTemplate(normalizedName, relativePath);
             const hash = await writeFileWithSignature(storiesFilePath, storiesContent, getSignature(config, 'typescript'), config.hashing?.normalization);
@@ -3794,6 +3855,205 @@ async function normalizeStateCommand(options) {
     }
 }
 
+/**
+ * Removes missing references from Textor state.
+ * @param {Object} options
+ * @param {boolean} options.dryRun
+ * @param {boolean} options.yes
+ */
+async function pruneMissingCommand(options = {}) {
+    try {
+        const config = await loadConfig();
+        const state = await loadState();
+        const results = await getProjectStatus(config, state);
+        if (results.missing.length === 0) {
+            console.log('No missing references found.');
+            return;
+        }
+        console.log(`Found ${results.missing.length} missing references:`);
+        results.missing.forEach(f => console.log(`  - ${f}`));
+        if (options.dryRun) {
+            console.log('\nDry run: no changes applied to state.');
+            return;
+        }
+        if (!options.yes && options.interactive !== false && process.stdin.isTTY && process.env.NODE_ENV !== 'test') {
+            const rl = readline.createInterface({
+                input: process.stdin,
+                output: process.stdout
+            });
+            const confirmed = await new Promise(resolve => {
+                rl.question('\nDo you want to proceed with pruning? (y/N) ', (answer) => {
+                    rl.close();
+                    resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+                });
+            });
+            if (!confirmed) {
+                console.log('Aborted.');
+                return;
+            }
+        }
+        for (const relPath of results.missing) {
+            delete state.files[relPath];
+        }
+        // Reconstruct metadata
+        state.components = reconstructComponents(state.files, config);
+        state.sections = reconstructSections(state, config);
+        await saveState(state);
+        console.log(`\n✓ Successfully removed ${results.missing.length} missing references from state.`);
+    }
+    catch (error) {
+        console.error('Error:', error.message);
+        if (typeof process.exit === 'function' && process.env.NODE_ENV !== 'test') {
+            process.exit(1);
+        }
+        throw error;
+    }
+}
+
+/**
+ * Dispatcher for rename commands.
+ */
+async function renameCommand(type, oldName, newName, options) {
+    try {
+        if (!type || !oldName || !newName) {
+            throw new Error('Usage: textor rename <route|feature|component> <oldName> <newName>');
+        }
+        if (type === 'route' || type === 'path') {
+            const normalizedOld = normalizeRoute(oldName);
+            const normalizedNew = normalizeRoute(newName);
+            // By default, move-section will try to move the feature if it matches the route.
+            // For a simple "rename route", we might want to keep that behavior or not.
+            // Usually "rename route" means just the URL/file.
+            return await moveSectionCommand(normalizedOld, undefined, normalizedNew, undefined, options);
+        }
+        if (type === 'feature') {
+            const state = await loadState();
+            const normalizedOld = featureToDirectoryPath(oldName);
+            const normalizedNew = featureToDirectoryPath(newName);
+            const section = findSection(state, normalizedOld);
+            if (section) {
+                // If it's a managed section, move it using section logic
+                return await moveSectionCommand(section.route, section.featurePath, section.route, normalizedNew, options);
+            }
+            else {
+                // Standalone feature move
+                return await moveSectionCommand(undefined, normalizedOld, undefined, normalizedNew, options);
+            }
+        }
+        if (type === 'component') {
+            return await renameComponent(oldName, newName, options);
+        }
+        throw new Error(`Unknown rename type: ${type}. Supported types: route, feature, component.`);
+    }
+    catch (error) {
+        console.error('Error:', error.message);
+        if (typeof process.exit === 'function' && process.env.NODE_ENV !== 'test') {
+            process.exit(1);
+        }
+        throw error;
+    }
+}
+/**
+ * Specialized logic for renaming shared components.
+ */
+async function renameComponent(oldName, newName, options) {
+    const config = await loadConfig();
+    const state = await loadState();
+    const normalizedOldName = normalizeComponentName(oldName);
+    const normalizedNewName = normalizeComponentName(newName);
+    const component = findComponent(state, normalizedOldName);
+    const componentsRoot = resolvePath(config, 'components');
+    const fromPath = component
+        ? path.resolve(process.cwd(), component.path)
+        : path.join(componentsRoot, normalizedOldName);
+    const toPath = path.join(componentsRoot, normalizedNewName);
+    if (options.dryRun) {
+        console.log(`Dry run - would rename component: ${normalizedOldName} -> ${normalizedNewName}`);
+        console.log(`  Path: ${fromPath} -> ${toPath}`);
+        return;
+    }
+    const signatures = Object.values(config.signatures || {});
+    await moveDirectory(fromPath, toPath, state, config, {
+        ...options,
+        fromName: normalizedOldName,
+        toName: normalizedNewName,
+        signatures
+    });
+    if (options.scan) {
+        await scanAndReplaceImports(config, state, {
+            fromPath: normalizedOldName,
+            fromName: normalizedOldName,
+            type: 'component'
+        }, {
+            toPath: normalizedNewName,
+            toName: normalizedNewName
+        }, options);
+    }
+    await cleanupEmptyDirs(path.dirname(fromPath), componentsRoot);
+    // Update state metadata
+    if (component) {
+        component.name = normalizedNewName;
+        component.path = path.relative(process.cwd(), toPath).replace(/\\/g, '/');
+    }
+    await saveState(state);
+    console.log(`✓ Renamed component ${normalizedOldName} to ${normalizedNewName}`);
+}
+
+/**
+ * Add a new item (hook, api, service, etc.) to an existing feature or component.
+ *
+ * @param {string} itemType The type of item to add (e.g., 'api', 'hook', 'service')
+ * @param {string} targetName The name of the feature or component
+ * @param {Object} options Additional options from Commander
+ */
+async function addItemCommand(itemType, targetName, options) {
+    try {
+        const state = await loadState();
+        // Normalize itemType
+        let normalizedItem = itemType.toLowerCase();
+        if (normalizedItem === 'test')
+            normalizedItem = 'tests';
+        if (normalizedItem === 'service')
+            normalizedItem = 'services';
+        if (normalizedItem === 'schema')
+            normalizedItem = 'schemas';
+        if (normalizedItem === 'hook')
+            normalizedItem = 'hooks'; // for add-section
+        // Try to find as section (feature) first
+        let section = findSection(state, targetName);
+        let component = findComponent(state, targetName);
+        // If not found by exact name, try to find by featurePath or part of it
+        if (!section && !component) {
+            section = state.sections.find(s => s.featurePath === targetName || s.featurePath.endsWith('/' + targetName));
+        }
+        if (!section && !component) {
+            throw new Error(`Target not found in state: "${targetName}". Please use "add-section" or "create-component" directly if it's not managed by Textor.`);
+        }
+        const flags = { [normalizedItem]: true };
+        // Also set singular for create-component which uses 'hook'
+        if (normalizedItem === 'hooks')
+            flags.hook = true;
+        if (section) {
+            console.log(`ℹ Adding ${normalizedItem} to feature: ${section.featurePath}`);
+            return await addSectionCommand(undefined, section.featurePath, { ...options, ...flags });
+        }
+        if (component) {
+            console.log(`ℹ Adding ${normalizedItem} to component: ${component.name}`);
+            // For create-component, we might need to be careful with flags that are on by default
+            // but getEffectiveOptions should handle it if we pass them explicitly as true.
+            return await createComponentCommand(component.name, { ...options, ...flags });
+        }
+    }
+    catch (error) {
+        console.error('Error:', error.message);
+        if (typeof process.exit === 'function' && process.env.NODE_ENV !== 'test') {
+            process.exit(1);
+        }
+        throw error;
+    }
+}
+
+exports.addItemCommand = addItemCommand;
 exports.addSectionCommand = addSectionCommand;
 exports.adoptCommand = adoptCommand;
 exports.createComponentCommand = createComponentCommand;
@@ -3801,8 +4061,10 @@ exports.initCommand = initCommand;
 exports.listSectionsCommand = listSectionsCommand;
 exports.moveSectionCommand = moveSectionCommand;
 exports.normalizeStateCommand = normalizeStateCommand;
+exports.pruneMissingCommand = pruneMissingCommand;
 exports.removeComponentCommand = removeComponentCommand;
 exports.removeSectionCommand = removeSectionCommand;
+exports.renameCommand = renameCommand;
 exports.statusCommand = statusCommand;
 exports.syncCommand = syncCommand;
 exports.upgradeConfigCommand = upgradeConfigCommand;