@lenne.tech/cli 1.19.0 → 1.20.0

package/build/commands/fullstack/init.js

@@ -8,8 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const hoist_workspace_pnpm_config_1 = require("../../lib/hoist-workspace-pnpm-config");
+const workspace_integration_1 = require("../../lib/workspace-integration");
+const add_api_1 = __importDefault(require("./add-api"));
+const add_app_1 = __importDefault(require("./add-app"));
 /**
  * Create a new fullstack workspace
  */
@@ -58,6 +64,46 @@ const NewCommand = {
             commandConfig: (_y = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _y === void 0 ? void 0 : _y.fullstack,
             config: ltConfig,
         });
+        // ── Auto-detect existing workspace ─────────────────────────────────
+        //
+        // If `lt fullstack init` runs inside a directory that already looks
+        // like a workspace (pnpm-workspace.yaml or projects/) and the user
+        // didn't pass a workspace name, dispatch to the matching incremental
+        // command instead of trying to clone a new lt-monorepo on top of the
+        // existing one. Three branches:
+        //
+        //   - both projects/api and projects/app exist  → nothing to do.
+        //   - only projects/app exists                  → delegate to add-api.
+        //   - only projects/api exists                  → delegate to add-app.
+        //
+        // Users who really want to create a *new* workspace from inside an
+        // existing one bypass detection by supplying `--name <slug>` (or a
+        // positional argument); the slug then becomes the new project dir
+        // and the original detection-skipping path runs normally.
+        const noNameProvided = !cliName && !parameters.first;
+        if (noNameProvided) {
+            const cwdLayout = (0, workspace_integration_1.detectWorkspaceLayout)('.', filesystem);
+            if (cwdLayout.hasWorkspace) {
+                if (cwdLayout.hasApi && cwdLayout.hasApp) {
+                    error('Workspace already has both projects/api and projects/app — nothing to add.');
+                    info('Use `lt fullstack add-api --help-json` or `lt fullstack add-app --help-json` to inspect options.');
+                    return;
+                }
+                if (cwdLayout.hasApp && !cwdLayout.hasApi) {
+                    info('Detected existing workspace with projects/app — delegating to `lt fullstack add-api`.');
+                    // gluegun's `GluegunCommand.run` is typed as
+                    // `void | Promise<any>`. Cast through `unknown` so the await
+                    // is statically meaningful for our async implementations.
+                    return (yield add_api_1.default.run(toolbox));
+                }
+                if (cwdLayout.hasApi && !cwdLayout.hasApp) {
+                    info('Detected existing workspace with projects/api — delegating to `lt fullstack add-app`.');
+                    return (yield add_app_1.default.run(toolbox));
+                }
+                // Workspace dir but neither sub-project present — fall through
+                // to normal init. The user can still pass --name to override.
+            }
+        }
         // Get name of the workspace
         const name = cliName ||
             (yield helper.getInput(parameters.first, {

package/build/commands/server/create.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const workspace_integration_1 = require("../../lib/workspace-integration");
 /**
  * Create a new server
  */
@@ -42,6 +43,19 @@ const NewCommand = {
                 { description: 'Git branch to clone from', flag: '--branch', required: false, type: 'string' },
                 { description: 'Copy from local path instead of cloning', flag: '--copy', required: false, type: 'string' },
                 { description: 'Symlink to local path instead of cloning', flag: '--link', required: false, type: 'string' },
+                {
+                    description: 'Backend framework consumption mode',
+                    flag: '--framework-mode',
+                    required: false,
+                    type: 'string',
+                    values: ['npm', 'vendor'],
+                },
+                {
+                    description: 'Upstream nest-server branch/tag to vendor (with --framework-mode vendor)',
+                    flag: '--framework-upstream-branch',
+                    required: false,
+                    type: 'string',
+                },
                 {
                     default: false,
                     description: 'Use experimental nest-base template (Bun + Prisma + Postgres)',
@@ -49,6 +63,20 @@ const NewCommand = {
                     required: false,
                     type: 'boolean',
                 },
+                {
+                    default: false,
+                    description: 'Print resolved plan and exit without making any changes',
+                    flag: '--dry-run',
+                    required: false,
+                    type: 'boolean',
+                },
+                {
+                    default: false,
+                    description: 'Override the workspace-detection abort under --noConfirm',
+                    flag: '--force',
+                    required: false,
+                    type: 'boolean',
+                },
                 {
                     default: false,
                     description: 'Skip all interactive prompts',
@@ -84,7 +112,11 @@ const NewCommand = {
         const cliApiMode = parameters.options['api-mode'] || parameters.options.apiMode;
         const cliFrameworkMode = parameters.options['framework-mode'];
         const cliFrameworkUpstreamBranch = parameters.options['framework-upstream-branch'];
+        const cliDryRun = parameters.options['dry-run'];
+        const cliForce = parameters.options.force;
         const experimental = parameters.options.next === true || parameters.options.next === 'true';
+        const dryRun = cliDryRun === true || cliDryRun === 'true';
+        const force = cliForce === true || cliForce === 'true';
         // Determine noConfirm with priority: CLI > config > global > default (false)
         const noConfirm = config.getNoConfirm({
             cliValue: cliNoConfirm,
@@ -96,16 +128,41 @@ const NewCommand = {
         // Info
         info('Create a new server');
         // Hint for non-interactive callers (e.g. Claude Code)
-        toolbox.tools.nonInteractiveHint('lt server create --name <name> --api-mode <Rest|GraphQL|Both> [--next] --noConfirm');
+        toolbox.tools.nonInteractiveHint('lt server create --name <name> --api-mode <Rest|GraphQL|Both> --framework-mode <npm|vendor> [--next] [--dry-run] --noConfirm');
         // Check git
         if (!(yield git.gitInstalled())) {
             return;
         }
-        // Get name
-        const name = yield helper.getInput(parameters.first, {
-            name: 'server name',
-            showError: true,
+        // Workspace-awareness: bundled into runStandaloneWorkspaceGate so
+        // server/frontend commands share the print + prompt + decision +
+        // exit logic. Three modes:
+        //   - interactive             → confirm prompt
+        //   - non-interactive         → refuse (KI/CI default — fail loud)
+        //   - non-interactive + force → proceed with a hint
+        const proceed = yield (0, workspace_integration_1.runStandaloneWorkspaceGate)({
+            cwd: '.',
+            filesystem,
+            force,
+            fromGluegunMenu: Boolean(toolbox.parameters.options.fromGluegunMenu),
+            noConfirmFlag: noConfirm,
+            pieceName: 'api',
+            print: { confirm, error, info },
+            projectKind: 'server',
+            suggestion: 'lt fullstack add-api',
         });
+        if (!proceed)
+            return;
+        // Get name. Honour the explicit `--name <slug>` flag (declared as
+        // required in the help-json contract) before falling back to the
+        // first positional argument or interactive input. Without this, a
+        // non-interactive caller passing only `--name my-srv` is forced
+        // into the prompt because `parameters.first` is empty.
+        const cliName = parameters.options.name;
+        const name = cliName ||
+            (yield helper.getInput(parameters.first, {
+                name: 'server name',
+                showError: true,
+            }));
         if (!name) {
             return;
         }
@@ -122,7 +179,10 @@ const NewCommand = {
         const linkPath = cliLink || configLink;
         // Determine branch with priority: CLI > config
         const branch = cliBranch || configBranch;
-        // Determine description with priority: CLI > config > interactive
+        // Determine description with priority: CLI > config > interactive.
+        // Skip the interactive prompt under --noConfirm; description is
+        // optional and defaulting to the project name keeps the package.json
+        // valid for non-interactive callers.
         let description;
         if (cliDescription) {
             description = cliDescription;
@@ -131,13 +191,17 @@ const NewCommand = {
             description = configDescription.replace('{name}', name);
             info(`Using description from lt.config: ${description}`);
         }
+        else if (noConfirm) {
+            description = '';
+        }
         else {
             description = yield helper.getInput(parameters.second, {
                 name: 'Description',
                 showError: false,
             });
         }
-        // Determine author with priority: CLI > config > global > interactive
+        // Determine author with priority: CLI > config > global > interactive.
+        // Skip the prompt under --noConfirm.
         let author;
         if (cliAuthor) {
             author = cliAuthor;
@@ -150,6 +214,9 @@ const NewCommand = {
             author = globalAuthor;
             info(`Using author from lt.config defaults: ${author}`);
         }
+        else if (noConfirm) {
+            author = '';
+        }
         else {
             author = yield helper.getInput('', {
                 name: 'Author',
@@ -229,6 +296,50 @@ const NewCommand = {
         const frameworkUpstreamBranch = typeof cliFrameworkUpstreamBranch === 'string' && cliFrameworkUpstreamBranch.length > 0
             ? cliFrameworkUpstreamBranch
             : undefined;
+        // Dry-run: print the resolved plan and exit without any disk
+        // changes. Mirrors the dry-run surface of `lt fullstack init` /
+        // `add-api` / `add-app` so agent workflows can preview the
+        // standalone path the same way.
+        if (dryRun) {
+            info('');
+            info('Dry-run plan:');
+            info(`  name:                       ${name}`);
+            info(`  projectDir:                 ${projectDir}`);
+            info(`  apiMode:                    ${apiMode}`);
+            info(`  frameworkMode:              ${frameworkMode}`);
+            if (frameworkUpstreamBranch) {
+                info(`  frameworkUpstreamBranch:    ${frameworkUpstreamBranch}`);
+            }
+            info(`  branch:                     ${branch || '(default)'}`);
+            info(`  copy:                       ${copyPath || '(none)'}`);
+            info(`  link:                       ${linkPath || '(none)'}`);
+            info(`  experimental (--next):      ${experimental}`);
+            info(`  description:                ${description || '(none)'}`);
+            info(`  author:                     ${author || '(none)'}`);
+            info('');
+            info('Would execute:');
+            if (experimental) {
+                info(`  1. clone nest-base → ./${projectDir}`);
+                info(`  2. patch package.json (name = ${projectDir})`);
+            }
+            else if (frameworkMode === 'vendor') {
+                info(`  1. clone nest-server-starter → ./${projectDir}`);
+                info(`  2. clone @lenne.tech/nest-server${frameworkUpstreamBranch ? ` (${frameworkUpstreamBranch})` : ''} → /tmp`);
+                info(`  3. vendor core/ + flatten-fix + codemod consumer imports`);
+                info(`  4. merge upstream deps`);
+                info(`  5. run processApiMode(${apiMode})`);
+            }
+            else {
+                info(`  1. clone nest-server-starter → ./${projectDir}`);
+                info(`  2. run processApiMode(${apiMode})`);
+            }
+            info(`  N. write ./${projectDir}/lt.config.json`);
+            info('');
+            if (!toolbox.parameters.options.fromGluegunMenu) {
+                process.exit();
+            }
+            return `dry-run server create (${frameworkMode} / ${apiMode})`;
+        }
         // Setup server using Server extension
         const setupSpinner = spin(`Setting up server${linkPath ? ' (link)' : copyPath ? ' (copy)' : branch ? ` (branch: ${branch})` : ''}`);
         const result = yield server.setupServer(`./${projectDir}`, {

package/build/commands/status.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const framework_detection_1 = require("../lib/framework-detection");
 const frontend_framework_detection_1 = require("../lib/frontend-framework-detection");
+const workspace_integration_1 = require("../lib/workspace-integration");
 /**
  * Show project status and context
  */
@@ -42,6 +43,18 @@ const StatusCommand = {
             packageName: null,
             packageVersion: null,
             projectType: 'unknown',
+            // Probe layout at the workspace root if cwd is inside a
+            // sub-project; otherwise probe at cwd. Without this, status
+            // shown from `projects/api/src/` would report both halves
+            // missing because there's no `projects/` underneath cwd.
+            workspaceLayout: (() => {
+                const ctx = (0, workspace_integration_1.detectSubProjectContext)(cwd, filesystem);
+                return (0, workspace_integration_1.detectWorkspaceLayout)(ctx ? ctx.workspaceRoot : cwd, filesystem);
+            })(),
+            workspaceSubProject: (() => {
+                const ctx = (0, workspace_integration_1.detectSubProjectContext)(cwd, filesystem);
+                return ctx ? { kind: ctx.kind, root: ctx.workspaceRoot } : null;
+            })(),
         };
         // Check for lt.config
         const ltConfigFiles = ['lt.config.json', 'lt.config.yaml', 'lt.config'];
@@ -192,6 +205,35 @@ const StatusCommand = {
                 info(`  Frontend Framework: ${frontendModeLabel}`);
             }
         }
+        // Workspace overview — surfaces the layout that drives the
+        // `add-api` / `add-app` / standalone gate decisions. Shown
+        // whenever we're inside a workspace OR a sub-project of one,
+        // so users immediately see what's missing and where the
+        // workspace root is.
+        if (projectInfo.workspaceLayout.hasWorkspace || projectInfo.workspaceSubProject) {
+            info('');
+            info(colors.bold('Workspace:'));
+            if (projectInfo.workspaceSubProject) {
+                const { kind, root } = projectInfo.workspaceSubProject;
+                warning(`  You are inside projects/${kind}/ of a workspace.`);
+                info(`  Root:     ${root}`);
+                info(colors.dim(`  Hint: cd to the workspace root for \`lt fullstack add-${kind === 'api' ? 'app' : 'api'}\``));
+            }
+            else {
+                success('  Detected (pnpm-workspace.yaml, package.json#workspaces, or projects/)');
+            }
+            const apiMark = projectInfo.workspaceLayout.hasApi ? colors.green('✓') : colors.yellow('✗');
+            const appMark = projectInfo.workspaceLayout.hasApp ? colors.green('✓') : colors.yellow('✗');
+            info(`  ${apiMark} projects/api/`);
+            info(`  ${appMark} projects/app/`);
+            // Suggest the next step when only one half is present.
+            if (projectInfo.workspaceLayout.hasApp && !projectInfo.workspaceLayout.hasApi) {
+                info(colors.dim('  Hint: `lt fullstack add-api` to integrate a NestJS server.'));
+            }
+            else if (projectInfo.workspaceLayout.hasApi && !projectInfo.workspaceLayout.hasApp) {
+                info(colors.dim('  Hint: `lt fullstack add-app` to integrate a Nuxt or Angular app.'));
+            }
+        }
         // Show monorepo subprojects if we detected any (typically at monorepo root)
         if (projectInfo.monorepoSubprojects.length > 0) {
             info('');

package/build/commands/tools/ocr.js

@@ -30,8 +30,13 @@ const NewCommand = {
     description: 'OCR PDFs to Markdown via marker-pdf (MPS-accelerated on Apple Silicon)',
     hidden: false,
     name: 'ocr',
-    run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
+    // GluegunCommand types `run` against the base `Toolbox`, but the lt CLI
+    // augments it with `helper`, `git`, etc. Cast inside so the implementation
+    // remains typed against the project-specific `ExtendedGluegunToolbox` while
+    // satisfying the upstream `(toolbox: Toolbox) => void` signature.
+    run: (rawToolbox) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
+        const toolbox = rawToolbox;
         const { parameters, print: { error, info, spin, warning }, } = toolbox;
         const showStatus = !!parameters.options.status;
         const installOnly = !!parameters.options.install;