@principal-ai/principal-view-core 0.16.0 → 0.17.1

package/dist/discovery/CanvasDiscovery.d.ts

@@ -2,7 +2,7 @@
  * Unified discovery system for canvas and execution files in a package-aware way
  */
 import type { FileTree } from '@principal-ai/repository-abstraction';
-import type { DiscoveredCanvas, DiscoveredExecution, CanvasDiscoveryResult, DiscoveryOptions } from './types';
+import type { CanvasDiscoveryResult, DiscoveryOptions } from './types';
 /**
  * Unified discovery system for canvas and execution files in a package-aware way
  *
@@ -27,7 +27,6 @@ import type { DiscoveredCanvas, DiscoveredExecution, CanvasDiscoveryResult, Disc
  */
 export declare class CanvasDiscovery {
     private static readonly CANVAS_DIR;
-    private static readonly EXECUTIONS_DIR;
     private static readonly WORKFLOW_EXTENSION;
     private packageModule;
     private packageCache;
@@ -40,22 +39,6 @@ export declare class CanvasDiscovery {
      * @returns Discovery result with canvases, executions, storyboards, and errors
      */
     discover(fileTree: FileTree, options?: DiscoveryOptions): Promise<CanvasDiscoveryResult>;
-    /**
-     * Find canvas file for a given execution
-     *
-     * @param execution - Discovered execution
-     * @param canvases - Array of discovered canvases (from discover())
-     * @returns Matching canvas or null
-     */
-    findCanvasForExecution(execution: DiscoveredExecution, canvases: DiscoveredCanvas[]): DiscoveredCanvas | null;
-    /**
-     * Find execution files for a given canvas
-     *
-     * @param canvas - Discovered canvas
-     * @param executions - Array of discovered executions (from discover())
-     * @returns Array of matching executions
-     */
-    findExecutionsForCanvas(canvas: DiscoveredCanvas, executions: DiscoveredExecution[]): DiscoveredExecution[];
     /**
      * Clear package cache (useful when file tree changes)
      */
@@ -68,6 +51,10 @@ export declare class CanvasDiscovery {
      * Discover workflows within a storyboard folder
      */
     private discoverWorkflowsInStoryboard;
+    /**
+     * Discover execution files co-located in a workflow directory
+     */
+    private discoverExecutionsInWorkflowDir;
     /**
      * Discover packages with caching by fileTree SHA
      */
@@ -83,24 +70,14 @@ export declare class CanvasDiscovery {
     /**
      * Discover execution files in the file tree
      */
-    private discoverExecutionFiles;
     /**
-     * Check if path is in .principal-views directory
+     * Check if path is in .principal-views directory (directly, not in subdirectories)
      */
     private isInCanvasDir;
     /**
      * Parse canvas file path to extract metadata
      */
     private parseCanvasPath;
-    /**
-     * Check if path is in __executions__ directory
-     */
-    private isInExecutionsDir;
-    /**
-     * Parse execution file path to extract metadata
-     * Only .otel.json files are supported
-     */
-    private parseExecutionPath;
     /**
      * Find package for a given path using longest-path matching
      */
@@ -114,7 +91,7 @@ export declare class CanvasDiscovery {
      */
     private compareByPackageThenName;
     /**
-     * Detect legacy flat structures and add deprecation errors
+     * Detect legacy flat canvas structures and add deprecation errors
      */
     private detectLegacyStructures;
 }

package/dist/discovery/CanvasDiscovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CanvasDiscovery.d.ts","sourceRoot":"","sources":["../../src/discovery/CanvasDiscovery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErE,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAMnB,qBAAqB,EACrB,gBAAgB,EAGjB,MAAM,SAAS,CAAC;AAEjB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAoB;IAC1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IAE9D,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,YAAY,CAA0C;;IAM9D;;;;;;OAMG;IACG,QAAQ,CACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,qBAAqB,CAAC;IA8BjC;;;;;;OAMG;IACH,sBAAsB,CACpB,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,gBAAgB,GAAG,IAAI;IAS1B;;;;;;OAMG;IACH,uBAAuB,CACrB,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,mBAAmB,EAAE,GAChC,mBAAmB,EAAE;IASxB;;OAEG;IACH,UAAU,IAAI,IAAI;IAIlB;;OAEG;YACW,mBAAmB;IAqFjC;;OAEG;YACW,6BAA6B;IA6E3C;;OAEG;YACW,yBAAyB;IAgBvC;;OAEG;IACH,OAAO,CAAC,eAAe;IAYvB;;OAEG;YACW,mBAAmB;IAkEjC;;OAEG;YACW,sBAAsB;IA0DpC;;OAEG;IACH,OAAO,CAAC,aAAa;IAkBrB;;OAEG;IACH,OAAO,CAAC,eAAe;IAuBvB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAsB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAkBhC;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAkD/B"}
+{"version":3,"file":"CanvasDiscovery.d.ts","sourceRoot":"","sources":["../../src/discovery/CanvasDiscovery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErE,OAAO,KAAK,EASV,qBAAqB,EACrB,gBAAgB,EAGjB,MAAM,SAAS,CAAC;AAEjB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IAE9D,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,YAAY,CAA0C;;IAM9D;;;;;;OAMG;IACG,QAAQ,CACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,qBAAqB,CAAC;IAoCjC;;OAEG;IACH,UAAU,IAAI,IAAI;IAIlB;;OAEG;YACW,mBAAmB;IAmFjC;;OAEG;YACW,6BAA6B;IAkF3C;;OAEG;YACW,+BAA+B;IA6E7C;;OAEG;YACW,yBAAyB;IAgBvC;;OAEG;IACH,OAAO,CAAC,eAAe;IAYvB;;OAEG;YACW,mBAAmB;IAkEjC;;OAEG;IACH;;OAEG;IACH,OAAO,CAAC,aAAa;IAkBrB;;OAEG;IACH,OAAO,CAAC,eAAe;IAuBvB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAkBhC;;OAEG;IACH,OAAO,CAAC,sBAAsB;CA0B/B"}

package/dist/discovery/CanvasDiscovery.js

@@ -45,44 +45,24 @@ class CanvasDiscovery {
         const packageMap = this.buildPackageMap(packages);
         // 3. Discover canvas files
         const canvases = await this.discoverCanvasFiles(fileTree, packageMap, options, errors);
-        // 4. Discover execution files
-        const executions = await this.discoverExecutionFiles(fileTree, packageMap, options, errors);
-        // 5. Discover storyboards (hierarchical organization)
-        const storyboards = await this.discoverStoryboards(fileTree, packageMap, canvases, executions, options, errors);
-        // 6. Detect legacy structures and add deprecation errors
-        this.detectLegacyStructures(canvases, executions, storyboards, errors);
+        // 4. Discover storyboards (hierarchical organization)
+        // Note: Executions are discovered as part of workflows, not separately
+        const storyboards = await this.discoverStoryboards(fileTree, packageMap, canvases, options, errors);
+        // 5. Collect all executions from workflows for backward compatibility
+        const executions = [];
+        for (const storyboard of storyboards) {
+            for (const workflow of storyboard.workflows) {
+                executions.push(...workflow.executions);
+            }
+        }
+        // 6. Detect legacy flat canvas structures and add deprecation errors
+        this.detectLegacyStructures(canvases, storyboards, errors);
         // 7. Sort results
         canvases.sort(this.compareByPackageThenName);
         executions.sort(this.compareByPackageThenName);
         storyboards.sort(this.compareByPackageThenName);
         return { canvases, executions, storyboards, errors, warnings };
     }
-    /**
-     * Find canvas file for a given execution
-     *
-     * @param execution - Discovered execution
-     * @param canvases - Array of discovered canvases (from discover())
-     * @returns Matching canvas or null
-     */
-    findCanvasForExecution(execution, canvases) {
-        // Find canvas with matching basename and scope
-        return canvases.find(canvas => canvas.basename === execution.canvasBasename &&
-            canvas.scope === execution.scope &&
-            canvas.packageName === execution.packageName) || null;
-    }
-    /**
-     * Find execution files for a given canvas
-     *
-     * @param canvas - Discovered canvas
-     * @param executions - Array of discovered executions (from discover())
-     * @returns Array of matching executions
-     */
-    findExecutionsForCanvas(canvas, executions) {
-        // Find all executions with matching basename and scope
-        return executions.filter(execution => execution.canvasBasename === canvas.basename &&
-            execution.scope === canvas.scope &&
-            execution.packageName === canvas.packageName);
-    }
     /**
      * Clear package cache (useful when file tree changes)
      */
@@ -92,7 +72,7 @@ class CanvasDiscovery {
     /**
      * Discover storyboards (hierarchical organization of canvas + workflows + executions)
      */
-    async discoverStoryboards(fileTree, packageMap, canvases, executions, options, errors) {
+    async discoverStoryboards(fileTree, packageMap, canvases, options, errors) {
         const storyboards = [];
         // Build a map of directories to check for storyboards
         const storyboardDirs = new Map();
@@ -115,8 +95,8 @@ class CanvasDiscovery {
         // For each potential storyboard directory, check if it has a canvas
         for (const [storyboardPath, storyboardNames] of storyboardDirs) {
             for (const storyboardName of storyboardNames) {
-                // Skip __executions__ directory
-                if (storyboardName === CanvasDiscovery.EXECUTIONS_DIR)
+                // Skip __executions__ directory (legacy pattern, should not exist)
+                if (storyboardName === '__executions__')
                     continue;
                 // Find canvas for this storyboard
                 const storyboardCanvas = canvases.find(c => {
@@ -126,7 +106,7 @@ class CanvasDiscovery {
                 if (!storyboardCanvas)
                     continue;
                 // This is a storyboard! Now discover workflows
-                const workflows = await this.discoverWorkflowsInStoryboard(fileTree, storyboardPath, storyboardName, packageMap, executions, options, errors);
+                const workflows = await this.discoverWorkflowsInStoryboard(fileTree, storyboardPath, storyboardName, packageMap, options, errors);
                 // Determine package context
                 const packageInfo = this.findPackageForPath(storyboardPath, packageMap);
                 // Generate unique ID
@@ -153,7 +133,7 @@ class CanvasDiscovery {
     /**
      * Discover workflows within a storyboard folder
      */
-    async discoverWorkflowsInStoryboard(fileTree, storyboardPath, storyboardName, packageMap, executions, options, errors) {
+    async discoverWorkflowsInStoryboard(fileTree, storyboardPath, storyboardName, packageMap, options, errors) {
         const workflows = [];
         // Find all workflow files in this storyboard
         for (const file of fileTree.allFiles) {
@@ -176,11 +156,11 @@ class CanvasDiscovery {
             const id = packageInfo
                 ? `${packageInfo.packageData.name}/${storyboardName}/${basename}`
                 : `${storyboardName}/${basename}`;
-            // Find executions for this workflow (in the same directory as workflow.json)
-            const workflowExecutions = executions.filter(e => {
-                const execDir = e.path.split('/').slice(0, -1).join('/');
-                return execDir === workflowDir;
-            });
+            // Discover executions co-located in the same directory as workflow.json
+            console.log(`[CanvasDiscovery] Discovering executions for workflow: ${path}`);
+            console.log(`[CanvasDiscovery] Workflow directory: ${workflowDir}`);
+            const workflowExecutions = await this.discoverExecutionsInWorkflowDir(fileTree, workflowDir, packageMap, options, errors);
+            console.log(`[CanvasDiscovery] Found ${workflowExecutions.length} executions for workflow ${basename}`);
             // Create discovered workflow
             let workflow = {
                 id,
@@ -213,6 +193,69 @@ class CanvasDiscovery {
         }
         return workflows;
     }
+    /**
+     * Discover execution files co-located in a workflow directory
+     */
+    async discoverExecutionsInWorkflowDir(fileTree, workflowDir, packageMap, options, errors) {
+        const executions = [];
+        console.log(`[CanvasDiscovery] Scanning for executions in directory: ${workflowDir}`);
+        console.log(`[CanvasDiscovery] Total files in tree: ${fileTree.allFiles.length}`);
+        // Find all .otel.json files in the workflow directory
+        for (const file of fileTree.allFiles) {
+            const path = file.relativePath || file.path || '';
+            // Check if file is in this workflow directory
+            const fileDir = path.split('/').slice(0, -1).join('/');
+            if (fileDir !== workflowDir)
+                continue;
+            console.log(`[CanvasDiscovery] Found file in workflow dir: ${path}`);
+            // Check if it's an execution file (.otel.json)
+            if (!path.endsWith('.otel.json')) {
+                console.log(`[CanvasDiscovery] Skipping non-.otel.json file: ${path}`);
+                continue;
+            }
+            // Extract execution metadata
+            const filename = path.split('/').pop();
+            if (!filename)
+                continue;
+            const basename = filename.replace('.otel.json', '');
+            // Determine package context
+            const packageInfo = this.findPackageForPath(path, packageMap);
+            // Generate unique ID (workflow-scoped)
+            const workflowBasename = workflowDir.split('/').pop() || '';
+            const id = packageInfo
+                ? `${packageInfo.packageData.name}/${workflowBasename}/${basename}`
+                : `${workflowBasename}/${basename}`;
+            // Create discovered execution
+            let execution = {
+                id,
+                name: this.toDisplayName(basename),
+                path,
+                basename,
+                type: 'otel',
+                canvasBasename: basename,
+                packageName: packageInfo?.packageData.name,
+                packagePath: packageInfo?.packageData.path,
+                scope: packageInfo ? 'package' : 'root',
+            };
+            // Optionally load content
+            if (options.includeContent && options.fileReader) {
+                try {
+                    const content = await options.fileReader(path);
+                    execution = { ...execution, content: JSON.parse(content) };
+                }
+                catch (error) {
+                    errors.push({
+                        path,
+                        error: `Failed to parse execution content: ${error.message}`,
+                    });
+                }
+            }
+            console.log(`[CanvasDiscovery] Added execution: ${execution.id} (${path})`);
+            executions.push(execution);
+        }
+        console.log(`[CanvasDiscovery] Total executions found in ${workflowDir}: ${executions.length}`);
+        return executions;
+    }
     /**
      * Discover packages with caching by fileTree SHA
      */
@@ -295,54 +338,8 @@ class CanvasDiscovery {
     /**
      * Discover execution files in the file tree
      */
-    async discoverExecutionFiles(fileTree, packageMap, options, errors) {
-        const executions = [];
-        for (const file of fileTree.allFiles) {
-            const path = file.relativePath || file.path || '';
-            // Check if in __executions__ directory
-            if (!this.isInExecutionsDir(path))
-                continue;
-            // Extract execution metadata
-            const metadata = this.parseExecutionPath(path);
-            if (!metadata)
-                continue;
-            // Determine package context
-            const packageInfo = this.findPackageForPath(path, packageMap);
-            // Generate unique ID
-            const id = packageInfo
-                ? `${packageInfo.packageData.name}/${metadata.basename}`
-                : metadata.basename;
-            // Create discovered execution
-            let execution = {
-                id,
-                name: this.toDisplayName(metadata.basename),
-                path,
-                basename: metadata.basename,
-                type: metadata.type,
-                canvasBasename: metadata.canvasBasename,
-                packageName: packageInfo?.packageData.name,
-                packagePath: packageInfo?.packageData.path,
-                scope: packageInfo ? 'package' : 'root',
-            };
-            // Optionally load content
-            if (options.includeContent && options.fileReader) {
-                try {
-                    const content = await options.fileReader(path);
-                    execution = { ...execution, content: JSON.parse(content) };
-                }
-                catch (error) {
-                    errors.push({
-                        path,
-                        error: `Failed to parse execution content: ${error.message}`,
-                    });
-                }
-            }
-            executions.push(execution);
-        }
-        return executions;
-    }
     /**
-     * Check if path is in .principal-views directory
+     * Check if path is in .principal-views directory (directly, not in subdirectories)
      */
     isInCanvasDir(path) {
         const parts = path.split('/');
@@ -353,8 +350,8 @@ class CanvasDiscovery {
         // Package: packages/core/.principal-views/file.canvas
         if (parts.includes(CanvasDiscovery.CANVAS_DIR)) {
             const idx = parts.indexOf(CanvasDiscovery.CANVAS_DIR);
-            // Ensure it's not in __executions__ subdirectory
-            return !parts.includes(CanvasDiscovery.EXECUTIONS_DIR, idx);
+            // Must be directly in .principal-views/, not in a subdirectory
+            return parts.length === idx + 2;
         }
         return false;
     }
@@ -381,40 +378,6 @@ class CanvasDiscovery {
         }
         return null;
     }
-    /**
-     * Check if path is in __executions__ directory
-     */
-    isInExecutionsDir(path) {
-        const parts = path.split('/');
-        // Must contain __executions__ directory
-        if (!parts.includes(CanvasDiscovery.EXECUTIONS_DIR))
-            return false;
-        // Valid patterns:
-        // 1. .principal-views/__executions__/file.otel.json
-        // 2. packages/core/.principal-views/__executions__/file.otel.json
-        // 3. __executions__/file.otel.json (root level)
-        return true;
-    }
-    /**
-     * Parse execution file path to extract metadata
-     * Only .otel.json files are supported
-     */
-    parseExecutionPath(path) {
-        const filename = path.split('/').pop();
-        if (!filename)
-            return null;
-        // Pattern: name.otel.json
-        const match = filename.match(/^(.+)\.otel\.json$/);
-        if (match) {
-            const basename = match[1];
-            return {
-                basename,
-                type: 'otel',
-                canvasBasename: basename, // Same as basename for linking
-            };
-        }
-        return null;
-    }
     /**
      * Find package for a given path using longest-path matching
      */
@@ -460,20 +423,11 @@ class CanvasDiscovery {
         return a.name.localeCompare(b.name);
     }
     /**
-     * Detect legacy flat structures and add deprecation errors
+     * Detect legacy flat canvas structures and add deprecation errors
      */
-    detectLegacyStructures(canvases, executions, storyboards, errors) {
+    detectLegacyStructures(canvases, storyboards, errors) {
         // Build a set of storyboard canvas IDs for quick lookup
         const storyboardCanvasIds = new Set(storyboards.map(s => s.canvas.id));
-        // Build a set of execution IDs that are part of storyboards
-        const storyboardExecutionIds = new Set();
-        for (const storyboard of storyboards) {
-            for (const workflow of storyboard.workflows) {
-                for (const execution of workflow.executions) {
-                    storyboardExecutionIds.add(execution.id);
-                }
-            }
-        }
         // Check for legacy flat canvases (not part of any storyboard)
         for (const canvas of canvases) {
             if (!storyboardCanvasIds.has(canvas.id)) {
@@ -490,22 +444,9 @@ class CanvasDiscovery {
                 }
             }
         }
-        // Check for legacy executions in __executions__/ directory
-        for (const execution of executions) {
-            if (!storyboardExecutionIds.has(execution.id)) {
-                // Check if this execution is in __executions__/ directory
-                if (execution.path.includes(`/${CanvasDiscovery.EXECUTIONS_DIR}/`)) {
-                    errors.push({
-                        path: execution.path,
-                        error: 'DEPRECATED: Legacy __executions__/ directory is no longer supported. Migrate executions to workflow folders within storyboards immediately. See migration guide at docs/MIGRATION_GUIDE.md for details.',
-                    });
-                }
-            }
-        }
     }
 }
 CanvasDiscovery.CANVAS_DIR = '.principal-views';
-CanvasDiscovery.EXECUTIONS_DIR = '__executions__';
 CanvasDiscovery.WORKFLOW_EXTENSION = '.workflow.json';
 export { CanvasDiscovery };
 //# sourceMappingURL=CanvasDiscovery.js.map

package/dist/discovery/CanvasDiscovery.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@principal-ai/principal-view-core",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "Core logic and types for graph-based principal view framework",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/discovery/CanvasDiscovery.test.ts

@@ -133,213 +133,6 @@ describe('CanvasDiscovery', () => {
       expect(result.errors.some(e => e.path === '.principal-views/bad.canvas' && e.error.includes('DEPRECATED'))).toBe(true);
     });
 
-    test('ignores canvas files in __executions__ directory', async () => {
-      const fileTree = createMockFileTree([
-        '.principal-views/__executions__/should-ignore.canvas',
-        '.principal-views/should-include.canvas',
-      ]);
-
-      const result = await discovery.discover(fileTree);
-
-      expect(result.canvases).toHaveLength(1);
-      expect(result.canvases[0].basename).toBe('should-include');
-    });
-  });
-
-  describe('discover() - Execution Files', () => {
-    test('discovers execution files in .principal-views/__executions__', async () => {
-      const fileTree = createMockFileTree([
-        '.principal-views/__executions__/test-run.otel.json',
-        '.principal-views/__executions__/api-test.otel.json',
-      ]);
-
-      const result = await discovery.discover(fileTree);
-
-      expect(result.executions).toHaveLength(2);
-      expect(result.executions[0]).toMatchObject({
-        id: 'api-test',
-        type: 'otel',
-        canvasBasename: 'api-test',
-        scope: 'root',
-      });
-      expect(result.executions[1]).toMatchObject({
-        id: 'test-run',
-        type: 'otel',
-        canvasBasename: 'test-run',
-        scope: 'root',
-      });
-    });
-
-    test('discovers execution files in packages with package prefix', async () => {
-      const fileTree = createMockFileTree([
-        'packages/core/.principal-views/__executions__/auth.otel.json',
-        'packages/api/.principal-views/__executions__/request.otel.json',
-        'packages/core/package.json',
-        'packages/api/package.json',
-      ]);
-
-      const result = await discovery.discover(fileTree, {
-        fileReader: async (path) => {
-          if (path.includes('core/package.json')) {
-            return JSON.stringify({ name: 'core' });
-          }
-          if (path.includes('api/package.json')) {
-            return JSON.stringify({ name: 'api' });
-          }
-          return '';
-        },
-      });
-
-      expect(result.executions).toHaveLength(2);
-      expect(result.executions.map(e => e.id)).toEqual([
-        'api/request',
-        'core/auth',
-      ]);
-    });
-
-    test('discovers execution files in root __executions__', async () => {
-      const fileTree = createMockFileTree([
-        '__executions__/integration-test.otel.json',
-      ]);
-
-      const result = await discovery.discover(fileTree);
-
-      expect(result.executions).toHaveLength(1);
-      expect(result.executions[0]).toMatchObject({
-        id: 'integration-test',
-        scope: 'root',
-      });
-    });
-
-    test('only discovers .otel.json execution files', async () => {
-      const fileTree = createMockFileTree([
-        '__executions__/test.otel.json',
-        '__executions__/test.execution.json',
-        '__executions__/test.events.json',
-      ]);
-
-      const result = await discovery.discover(fileTree);
-
-      // Only .otel.json files should be discovered
-      expect(result.executions).toHaveLength(1);
-      expect(result.executions[0]).toMatchObject({
-        id: 'test',
-        type: 'otel',
-        canvasBasename: 'test',
-      });
-    });
-  });
-
-  describe('findCanvasForExecution()', () => {
-    test('finds matching canvas in same scope', async () => {
-      const fileTree = createMockFileTree([
-        '.principal-views/test-flow.otel.canvas',
-        '.principal-views/__executions__/test-flow.otel.json',
-      ]);
-
-      const result = await discovery.discover(fileTree);
-      const execution = result.executions[0];
-
-      const canvas = discovery.findCanvasForExecution(execution, result.canvases);
-
-      expect(canvas).toBeTruthy();
-      expect(canvas?.basename).toBe('test-flow');
-    });
-
-    test('finds matching canvas in same package', async () => {
-      const fileTree = createMockFileTree([
-        'packages/core/.principal-views/auth.otel.canvas',
-        'packages/core/.principal-views/__executions__/auth.otel.json',
-        'packages/core/package.json',
-      ]);
-
-      const result = await discovery.discover(fileTree, {
-        fileReader: async (path) => {
-          if (path.endsWith('package.json')) {
-            return JSON.stringify({ name: 'core' });
-          }
-          return '';
-        },
-      });
-
-      const execution = result.executions[0];
-      const canvas = discovery.findCanvasForExecution(execution, result.canvases);
-
-      expect(canvas).toBeTruthy();
-      expect(canvas?.packageName).toBe('core');
-    });
-
-    test('does not match canvas in different package', async () => {
-      const fileTree = createMockFileTree([
-        'packages/core/.principal-views/auth.canvas',
-        'packages/api/.principal-views/__executions__/auth.otel.json',
-        'packages/core/package.json',
-        'packages/api/package.json',
-      ]);
-
-      const result = await discovery.discover(fileTree, {
-        fileReader: async (path) => {
-          if (path.includes('core/package.json')) {
-            return JSON.stringify({ name: 'core' });
-          }
-          if (path.includes('api/package.json')) {
-            return JSON.stringify({ name: 'api' });
-          }
-          return '';
-        },
-      });
-
-      const execution = result.executions[0];
-      const canvas = discovery.findCanvasForExecution(execution, result.canvases);
-
-      // Should not find match (different packages)
-      expect(canvas).toBeNull();
-    });
-  });
-
-  describe('findExecutionsForCanvas()', () => {
-    test('finds all executions for a canvas', async () => {
-      const fileTree = createMockFileTree([
-        '.principal-views/test-flow.otel.canvas',
-        '.principal-views/__executions__/test-flow.otel.json',
-      ]);
-
-      const result = await discovery.discover(fileTree);
-      const canvas = result.canvases[0];
-
-      const executions = discovery.findExecutionsForCanvas(canvas, result.executions);
-
-      expect(executions).toHaveLength(1);
-      expect(executions[0].canvasBasename).toBe('test-flow');
-    });
-
-    test('only returns executions in same package', async () => {
-      const fileTree = createMockFileTree([
-        'packages/core/.principal-views/auth.canvas',
-        'packages/core/.principal-views/__executions__/auth.otel.json',
-        'packages/api/.principal-views/__executions__/auth.otel.json',
-        'packages/core/package.json',
-        'packages/api/package.json',
-      ]);
-
-      const result = await discovery.discover(fileTree, {
-        fileReader: async (path) => {
-          if (path.includes('core/package.json')) {
-            return JSON.stringify({ name: 'core' });
-          }
-          if (path.includes('api/package.json')) {
-            return JSON.stringify({ name: 'api' });
-          }
-          return '';
-        },
-      });
-
-      const canvas = result.canvases.find(c => c.packageName === 'core')!;
-      const executions = discovery.findExecutionsForCanvas(canvas, result.executions);
-
-      expect(executions).toHaveLength(1);
-      expect(executions[0].packageName).toBe('core');
-    });
   });
 
   describe('caching', () => {

package/src/discovery/CanvasDiscovery.ts

@@ -43,7 +43,6 @@ import type {
  */
 export class CanvasDiscovery {
   private static readonly CANVAS_DIR = '.principal-views';
-  private static readonly EXECUTIONS_DIR = '__executions__';
   private static readonly WORKFLOW_EXTENSION = '.workflow.json';
 
   private packageModule: PackageLayerModule;
@@ -76,14 +75,20 @@ export class CanvasDiscovery {
     // 3. Discover canvas files
     const canvases = await this.discoverCanvasFiles(fileTree, packageMap, options, errors);
 
-    // 4. Discover execution files
-    const executions = await this.discoverExecutionFiles(fileTree, packageMap, options, errors);
+    // 4. Discover storyboards (hierarchical organization)
+    // Note: Executions are discovered as part of workflows, not separately
+    const storyboards = await this.discoverStoryboards(fileTree, packageMap, canvases, options, errors);
 
-    // 5. Discover storyboards (hierarchical organization)
-    const storyboards = await this.discoverStoryboards(fileTree, packageMap, canvases, executions, options, errors);
+    // 5. Collect all executions from workflows for backward compatibility
+    const executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[] = [];
+    for (const storyboard of storyboards) {
+      for (const workflow of storyboard.workflows) {
+        executions.push(...workflow.executions);
+      }
+    }
 
-    // 6. Detect legacy structures and add deprecation errors
-    this.detectLegacyStructures(canvases, executions, storyboards, errors);
+    // 6. Detect legacy flat canvas structures and add deprecation errors
+    this.detectLegacyStructures(canvases, storyboards, errors);
 
     // 7. Sort results
     canvases.sort(this.compareByPackageThenName);
@@ -93,44 +98,6 @@ export class CanvasDiscovery {
     return { canvases, executions, storyboards, errors, warnings };
   }
 
-  /**
-   * Find canvas file for a given execution
-   *
-   * @param execution - Discovered execution
-   * @param canvases - Array of discovered canvases (from discover())
-   * @returns Matching canvas or null
-   */
-  findCanvasForExecution(
-    execution: DiscoveredExecution,
-    canvases: DiscoveredCanvas[]
-  ): DiscoveredCanvas | null {
-    // Find canvas with matching basename and scope
-    return canvases.find(canvas =>
-      canvas.basename === execution.canvasBasename &&
-      canvas.scope === execution.scope &&
-      canvas.packageName === execution.packageName
-    ) || null;
-  }
-
-  /**
-   * Find execution files for a given canvas
-   *
-   * @param canvas - Discovered canvas
-   * @param executions - Array of discovered executions (from discover())
-   * @returns Array of matching executions
-   */
-  findExecutionsForCanvas(
-    canvas: DiscoveredCanvas,
-    executions: DiscoveredExecution[]
-  ): DiscoveredExecution[] {
-    // Find all executions with matching basename and scope
-    return executions.filter(execution =>
-      execution.canvasBasename === canvas.basename &&
-      execution.scope === canvas.scope &&
-      execution.packageName === canvas.packageName
-    );
-  }
-
   /**
    * Clear package cache (useful when file tree changes)
    */
@@ -145,7 +112,6 @@ export class CanvasDiscovery {
     fileTree: FileTree,
     packageMap: Map<string, PackageLayer>,
     canvases: DiscoveredCanvas[],
-    executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[],
     options: DiscoveryOptions,
     errors: Array<{ path: string; error: string }>
   ): Promise<(DiscoveredStoryboard | DiscoveredStoryboardWithContent)[]> {
@@ -176,8 +142,8 @@ export class CanvasDiscovery {
     // For each potential storyboard directory, check if it has a canvas
     for (const [storyboardPath, storyboardNames] of storyboardDirs) {
       for (const storyboardName of storyboardNames) {
-        // Skip __executions__ directory
-        if (storyboardName === CanvasDiscovery.EXECUTIONS_DIR) continue;
+        // Skip __executions__ directory (legacy pattern, should not exist)
+        if (storyboardName === '__executions__') continue;
 
         // Find canvas for this storyboard
         const storyboardCanvas = canvases.find(c => {
@@ -193,7 +159,6 @@ export class CanvasDiscovery {
           storyboardPath,
           storyboardName,
           packageMap,
-          executions,
           options,
           errors
         );
@@ -234,7 +199,6 @@ export class CanvasDiscovery {
     storyboardPath: string,
     storyboardName: string,
     packageMap: Map<string, PackageLayer>,
-    executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[],
     options: DiscoveryOptions,
     errors: Array<{ path: string; error: string }>
   ): Promise<(DiscoveredWorkflow | DiscoveredWorkflowWithContent)[]> {
@@ -265,11 +229,17 @@ export class CanvasDiscovery {
         ? `${packageInfo.packageData.name}/${storyboardName}/${basename}`
         : `${storyboardName}/${basename}`;
 
-      // Find executions for this workflow (in the same directory as workflow.json)
-      const workflowExecutions = executions.filter(e => {
-        const execDir = e.path.split('/').slice(0, -1).join('/');
-        return execDir === workflowDir;
-      });
+      // Discover executions co-located in the same directory as workflow.json
+      console.log(`[CanvasDiscovery] Discovering executions for workflow: ${path}`);
+      console.log(`[CanvasDiscovery] Workflow directory: ${workflowDir}`);
+      const workflowExecutions = await this.discoverExecutionsInWorkflowDir(
+        fileTree,
+        workflowDir,
+        packageMap,
+        options,
+        errors
+      );
+      console.log(`[CanvasDiscovery] Found ${workflowExecutions.length} executions for workflow ${basename}`);
 
       // Create discovered workflow
       let workflow: DiscoveredWorkflow | DiscoveredWorkflowWithContent = {
@@ -306,6 +276,86 @@ export class CanvasDiscovery {
     return workflows;
   }
 
+  /**
+   * Discover execution files co-located in a workflow directory
+   */
+  private async discoverExecutionsInWorkflowDir(
+    fileTree: FileTree,
+    workflowDir: string,
+    packageMap: Map<string, PackageLayer>,
+    options: DiscoveryOptions,
+    errors: Array<{ path: string; error: string }>
+  ): Promise<(DiscoveredExecution | DiscoveredExecutionWithContent)[]> {
+    const executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[] = [];
+
+    console.log(`[CanvasDiscovery] Scanning for executions in directory: ${workflowDir}`);
+    console.log(`[CanvasDiscovery] Total files in tree: ${fileTree.allFiles.length}`);
+
+    // Find all .otel.json files in the workflow directory
+    for (const file of fileTree.allFiles) {
+      const path = file.relativePath || file.path || '';
+
+      // Check if file is in this workflow directory
+      const fileDir = path.split('/').slice(0, -1).join('/');
+      if (fileDir !== workflowDir) continue;
+
+      console.log(`[CanvasDiscovery] Found file in workflow dir: ${path}`);
+
+      // Check if it's an execution file (.otel.json)
+      if (!path.endsWith('.otel.json')) {
+        console.log(`[CanvasDiscovery] Skipping non-.otel.json file: ${path}`);
+        continue;
+      }
+
+      // Extract execution metadata
+      const filename = path.split('/').pop();
+      if (!filename) continue;
+
+      const basename = filename.replace('.otel.json', '');
+
+      // Determine package context
+      const packageInfo = this.findPackageForPath(path, packageMap);
+
+      // Generate unique ID (workflow-scoped)
+      const workflowBasename = workflowDir.split('/').pop() || '';
+      const id = packageInfo
+        ? `${packageInfo.packageData.name}/${workflowBasename}/${basename}`
+        : `${workflowBasename}/${basename}`;
+
+      // Create discovered execution
+      let execution: DiscoveredExecution | DiscoveredExecutionWithContent = {
+        id,
+        name: this.toDisplayName(basename),
+        path,
+        basename,
+        type: 'otel',
+        canvasBasename: basename, // For backward compatibility
+        packageName: packageInfo?.packageData.name,
+        packagePath: packageInfo?.packageData.path,
+        scope: packageInfo ? 'package' : 'root',
+      };
+
+      // Optionally load content
+      if (options.includeContent && options.fileReader) {
+        try {
+          const content = await options.fileReader(path);
+          execution = { ...execution, content: JSON.parse(content) } as DiscoveredExecutionWithContent;
+        } catch (error) {
+          errors.push({
+            path,
+            error: `Failed to parse execution content: ${(error as Error).message}`,
+          });
+        }
+      }
+
+      console.log(`[CanvasDiscovery] Added execution: ${execution.id} (${path})`);
+      executions.push(execution);
+    }
+
+    console.log(`[CanvasDiscovery] Total executions found in ${workflowDir}: ${executions.length}`);
+    return executions;
+  }
+
   /**
    * Discover packages with caching by fileTree SHA
    */
@@ -412,66 +462,8 @@ export class CanvasDiscovery {
   /**
    * Discover execution files in the file tree
    */
-  private async discoverExecutionFiles(
-    fileTree: FileTree,
-    packageMap: Map<string, PackageLayer>,
-    options: DiscoveryOptions,
-    errors: Array<{ path: string; error: string }>
-  ): Promise<(DiscoveredExecution | DiscoveredExecutionWithContent)[]> {
-    const executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[] = [];
-
-    for (const file of fileTree.allFiles) {
-      const path = file.relativePath || file.path || '';
-
-      // Check if in __executions__ directory
-      if (!this.isInExecutionsDir(path)) continue;
-
-      // Extract execution metadata
-      const metadata = this.parseExecutionPath(path);
-      if (!metadata) continue;
-
-      // Determine package context
-      const packageInfo = this.findPackageForPath(path, packageMap);
-
-      // Generate unique ID
-      const id = packageInfo
-        ? `${packageInfo.packageData.name}/${metadata.basename}`
-        : metadata.basename;
-
-      // Create discovered execution
-      let execution: DiscoveredExecution | DiscoveredExecutionWithContent = {
-        id,
-        name: this.toDisplayName(metadata.basename),
-        path,
-        basename: metadata.basename,
-        type: metadata.type,
-        canvasBasename: metadata.canvasBasename,
-        packageName: packageInfo?.packageData.name,
-        packagePath: packageInfo?.packageData.path,
-        scope: packageInfo ? 'package' : 'root',
-      };
-
-      // Optionally load content
-      if (options.includeContent && options.fileReader) {
-        try {
-          const content = await options.fileReader(path);
-          execution = { ...execution, content: JSON.parse(content) } as DiscoveredExecutionWithContent;
-        } catch (error) {
-          errors.push({
-            path,
-            error: `Failed to parse execution content: ${(error as Error).message}`,
-          });
-        }
-      }
-
-      executions.push(execution);
-    }
-
-    return executions;
-  }
-
   /**
-   * Check if path is in .principal-views directory
+   * Check if path is in .principal-views directory (directly, not in subdirectories)
    */
   private isInCanvasDir(path: string): boolean {
     const parts = path.split('/');
@@ -484,8 +476,8 @@ export class CanvasDiscovery {
     // Package: packages/core/.principal-views/file.canvas
     if (parts.includes(CanvasDiscovery.CANVAS_DIR)) {
       const idx = parts.indexOf(CanvasDiscovery.CANVAS_DIR);
-      // Ensure it's not in __executions__ subdirectory
-      return !parts.includes(CanvasDiscovery.EXECUTIONS_DIR, idx);
+      // Must be directly in .principal-views/, not in a subdirectory
+      return parts.length === idx + 2;
     }
 
     return false;
@@ -517,49 +509,6 @@ export class CanvasDiscovery {
     return null;
   }
 
-  /**
-   * Check if path is in __executions__ directory
-   */
-  private isInExecutionsDir(path: string): boolean {
-    const parts = path.split('/');
-
-    // Must contain __executions__ directory
-    if (!parts.includes(CanvasDiscovery.EXECUTIONS_DIR)) return false;
-
-    // Valid patterns:
-    // 1. .principal-views/__executions__/file.otel.json
-    // 2. packages/core/.principal-views/__executions__/file.otel.json
-    // 3. __executions__/file.otel.json (root level)
-
-    return true;
-  }
-
-  /**
-   * Parse execution file path to extract metadata
-   * Only .otel.json files are supported
-   */
-  private parseExecutionPath(path: string): {
-    basename: string;
-    type: ExecutionType;
-    canvasBasename: string;
-  } | null {
-    const filename = path.split('/').pop();
-    if (!filename) return null;
-
-    // Pattern: name.otel.json
-    const match = filename.match(/^(.+)\.otel\.json$/);
-    if (match) {
-      const basename = match[1];
-      return {
-        basename,
-        type: 'otel',
-        canvasBasename: basename, // Same as basename for linking
-      };
-    }
-
-    return null;
-  }
-
   /**
    * Find package for a given path using longest-path matching
    */
@@ -615,27 +564,16 @@ export class CanvasDiscovery {
   }
 
   /**
-   * Detect legacy flat structures and add deprecation errors
+   * Detect legacy flat canvas structures and add deprecation errors
    */
   private detectLegacyStructures(
     canvases: DiscoveredCanvas[],
-    executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[],
     storyboards: (DiscoveredStoryboard | DiscoveredStoryboardWithContent)[],
     errors: Array<{ path: string; error: string }>
   ): void {
     // Build a set of storyboard canvas IDs for quick lookup
     const storyboardCanvasIds = new Set(storyboards.map(s => s.canvas.id));
 
-    // Build a set of execution IDs that are part of storyboards
-    const storyboardExecutionIds = new Set<string>();
-    for (const storyboard of storyboards) {
-      for (const workflow of storyboard.workflows) {
-        for (const execution of workflow.executions) {
-          storyboardExecutionIds.add(execution.id);
-        }
-      }
-    }
-
     // Check for legacy flat canvases (not part of any storyboard)
     for (const canvas of canvases) {
       if (!storyboardCanvasIds.has(canvas.id)) {
@@ -653,18 +591,5 @@ export class CanvasDiscovery {
         }
       }
     }
-
-    // Check for legacy executions in __executions__/ directory
-    for (const execution of executions) {
-      if (!storyboardExecutionIds.has(execution.id)) {
-        // Check if this execution is in __executions__/ directory
-        if (execution.path.includes(`/${CanvasDiscovery.EXECUTIONS_DIR}/`)) {
-          errors.push({
-            path: execution.path,
-            error: 'DEPRECATED: Legacy __executions__/ directory is no longer supported. Migrate executions to workflow folders within storyboards immediately. See migration guide at docs/MIGRATION_GUIDE.md for details.',
-          });
-        }
-      }
-    }
   }
 }