@outputai/cli 0.3.3-dev.422151e.0 → 0.3.3-dev.e8eff63.0

package/dist/assets/docker/docker-compose-dev.yml

@@ -77,7 +77,7 @@ services:
         condition: service_healthy
       worker:
         condition: service_healthy
-    image: outputai/api:${OUTPUT_API_VERSION:-0.3.3-dev.422151e.0}
+    image: outputai/api:${OUTPUT_API_VERSION:-0.3.3-dev.e8eff63.0}
     init: true
     networks:
       - main

package/dist/generated/framework_version.json

@@ -1,3 +1,3 @@
 {
-    "framework": "0.3.3-dev.422151e.0"
+    "framework": "0.3.3-dev.e8eff63.0"
 }

package/dist/utils/scenario_resolver.d.ts

@@ -4,6 +4,7 @@ export interface ScenarioResolutionResult {
     searchedPaths: string[];
 }
 export declare function extractWorkflowRelativePath(path: string): string | null;
-export declare function resolveScenarioPath(workflowName: string, scenarioName: string, basePath?: string): Promise<ScenarioResolutionResult>;
+export declare function findWorkflowDirectoryFromPath(workflowPath: string | undefined, basePath?: string): string | null;
+export declare function resolveScenarioPath(workflowName: string, scenarioName: string, basePath?: string, workflowPath?: string): Promise<ScenarioResolutionResult>;
 export declare function listScenariosForWorkflow(workflowName: string, workflowPath?: string, basePath?: string): string[];
 export declare function getScenarioNotFoundMessage(workflowName: string, scenarioName: string, searchedPaths: string[]): string;

package/dist/utils/scenario_resolver.js

@@ -1,14 +1,34 @@
 import { existsSync, readdirSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { dirname, resolve } from 'node:path';
 import { getWorkflowCatalog } from '#api/generated/api.js';
 import { getWorkflowsBasePath } from '#utils/paths.js';
 const SCENARIOS_DIR = 'scenarios';
 const WORKFLOWS_PATHS = ['src/workflows', 'workflows'];
 export function extractWorkflowRelativePath(path) {
-    const match = path.match(/workflows\/(.+)\/workflow\.[jt]s$/);
+    const match = path.match(/(?:^|\/)workflows\/(.+)\/workflow\.[jt]s$/);
     return match ? match[1] : null;
 }
-async function fetchWorkflowDirectory(workflowName) {
+function unique(values) {
+    return [...new Set(values)];
+}
+function workflowPathSuffixes(workflowPath) {
+    const parts = dirname(workflowPath).split(/[/\\]+/).filter(Boolean);
+    return parts.map((_, index) => parts.slice(index));
+}
+function candidateWorkflowDirsFromPath(workflowPath, basePath) {
+    return unique(workflowPathSuffixes(workflowPath).flatMap(suffix => WORKFLOWS_PATHS.map(workflowsDir => resolve(basePath, workflowsDir, ...suffix))));
+}
+function candidateScenarioDirsFromPath(workflowPath, basePath) {
+    return candidateWorkflowDirsFromPath(workflowPath, basePath)
+        .map(workflowDir => resolve(workflowDir, SCENARIOS_DIR));
+}
+export function findWorkflowDirectoryFromPath(workflowPath, basePath = getWorkflowsBasePath()) {
+    if (!workflowPath) {
+        return null;
+    }
+    return candidateWorkflowDirsFromPath(workflowPath, basePath).find(existsSync) ?? null;
+}
+async function fetchWorkflowPath(workflowName) {
     try {
         const response = await getWorkflowCatalog();
         const data = response?.data;
@@ -20,11 +40,7 @@ async function fetchWorkflowDirectory(workflowName) {
         if (!workflow) {
             return null;
         }
-        const workflowPath = workflow.path;
-        if (!workflowPath) {
-            return null;
-        }
-        return extractWorkflowRelativePath(workflowPath);
+        return workflow.path ?? null;
     }
     catch {
         return null;
@@ -41,33 +57,48 @@ function resolveScenarioFromDirectory(relativeDir, scenarioFileName, basePath) {
     }
     return { found: false, searchedPaths };
 }
-export async function resolveScenarioPath(workflowName, scenarioName, basePath = getWorkflowsBasePath()) {
+function resolveScenarioFromScenarioDirs(scenariosDirs, scenarioFileName) {
+    const searchedPaths = scenariosDirs.map(dir => resolve(dir, scenarioFileName));
+    const path = searchedPaths.find(existsSync);
+    return path ?
+        { found: true, path, searchedPaths } :
+        { found: false, searchedPaths };
+}
+export async function resolveScenarioPath(workflowName, scenarioName, basePath = getWorkflowsBasePath(), workflowPath) {
     const scenarioFileName = scenarioName.endsWith('.json') ?
         scenarioName :
         `${scenarioName}.json`;
-    const catalogDir = await fetchWorkflowDirectory(workflowName);
-    if (catalogDir) {
-        const result = resolveScenarioFromDirectory(catalogDir, scenarioFileName, basePath);
+    if (workflowPath) {
+        const pathResult = resolveScenarioFromScenarioDirs(candidateScenarioDirsFromPath(workflowPath, basePath), scenarioFileName);
+        if (pathResult.found) {
+            return pathResult;
+        }
+    }
+    const catalogPath = workflowPath ? null : await fetchWorkflowPath(workflowName);
+    if (catalogPath) {
+        const result = resolveScenarioFromScenarioDirs(candidateScenarioDirsFromPath(catalogPath, basePath), scenarioFileName);
         if (result.found) {
             return result;
         }
-        // Catalog resolved but scenario not found at that path — still try convention fallback
-        // in case the catalog path differs from local source layout
-        if (catalogDir !== workflowName) {
-            const fallback = resolveScenarioFromDirectory(workflowName, scenarioFileName, basePath);
-            return {
-                found: fallback.found,
-                path: fallback.path,
-                searchedPaths: [...result.searchedPaths, ...fallback.searchedPaths]
-            };
-        }
-        return result;
+        const fallback = resolveScenarioFromDirectory(workflowName, scenarioFileName, basePath);
+        return {
+            found: fallback.found,
+            path: fallback.path,
+            searchedPaths: [...result.searchedPaths, ...fallback.searchedPaths]
+        };
     }
     // API unavailable or workflow not in catalog — fall back to convention
     return resolveScenarioFromDirectory(workflowName, scenarioFileName, basePath);
 }
 export function listScenariosForWorkflow(workflowName, workflowPath, basePath = getWorkflowsBasePath()) {
-    const relativeDir = (workflowPath && extractWorkflowRelativePath(workflowPath)) || workflowName;
+    const scenariosDirs = workflowPath ? candidateScenarioDirsFromPath(workflowPath, basePath) : [];
+    const scenariosDir = scenariosDirs.find(existsSync);
+    if (scenariosDir) {
+        return readdirSync(scenariosDir)
+            .filter(f => f.endsWith('.json'))
+            .map(f => f.replace(/\.json$/, ''));
+    }
+    const relativeDir = workflowName;
     for (const workflowsDir of WORKFLOWS_PATHS) {
         const scenariosDir = resolve(basePath, workflowsDir, relativeDir, SCENARIOS_DIR);
         if (existsSync(scenariosDir)) {

package/dist/utils/scenario_resolver.spec.js

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
-import { resolveScenarioPath, getScenarioNotFoundMessage, extractWorkflowRelativePath, listScenariosForWorkflow } from './scenario_resolver.js';
+import { resolveScenarioPath, getScenarioNotFoundMessage, extractWorkflowRelativePath, findWorkflowDirectoryFromPath, listScenariosForWorkflow } from './scenario_resolver.js';
 import * as fs from 'node:fs';
 import * as api from '#api/generated/api.js';
 vi.mock('node:fs', () => ({
@@ -32,6 +32,10 @@ describe('extractWorkflowRelativePath', () => {
         expect(extractWorkflowRelativePath('/src/workflows/my_flow/workflow.ts'))
             .toBe('my_flow');
     });
+    it('should not match workflows inside a parent directory name', () => {
+        expect(extractWorkflowRelativePath('/app/test_workflows/dist/workflows/simple_sleep/workflow.js'))
+            .toBe('simple_sleep');
+    });
     it('should return null for non-matching paths', () => {
         expect(extractWorkflowRelativePath('/app/dist/other/workflow.js')).toBeNull();
         expect(extractWorkflowRelativePath('/app/dist/workflows/')).toBeNull();
@@ -100,6 +104,15 @@ describe('resolveScenarioPath', () => {
             expect(result.found).toBe(true);
             expect(result.path).toContain('src/workflows/my_workflow/scenarios/test_scenario.json');
         });
+        it('should resolve using a provided workflow path without requiring a workflows segment', async () => {
+            mockCatalogFailure();
+            vi.mocked(fs.existsSync).mockImplementation(path => {
+                return String(path) === '/project/src/workflows/writing/editor/scenarios/basic.json';
+            });
+            const result = await resolveScenarioPath('writing_editor', 'basic', '/project', '/app/build-output/writing/editor/workflow.js');
+            expect(result.found).toBe(true);
+            expect(result.path).toBe('/project/src/workflows/writing/editor/scenarios/basic.json');
+        });
     });
     describe('when workflow is not in catalog', () => {
         it('should fall back to convention-based lookup', async () => {
@@ -158,6 +171,12 @@ describe('listScenariosForWorkflow', () => {
         const result = listScenariosForWorkflow('my_workflow', undefined, '/project');
         expect(result).toEqual(['basic', 'advanced']);
     });
+    it('should list scenarios from a workflow path without requiring a workflows segment', () => {
+        vi.mocked(fs.existsSync).mockImplementation(path => String(path) === '/project/src/workflows/writing/editor/scenarios');
+        vi.mocked(fs.readdirSync).mockReturnValue(['basic.json', 'README.md']);
+        const result = listScenariosForWorkflow('writing_editor', '/app/build-output/writing/editor/workflow.js', '/project');
+        expect(result).toEqual(['basic']);
+    });
     it('should use workflowPath from catalog to derive directory', () => {
         vi.mocked(fs.existsSync).mockImplementation(path => String(path).includes('src/workflows/viz_examples/01_simple_linear/scenarios'));
         vi.mocked(fs.readdirSync).mockReturnValue(['test.json']);
@@ -197,6 +216,16 @@ describe('listScenariosForWorkflow', () => {
         expect(result).toEqual([]);
     });
 });
+describe('findWorkflowDirectoryFromPath', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+    });
+    it('should find the local workflow directory from a loaded workflow path suffix', () => {
+        vi.mocked(fs.existsSync).mockImplementation(path => String(path) === '/project/src/workflows/writing/editor');
+        const result = findWorkflowDirectoryFromPath('/app/build-output/writing/editor/workflow.js', '/project');
+        expect(result).toBe('/project/src/workflows/writing/editor');
+    });
+});
 describe('getScenarioNotFoundMessage', () => {
     it('should return a helpful error message', () => {
         const searchedPaths = [

package/dist/views/dev/dev_app.js

@@ -141,6 +141,6 @@ const Shell = ({ dockerComposePath, onCleanup }) => {
     if (ui.expandedJson.open) {
         return (_jsx(Box, { flexDirection: "column", height: rows, paddingX: 2, paddingTop: 1, children: _jsx(ExpandedJsonModal, {}) }));
     }
-    return (_jsxs(Box, { flexDirection: "column", height: rows, paddingX: 2, paddingTop: 1, children: [_jsx(Header, { counters: counters }), _jsx(TabBar, { active: ui.tab }), _jsx(HorizontalRule, {}), _jsx(SearchBar, { active: ui.search.open }), _jsx(Toasts, {}), _jsxs(Box, { flexDirection: "column", flexGrow: 1, overflow: "hidden", children: [ui.tab === 'workflows' && !ui.runModal.open && _jsx(WorkflowsPanel, { workflows: workflows, runs: runs }), ui.tab === 'runs' && !ui.runModal.open && _jsx(RunsPanel, { runs: runs }), ui.tab === 'services' && !ui.runModal.open && (_jsx(ServicesPanel, { phase: phase, services: services, dockerComposePath: dockerComposePath })), ui.tab === 'help' && !ui.runModal.open && _jsx(HelpPanel, {}), ui.runModal.open && _jsx(RunModal, { workflowName: ui.runModal.workflowName })] })] }));
+    return (_jsxs(Box, { flexDirection: "column", height: rows, paddingX: 2, paddingTop: 1, children: [_jsx(Header, { counters: counters }), _jsx(TabBar, { active: ui.tab }), _jsx(HorizontalRule, {}), _jsx(SearchBar, { active: ui.search.open }), _jsx(Toasts, {}), _jsxs(Box, { flexDirection: "column", flexGrow: 1, overflow: "hidden", children: [ui.tab === 'workflows' && !ui.runModal.open && _jsx(WorkflowsPanel, { workflows: workflows, runs: runs }), ui.tab === 'runs' && !ui.runModal.open && _jsx(RunsPanel, { runs: runs }), ui.tab === 'services' && !ui.runModal.open && (_jsx(ServicesPanel, { phase: phase, services: services, dockerComposePath: dockerComposePath })), ui.tab === 'help' && !ui.runModal.open && _jsx(HelpPanel, {}), ui.runModal.open && _jsx(RunModal, { workflowName: ui.runModal.workflowName, workflowPath: ui.runModal.workflowPath })] })] }));
 };
 export const DevApp = ({ dockerComposePath, onCleanup }) => (_jsx(UiStateProvider, { children: _jsx(Shell, { dockerComposePath: dockerComposePath, onCleanup: onCleanup }) }));

package/dist/views/dev/modals/run_modal.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 export declare const RunModal: React.FC<{
     workflowName: string;
+    workflowPath?: string;
 }>;

package/dist/views/dev/modals/run_modal.js

@@ -21,9 +21,9 @@ const buildEntries = (scenarios) => {
 };
 const Frame = ({ title, children }) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "round", paddingX: 1, paddingY: 0, children: [_jsx(Text, { bold: true, children: title }), children] }));
 const TextPrompt = ({ label, value }) => (_jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { children: [label, " "] }), _jsx(Text, { children: value }), _jsx(Text, { inverse: true, children: ' ' })] }));
-export const RunModal = ({ workflowName }) => {
+export const RunModal = ({ workflowName, workflowPath }) => {
     const ui = useUiState();
-    const scenarios = useMemo(() => listScenariosForWorkflow(workflowName), [workflowName]);
+    const scenarios = useMemo(() => listScenariosForWorkflow(workflowName, workflowPath), [workflowName, workflowPath]);
     const entries = useMemo(() => buildEntries(scenarios), [scenarios]);
     const [mode, setMode] = useState('select');
     const [index, setIndex] = useState(0);
@@ -54,7 +54,7 @@ export const RunModal = ({ workflowName }) => {
     };
     const runScenario = async (scenarioName) => {
         try {
-            const input = await readScenario(workflowName, scenarioName);
+            const input = await readScenario(workflowName, scenarioName, workflowPath);
             await submit(input, scenarioName);
         }
         catch (err) {
@@ -64,7 +64,7 @@ export const RunModal = ({ workflowName }) => {
     };
     const startDuplicate = async (scenarioName) => {
         try {
-            const sourceContent = await readScenario(workflowName, scenarioName);
+            const sourceContent = await readScenario(workflowName, scenarioName, workflowPath);
             setEditName(`${scenarioName}_copy`);
             setEditSeed(sourceContent);
             setEditFrameTitle(`Duplicate '${scenarioName}'`);
@@ -106,7 +106,7 @@ export const RunModal = ({ workflowName }) => {
         }
         setMode('submitting');
         try {
-            const writtenPath = await writeScenario(workflowName, name, value);
+            const writtenPath = await writeScenario(workflowName, name, value, workflowPath);
             ui.pushToast(`Saved scenario at ${writtenPath}`, 'info');
             await submit(value, name);
         }

package/dist/views/dev/panels/workflows_panel.js

@@ -98,7 +98,7 @@ export const WorkflowsPanel = ({ workflows, runs }) => {
             ui.setTab('runs');
         }
         else if (input === 'r' && selectedWorkflow?.name) {
-            ui.openRunModal(selectedWorkflow.name);
+            ui.openRunModal(selectedWorkflow.name, selectedWorkflow.path);
         }
     }, { isActive });
     if (workflows.length === 0) {

package/dist/views/dev/services/scenario_io.d.ts

@@ -1,2 +1,2 @@
-export declare const readScenario: (workflowName: string, scenarioName: string) => Promise<unknown>;
-export declare const writeScenario: (workflowName: string, scenarioName: string, content: unknown) => Promise<string>;
+export declare const readScenario: (workflowName: string, scenarioName: string, workflowPath?: string) => Promise<unknown>;
+export declare const writeScenario: (workflowName: string, scenarioName: string, content: unknown, workflowPath?: string) => Promise<string>;

package/dist/views/dev/services/scenario_io.js

@@ -1,19 +1,23 @@
 import { readFile, writeFile, mkdir } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { resolve, dirname } from 'node:path';
-import { resolveScenarioPath } from '#utils/scenario_resolver.js';
+import { findWorkflowDirectoryFromPath, resolveScenarioPath } from '#utils/scenario_resolver.js';
 import { getWorkflowsBasePath } from '#utils/paths.js';
 const WORKFLOWS_PATHS = ['src/workflows', 'workflows'];
-export const readScenario = async (workflowName, scenarioName) => {
-    const resolution = await resolveScenarioPath(workflowName, scenarioName);
+export const readScenario = async (workflowName, scenarioName, workflowPath) => {
+    const resolution = await resolveScenarioPath(workflowName, scenarioName, getWorkflowsBasePath(), workflowPath);
     if (!resolution.found || !resolution.path) {
         throw new Error(`Scenario '${scenarioName}' not found for workflow '${workflowName}'.`);
     }
     const content = await readFile(resolution.path, 'utf-8');
     return JSON.parse(content);
 };
-const findWorkflowDirectory = (workflowName) => {
+const findWorkflowDirectory = (workflowName, workflowPath) => {
     const basePath = getWorkflowsBasePath();
+    const pathDir = findWorkflowDirectoryFromPath(workflowPath, basePath);
+    if (pathDir) {
+        return pathDir;
+    }
     for (const wfDir of WORKFLOWS_PATHS) {
         const candidate = resolve(basePath, wfDir, workflowName);
         if (existsSync(candidate)) {
@@ -22,8 +26,8 @@ const findWorkflowDirectory = (workflowName) => {
     }
     return null;
 };
-export const writeScenario = async (workflowName, scenarioName, content) => {
-    const dir = findWorkflowDirectory(workflowName);
+export const writeScenario = async (workflowName, scenarioName, content, workflowPath) => {
+    const dir = findWorkflowDirectory(workflowName, workflowPath);
     if (!dir) {
         throw new Error(`Workflow directory for '${workflowName}' not found locally.`);
     }

package/dist/views/dev/state/ui_state.d.ts

@@ -17,6 +17,7 @@ export interface SearchState {
 export interface RunModalState {
     open: boolean;
     workflowName: string;
+    workflowPath?: string;
 }
 export interface ExpandedJsonState {
     open: boolean;
@@ -47,7 +48,7 @@ export interface UiState {
     setSelection: (selection: Selection) => void;
     setRightPaneTab: (tab: RightPaneTab) => void;
     setRunsView: (view: RunsView) => void;
-    openRunModal: (workflowName: string) => void;
+    openRunModal: (workflowName: string, workflowPath?: string) => void;
     closeRunModal: () => void;
     openExpandedJson: (value: unknown, title: string) => void;
     closeExpandedJson: () => void;

package/dist/views/dev/state/ui_state.js

@@ -43,7 +43,7 @@ export const UiStateProvider = ({ children }) => {
         setSelection,
         setRightPaneTab,
         setRunsView,
-        openRunModal: (workflowName) => setRunModal({ open: true, workflowName }),
+        openRunModal: (workflowName, workflowPath) => setRunModal({ open: true, workflowName, workflowPath }),
         closeRunModal: () => setRunModal({ open: false, workflowName: '' }),
         openExpandedJson: (value, title) => setExpandedJson({ open: true, value, title }),
         closeExpandedJson: () => setExpandedJson({ open: false, value: null, title: '' }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/cli",
-  "version": "0.3.3-dev.422151e.0",
+  "version": "0.3.3-dev.e8eff63.0",
   "description": "CLI for Output.ai workflow generation",
   "type": "module",
   "main": "dist/index.js",
@@ -36,9 +36,9 @@
     "semver": "7.7.4",
     "undici": "8.1.0",
     "yaml": "^2.8.3",
-    "@outputai/credentials": "0.3.3-dev.422151e.0",
-    "@outputai/llm": "0.3.3-dev.422151e.0",
-    "@outputai/evals": "0.3.3-dev.422151e.0"
+    "@outputai/credentials": "0.3.3-dev.e8eff63.0",
+    "@outputai/evals": "0.3.3-dev.e8eff63.0",
+    "@outputai/llm": "0.3.3-dev.e8eff63.0"
   },
   "devDependencies": {
     "@types/cli-progress": "3.11.6",