@notis_ai/cli 0.2.0-beta.21.1 → 0.2.0-beta.35.1

package/src/runtime/app-platform.js

@@ -7,18 +7,47 @@
  */
 
 import { spawn } from 'node:child_process';
-import { existsSync, mkdirSync, readFileSync, writeFileSync, cpSync, readdirSync } from 'node:fs';
+import { cpSync, existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, rmSync, statSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { gunzipSync } from 'node:zlib';
 
 import { usageError } from './errors.js';
+import { validateArtifactBoundary, validateProjectBoundary } from './app-boundary-validator.js';
 
 const NOTIS_DIR = '.notis';
 const STATE_FILE = join(NOTIS_DIR, 'state.json');
 const OUTPUT_DIR = join(NOTIS_DIR, 'output');
 const BUNDLE_DIR = join(OUTPUT_DIR, 'bundle');
 const MANIFEST_FILE = join(OUTPUT_DIR, 'manifest.json');
+const METADATA_DIR = 'metadata';
+const CLI_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
+const MONOREPO_APPS_DIR = resolve(CLI_ROOT, '../..', 'apps');
+const DIST_DIR = join(CLI_ROOT, 'dist');
+const SCAFFOLD_CATALOG_FILE = join(DIST_DIR, 'scaffolds.json');
+const SCAFFOLD_SOURCE_DIR = join(DIST_DIR, 'scaffolds');
+export const NOTIS_APP_CATEGORIES = [
+  'Productivity',
+  'Sales & Marketing',
+  'Operations',
+  'Product & Engineering',
+  'Personal',
+];
+const SOURCE_COPY_EXCLUDES = new Set([
+  'node_modules',
+  '.notis',
+  '.git',
+  'dist',
+  'tsconfig.tsbuildinfo',
+  '.DS_Store',
+]);
+const SCAFFOLD_COPY_EXCLUDES = new Set([
+  ...SOURCE_COPY_EXCLUDES,
+  'coverage',
+  '.next',
+  '.turbo',
+]);
 let appConfigImportNonce = 0;
 
 // ---------------------------------------------------------------------------
@@ -29,6 +58,47 @@ export function resolveProjectDir(inputDir = '.') {
   return resolve(process.cwd(), inputDir);
 }
 
+export function getBundleDir(projectDir) {
+  return join(projectDir, BUNDLE_DIR);
+}
+
+export function resolveBuiltBundleDir(projectDir) {
+  const bundleDir = getBundleDir(projectDir);
+  if (existsSync(join(bundleDir, 'app.js'))) {
+    return bundleDir;
+  }
+  return null;
+}
+
+function normalizeShadowScopedCss(css) {
+  return css
+    // Tailwind preflight emits `html,:host` in v3. Inside a shadow tree we want
+    // the shadow host itself to carry those defaults.
+    .replace(/html\s*,\s*:host\s*\{/g, ':host{')
+    .replace(/:root\s*,\s*:host\s*\{/g, ':host{')
+    .replace(/:root\s*\{/g, ':host{')
+    .replace(/html\s*\{/g, ':host{')
+    // Shadow trees do not contain a body element. Route those defaults to the
+    // app root contract instead so authors still get the expected reset.
+    .replace(/body\s*\{/g, '[data-notis-app-root]{');
+}
+
+function normalizeBundleStylesheets(projectDir) {
+  const bundleDir = join(projectDir, BUNDLE_DIR);
+  if (!existsSync(bundleDir)) {
+    return;
+  }
+
+  for (const entry of readdirSync(bundleDir)) {
+    if (!entry.endsWith('.css')) {
+      continue;
+    }
+    const cssPath = join(bundleDir, entry);
+    const normalizedCss = normalizeShadowScopedCss(readFileSync(cssPath, 'utf-8'));
+    writeFileSync(cssPath, normalizedCss);
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Config loading
 // ---------------------------------------------------------------------------
@@ -38,11 +108,24 @@ export function resolveProjectDir(inputDir = '.') {
  * approach: we read the file, transpile with the project's TypeScript compiler
  * when available, then evaluate as ESM.
  */
+function stripNotisSdkImports(source) {
+  return source
+    .replace(/import\s+type\s+[\s\S]*?from\s+['"][^'"]*['"]\s*;?/g, '')
+    .replace(/import\s*{[\s\S]*?\bdefineNotisApp\b[\s\S]*?}\s+from\s+['"]@notis\/sdk\/config['"]\s*;?/g, '')
+    .replace(/defineNotisApp\s*\(/g, '(');
+}
+
 function transpileTsConfigSource(source, configPath) {
+  // Strip the @notis/sdk/config import unconditionally. The SDK package often
+  // points its `exports` at raw .ts source, which Node cannot import from the
+  // temp .mjs file we emit below. `defineNotisApp` is just an identity helper,
+  // so removing the import and replacing the call with a parens-wrapped
+  // expression preserves the config value without ever resolving the SDK.
+  const stripped = stripNotisSdkImports(source);
   const requireFromConfig = createRequire(`file://${configPath}`);
   try {
     const ts = requireFromConfig('typescript');
-    const transpiled = ts.transpileModule(source, {
+    const transpiled = ts.transpileModule(stripped, {
       compilerOptions: {
         module: ts.ModuleKind.ESNext,
         target: ts.ScriptTarget.ES2020,
@@ -51,10 +134,7 @@ function transpileTsConfigSource(source, configPath) {
     });
     return transpiled.outputText;
   } catch {
-    return source
-      .replace(/import\s+type\s+[\s\S]*?from\s+['"][^'"]*['"]\s*;?/g, '')
-      .replace(/import\s*{[\s\S]*?\bdefineNotisApp\b[\s\S]*?}\s+from\s+['"]@notis\/sdk\/config['"]\s*;?/g, '')
-      .replace(/defineNotisApp\s*\(/, '(');
+    return stripped;
   }
 }
 
@@ -152,9 +232,160 @@ export function detectProjectWarnings(projectDir, appConfig = null) {
     warnings.push('No database references declared in notis.config.ts.');
   }
 
+  if (appConfig) {
+    try {
+      const listing = inspectListingReadiness(projectDir, appConfig);
+      warnings.push(...listing.warnings);
+    } catch (error) {
+      warnings.push(error instanceof Error ? error.message : String(error));
+    }
+  }
+
   return warnings;
 }
 
+function safeKebab(value) {
+  return String(value || '')
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/(^-|-$)+/g, '');
+}
+
+function jsStringLiteral(value) {
+  return `'${String(value).replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
+}
+
+function normalizeCategories(categories = []) {
+  if (!Array.isArray(categories)) {
+    return [];
+  }
+  const allowed = new Set(NOTIS_APP_CATEGORIES);
+  const normalized = [];
+  for (const category of categories) {
+    if (typeof category !== 'string' || !category.trim()) {
+      continue;
+    }
+    const trimmed = category.trim();
+    if (!allowed.has(trimmed)) {
+      throw usageError(
+        `Invalid Notis app category "${trimmed}". Use one of: ${NOTIS_APP_CATEGORIES.join(', ')}.`,
+      );
+    }
+    if (!normalized.includes(trimmed)) {
+      normalized.push(trimmed);
+    }
+  }
+  return normalized;
+}
+
+function pngDimensions(buffer) {
+  const signature = '89504e470d0a1a0a';
+  if (!Buffer.isBuffer(buffer) || buffer.length < 24 || buffer.subarray(0, 8).toString('hex') !== signature) {
+    return null;
+  }
+  return {
+    width: buffer.readUInt32BE(16),
+    height: buffer.readUInt32BE(20),
+  };
+}
+
+function imageAssetMeta(projectDir, relPath, { maxBytes, recommendedRatio = 1.6 }) {
+  const fullPath = join(projectDir, relPath);
+  const content = readFileSync(fullPath);
+  const dimensions = pngDimensions(content);
+  const ratio = dimensions?.height ? dimensions.width / dimensions.height : null;
+  const errors = [];
+  const warnings = [];
+
+  if (!relPath.toLowerCase().endsWith('.png')) {
+    errors.push(`${relPath} must be a PNG file.`);
+  }
+  if (content.length > maxBytes) {
+    errors.push(`${relPath} must be ${Math.round(maxBytes / 1024 / 1024)} MB or smaller.`);
+  }
+  if (ratio !== null && (ratio < 1.3 || ratio > 1.9)) {
+    errors.push(`${relPath} should be close to a 16:10 aspect ratio.`);
+  } else if (ratio !== null && Math.abs(ratio - recommendedRatio) > 0.08) {
+    warnings.push(`${relPath} is not 2000x1250; 16:10 PNG is recommended.`);
+  }
+
+  return {
+    path: relPath,
+    content_type: 'image/png',
+    bytes: content.length,
+    width: dimensions?.width ?? null,
+    height: dimensions?.height ?? null,
+    errors,
+    warnings,
+  };
+}
+
+export function discoverMetadataAssets(projectDir) {
+  const metadataDir = join(projectDir, METADATA_DIR);
+  const coverPath = join(METADATA_DIR, 'cover.png');
+  const cover = existsSync(join(projectDir, coverPath))
+    ? imageAssetMeta(projectDir, coverPath, { maxBytes: 5 * 1024 * 1024 })
+    : null;
+  const screenshots = [];
+
+  if (existsSync(metadataDir)) {
+    for (const entry of readdirSync(metadataDir, { withFileTypes: true })) {
+      if (!entry.isFile()) continue;
+      const match = /^screenshot-(\d+)\.png$/i.exec(entry.name);
+      if (!match) continue;
+      screenshots.push({
+        index: Number.parseInt(match[1], 10),
+        ...imageAssetMeta(projectDir, join(METADATA_DIR, entry.name), {
+          maxBytes: 2 * 1024 * 1024,
+        }),
+      });
+    }
+  }
+
+  screenshots.sort((a, b) => a.index - b.index);
+  return {
+    cover,
+    screenshots: screenshots.slice(0, 6),
+  };
+}
+
+export function inspectListingReadiness(projectDir, appConfig = null) {
+  const config = appConfig || {};
+  const warnings = [];
+  const errors = [];
+  const metadata = discoverMetadataAssets(projectDir);
+  const categories = normalizeCategories(config.categories || []);
+
+  if (!String(config.tagline || '').trim()) {
+    warnings.push('Listing tagline missing in notis.config.ts.');
+  }
+  if (categories.length === 0) {
+    warnings.push(`Listing category missing in notis.config.ts. Use one of: ${NOTIS_APP_CATEGORIES.join(', ')}.`);
+  }
+  if (!metadata.cover) {
+    warnings.push('Listing cover missing at metadata/cover.png.');
+  } else {
+    errors.push(...metadata.cover.errors);
+    warnings.push(...metadata.cover.warnings);
+  }
+  if (metadata.screenshots.length < 3) {
+    warnings.push(`Listing screenshots: ${metadata.screenshots.length}/3 minimum in metadata/screenshot-N.png.`);
+  }
+  for (const screenshot of metadata.screenshots) {
+    errors.push(...screenshot.errors);
+    warnings.push(...screenshot.warnings);
+  }
+
+  return {
+    ready: errors.length === 0 && Boolean(config.tagline) && categories.length > 0 && Boolean(metadata.cover) && metadata.screenshots.length >= 1,
+    warnings,
+    errors,
+    metadata,
+    categories,
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Build
 // ---------------------------------------------------------------------------
@@ -181,7 +412,7 @@ export async function runProjectScript({ projectDir, scriptName, env = {}, stdio
  * Derive an export name from a route path.
  * '/' -> 'index', '/inbox' -> 'inbox', '/my-tasks' -> 'myTasks'
  */
-function exportNameFromPath(routePath) {
+export function exportNameFromPath(routePath) {
   if (routePath === '/') return 'index';
   const slug = routePath.replace(/^\//, '').replace(/\//g, '-');
   const identifier = slug
@@ -236,11 +467,88 @@ function autoDetectRoutes(projectDir) {
   return routes;
 }
 
+function validateConfiguredRoutes(routes) {
+  if (routes.length === 0) {
+    return;
+  }
+
+  const slugSet = new Set();
+  let defaultCount = 0;
+
+  for (const route of routes) {
+    if (!route.slug || typeof route.slug !== 'string') {
+      throw usageError(`Route "${route.path}" must define a slug.`);
+    }
+    if (slugSet.has(route.slug)) {
+      throw usageError(`Duplicate route slug "${route.slug}".`);
+    }
+    slugSet.add(route.slug);
+    if (route.default) {
+      defaultCount += 1;
+    }
+  }
+
+  if (defaultCount !== 1) {
+    throw usageError(`Expected exactly one default route, received ${defaultCount}.`);
+  }
+
+  for (const route of routes) {
+    if (route.parentSlug && !slugSet.has(route.parentSlug)) {
+      throw usageError(
+        `Route "${route.slug}" references unknown parentSlug "${route.parentSlug}".`,
+      );
+    }
+    const collection = route.collection || null;
+    if (
+      collection?.sidebar?.mode === 'tree' &&
+      (!collection.parentProperty || typeof collection.parentProperty !== 'string')
+    ) {
+      throw usageError(
+        `Tree collection route "${route.slug}" must define collection.parentProperty.`,
+      );
+    }
+  }
+
+  const childrenByParent = new Map();
+  for (const route of routes) {
+    if (!route.parentSlug) {
+      continue;
+    }
+    const children = childrenByParent.get(route.parentSlug) || [];
+    children.push(route.slug);
+    childrenByParent.set(route.parentSlug, children);
+  }
+
+  for (const route of routes) {
+    const seen = new Set([route.slug]);
+    let current = route.parentSlug || null;
+    while (current) {
+      if (seen.has(current)) {
+        throw usageError(`Route parent cycle detected at "${route.slug}".`);
+      }
+      seen.add(current);
+      current = routes.find((candidate) => candidate.slug === current)?.parentSlug || null;
+    }
+  }
+
+  for (const route of routes) {
+    if (
+      route.collection?.sidebar?.mode === 'tree' &&
+      (childrenByParent.get(route.slug) || []).length > 0
+    ) {
+      throw usageError(
+        `Tree collection route "${route.slug}" cannot also define static child routes.`,
+      );
+    }
+  }
+}
+
 function resolveConfiguredRoutes(appConfig, projectDir) {
   const configuredRoutes = Array.isArray(appConfig.routes) ? appConfig.routes : [];
+  validateConfiguredRoutes(configuredRoutes);
   const routes = configuredRoutes.map((route) => ({
     ...route,
-    slug: route.slug || slugFromPath(route.path),
+    slug: route.slug,
     export_name: route.exportName || route.export_name || exportNameFromPath(route.path),
   }));
   return routes.length > 0 ? routes : autoDetectRoutes(projectDir);
@@ -270,16 +578,32 @@ function generateEntryFile(projectDir, routes) {
   return entryPath;
 }
 
+export async function prepareArtifactBuild(projectDir) {
+  validateProjectBoundary(projectDir);
+  const appConfig = await loadAppConfig(projectDir);
+  const detectedRoutes = resolveConfiguredRoutes(appConfig, projectDir);
+
+  generateEntryFile(projectDir, detectedRoutes);
+
+  const manifest = generateManifest(appConfig, projectDir);
+  const manifestPath = join(projectDir, MANIFEST_FILE);
+  mkdirSync(dirname(manifestPath), { recursive: true });
+  writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
+
+  return { appConfig, manifest, routes: detectedRoutes };
+}
+
 /**
  * Generate the manifest from app config and build output.
  */
-function generateManifest(appConfig, projectDir) {
+export function generateManifest(appConfig, projectDir) {
   const routes = resolveConfiguredRoutes(appConfig, projectDir).map((route) => {
     const entry = {
       path: route.path,
-      slug: route.slug || slugFromPath(route.path),
+      slug: route.slug,
       name: route.name,
       icon: route.icon || null,
+      parentSlug: route.parentSlug || null,
       default: route.default || false,
       export_name: route.exportName || route.export_name || exportNameFromPath(route.path),
       collection: route.collection || null,
@@ -291,15 +615,52 @@ function generateManifest(appConfig, projectDir) {
   });
 
   const databases = appConfig.databases || [];
+  const categories = normalizeCategories(appConfig.categories || []);
+  const metadata = discoverMetadataAssets(projectDir);
+  const appSlug = safeKebab(appConfig.name);
+  const displayTitle = appConfig.title || appConfig.displayName || appConfig.name;
+  const listingMedia = {
+    cover: metadata.cover
+      ? {
+          path: metadata.cover.path,
+          content_type: metadata.cover.content_type,
+          width: metadata.cover.width,
+          height: metadata.cover.height,
+          bytes: metadata.cover.bytes,
+        }
+      : null,
+    screenshots: metadata.screenshots.map((screenshot) => ({
+      path: screenshot.path,
+      content_type: screenshot.content_type,
+      width: screenshot.width,
+      height: screenshot.height,
+      bytes: screenshot.bytes,
+    })),
+  };
 
   return {
     version: 1,
-    spec_version: 3,
+    spec_version: 4,
     app: {
-      name: appConfig.name,
+      name: displayTitle,
+      slug: appSlug || null,
       description: appConfig.description || null,
       icon: appConfig.icon || null,
+      title: displayTitle,
+      tagline: appConfig.tagline || null,
+      categories,
+      author: appConfig.author || null,
+      version_notes: appConfig.versionNotes || appConfig.version_notes || null,
+    },
+    listing: {
+      title: displayTitle,
+      tagline: appConfig.tagline || null,
+      categories,
+      author: appConfig.author || null,
+      version_notes: appConfig.versionNotes || appConfig.version_notes || null,
+      media: listingMedia,
     },
+    metadata: listingMedia,
     routes,
     bundle: {
       js: 'bundle/app.js',
@@ -314,13 +675,7 @@ function generateManifest(appConfig, projectDir) {
  * Build the app bundle: generate entry file, run `vite build`, package into .notis/output/.
  */
 export async function buildArtifact(projectDir) {
-  const appConfig = await loadAppConfig(projectDir);
-
-  // Auto-detect or use configured routes
-  const detectedRoutes = resolveConfiguredRoutes(appConfig, projectDir);
-
-  // Generate the entry file that re-exports all route page components
-  generateEntryFile(projectDir, detectedRoutes);
+  await prepareArtifactBuild(projectDir);
 
   // Run Vite build
   await runProjectScript({
@@ -328,18 +683,19 @@ export async function buildArtifact(projectDir) {
     scriptName: 'build',
   });
 
-  // Verify output
-  const bundleDir = join(projectDir, BUNDLE_DIR);
-  const jsPath = join(bundleDir, 'app.js');
-  if (!existsSync(jsPath)) {
-    throw usageError('Vite build did not produce .notis/output/bundle/app.js. Check your vite.config.ts.');
+  // Verify the canonical `.notis/output/bundle` packaging contract.
+  const builtBundleDir = resolveBuiltBundleDir(projectDir);
+  if (!builtBundleDir) {
+    throw usageError(
+      'Vite build did not produce app.js in .notis/output/bundle. Check your vite.config.ts.',
+    );
   }
+  normalizeBundleStylesheets(projectDir);
+  copyMetadataAssets(projectDir);
 
-  // Generate manifest
-  const manifest = generateManifest(appConfig, projectDir);
-  const manifestPath = join(projectDir, MANIFEST_FILE);
-  mkdirSync(dirname(manifestPath), { recursive: true });
-  writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
+  validateArtifactBoundary(readArtifactFiles(projectDir));
+
+  const manifest = readManifest(projectDir);
 
   return { manifest, outputDir: join(projectDir, OUTPUT_DIR) };
 }
@@ -355,6 +711,22 @@ export function readManifest(projectDir) {
   return JSON.parse(readFileSync(manifestPath, 'utf-8'));
 }
 
+function copyMetadataAssets(projectDir) {
+  const metadataDir = join(projectDir, METADATA_DIR);
+  if (!existsSync(metadataDir)) {
+    return;
+  }
+  const outputMetadataDir = join(projectDir, OUTPUT_DIR, METADATA_DIR);
+  mkdirSync(outputMetadataDir, { recursive: true });
+  for (const entry of readdirSync(metadataDir, { withFileTypes: true })) {
+    if (!entry.isFile()) continue;
+    if (entry.name !== 'cover.png' && !/^screenshot-\d+\.png$/i.test(entry.name)) {
+      continue;
+    }
+    cpSync(join(metadataDir, entry.name), join(outputMetadataDir, entry.name));
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Linking
 // ---------------------------------------------------------------------------
@@ -385,18 +757,30 @@ export function requireLinkedAppId(projectDir, explicitAppId) {
 /**
  * Scaffold a new Notis app project from the SDK template.
  */
-export function scaffoldProject({ projectDir, appName }) {
-  const templateDir = resolve(
-    dirname(fileURLToPath(import.meta.url)),
-    '../../template',
-  );
+export function loadScaffoldCatalog() {
+  if (existsSync(SCAFFOLD_CATALOG_FILE)) {
+    const parsed = JSON.parse(readFileSync(SCAFFOLD_CATALOG_FILE, 'utf-8'));
+    const scaffolds = Array.isArray(parsed?.scaffolds) ? parsed.scaffolds : parsed;
+    return Array.isArray(scaffolds)
+      ? scaffolds.filter((entry) => entry && typeof entry.slug === 'string')
+      : [];
+  }
+  return loadMonorepoScaffoldCatalog();
+}
+
+export function scaffoldProject({ projectDir, appName, fromSlug = null }) {
+  const templateDir = fromSlug ? resolveScaffoldSourceDir(fromSlug) : join(CLI_ROOT, 'template');
 
   if (!existsSync(templateDir)) {
+    if (fromSlug) {
+      const known = loadScaffoldCatalog().map((entry) => entry.slug).join(', ') || 'none';
+      throw usageError(`Unknown scaffold "${fromSlug}". Available scaffolds: ${known}.`);
+    }
     throw usageError(`SDK template not found at ${templateDir}. Ensure @notis_ai/cli is installed correctly.`);
   }
 
   mkdirSync(projectDir, { recursive: true });
-  cpSync(templateDir, projectDir, { recursive: true });
+  copyScaffoldSource(templateDir, projectDir);
 
   // Update package.json with the app name
   const pkgPath = join(projectDir, 'package.json');
@@ -410,13 +794,115 @@ export function scaffoldProject({ projectDir, appName }) {
   const configPath = join(projectDir, 'notis.config.ts');
   if (existsSync(configPath)) {
     let config = readFileSync(configPath, 'utf-8');
-    config = config.replace(/'My Notis App'/, `'${appName.replace(/'/g, "\\'")}'`);
+    const displayName = jsStringLiteral(appName);
+    const slugName = jsStringLiteral(safeKebab(appName) || 'my-notis-app');
+    if (fromSlug) {
+      if (/name\s*:/.test(config)) {
+        config = config.replace(/name\s*:\s*(['"`])[\s\S]*?\1/, `name: ${slugName}`);
+      }
+      if (/title\s*:/.test(config)) {
+        config = config.replace(/title\s*:\s*(['"`])[\s\S]*?\1/, `title: ${displayName}`);
+      } else {
+        config = config.replace(/name\s*:\s*(['"`])[\s\S]*?\1/, `name: ${slugName},\n  title: ${displayName}`);
+      }
+    } else {
+      if (/name\s*:/.test(config)) {
+        config = config.replace(/name\s*:\s*(['"`])[\s\S]*?\1/, `name: ${slugName}`);
+      }
+      if (/title\s*:/.test(config)) {
+        config = config.replace(/title\s*:\s*(['"`])[\s\S]*?\1/, `title: ${displayName}`);
+      } else {
+        config = config.replace(/'My Notis App'/, displayName);
+      }
+    }
     writeFileSync(configPath, config);
   }
 
   return { projectDir };
 }
 
+function resolveScaffoldSourceDir(fromSlug) {
+  const bundledDir = join(SCAFFOLD_SOURCE_DIR, fromSlug);
+  if (existsSync(bundledDir)) {
+    return bundledDir;
+  }
+  const monorepoDir = join(MONOREPO_APPS_DIR, fromSlug);
+  if (existsSync(join(monorepoDir, 'notis.config.ts'))) {
+    return monorepoDir;
+  }
+  return bundledDir;
+}
+
+function loadMonorepoScaffoldCatalog() {
+  if (!existsSync(MONOREPO_APPS_DIR)) {
+    return [];
+  }
+  const scaffolds = [];
+  for (const entry of readdirSync(MONOREPO_APPS_DIR, { withFileTypes: true })) {
+    if (!entry.isDirectory() || entry.name.startsWith('.') || entry.name.startsWith('_')) {
+      continue;
+    }
+    const configPath = join(MONOREPO_APPS_DIR, entry.name, 'notis.config.ts');
+    if (!existsSync(configPath)) {
+      continue;
+    }
+    const configSource = readFileSync(configPath, 'utf-8');
+    const description = readTsStringProperty(configSource, 'description') || '';
+    scaffolds.push({
+      slug: entry.name,
+      name: readTsStringProperty(configSource, 'title') || readTsStringProperty(configSource, 'name') || entry.name,
+      description,
+      icon: readTsStringProperty(configSource, 'icon') || 'phosphor:squares-four',
+      categories: readTsStringArrayProperty(configSource, 'categories'),
+      tagline: readTsStringProperty(configSource, 'tagline') || description,
+    });
+  }
+  return scaffolds.sort((a, b) => a.slug.localeCompare(b.slug));
+}
+
+function readTsStringProperty(source, propertyName) {
+  const match = source.match(new RegExp(`\\b${propertyName}\\s*:\\s*(['"\`])([\\s\\S]*?)\\1`));
+  return match ? match[2] : null;
+}
+
+function readTsStringArrayProperty(source, propertyName) {
+  const match = source.match(new RegExp(`\\b${propertyName}\\s*:\\s*\\[([\\s\\S]*?)\\]`));
+  if (!match) {
+    return [];
+  }
+  return Array.from(match[1].matchAll(/(['"`])([\s\S]*?)\1/g), (entry) => entry[2].trim()).filter(Boolean);
+}
+
+function copyScaffoldSource(sourceDir, targetDir) {
+  function shouldCopy(path) {
+    const name = path.split(/[\\/]/).pop();
+    if (!name) return true;
+    return !SCAFFOLD_COPY_EXCLUDES.has(name)
+      && !name.startsWith('.env')
+      && !/\.(test|spec)\.[cm]?[jt]sx?$/i.test(name);
+  }
+
+  function walk(src, dest) {
+    if (!shouldCopy(src)) {
+      return;
+    }
+    const stat = statSync(src);
+    if (stat.isDirectory()) {
+      mkdirSync(dest, { recursive: true });
+      for (const entry of readdirSync(src)) {
+        walk(join(src, entry), join(dest, entry));
+      }
+      return;
+    }
+    if (stat.isFile()) {
+      mkdirSync(dirname(dest), { recursive: true });
+      cpSync(src, dest);
+    }
+  }
+
+  walk(sourceDir, targetDir);
+}
+
 // ---------------------------------------------------------------------------
 // Deploy helpers
 // ---------------------------------------------------------------------------
@@ -430,6 +916,8 @@ export function collectArtifactFiles(projectDir) {
     throw usageError('No build output found. Run "notis apps build" first.');
   }
 
+  validateArtifactBoundary(readArtifactFiles(projectDir));
+
   const files = {};
 
   function walk(dir, prefix) {
@@ -449,6 +937,149 @@ export function collectArtifactFiles(projectDir) {
   return files;
 }
 
+function shouldExcludeSourceEntry(name) {
+  return SOURCE_COPY_EXCLUDES.has(name) || name.startsWith('.env');
+}
+
+function readSourceFiles(projectDir) {
+  const files = {};
+
+  function walk(dir, prefix) {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (shouldExcludeSourceEntry(entry.name) || entry.isSymbolicLink()) {
+        continue;
+      }
+      const fullPath = join(dir, entry.name);
+      const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
+      if (entry.isDirectory()) {
+        walk(fullPath, relPath);
+      } else if (entry.isFile()) {
+        files[relPath] = readFileSync(fullPath);
+      }
+    }
+  }
+
+  walk(projectDir, '');
+  return files;
+}
+
+export function collectSourceFiles(projectDir) {
+  const files = readSourceFiles(projectDir);
+  const encoded = {};
+  for (const [relPath, content] of Object.entries(files)) {
+    encoded[relPath] = content.toString('base64');
+  }
+  return encoded;
+}
+
+function cleanTarPath(name) {
+  const cleaned = String(name || '').replace(/\\/g, '/').replace(/^\/+/, '');
+  const parts = cleaned.split('/').filter(Boolean);
+  if (!parts.length || parts.includes('..')) {
+    throw usageError(`Refusing to extract unsafe path from source archive: ${name}`);
+  }
+  return parts.join('/');
+}
+
+function extractTarGz(buffer, targetDir) {
+  const tar = gunzipSync(buffer);
+  let offset = 0;
+  while (offset + 512 <= tar.length) {
+    const header = tar.subarray(offset, offset + 512);
+    offset += 512;
+    if (header.every((byte) => byte === 0)) {
+      break;
+    }
+
+    const name = header.subarray(0, 100).toString('utf-8').replace(/\0.*$/, '');
+    const prefix = header.subarray(345, 500).toString('utf-8').replace(/\0.*$/, '');
+    const fullName = prefix ? `${prefix}/${name}` : name;
+    const sizeRaw = header.subarray(124, 136).toString('utf-8').replace(/\0.*$/, '').trim();
+    const size = Number.parseInt(sizeRaw || '0', 8);
+    const typeFlag = header[156];
+    const relPath = cleanTarPath(fullName);
+    const outputPath = join(targetDir, relPath);
+
+    if (typeFlag === 53) {
+      mkdirSync(outputPath, { recursive: true });
+    } else {
+      mkdirSync(dirname(outputPath), { recursive: true });
+      writeFileSync(outputPath, tar.subarray(offset, offset + size));
+    }
+
+    offset += Math.ceil(size / 512) * 512;
+  }
+}
+
+export async function pullAppSource({
+  apiBase,
+  jwt,
+  appId,
+  targetDir,
+  version = 'latest',
+  force = false,
+}) {
+  if (existsSync(targetDir) && readdirSync(targetDir).length > 0) {
+    if (!force) {
+      throw usageError(`Target directory is not empty: ${targetDir}. Pass --force to overwrite it.`);
+    }
+    rmSync(targetDir, { recursive: true, force: true });
+  }
+  mkdirSync(targetDir, { recursive: true });
+
+  const params = new URLSearchParams({ app_id: appId, version: String(version || 'latest') });
+  const response = await fetch(`${apiBase.replace(/\/$/, '')}/portal_apps/source?${params.toString()}`, {
+    headers: { Authorization: `Bearer ${jwt}` },
+  });
+  if (!response.ok) {
+    const data = await response.json().catch(() => ({}));
+    throw usageError(typeof data?.error === 'string' ? data.error : `Failed to pull app source (${response.status}).`);
+  }
+
+  const contentDisposition = response.headers.get('content-disposition') || '';
+  const versionMatch = /-v(\d+)\.tar\.gz/i.exec(contentDisposition);
+  const pulledVersion = versionMatch ? Number.parseInt(versionMatch[1], 10) : null;
+  extractTarGz(Buffer.from(await response.arrayBuffer()), targetDir);
+  const linkedVersion = pulledVersion || (
+    String(version || 'latest') === 'latest'
+      ? undefined
+      : Number.parseInt(String(version), 10)
+  );
+  writeLinkedState(targetDir, {
+    app_id: appId,
+    ...(Number.isFinite(linkedVersion) ? { version: linkedVersion } : {}),
+    linked_at: new Date().toISOString(),
+  });
+
+  return { projectDir: targetDir, version: pulledVersion || version };
+}
+
+function readArtifactFiles(projectDir) {
+  const outputDir = join(projectDir, OUTPUT_DIR);
+  if (!existsSync(outputDir)) {
+    throw usageError('No build output found. Run "notis apps build" first.');
+  }
+
+  const files = {};
+
+  function walk(dir, prefix) {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join(dir, entry.name);
+      const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
+      if (entry.isDirectory()) {
+        walk(fullPath, relPath);
+      } else {
+        files[relPath] = readFileSync(fullPath);
+      }
+    }
+  }
+
+  walk(outputDir, '');
+  return files;
+}
+
 // ---------------------------------------------------------------------------
 // Direct deploy (bypasses backend server)
 // ---------------------------------------------------------------------------
@@ -525,6 +1156,46 @@ async function uploadToStorage(supabaseUrl, supabaseKey, bucket, storagePath, co
   }
 }
 
+async function ensureStorageBucket(supabaseUrl, supabaseKey, bucket, options = {}) {
+  const encodedBucket = encodeURIComponent(bucket);
+  const headers = {
+    'Authorization': `Bearer ${supabaseKey}`,
+    'apikey': supabaseKey,
+  };
+  const inspectResponse = await fetch(`${supabaseUrl}/storage/v1/bucket/${encodedBucket}`, {
+    headers,
+  });
+  if (inspectResponse.ok) {
+    return;
+  }
+  if (inspectResponse.status !== 404) {
+    const text = await inspectResponse.text().catch(() => '');
+    throw new Error(`Failed to inspect storage bucket ${bucket} (${inspectResponse.status}): ${text}`);
+  }
+
+  const createResponse = await fetch(`${supabaseUrl}/storage/v1/bucket`, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      id: bucket,
+      name: bucket,
+      public: Boolean(options.public),
+    }),
+  });
+  if (createResponse.ok) {
+    return;
+  }
+
+  const text = await createResponse.text().catch(() => '');
+  if (createResponse.status === 409 || /already exists|duplicate/i.test(text)) {
+    return;
+  }
+  throw new Error(`Failed to create storage bucket ${bucket} (${createResponse.status}): ${text}`);
+}
+
 /**
  * Get the current app manifest version from the apps table.
  */
@@ -574,6 +1245,9 @@ const CONTENT_TYPE_MAP = {
   '.css': 'text/css',
   '.json': 'application/json',
   '.html': 'text/html',
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
 };
 
 /**
@@ -582,14 +1256,18 @@ const CONTENT_TYPE_MAP = {
 export async function directDeploy(projectDir, appId) {
   const { supabaseUrl, supabaseKey } = resolveSupabaseCredentials();
   const manifest = readManifest(projectDir);
+  const artifactFiles = readArtifactFiles(projectDir);
+  const sourceFiles = readSourceFiles(projectDir);
+  validateArtifactBoundary(artifactFiles);
 
   // Get current version and increment
   const { currentVersion } = await getAppCurrentVersion(supabaseUrl, supabaseKey, appId);
   const newVersion = currentVersion + 1;
 
   // Upload all files from the output directory
-  const outputDir = join(projectDir, OUTPUT_DIR);
   const bucket = 'app-code';
+  await ensureStorageBucket(supabaseUrl, supabaseKey, bucket, { public: false });
+  await ensureStorageBucket(supabaseUrl, supabaseKey, 'app-source', { public: false });
 
   async function uploadDir(dir, prefix) {
     const entries = readdirSync(dir, { withFileTypes: true });
@@ -608,7 +1286,14 @@ export async function directDeploy(projectDir, appId) {
     }
   }
 
-  await uploadDir(outputDir, '');
+  await uploadDir(join(projectDir, OUTPUT_DIR), '');
+
+  for (const [relPath, content] of Object.entries(sourceFiles)) {
+    const ext = relPath.includes('.') ? `.${relPath.split('.').pop()}` : '';
+    const contentType = CONTENT_TYPE_MAP[ext] || 'application/octet-stream';
+    const storagePath = `${appId}/v${newVersion}/${relPath}`;
+    await uploadToStorage(supabaseUrl, supabaseKey, 'app-source', storagePath, content, contentType);
+  }
 
   // Update the app record -- include storage_prefix so the portal can resolve bundle URLs
   const storagePrefix = `${appId}/v${newVersion}/`;
@@ -617,6 +1302,8 @@ export async function directDeploy(projectDir, appId) {
     version: newVersion,
     storage_bucket: bucket,
     storage_prefix: storagePrefix,
+    source_storage_bucket: 'app-source',
+    source_storage_prefix: storagePrefix,
   };
   await updateAppVersion(supabaseUrl, supabaseKey, appId, newVersion, deployManifest);