Fixed [BUG] Canonical sync not work with options

Fixes #85 and [BUG] Adding a file to project option doesn't put it in romfs folder
Fixes #84

Author: Mindstormman06

package.json

@@ -4,7 +4,7 @@
   "publisher": "TKVSC-Team",
   "displayName": "TKVSC",
   "description": "Canonically Amazing",
-  "version": "0.0.2-beta.1",
+  "version": "0.0.2-beta.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/TKVSC-Team/totk-vscode"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "totk-vscode-python"
-version = "0.0.2b1"
+version = "0.0.2b2"
 description = "Python scripts for TOTK VSCode extension"
 requires-python = "~=3.12"
 dependencies = [

src/canonicalSavePropagation.ts

@@ -129,7 +129,7 @@ function pathMatchesBlacklistedFileSuffix(pathValue: string, fileSuffixes: strin
     return false;
 }
 
-function inferActiveProjectRoot(
+function inferActiveModRoot(
     editedPath: string,
     roots: ProjectRootInfo[],
 ): ProjectRootInfo | undefined {
@@ -148,7 +148,21 @@ function inferActiveProjectRoot(
         }
     }
 
-    return best?.root;
+    if (!best) {
+        return undefined;
+    }
+    
+    // Narrow down to the specific mod option if applicable
+    const wsRoot = best.root.fsPath;
+    const rel = path.relative(wsRoot, normalizedEditedPath);
+    const parts = rel.split(path.sep);
+
+    if (parts.length >= 4 && parts[0]?.toLowerCase() === 'options') {
+        const modRoot = path.join(wsRoot, 'options', parts[1]!, parts[2]!);
+        return { ...best.root, fsPath: normalizePath(modRoot) };
+    }
+
+    return best.root;
 }
 
 async function ensureArchiveInProject(
@@ -202,7 +216,7 @@ export async function propagateCanonicalSave(
         return;
     }
 
-    const activeProjectRoot = inferActiveProjectRoot(
+    const activeProjectRoot = inferActiveModRoot(
         options.writeInput.diskArchivePath,
         options.projectRoots,
     );

src/extension.ts

@@ -64,7 +64,7 @@ import {
     setCanonicalIndexExtensionPath,
 } from './canonicalPathIndex';
 import { propagateCanonicalSave } from './canonicalSavePropagation';
-import { normalizePath, pathsEqual } from './projectPaths';
+import { getProjectModRoots, normalizePath, pathsEqual } from './projectPaths';
 import type { DiskWriteNotification } from './totkDiskFs';
 import { configureFilteringRules } from './filteringRules';
 import {
@@ -1078,17 +1078,25 @@ export async function activate(context: vscode.ExtensionContext) {
             return;
         }
 
+        const allModRoots = new Set<string>();
+        for (const root of roots) {
+            const modRoots = getProjectModRoots(root.fsPath);
+            for (const m of modRoots) {
+                allModRoots.add(m);
+            }
+        }
+
         await vscode.window.withProgress(
             {
                 location: vscode.ProgressLocation.Notification,
                 title: 'Scanning project files and mapping canonical paths...',
                 cancellable: false,
             },
             async () => {
-                for (const root of roots) {
+                for (const modRoot of allModRoots) {
                     await ensureProjectCanonicalImport({
                         overlayDbPath: projectCanonicalOverlayPath,
-                        projectRoot: root.fsPath,
+                        projectRoot: modRoot,
                         romfsPath,
                         pythonExecutable: pythonExe,
                         bridgePath,

src/projectPaths.ts

@@ -146,6 +146,7 @@ export function resolveProjectDestination(
         if (path.basename(gameRomfs).toLowerCase() === 'exefs') {
             isExefs = true;
         }
+        foundFolder = true;
     } else {
         // Source is in the project (or a different dump structure). Find its relative path.
         const projectRel = path.relative(project, source);
@@ -206,3 +207,25 @@ export function resolveAddToCopyPaths(
         destination: resolveProjectDestination(copySource, projectRoot, romfsRoot, tkmmOption),
     };
 }
+
+/** 
+ * Returns all isolated mod roots within a given workspace folder.
+ * This includes the workspace root itself and all TKMM options (options/<Group>/<Option>).
+ */
+export function getProjectModRoots(projectRoot: string): string[] {
+    const project = normalizePath(projectRoot);
+    const roots: string[] = [project];
+    const optionsDir = path.join(project, 'options');
+    
+    if (fs.existsSync(optionsDir) && isDirectory(optionsDir)) {
+        const groups = listSubdirectories(optionsDir);
+        for (const group of groups) {
+            const options = listSubdirectories(group);
+            for (const option of options) {
+                roots.push(normalizePath(option));
+            }
+        }
+    }
+    
+    return roots;
+}