@lenne.tech/cli 1.23.0 → 1.24.1

package/build/commands/fullstack/add-api.js

@@ -301,6 +301,18 @@ const NewCommand = {
             else {
                 renameSpinner.succeed(`Renamed nest-base → ${projectDir} in projects/api`);
             }
+            // Flip .claude/upstream.json from the template-self default to the
+            // downstream shape so `/upstream-pr` can contribute core fixes back
+            // to nest-base. Independent of the rename above — run it even if
+            // the rename failed. Non-fatal when the file is absent.
+            const upstreamResult = (0, workspace_integration_1.reconfigureUpstreamForDownstream)({
+                apiDir: apiDest,
+                filesystem,
+                upstreamBranch: apiBranch,
+            });
+            if (upstreamResult.updated) {
+                info('Configured .claude/upstream.json for downstream contributions');
+            }
         }
         // Persist apiMode + frameworkMode for downstream generators.
         if (apiResult.method !== 'link') {

package/build/commands/fullstack/init.js

@@ -559,6 +559,18 @@ const NewCommand = {
                 catch (err) {
                     renameSpinner.warn(`Auto-rename failed (${err.message}). Run \`bun run rename ${projectDir}\` manually inside projects/api.`);
                 }
+                // Flip .claude/upstream.json from the template-self default to the
+                // downstream shape so `/upstream-pr` can contribute core fixes back
+                // to nest-base. Independent of the rename above — run it even if the
+                // rename failed. Non-fatal when the file is absent.
+                const upstreamResult = (0, workspace_integration_1.reconfigureUpstreamForDownstream)({
+                    apiDir: apiDest,
+                    filesystem,
+                    upstreamBranch: apiBranch,
+                });
+                if (upstreamResult.updated) {
+                    info('Configured .claude/upstream.json for downstream contributions');
+                }
             }
             // Create lt.config.json for API
             // Note: frameworkMode is persisted under meta so that subsequent `lt

package/build/commands/server/create.js

@@ -376,9 +376,25 @@ const NewCommand = {
             }
             return `created server symlink ${name}`;
         }
-        // Git initialization (after npm install which is done in setupServer)
+        // For the experimental nest-base template, flip .claude/upstream.json
+        // from the template-self default to the downstream shape so
+        // `/upstream-pr` can contribute core fixes back to nest-base. The
+        // standalone clone lands directly at `projectDir`. Non-fatal when the
+        // file is absent (older templates).
+        if (experimental) {
+            const upstreamResult = (0, workspace_integration_1.reconfigureUpstreamForDownstream)({
+                apiDir: projectDir,
+                filesystem,
+                upstreamBranch: branch,
+            });
+            if (upstreamResult.updated) {
+                info('Configured .claude/upstream.json for downstream contributions');
+            }
+        }
+        // Git initialization (after npm install which is done in setupServer).
+        // When cwd is not inside a repo, `git rev-parse` exits 128 — treat as false.
         if (git) {
-            const inGit = (_2 = (yield system.run('git rev-parse --is-inside-work-tree'))) === null || _2 === void 0 ? void 0 : _2.trim();
+            const inGit = (_2 = (yield system.run('git rev-parse --is-inside-work-tree 2>/dev/null || echo false'))) === null || _2 === void 0 ? void 0 : _2.trim();
             if (inGit !== 'true') {
                 // Determine initGit with priority: CLI > config > interactive
                 let initializeGit;

package/build/lib/workspace-integration.js

@@ -40,6 +40,7 @@ exports.detectSubProjectContext = detectSubProjectContext;
 exports.detectWorkspaceLayout = detectWorkspaceLayout;
 exports.findWorkspaceRoot = findWorkspaceRoot;
 exports.isNonInteractive = isNonInteractive;
+exports.reconfigureUpstreamForDownstream = reconfigureUpstreamForDownstream;
 exports.runExperimentalNestBaseRename = runExperimentalNestBaseRename;
 exports.runStandaloneWorkspaceGate = runStandaloneWorkspaceGate;
 exports.shouldProceedAsStandalone = shouldProceedAsStandalone;
@@ -140,6 +141,60 @@ function isNonInteractive(noConfirmFlag) {
     // process.stdin may be undefined in some test runners — guard.
     return Boolean(process.stdin && process.stdin.isTTY === false);
 }
+/**
+ * Reconfigure the cloned nest-base template's `.claude/upstream.json`
+ * into its downstream shape.
+ *
+ * WHY: nest-base ships `.claude/upstream.json` with `isTemplate: true`
+ * and `upstream: null` — the template-self default. The `/upstream-pr`
+ * slash command and the `contributing-upstream` skill key off
+ * `isTemplate` and refuse to open upstream PRs when it is still `true`
+ * ("this repo IS the template"). The template's own notes document a
+ * manual post-fork step (flip `isTemplate` to false, fill `upstream`)
+ * that humans and agents both forget. The `bun run rename` step only
+ * rewrites four files and never touches this one, so without this
+ * helper every scaffolded project keeps `isTemplate: true` and can
+ * never contribute core fixes back to nest-base.
+ *
+ * Behaviour:
+ *   - Missing file (or unparseable JSON) → `{ updated: false }`, no
+ *     throw. Older templates may not ship the file at all; that is not
+ *     an error, just nothing to do.
+ *   - Otherwise sets `isTemplate = false` and
+ *     `upstream = { repo, branch }`, preserving `$schema` and
+ *     `syncedPaths` exactly as the template defined them.
+ *
+ * Idempotent: running twice yields identical output.
+ */
+function reconfigureUpstreamForDownstream(options) {
+    const { apiDir, filesystem, upstreamBranch, upstreamRepo } = options;
+    const upstreamPath = filesystem.path(apiDir, '.claude', 'upstream.json');
+    // Non-fatal when absent — older templates may not ship the file.
+    if (filesystem.exists(upstreamPath) !== 'file') {
+        return { updated: false };
+    }
+    const current = filesystem.read(upstreamPath, 'json');
+    if (!current) {
+        // Unparseable / empty JSON — leave it untouched rather than risk
+        // clobbering hand-edited content with a guessed shape.
+        return { updated: false };
+    }
+    const next = Object.assign(Object.assign({}, current), { 
+        // The whole point of the fix: this is a fork, not the template.
+        isTemplate: false, 
+        // Replace the template-self notes (no longer applicable) with a
+        // short downstream-appropriate marker. Kept as a fixed array so the
+        // operation is idempotent.
+        notes: [
+            'Downstream project forked from the nest-base template.',
+            'Core fixes flow back upstream via the /upstream-pr command.',
+        ], upstream: {
+            branch: upstreamBranch !== null && upstreamBranch !== void 0 ? upstreamBranch : 'main',
+            repo: upstreamRepo !== null && upstreamRepo !== void 0 ? upstreamRepo : 'lenneTech/nest-base',
+        } });
+    filesystem.write(upstreamPath, next, { jsonIndent: 2 });
+    return { updated: true };
+}
 /**
  * Run the experimental `bun run rename <projectDir>` step. Only relevant
  * for the `--next` nest-base template (it ships hard-coded `nest-base`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/cli",
-  "version": "1.23.0",
+  "version": "1.24.1",
   "description": "lenne.Tech CLI: lt",
   "keywords": [
     "lenne.Tech",