@outputai/cli 0.15.1-next.5db73d3.0 → 0.15.1-next.755b932.0

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

@@ -80,7 +80,7 @@ services:
         condition: service_healthy
       worker:
         condition: service_healthy
-    image: outputai/api:${OUTPUT_API_VERSION:-0.15.1-next.5db73d3.0}
+    image: outputai/api:${OUTPUT_API_VERSION:-0.15.1-next.755b932.0}
     init: true
     networks:
       - main

package/dist/commands/fix.js

@@ -9,7 +9,8 @@ const Ansi = {
     RESET: '\x1b[0m'
 };
 export default class Fix extends Command {
-    static description = 'Fix Output scripts in the package.json (reset overwrites, add missing and remove deprecated) and remove stale hook files';
+    static description = 'Fix Output scripts in the package.json (reset overwrites, add missing and remove deprecated), ' +
+        'replace the @outputai/output package with @outputai/core and @outputai/cli, and remove stale hook files';
     static examples = [
         '<%= config.bin %> <%= command.id %>'
     ];
@@ -30,6 +31,11 @@ export default class Fix extends Command {
             this.log('\n  Scripts to remove:');
             plan.scriptsToRemove.forEach(({ key }) => this.log(`    ${Ansi.RED}-${Ansi.RESET} "${key}"`));
         }
+        if (plan.dependenciesToRemove.length > 0 || plan.dependenciesToAdd.length > 0) {
+            this.log('\n  Dependencies to replace:');
+            plan.dependenciesToRemove.forEach(({ section, name, version }) => this.log(`    ${Ansi.RED}-${Ansi.RESET} "${name}": "${version}" (${section})`));
+            plan.dependenciesToAdd.forEach(({ section, name, version }) => this.log(`    ${Ansi.GREEN}+${Ansi.RESET} "${name}": "${version}" (${section})`));
+        }
         if (plan.hookFilesToRemove.length > 0) {
             this.log('\n  Hook files to remove:');
             plan.hookFilesToRemove.forEach(file => this.log(`    ${Ansi.RED}-${Ansi.RESET} "${file}"`));
@@ -51,6 +57,9 @@ export default class Fix extends Command {
             }
             applyFix(plan);
             this.log('Done, package.json is properly configured.');
+            if (plan.dependenciesToRemove.length > 0) {
+                this.log('Dependencies changed: run your package manager install to update node_modules and the lockfile.');
+            }
         }
         catch (error) {
             // ExitPromptError means Ctrl+C

package/dist/commands/fix.spec.js

@@ -17,6 +17,8 @@ const basePlan = () => ({
     scriptsToRemove: [{ key: 'dev', value: 'old' }],
     scriptsToAdd: [{ key: 'output:new', value: 'echo new' }],
     scriptsToReplace: [{ key: 'output:dev', before: 'old dev', after: 'output dev' }],
+    dependenciesToRemove: [],
+    dependenciesToAdd: [],
     hookFilesToRemove: []
 });
 describe('fix command', () => {
@@ -71,6 +73,34 @@ describe('fix command', () => {
         expect(cmd.log).toHaveBeenCalledWith('\n  Hook files to remove:');
         expect(cmd.log).toHaveBeenCalledWith(expect.stringContaining('"node_modules/@outputai/credentials/dist/hooks.js"'));
     });
+    it('should list dependencies to replace and hint to reinstall after applying', async () => {
+        vi.mocked(fixService.planFix).mockReturnValue({
+            ...basePlan(),
+            dependenciesToRemove: [{ section: 'dependencies', name: '@outputai/output', version: '^0.15.0' }],
+            dependenciesToAdd: [
+                { section: 'dependencies', name: '@outputai/core', version: '^0.15.0' },
+                { section: 'devDependencies', name: '@outputai/cli', version: '^0.15.0' }
+            ]
+        });
+        vi.mocked(confirm).mockResolvedValue(true);
+        vi.mocked(fixService.applyFix).mockImplementation(() => { });
+        const cmd = createTestCommand();
+        await cmd.run();
+        expect(cmd.log).toHaveBeenCalledWith('\n  Dependencies to replace:');
+        expect(cmd.log).toHaveBeenCalledWith(expect.stringContaining('"@outputai/output": "^0.15.0" (dependencies)'));
+        expect(cmd.log).toHaveBeenCalledWith(expect.stringContaining('"@outputai/core": "^0.15.0" (dependencies)'));
+        expect(cmd.log).toHaveBeenCalledWith(expect.stringContaining('"@outputai/cli": "^0.15.0" (devDependencies)'));
+        expect(cmd.log).toHaveBeenCalledWith('Dependencies changed: run your package manager install to update node_modules and the lockfile.');
+    });
+    it('should not hint to reinstall when dependencies did not change', async () => {
+        vi.mocked(fixService.planFix).mockReturnValue(basePlan());
+        vi.mocked(confirm).mockResolvedValue(true);
+        vi.mocked(fixService.applyFix).mockImplementation(() => { });
+        const cmd = createTestCommand();
+        await cmd.run();
+        expect(cmd.log).not.toHaveBeenCalledWith('\n  Dependencies to replace:');
+        expect(cmd.log).not.toHaveBeenCalledWith(expect.stringContaining('Dependencies changed'));
+    });
     it('should not apply when user declines', async () => {
         vi.mocked(fixService.planFix).mockReturnValue(basePlan());
         vi.mocked(confirm).mockResolvedValue(false);

package/dist/commands/update.js

@@ -103,8 +103,8 @@ export default class Update extends Command {
             if (newLocalVersion) {
                 this.log(`\nLocal install updated to v${newLocalVersion}`);
                 if (isOutdated(newLocalVersion, latest)) {
-                    this.warn(`Your package.json constrains @outputai/output which limits @outputai/cli to v${newLocalVersion}. ` +
-                        'Update the @outputai/output version range in package.json to get the latest CLI.');
+                    this.warn(`Your package.json version range limits @outputai/cli to v${newLocalVersion}. ` +
+                        'Update the range in package.json to get the latest CLI.');
                 }
             }
             else {

package/dist/commands/update.spec.js

@@ -172,7 +172,7 @@ describe('update command', () => {
                 .mockReturnValueOnce(true);
             const cmd = createTestCommand({ cli: true });
             await cmd.run();
-            expect(cmd.warn).toHaveBeenCalledWith(expect.stringContaining('package.json constrains'));
+            expect(cmd.warn).toHaveBeenCalledWith(expect.stringContaining('package.json version range limits'));
         });
     });
 });

package/dist/generated/framework_version.json

@@ -1,3 +1,3 @@
 {
-    "framework": "0.15.1-next.5db73d3.0"
+    "framework": "0.15.1-next.755b932.0"
 }

package/dist/services/cost_calculator.spec.js

@@ -286,41 +286,41 @@ describe('findLLMCalls', () => {
         const items = [
             { group: 'input', label: 'no_cache', amount: 1032, ppm: 0.3, total: 0.0003096, status: 'ok' },
             { group: 'output', label: 'text', amount: 793, ppm: 2.5, total: 0.0019825, status: 'ok' },
-            { group: 'tools', label: 'grounding_prompt', amount: 1, ppm: 35_000, total: 0.035, status: 'ok' }
+            { group: 'tools', label: 'grounding_query', amount: 3, ppm: 14_000, total: 0.042, status: 'ok' }
         ];
         const calls = findLLMCalls({
             kind: 'workflow',
-            children: [llmCostNode('grounded', 'gemini-2.5-flash', items)]
+            children: [llmCostNode('grounded', 'gemini-3.1-flash-lite', items)]
         });
         expect(calls[0].incomplete).toBe(false);
-        expect(calls[0].originalCost).toBeCloseTo(0.0372921, 8);
-        // Grounding bills per request, so it must not inflate token usage.
+        expect(calls[0].originalCost).toBeCloseTo(0.0442921, 8);
+        // Grounding bills per query, so it must not inflate token usage.
         expect(calls[0].usage).toEqual({
             inputTokens: 1032,
             cachedInputTokens: 0,
             outputTokens: 793,
             reasoningTokens: 0
         });
-        expect(calls[0].lines.find(l => l.type === 'tools_grounding_prompt')).toEqual({
-            type: 'tools_grounding_prompt',
-            ppm: 35_000,
-            amount: 1,
-            total: 0.035
+        expect(calls[0].lines.find(l => l.type === 'tools_grounding_query')).toEqual({
+            type: 'tools_grounding_query',
+            ppm: 14_000,
+            amount: 3,
+            total: 0.042
         });
     });
     it('preserves a priced grounding charge as-charged when re-pricing at costs.yml rates', () => {
         const items = [
             { group: 'input', label: 'no_cache', amount: 1032, ppm: 0.3, total: 0.0003096, status: 'ok' },
             { group: 'output', label: 'text', amount: 793, ppm: 2.5, total: 0.0019825, status: 'ok' },
-            { group: 'tools', label: 'grounding_prompt', amount: 1, ppm: 35_000, total: 0.035, status: 'ok' }
+            { group: 'tools', label: 'grounding_query', amount: 3, ppm: 14_000, total: 0.042, status: 'ok' }
         ];
         const config = {
-            models: { 'gemini-2.5-flash': { provider: 'google-vertex', input: 0.3, output: 2.5 } },
+            models: { 'gemini-3.1-flash-lite': { provider: 'google-vertex', input: 0.3, output: 2.5 } },
             services: {}
         };
-        const report = calculateCost({ kind: 'workflow', name: 'w', children: [llmCostNode('grounded', 'gemini-2.5-flash', items)] }, config);
+        const report = calculateCost({ kind: 'workflow', name: 'w', children: [llmCostNode('grounded', 'gemini-3.1-flash-lite', items)] }, config);
         // grounding has no costs.yml line rate, so it degrades to its as-charged total, not $0.
-        expect(report.llmAdjustedCost).toBeCloseTo(0.0372921, 8);
+        expect(report.llmAdjustedCost).toBeCloseTo(0.0442921, 8);
     });
     it('flags an unrated grounding charge as incomplete instead of a silent $0', () => {
         const items = [

package/dist/services/fix_package.d.ts

@@ -1,5 +1,7 @@
 /** Legacy script names from older versions of the project */
 export declare const legacyScripts: readonly ["dev"];
+declare const dependencySections: readonly ["dependencies", "devDependencies"];
+type DependencySection = typeof dependencySections[number];
 export interface ScriptToRemove {
     key: string;
     value: string;
@@ -13,8 +15,14 @@ export interface ScriptToReplace {
     before: string;
     after: string;
 }
+export interface DependencyChange {
+    section: DependencySection;
+    name: string;
+    version: string;
+}
 /**
- * Plan for aligning `scripts` with the scaffold template and dropping stale hook files (reads only; no write until apply).
+ * Plan for aligning `scripts` with the scaffold template, replacing the `@outputai/output` umbrella package
+ * and dropping stale hook files (reads only; no write until apply).
  */
 export interface FixPlan {
     packageJsonPath: string;
@@ -23,6 +31,8 @@ export interface FixPlan {
     scriptsToRemove: ScriptToRemove[];
     scriptsToReplace: ScriptToReplace[];
     scriptsToAdd: ScriptToAdd[];
+    dependenciesToRemove: DependencyChange[];
+    dependenciesToAdd: DependencyChange[];
     hookFilesToRemove: string[];
 }
 /**
@@ -33,3 +43,4 @@ export declare function planFix(projectRoot: string): FixPlan;
  * Writes the planned package.json. No-op when {@link FixPlan.hasChanges} is false.
  */
 export declare function applyFix(plan: FixPlan): void;
+export {};

package/dist/services/fix_package.js

@@ -8,6 +8,13 @@ const templateRelativePath = path.join('templates', 'project', 'package.json.tem
 export const legacyScripts = ['dev'];
 /** Hook files from the @outputai/credentials package, which was folded into @outputai/core */
 const credentialsHookFilePattern = /@outputai[\\/]credentials([\\/]|$)/;
+/** The @outputai/output umbrella package is replaced by its parts: core at runtime, the CLI for development */
+const umbrellaPackage = '@outputai/output';
+const umbrellaReplacements = [
+    { name: '@outputai/core', section: 'dependencies' },
+    { name: '@outputai/cli', section: 'devDependencies' }
+];
+const dependencySections = ['dependencies', 'devDependencies'];
 function getTemplatesPackageJsonPath() {
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);
@@ -46,6 +53,31 @@ function removeCredentialsHookFiles(pkg) {
     section.hookFiles = hookFiles.filter(file => !removed.includes(file));
     return removed;
 }
+function getDependencySection(pkg, section) {
+    const deps = pkg[section];
+    return typeof deps === 'object' && deps !== null && !Array.isArray(deps) ? deps : null;
+}
+function replaceUmbrellaPackage(pkg) {
+    const dependenciesToRemove = [];
+    const dependenciesToAdd = [];
+    const section = dependencySections.find(s => typeof getDependencySection(pkg, s)?.[umbrellaPackage] === 'string');
+    if (!section) {
+        return { dependenciesToRemove, dependenciesToAdd };
+    }
+    const deps = getDependencySection(pkg, section);
+    const version = deps[umbrellaPackage];
+    delete deps[umbrellaPackage];
+    dependenciesToRemove.push({ section, name: umbrellaPackage, version });
+    const isDeclared = (name) => dependencySections.some(s => Object.hasOwn(getDependencySection(pkg, s) ?? {}, name));
+    for (const { name, section: target } of umbrellaReplacements) {
+        if (isDeclared(name)) {
+            continue;
+        }
+        pkg[target] = { ...getDependencySection(pkg, target), [name]: version };
+        dependenciesToAdd.push({ section: target, name, version });
+    }
+    return { dependenciesToRemove, dependenciesToAdd };
+}
 function parseTemplatePackageJson(processed) {
     try {
         return JSON.parse(processed);
@@ -95,6 +127,7 @@ export function planFix(projectRoot) {
         scripts[key] = after;
     }
     pkg.scripts = scripts;
+    const { dependenciesToRemove, dependenciesToAdd } = replaceUmbrellaPackage(pkg);
     const hookFilesToRemove = removeCredentialsHookFiles(pkg);
     const packageJsonUpdatedContent = `${JSON.stringify(pkg, null, 2)}\n`;
     const hasChanges = packageJsonUpdatedContent !== raw;
@@ -105,6 +138,8 @@ export function planFix(projectRoot) {
         scriptsToRemove,
         scriptsToReplace,
         scriptsToAdd,
+        dependenciesToRemove,
+        dependenciesToAdd,
         hookFilesToRemove
     };
 }

package/dist/services/fix_package.spec.js

@@ -84,6 +84,46 @@ describe('fix package', () => {
         expect(malformedPlan.hookFilesToRemove).toEqual([]);
         expect(JSON.parse(malformedPlan.packageJsonUpdatedContent).outputai).toEqual(malformed.outputai);
     });
+    it('should replace @outputai/output in dependencies with core and a cli dev dependency at the same version', async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fix-test-'));
+        const pkg = { name: 'my-proj', dependencies: { '@outputai/output': '^0.15.0', zod: '4.0.0' } };
+        await fs.writeFile(path.join(tmpDir, 'package.json'), JSON.stringify(pkg, null, 2), 'utf-8');
+        const plan = planFix(tmpDir);
+        expect(plan.dependenciesToRemove).toEqual([{ section: 'dependencies', name: '@outputai/output', version: '^0.15.0' }]);
+        expect(plan.dependenciesToAdd).toEqual([
+            { section: 'dependencies', name: '@outputai/core', version: '^0.15.0' },
+            { section: 'devDependencies', name: '@outputai/cli', version: '^0.15.0' }
+        ]);
+        applyFix(plan);
+        const next = JSON.parse(await fs.readFile(path.join(tmpDir, 'package.json'), 'utf-8'));
+        expect(next.dependencies).toEqual({ zod: '4.0.0', '@outputai/core': '^0.15.0' });
+        expect(next.devDependencies).toEqual({ '@outputai/cli': '^0.15.0' });
+    });
+    it('should replace @outputai/output in devDependencies and keep already declared replacements', async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fix-test-'));
+        const pkg = {
+            name: 'my-proj',
+            dependencies: { '@outputai/core': '0.15.0' },
+            devDependencies: { '@outputai/output': '^0.15.0' }
+        };
+        await fs.writeFile(path.join(tmpDir, 'package.json'), JSON.stringify(pkg, null, 2), 'utf-8');
+        const plan = planFix(tmpDir);
+        expect(plan.dependenciesToRemove).toEqual([{ section: 'devDependencies', name: '@outputai/output', version: '^0.15.0' }]);
+        expect(plan.dependenciesToAdd).toEqual([{ section: 'devDependencies', name: '@outputai/cli', version: '^0.15.0' }]);
+        const next = JSON.parse(plan.packageJsonUpdatedContent);
+        expect(next.dependencies).toEqual({ '@outputai/core': '0.15.0' });
+        expect(next.devDependencies).toEqual({ '@outputai/cli': '^0.15.0' });
+    });
+    it('should leave dependencies untouched when @outputai/output is not declared', async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fix-test-'));
+        const pkg = { name: 'my-proj', dependencies: { '@outputai/core': '0.15.0' }, devDependencies: { '@outputai/cli': '0.15.0' } };
+        await fs.writeFile(path.join(tmpDir, 'package.json'), JSON.stringify(pkg, null, 2), 'utf-8');
+        const plan = planFix(tmpDir);
+        expect(plan.dependenciesToRemove).toEqual([]);
+        expect(plan.dependenciesToAdd).toEqual([]);
+        expect(JSON.parse(plan.packageJsonUpdatedContent).dependencies).toEqual(pkg.dependencies);
+        expect(JSON.parse(plan.packageJsonUpdatedContent).devDependencies).toEqual(pkg.devDependencies);
+    });
     it('should throw when package.json is missing', async () => {
         const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fix-test-'));
         expect(() => planFix(tmpDir)).toThrow(/No package\.json found/);

package/dist/templates/project/package.json.template

@@ -16,9 +16,10 @@
   "dependencies": {
     "@ai-sdk/anthropic": "4.0.61",
     "@ai-sdk/openai": "4.0.73",
-    "@outputai/output": "{{frameworkVersion}}"
+    "@outputai/core": "{{frameworkVersion}}"
   },
   "devDependencies": {
+    "@outputai/cli": "{{frameworkVersion}}",
     "@types/node": "24.5.2",
     "nodemon": "3.1.14",
     "typescript": "5.9.3"

package/oclif.manifest.json

@@ -3,7 +3,7 @@
     "fix": {
       "aliases": [],
       "args": {},
-      "description": "Fix Output scripts in the package.json (reset overwrites, add missing and remove deprecated) and remove stale hook files",
+      "description": "Fix Output scripts in the package.json (reset overwrites, add missing and remove deprecated), replace the @outputai/output package with @outputai/core and @outputai/cli, and remove stale hook files",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -1772,5 +1772,5 @@
       ]
     }
   },
-  "version": "0.15.1-next.5db73d3.0"
+  "version": "0.15.1-next.755b932.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/cli",
-  "version": "0.15.1-next.5db73d3.0",
+  "version": "0.15.1-next.755b932.0",
   "description": "CLI for Output.ai workflow generation",
   "type": "module",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "react": "19.3.0",
     "semver": "7.8.5",
     "undici": "8.10.2",
-    "@outputai/core": "0.15.1-next.5db73d3.0"
+    "@outputai/core": "0.15.1-next.755b932.0"
   },
   "devDependencies": {
     "@types/cli-progress": "3.11.6",