ucode-agent 1.43.0 → 1.45.0

package/src/tools/index.js

@@ -16,7 +16,7 @@ import { createApp, TEMPLATE_NAMES, TEMPLATE_NOTES } from './scaffold.js';
 import { deploy } from './deploy.js';
 import { clip, READ_LINES } from './shared.js';
 
-export { setRoot, setConfirm, getRoot } from './shared.js';
+export { setRoot, setConfirm, setRequest, getRoot } from './shared.js';
 
 const str = (description) => ({ type: 'string', description });
 const int = (description) => ({ type: 'integer', description });
@@ -85,17 +85,21 @@ export const tools = [
       'Start a new app AND write it, in one call. Pass "files" with the whole app and this ' +
       'is the only call the build needs: the starter lands, your files are written over it, ' +
       'and the result comes back with everything. Two starters. "plain-html" (the default): ' +
-      'one index.html, one stylesheet, one ES module — nothing to install, nothing to build, ' +
-      'and the stylesheet is a design system already: a palette, a spacing scale, radii, ' +
-      'motion timings, focus rings and a breakpoint. Re-tint those tokens to suit the app ' +
-      'and compose every rule from them. Replacing it with raw pixel values is what an ' +
+      'one index.html, one stylesheet, one ES module — nothing to install, nothing to build, ' +
+      'and the stylesheet is a design system already: a palette, a spacing scale, radii, ' +
+      'motion timings, focus rings and a breakpoint. Re-tint those tokens to suit the app ' +
+      'and compose every rule from them. Replacing it with raw pixel values is what an ' +
       'undesigned page is made of. ' +
       'opens straight in a browser, and its three files come back inside this result so there ' +
       'is never a reason to read them. Use it for anything that is one page: a tasks app, a ' +
       'toy, a game, a visualisation, a calculator, a timer. "next-shadcn": Next.js 16, ' +
       'TypeScript, Tailwind 4 and shadcn with 33 components — only when the app genuinely ' +
       'needs routes, a database or many screens, because it costs an install and a build. ' +
-      'This is how every Next.js app begins - never run create-next-app or shadcn init.',
+      'This is how every Next.js app begins - never run create-next-app or shadcn init. ' +
+      'In "next-shadcn" every path in "files" goes under src/: a page is a route only at ' +
+      '<app>/src/app/page.tsx or <app>/src/app/<segment>/page.tsx, an API handler only at ' +
+      '<app>/src/app/api/<name>/route.ts, and components at <app>/src/components/<feature>/. ' +
+      'A page.tsx written anywhere else is an ordinary file the router never serves.',
     parameters: {
       type: 'object',
       properties: {
@@ -120,7 +124,10 @@ export const tools = [
         },
         template: {
           type: 'string',
-          enum: ['next-shadcn', 'plain-html'],
+          // The default goes first: a model picking from an enum reaches for
+          // the head of the list, and the head of this one used to be the
+          // starter that costs an install and a build.
+          enum: ['plain-html', 'next-shadcn'],
           description:
             'Which starter. "plain-html" (the default) for one page, a toy, a game, or any ' +
             'app that does not need a server: no install, no build, nothing to wait for. ' +

package/src/tools/scaffold.js

@@ -14,7 +14,7 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { ToolFailure } from '../core/failure.js';
-import { resolveIn, guard, result } from './shared.js';
+import { resolveIn, guard, result, askedForPlainHtml } from './shared.js';
 import { batchWrite } from './files.js';
 import { packageJsonWritten, installIn } from './shell.js';
 import { restore, populate } from './cache.js';
@@ -173,6 +173,60 @@ async function unprefixOwnFolder(appDir, written) {
   return fixed;
 }
 
+/**
+ * Files that legitimately sit at the root of a Next.js project.
+ *
+ * Everything else a model writes there is app code that has missed src/.
+ */
+const NEXT_ROOT = /^(?:package(?:-lock)?\.json|next\.config\.[mc]?[jt]s|tsconfig\.json|postcss\.config\.[mc]?js|eslint\.config\.[mc]?js|components\.json|README\.md|TEMPLATE\.md|\.gitignore|next-env\.d\.ts)$/i;
+
+/**
+ * Put Next.js files where Next.js looks for them.
+ *
+ * Routing is folder-based and unforgiving: a page is a route only at
+ * src/app/<segment>/page.tsx. A traced build wrote page.tsx at the project
+ * root and api/expenses/route.ts beside it — the build passed, every route
+ * 404ed, and nothing said why.
+ *
+ * The guide has the tree in it, and the guide cannot help: it comes back
+ * inside the create_app result, and the model chooses these paths in the call
+ * that produces that result. It is reading the map after it has parked. So the
+ * paths are corrected on the way in, and the result says what moved and why,
+ * which is the copy that arrives in time to matter for the next file.
+ *
+ * Only for next-shadcn, only for files under the app folder, and never for the
+ * config files that genuinely belong at the root.
+ */
+function placeForNext(files, folder) {
+  const moved = [];
+
+  const out = files.map((f) => {
+    const rel = String(f.path ?? '').split('\\').join('/');
+    const prefix = `${folder}/`;
+    if (!rel.startsWith(prefix)) return f;
+
+    const inside = rel.slice(prefix.length);
+    if (!inside || inside.startsWith('src/') || inside.startsWith('public/')) return f;
+    if (NEXT_ROOT.test(inside)) return f;
+
+    // app/... is the right tree written one level too high; everything else
+    // that is app code belongs under src/ as it stands.
+    const under = inside.startsWith('app/') ? `src/${inside}` : `src/app/${inside}`;
+    const isRoute = /(?:^|\/)(?:page|layout|loading|error|not-found)\.[jt]sx?$/.test(inside)
+      || /(?:^|\/)route\.[jt]s$/.test(inside);
+    const isCode = /^(?:components|lib|hooks|styles|utils)\//.test(inside);
+
+    if (!isRoute && !isCode) return f;
+    const to = isCode ? `${prefix}src/${inside}` : `${prefix}${under}`;
+    if (to === rel) return f;
+
+    moved.push(`${inside} -> ${to.slice(prefix.length)}`);
+    return { ...f, path: to };
+  });
+
+  return { files: out, moved };
+}
+
 async function keepDesignTokens(appDir, template, written, starterCss) {
   const rel = TOKEN_FILE[template];
   if (!rel || !starterCss) return null;
@@ -286,6 +340,16 @@ export async function createApp({ folder, name, description, template = 'plain-h
     });
   }
 
+  // The user said no framework. A starter that costs an npm install and a
+  // build is then not a judgement call the model gets to make on their behalf
+  // — it is the one thing they ruled out, and the cost of getting it wrong is
+  // minutes of their time plus a rebuild from nothing.
+  let overrode = false;
+  if (template === 'next-shadcn' && askedForPlainHtml()) {
+    template = 'plain-html';
+    overrode = true;
+  }
+
   const target = resolveIn(folder, 'create_app', 'folder');
   const attempted = `creating an app in ${target.show}`;
   if (target.show === '.') {
@@ -366,7 +430,9 @@ export async function createApp({ folder, name, description, template = 'plain-h
 
   // The app's own files, written in this same call. Two round trips become
   // one, and round trips are nearly all of the time a build takes.
-  const mine = given;
+  // Next.js only: paths that have missed src/ are corrected before they land.
+  const placed = template === 'next-shadcn' ? placeForNext(given, path.basename(target.abs)) : { files: given, moved: [] };
+  const mine = placed.files;
   const wrote = mine.length ? await batchWrite({ files: mine }) : null;
   const written = new Set(mine.map((f) => resolveIn(f.path, 'create_app', 'files').abs));
   const keptTokens = await keepDesignTokens(target.abs, template, written, starterCss);
@@ -384,9 +450,21 @@ export async function createApp({ folder, name, description, template = 'plain-h
   }
 
   const out = result(
-    `Created ${target.show} from the ${template} starter — ${copied.length} files, already known to build.\n` +
+    (overrode
+      ? 'You asked for next-shadcn, but the request said plain HTML and no framework, so ' +
+        'this is the plain-html starter instead: three files, no install, no build. Write ' +
+        'the app in them.\n'
+      : '') +
+      `Created ${target.show} from the ${template} starter — ${copied.length} files, already known to build.\n` +
       (look ? `Design: the ${look.name} preset (${look.summary}), font ${look.fonts?.sans ?? 'Geist'}.\n` : '') +
       (wrote ? `\nYour ${mine.length} file${mine.length === 1 ? '' : 's'}:\n${wrote.content}\n` : '') +
+      (placed.moved.length
+        ? `\nMoved into place: ${placed.moved.join(', ')}. In Next.js a page is only a route at `
+          + 'src/app/<segment>/page.tsx, an API handler only at src/app/api/<name>/route.ts, and '
+          + 'components and libraries live under src/. A file written outside src/ builds fine and '
+          + 'is never served, which is the hardest kind of wrong to notice. Write the rest there '
+          + 'directly.\n'
+        : '') +
       (relinked.length
         ? `\nFixed in ${relinked.join(', ')}: links that began with "${path.basename(target.abs)}/". ` +
           'Paths in "files" are relative to the project root, but a link inside a page is ' +