@agent-native/core 0.121.2 → 0.122.1

package/dist/cli/create.js

@@ -497,7 +497,7 @@ async function scaffoldOneAppIntoWorkspace(workspace, appName, templateName, cla
     const s = clack.spinner();
     s.start(`Working... no action needed. Scaffolding apps/${appName} from ${templateName}.`);
     try {
-        await scaffoldAppTemplate(appDir, templateName);
+        const resolution = await scaffoldAppTemplate(appDir, templateName);
         replacePlaceholders(appDir, appName, appTitleForScaffold(appName), path.basename(workspace.workspaceRoot));
         rewriteTrackingAppId(appDir, appName, templateName);
         workspacifyApp({
@@ -510,7 +510,10 @@ async function scaffoldOneAppIntoWorkspace(workspace, appName, templateName, cla
             dispatchDependencyVersion: getDispatchDependencyVersion(),
             toolkitDependencyVersion: getToolkitDependencyVersion(),
         });
-        fixPackageJsonName(appDir, appName, templateName);
+        fixPackageJsonName(appDir, appName, templateName, {
+            ...resolution,
+            shape: "workspace",
+        });
         fixWebManifestName(appDir, appName, templateName);
         rewriteNetlifyToml(appDir, appName, "workspace");
         renameGitignore(appDir);
@@ -576,9 +579,9 @@ async function createStandaloneApp(name, opts, clack) {
         ? "Scaffolding the headless agent app..."
         : `Downloading the ${template} template from GitHub...`);
     try {
-        await scaffoldAppTemplate(targetDir, template);
+        const resolution = await scaffoldAppTemplate(targetDir, template);
         s.message(`Setting up ${name}…`);
-        postProcessStandalone(name, targetDir, template);
+        postProcessStandalone(name, targetDir, template, resolution);
         s.stop("App created!");
     }
     catch (err) {
@@ -620,9 +623,6 @@ function cleanupOnFailure(targetDir) {
         // Ignore — original error is more useful than a cleanup failure.
     }
 }
-/* ─────────────────────────────────────────────────────────────────────────
- * Shared scaffolding helpers
- * ───────────────────────────────────────────────────────────────────────── */
 /**
  * Scaffold a single app template into `targetDir`. Resolves:
  *   - "headless" / legacy "blank" → bundled action-first template
@@ -641,12 +641,15 @@ async function scaffoldAppTemplate(targetDir, template) {
             throw new Error(`Headless template not found at ${headlessDir}. Is the package installed correctly?`);
         }
         copyDir(headlessDir, targetDir);
-        return;
+        return {
+            templateSource: "bundled",
+            templateRef: getGitHubTemplateRefCandidates()[0],
+        };
     }
     if (resolved.startsWith("github:")) {
         const repo = resolved.slice("github:".length);
         await downloadGitHubRepo(repo, targetDir);
-        return;
+        return {};
     }
     if (!getTemplate(resolved)) {
         throw new Error(`Unknown template "${template}". Known: ${allTemplateNames().join(", ")} — or use github:user/repo for community templates.`);
@@ -658,10 +661,22 @@ async function scaffoldAppTemplate(targetDir, template) {
     const localTemplate = findLocalTemplate(sourceTemplate);
     if (localTemplate) {
         copyDir(localTemplate, targetDir);
+        return {
+            templateSource: localTemplateSourceKind(localTemplate),
+            templateRef: getGitHubTemplateRefCandidates()[0],
+        };
     }
-    else {
-        await downloadGitHubSubdir(REPO, `${TEMPLATES_DIR}/${sourceTemplate}`, targetDir);
-    }
+    const templateRef = await downloadGitHubSubdir(REPO, `${TEMPLATES_DIR}/${sourceTemplate}`, targetDir);
+    return { templateSource: "github", templateRef };
+}
+/** A template dir inside the installed core package ships with the CLI;
+ *  anything above it belongs to a framework checkout. */
+function localTemplateSourceKind(localTemplate) {
+    const packageRoot = path.resolve(__dirname, "../..");
+    const rel = path.relative(packageRoot, path.resolve(localTemplate));
+    return rel && !rel.startsWith("..") && !path.isAbsolute(rel)
+        ? "bundled"
+        : "local-checkout";
 }
 function templateSourceName(name) {
     if (name === "starter")
@@ -800,6 +815,15 @@ async function scaffoldRequiredPackages(templateNames, workspaceRoot) {
                         }
                     }
                 }
+                // These packages' `exports` maps point at `./dist/*`, and `dist/` is
+                // gitignored (never committed), so a scaffolded workspace must build
+                // it on install. pnpm always runs `prepare` for workspace packages,
+                // unlike `postinstall`, so this is the reliable hook.
+                if (pkg.scripts &&
+                    typeof pkg.scripts.build === "string" &&
+                    !pkg.scripts.prepare) {
+                    pkg.scripts.prepare = "npm run build";
+                }
                 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkg, null, 2) + "\n");
             }
             catch { }
@@ -836,12 +860,15 @@ async function scaffoldRequiredPackages(templateNames, workspaceRoot) {
  * Post-process a standalone scaffold: replace placeholders, strip
  * workspace:* deps, set up agent symlinks, etc.
  */
-function postProcessStandalone(name, targetDir, templateName) {
+function postProcessStandalone(name, targetDir, templateName, resolution) {
     const appTitle = appTitleForScaffold(name);
     replacePlaceholders(targetDir, name, appTitle);
     rewriteTrackingAppId(targetDir, name, templateName);
     rewriteAgentChatAppId(targetDir, name, templateName);
-    fixPackageJsonName(targetDir, name, templateName);
+    fixPackageJsonName(targetDir, name, templateName, {
+        ...resolution,
+        shape: "standalone",
+    });
     fixWebManifestName(targetDir, name, templateName);
     rewriteNetlifyToml(targetDir, name, "standalone");
     for (const base of ["learnings"]) {
@@ -1126,7 +1153,7 @@ export function detectWorkspace(startDir) {
 }
 export { parseWorkspaceScope };
 /** @internal — exported for E2E tests */
-export { scaffoldWorkspaceRoot as _scaffoldWorkspaceRoot, scaffoldAppTemplate as _scaffoldAppTemplate, scaffoldRequiredPackages as _scaffoldRequiredPackages, postProcessStandalone as _postProcessStandalone, loadCatalog as _loadCatalog, fixPackageJsonName as _fixPackageJsonName, renameGitignore as _renameGitignore, rewriteNetlifyToml as _rewriteNetlifyToml, getCoreDependencyVersion as _getCoreDependencyVersion, getDispatchDependencyVersion as _getDispatchDependencyVersion, getToolkitDependencyVersion as _getToolkitDependencyVersion, getCorePackageVersion as _getCorePackageVersion, getGitHubTemplateRef as _getGitHubTemplateRef, getGitHubTemplateRefCandidates as _getGitHubTemplateRefCandidates, githubTarballUrl as _githubTarballUrl, findLocalTemplateFrom as _findLocalTemplateFrom, workspaceAppNameForTemplateSelection as _workspaceAppNameForTemplateSelection, startShapePromptOptions as _startShapePromptOptions, shouldSkipScaffoldEntry as _shouldSkipScaffoldEntry, tarExtractArgs as _tarExtractArgs, };
+export { scaffoldWorkspaceRoot as _scaffoldWorkspaceRoot, scaffoldAppTemplate as _scaffoldAppTemplate, scaffoldRequiredPackages as _scaffoldRequiredPackages, postProcessStandalone as _postProcessStandalone, loadCatalog as _loadCatalog, fixPackageJsonName as _fixPackageJsonName, renameGitignore as _renameGitignore, rewriteNetlifyToml as _rewriteNetlifyToml, getCoreDependencyVersion as _getCoreDependencyVersion, getDispatchDependencyVersion as _getDispatchDependencyVersion, getToolkitDependencyVersion as _getToolkitDependencyVersion, getCorePackageVersion as _getCorePackageVersion, getGitHubTemplateRef as _getGitHubTemplateRef, getGitHubTemplateRefCandidates as _getGitHubTemplateRefCandidates, githubTarballUrl as _githubTarballUrl, findLocalTemplateFrom as _findLocalTemplateFrom, workspaceAppNameForTemplateSelection as _workspaceAppNameForTemplateSelection, startShapePromptOptions as _startShapePromptOptions, shouldSkipScaffoldEntry as _shouldSkipScaffoldEntry, tarExtractArgs as _tarExtractArgs, downloadGitHubSubdir as _downloadGitHubSubdir, findLocalTemplate as _findLocalTemplate, templateSourceName as _templateSourceName, normalizeTemplateName as _normalizeTemplateName, appTitleForScaffold as _appTitleForScaffold, replacePlaceholders as _replacePlaceholders, rewriteTrackingAppId as _rewriteTrackingAppId, rewriteAgentChatAppId as _rewriteAgentChatAppId, fixWebManifestName as _fixWebManifestName, copyDir as _copyDir, localTemplateSourceKind as _localTemplateSourceKind, REPO as _REPO, TEMPLATES_DIR as _TEMPLATES_DIR, };
 /* ─────────────────────────────────────────────────────────────────────────
  * Download / copy helpers
  * ───────────────────────────────────────────────────────────────────────── */
@@ -1185,9 +1212,12 @@ async function downloadAndExtract(url, destDir, options = {}) {
         fs.unlinkSync(tarPath);
     }
 }
-async function downloadGitHubSubdir(repo, subdir, targetDir) {
+/** Resolves to the ref that actually succeeded so callers can record it. */
+async function downloadGitHubSubdir(repo, subdir, targetDir, refOverride) {
     validateRepoName(repo);
-    const refs = getGitHubTemplateRefCandidates();
+    const refs = refOverride?.length
+        ? refOverride
+        : getGitHubTemplateRefCandidates();
     if (refs.length === 0) {
         throw new Error("Cannot download first-party scaffold files without a versioned @agent-native/core package.");
     }
@@ -1204,7 +1234,7 @@ async function downloadGitHubSubdir(repo, subdir, targetDir) {
                 throw new Error(`Template directory "${subdir}" not found at ref "${ref}".`);
             }
             copyDir(srcDir, targetDir);
-            return;
+            return ref;
         }
         catch (err) {
             errors.push(`  ${ref}: ${err instanceof Error ? err.message.split("\n")[0] : String(err)}`);
@@ -1345,7 +1375,7 @@ function shouldReplaceScaffoldDescription(value) {
         return true;
     return /\b(starter|new app|blank\b.*\bapp)\b/i.test(value);
 }
-function fixPackageJsonName(appDir, name, templateName) {
+function fixPackageJsonName(appDir, name, templateName, provenance) {
     const pkgPath = path.join(appDir, "package.json");
     if (!fs.existsSync(pkgPath))
         return;
@@ -1371,9 +1401,18 @@ function fixPackageJsonName(appDir, name, templateName) {
                 !Array.isArray(pkg["agent-native"])
                 ? pkg["agent-native"]
                 : {};
+            const coreVersion = getCorePackageVersion();
             agentNative.scaffold = {
                 template: trackingTemplateName(templateName),
                 frameworkSkills: scaffoldGuidance,
+                ...(provenance?.templateRef
+                    ? { templateRef: provenance.templateRef }
+                    : {}),
+                ...(provenance?.templateSource
+                    ? { templateSource: provenance.templateSource }
+                    : {}),
+                ...(coreVersion ? { coreVersion } : {}),
+                ...(provenance?.shape ? { shape: provenance.shape } : {}),
             };
             pkg["agent-native"] = agentNative;
         }
@@ -1842,6 +1881,17 @@ function shouldSkipScaffoldEntry(name, srcPath) {
         srcPath?.split(path.sep).includes(".claude")) {
         return true;
     }
+    // `.generated/bridge` is committed source, not a build artifact: the design
+    // app imports it at module load, so skipping it yields a workspace that 500s
+    // on every page. Everything else under `.generated` is regenerated at dev time.
+    if (pathParts?.at(-2) === ".generated") {
+        return name !== "bridge";
+    }
+    if (name === ".generated" &&
+        srcPath &&
+        fs.existsSync(path.join(srcPath, "bridge"))) {
+        return false;
+    }
     if (name === "node_modules" ||
         name === ".agent-native" ||
         name === ".env" ||