@distributionos/cli 0.1.3 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distributionos/cli",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "DistributionOS repo setup CLI for agent onboarding and first-party analytics.",
   "homepage": "https://distributionos.dev",
   "repository": {

package/src/initialization.js

@@ -1,11 +1,34 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 
-export async function buildInitializationPayload(plan, options = {}) {
-  const appName = titleFromPackageName(plan.repo.packageJson?.name ?? plan.appId);
-  const docs = await readProjectDocs(plan.cwd);
-  const publicBlogRoute = plan.repo.routes.find(route => route === '/blog' || route.startsWith('/blog/'));
-  const claims = [
+export async function buildInitializationPayload(plan, options = {}) {
+  const appName = titleFromPackageName(plan.repo.packageJson?.name ?? plan.appId);
+  const docs = await readProjectDocs(plan.cwd);
+  const publicBlogRoute = plan.repo.routes.find(route => route === '/blog' || route.startsWith('/blog/'));
+  const appIdentity = {
+    name: appName,
+  };
+  if (options.domain) {
+    appIdentity.domain = options.domain;
+  }
+  if (docs.overview?.claim) {
+    appIdentity.description = docs.overview.claim;
+  }
+  const repo = {
+    root: path.basename(plan.cwd),
+    frameworks: [plan.repo.framework].filter(value => value && value !== 'unknown'),
+    languages: ['TypeScript', 'JavaScript'],
+    packageManagers: [plan.repo.packageManager].filter(value => value && value !== 'unknown'),
+    notableFiles: [
+      'package.json',
+      ...plan.repo.layoutCandidates,
+      ...plan.repo.contentFiles.slice(0, 12),
+    ],
+  };
+  if (plan.repo.git.branch) {
+    repo.defaultBranch = plan.repo.git.branch;
+  }
+  const claims = [
     {
       category: 'repo',
       claim: `The repo package name is ${plan.repo.packageJson?.name ?? appName}.`,
@@ -47,23 +70,8 @@ export async function buildInitializationPayload(plan, options = {}) {
     client: 'distributionos-cli',
     instructionPackVersion: plan.instructionPackVersion,
     sourceSummary: 'DistributionOS CLI inspected package metadata, routes, content files, deploy hints, and agent instruction files. It did not read .env files or secrets.',
-    appIdentity: {
-      name: appName,
-      domain: options.domain,
-      description: docs.overview?.claim,
-    },
-    repo: {
-      root: path.basename(plan.cwd),
-      defaultBranch: plan.repo.git.branch ?? null,
-      frameworks: [plan.repo.framework].filter(value => value && value !== 'unknown'),
-      languages: ['TypeScript', 'JavaScript'],
-      packageManagers: [plan.repo.packageManager].filter(value => value && value !== 'unknown'),
-      notableFiles: [
-        'package.json',
-        ...plan.repo.layoutCandidates,
-        ...plan.repo.contentFiles.slice(0, 12),
-      ],
-    },
+    appIdentity,
+    repo,
     distribution: {
       blogRoute: publicBlogRoute ?? undefined,
       analytics: plan.analytics.status === 'enabled'

package/src/mutate.js

@@ -91,9 +91,9 @@ async function applyNextAppRouterAnalytics(cwd, analytics, scriptSrc) {
     contractVersion: analytics.contractVersion,
     configScript: analytics.configScript,
   });
-  const next = ANALYTICS_BLOCK_RE.test(existing)
-    ? existing.replace(ANALYTICS_BLOCK_RE, `\n${block}\n`)
-    : insertBeforeHeadClose(existing, block);
+  const next = ANALYTICS_BLOCK_RE.test(existing)
+    ? existing.replace(ANALYTICS_BLOCK_RE, `\n${block}\n`)
+    : insertIntoNextAppRouterLayout(existing, block);
 
   if (next === existing) {
     return { type: 'analytics', changed: false, file: analytics.layoutTarget, reason: 'No analytics change needed.' };
@@ -156,13 +156,33 @@ function buildHtmlAnalyticsBlock({ scriptSrc, contractVersion, configScript }) {
   ].join('\n');
 }
 
-function insertBeforeHeadClose(content, block) {
-  const headClose = content.match(/^(\s*)<\/head>/im);
-  if (headClose?.index === undefined) {
-    throw new Error('Could not find </head> in shared layout.');
-  }
-  return `${content.slice(0, headClose.index)}${block}\n${content.slice(headClose.index)}`;
-}
+function insertBeforeHeadClose(content, block) {
+  const headClose = content.match(/^(\s*)<\/head>/im);
+  if (headClose?.index === undefined) {
+    throw new Error('Could not find </head> in shared layout.');
+  }
+  return `${content.slice(0, headClose.index)}${block}\n${content.slice(headClose.index)}`;
+}
+
+function insertIntoNextAppRouterLayout(content, block) {
+  const headClose = content.match(/^(\s*)<\/head>/im);
+  if (headClose?.index !== undefined) {
+    return `${content.slice(0, headClose.index)}${block}\n${content.slice(headClose.index)}`;
+  }
+
+  const bodyOpen = content.match(/^(\s*)<body(\s|>)/im);
+  if (bodyOpen?.index === undefined) {
+    throw new Error('Could not find <body> in shared layout.');
+  }
+
+  const indent = bodyOpen[1] || '      ';
+  const headBlock = [
+    `${indent}<head>`,
+    block,
+    `${indent}</head>`,
+  ].join('\n');
+  return `${content.slice(0, bodyOpen.index)}${headBlock}\n${content.slice(bodyOpen.index)}`;
+}
 
 function indentLines(value, prefix) {
   return String(value).split(/\r?\n/).map(line => `${prefix}${line}`).join('\n');

package/src/plan.js

@@ -311,9 +311,9 @@ function analyticsSummary(analytics) {
   if (analytics.status === 'enabled') {
     return `contract ${analytics.contractVersion}; install script in ${analytics.layoutTarget ?? 'reviewed shared layout'}`;
   }
-  if (analytics.status === 'disabled') {
-    return 'tracker is not enabled yet; create tracker in DistributionOS first';
-  }
+  if (analytics.status === 'disabled') {
+    return 'tracker will be created or fetched during apply before analytics is installed';
+  }
   return 'contract not fetched; print manual guidance only';
 }