@bleedingdev/modern-js-create 3.2.0-ultramodern.8 → 3.2.0-ultramodern.80

package/template-workspace/oxfmt.config.ts

@@ -1,7 +1,17 @@
-import { defineConfig } from "oxfmt";
-import ultracite from "ultracite/oxfmt";
+import { defineConfig } from 'oxfmt';
+import ultracite from 'ultracite/oxfmt';
 
 export default defineConfig({
   extends: [ultracite],
-  ignorePatterns: ["dist", "node_modules", ".modern", ".modernjs", "**/routeTree.gen.ts"],
+  ignorePatterns: [
+    '.agents',
+    '**/*.json',
+    'dist',
+    'node_modules',
+    'repos/**',
+    '.modern',
+    '.modernjs',
+    '**/routeTree.gen.ts',
+  ],
+  singleQuote: true,
 });

package/template-workspace/oxlint.config.ts

@@ -1,6 +1,6 @@
-import { defineConfig } from "oxlint";
-import core from "ultracite/oxlint/core";
-import react from "ultracite/oxlint/react";
+import { defineConfig } from 'oxlint';
+import core from 'ultracite/oxlint/core';
+import react from 'ultracite/oxlint/react';
 
 export default defineConfig({
   env: {
@@ -8,5 +8,13 @@ export default defineConfig({
     node: true,
   },
   extends: [core, react],
-  ignorePatterns: ["dist", "node_modules", ".modern", ".modernjs", "**/routeTree.gen.ts"],
+  ignorePatterns: [
+    '.agents',
+    'dist',
+    'node_modules',
+    'repos/**',
+    '.modern',
+    '.modernjs',
+    '**/routeTree.gen.ts',
+  ],
 });

package/template-workspace/pnpm-workspace.yaml

@@ -1,17 +1,29 @@
 packages:
   - apps/*
-  - apps/remotes/*
-  - services/*
+  - verticals/*
   - packages/*
 
+minimumReleaseAge: 0
+blockExoticSubdeps: true
+engineStrict: true
+pmOnFail: error
+verifyDepsBeforeRun: error
+strictDepBuilds: true
+
+peerDependencyRules:
+  allowedVersions:
+    react: '>=19.0.0'
+    typescript: '>=6.0.0'
+
+overrides:
+  '@tanstack/react-router': 1.170.8
+  node-fetch: '^3.3.2'
+
 allowBuilds:
   '@swc/core': true
   core-js: true
   esbuild: true
+  lefthook: true
   msgpackr-extract: true
-
-onlyBuiltDependencies:
-  - '@swc/core'
-  - core-js
-  - esbuild
-  - msgpackr-extract
+  sharp: true
+  workerd: true

package/template-workspace/scripts/bootstrap-agent-skills.mjs

@@ -8,33 +8,54 @@ const lockPath = path.join(root, '.agents/skills-lock.json');
 const checkOnly = process.argv.includes('--check');
 const force = process.argv.includes('--force');
 
-function readJson(filePath) {
-  return JSON.parse(fs.readFileSync(filePath, 'utf8'));
-}
+const readJson = filePath => JSON.parse(fs.readFileSync(filePath, 'utf-8'));
 
-function run(command, args, options = {}) {
-  return execFileSync(command, args, {
+const run = (command, args, options = {}) =>
+  execFileSync(command, args, {
     cwd: options.cwd ?? root,
-    encoding: 'utf8',
+    encoding: 'utf-8',
     stdio: options.stdio ?? ['ignore', 'pipe', 'pipe'],
   });
-}
 
-function cloneSource(source, targetDir) {
-  const repo = source.repository.replace(/^https:\/\/github.com\//, '');
+const removeTree = dir =>
+  fs.rmSync(dir, {
+    force: true,
+    maxRetries: 5,
+    recursive: true,
+    retryDelay: 100,
+  });
+
+const cloneSource = (source, targetDir) => {
+  const repo = source.repository.replace(/^https:\/\/github.com\//u, '');
   try {
     run('gh', ['repo', 'clone', repo, targetDir, '--', '--depth', '1'], {
       stdio: 'inherit',
     });
-    return;
   } catch {
     run('git', ['clone', '--depth', '1', source.repository, targetDir], {
       stdio: 'inherit',
     });
   }
-}
+  if (source.commit) {
+    try {
+      run('git', ['checkout', source.commit], {
+        cwd: targetDir,
+        stdio: 'inherit',
+      });
+    } catch {
+      run('git', ['fetch', '--depth', '1', 'origin', source.commit], {
+        cwd: targetDir,
+        stdio: 'inherit',
+      });
+      run('git', ['checkout', source.commit], {
+        cwd: targetDir,
+        stdio: 'inherit',
+      });
+    }
+  }
+};
 
-function resolveSkillDir(sourceRoot, skillName) {
+const resolveSkillDir = (sourceRoot, skillName) => {
   const candidates = [
     path.join(sourceRoot, skillName),
     path.join(sourceRoot, 'skills', skillName),
@@ -44,7 +65,7 @@ function resolveSkillDir(sourceRoot, skillName) {
   return candidates.find(candidate =>
     fs.existsSync(path.join(candidate, 'SKILL.md')),
   );
-}
+};
 
 if (!fs.existsSync(lockPath)) {
   console.error('Missing .agents/skills-lock.json');
@@ -53,12 +74,28 @@ if (!fs.existsSync(lockPath)) {
 
 const lock = readJson(lockPath);
 const installDir = path.join(root, lock.installDir ?? '.agents/skills');
-const privateSources = (lock.sources ?? []).filter(
+const sources = lock.sources ?? [];
+const requiredCloneSources = sources.filter(
+  source => source.install === 'clone',
+);
+const optionalCloneSources = sources.filter(
   source => source.install === 'clone-if-authorized',
 );
+const requiredSkills = [
+  ...(lock.baseline ?? []),
+  ...requiredCloneSources.flatMap(source => source.baseline ?? []),
+].filter(
+  (skill, index, skills) =>
+    skills.findIndex(candidate => candidate.name === skill.name) === index,
+);
 
 if (checkOnly) {
-  const missing = privateSources.flatMap(source =>
+  const missingRequired = requiredSkills
+    .map(skill => skill.name)
+    .filter(
+      skillName => !fs.existsSync(path.join(installDir, skillName, 'SKILL.md')),
+    );
+  const missingOptional = optionalCloneSources.flatMap(source =>
     (source.baseline ?? [])
       .map(skill => skill.name)
       .filter(
@@ -66,22 +103,42 @@ if (checkOnly) {
           !fs.existsSync(path.join(installDir, skillName, 'SKILL.md')),
       ),
   );
-  if (missing.length > 0) {
+
+  if (missingRequired.length > 0) {
+    console.error(
+      `Required agent skills not installed: ${missingRequired.join(', ')}. Run pnpm skills:install.`,
+    );
+    process.exit(1);
+  }
+
+  if (missingOptional.length > 0) {
     console.warn(
-      `Private skills not installed: ${missing.join(', ')}. Run pnpm skills:install if you have access.`,
+      `Private skills not installed: ${missingOptional.join(', ')}. Run pnpm skills:install if you have access.`,
     );
   } else {
-    console.log('Agent skills are installed.');
+    console.log('Required and private agent skills are installed.');
+    process.exit(0);
   }
+  console.log('Required agent skills are installed.');
   process.exit(0);
 }
 
 fs.mkdirSync(installDir, { recursive: true });
 
-for (const source of privateSources) {
+for (const source of [...requiredCloneSources, ...optionalCloneSources]) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ultramodern-skills-'));
   try {
-    cloneSource(source, tempDir);
+    try {
+      cloneSource(source, tempDir);
+    } catch (error) {
+      if (source.install === 'clone-if-authorized') {
+        console.warn(
+          `Skipping ${source.repository}; current developer may not have access.`,
+        );
+        continue;
+      }
+      throw error;
+    }
     for (const skill of source.baseline ?? []) {
       const sourceSkillDir = resolveSkillDir(tempDir, skill.name);
       if (!sourceSkillDir) {
@@ -95,12 +152,12 @@ for (const source of privateSources) {
           console.log(`Skipping existing ${skill.name}`);
           continue;
         }
-        fs.rmSync(targetSkillDir, { recursive: true, force: true });
+        removeTree(targetSkillDir);
       }
       fs.cpSync(sourceSkillDir, targetSkillDir, { recursive: true });
       console.log(`Installed ${skill.name}`);
     }
   } finally {
-    fs.rmSync(tempDir, { recursive: true, force: true });
+    removeTree(tempDir);
   }
 }

package/template-workspace/scripts/setup-agent-reference-repos.mjs

@@ -0,0 +1,368 @@
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const root = process.cwd();
+const args = new Set(process.argv.slice(2));
+const checkOnly = args.has('--check');
+const configPath = path.join(root, '.agents', 'agent-reference-repos.json');
+const manifestPath = path.join(root, '.modernjs', 'agent-reference-repos.json');
+
+const truthy = value => /^(1|true|yes|on)$/i.test(String(value ?? ''));
+const falsy = value => /^(0|false|no|off)$/i.test(String(value ?? ''));
+
+const skipRequested =
+  truthy(process.env.ULTRAMODERN_SKIP_AGENT_REPOS) ||
+  falsy(process.env.ULTRAMODERN_AGENT_REPOS);
+const required = truthy(process.env.ULTRAMODERN_AGENT_REPOS_REQUIRED);
+const refresh = truthy(process.env.ULTRAMODERN_AGENT_REPOS_REFRESH);
+
+const gitIdentityEnv = {
+  GIT_AUTHOR_NAME:
+    process.env.GIT_AUTHOR_NAME || 'UltraModern Agent Reference Setup',
+  GIT_AUTHOR_EMAIL:
+    process.env.GIT_AUTHOR_EMAIL || 'ultramodern-agent-refs@local',
+  GIT_COMMITTER_NAME:
+    process.env.GIT_COMMITTER_NAME || 'UltraModern Agent Reference Setup',
+  GIT_COMMITTER_EMAIL:
+    process.env.GIT_COMMITTER_EMAIL || 'ultramodern-agent-refs@local',
+};
+
+const log = message => console.log(`[agent-reference-repos] ${message}`);
+const warn = message => console.warn(`[agent-reference-repos] ${message}`);
+
+function fail(message) {
+  if (required || checkOnly) {
+    throw new Error(message);
+  }
+  warn(message);
+}
+
+function readJson(filePath) {
+  return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+}
+
+function run(command, commandArgs, options = {}) {
+  const result = spawnSync(command, commandArgs, {
+    cwd: options.cwd ?? root,
+    encoding: 'utf-8',
+    env: {
+      ...process.env,
+      ...gitIdentityEnv,
+      ...(options.env ?? {}),
+    },
+    stdio: options.stdio ?? ['ignore', 'pipe', 'pipe'],
+    timeout: options.timeout ?? 120000,
+  });
+
+  if (result.error) {
+    throw result.error;
+  }
+  if (result.status !== 0) {
+    const stderr = result.stderr?.trim();
+    throw new Error(
+      `${command} ${commandArgs.join(' ')} failed${
+        stderr ? `: ${stderr}` : ''
+      }`,
+    );
+  }
+  return result.stdout?.trim() ?? '';
+}
+
+function assertSafeRepoPath(relativePath) {
+  if (
+    typeof relativePath !== 'string' ||
+    relativePath.length === 0 ||
+    path.isAbsolute(relativePath) ||
+    relativePath.split(/[\\/]+/).includes('..') ||
+    !relativePath.startsWith('repos/')
+  ) {
+    throw new Error(`Unsafe reference repository path: ${relativePath}`);
+  }
+}
+
+function hasGit() {
+  const result = spawnSync('git', ['--version'], {
+    encoding: 'utf-8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+  return result.status === 0;
+}
+
+function hasGitSubtree() {
+  const result = spawnSync('git', ['subtree', '-h'], {
+    encoding: 'utf-8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+  return (
+    (result.status === 0 || result.status === 129) &&
+    result.stdout.includes('usage: git subtree')
+  );
+}
+
+function isGitWorkTree() {
+  const result = spawnSync('git', ['rev-parse', '--is-inside-work-tree'], {
+    cwd: root,
+    encoding: 'utf-8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+  return result.status === 0 && result.stdout.trim() === 'true';
+}
+
+function hasCommits() {
+  const result = spawnSync('git', ['rev-parse', '--verify', 'HEAD'], {
+    cwd: root,
+    encoding: 'utf-8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+  return result.status === 0;
+}
+
+function porcelainStatus() {
+  return run('git', ['status', '--porcelain'], { timeout: 30000 });
+}
+
+function ensureGitRepository() {
+  if (!isGitWorkTree()) {
+    if (checkOnly) {
+      fail('workspace is not a git repository');
+      return false;
+    }
+    log('initializing git repository for agent reference subtrees');
+    run('git', ['init'], { timeout: 30000 });
+  }
+
+  if (!hasCommits()) {
+    if (checkOnly) {
+      fail('workspace has no initial git commit');
+      return false;
+    }
+    log('creating initial workspace commit before adding reference subtrees');
+    run('git', ['add', '-A'], { timeout: 30000 });
+    run('git', ['commit', '-m', 'Initialize UltraModern workspace'], {
+      timeout: 120000,
+    });
+    return true;
+  }
+
+  const status = porcelainStatus();
+  if (status) {
+    fail(
+      'workspace has uncommitted changes; commit or stash them before installing reference subtrees',
+    );
+    return false;
+  }
+
+  return true;
+}
+
+function remoteCommit(repo) {
+  let output = run('git', ['ls-remote', repo.url, `refs/heads/${repo.ref}`], {
+    timeout: 120000,
+  });
+  if (!output) {
+    output = run('git', ['ls-remote', repo.url, repo.ref], {
+      timeout: 120000,
+    });
+  }
+  const [commit] = output.split(/\s+/);
+  if (!/^[a-f0-9]{40}$/i.test(commit ?? '')) {
+    throw new Error(`Could not resolve ${repo.url}#${repo.ref}`);
+  }
+  return commit;
+}
+
+function subtreeCommitExists(repo) {
+  const result = spawnSync(
+    'git',
+    [
+      'log',
+      '--grep',
+      `git-subtree-dir: ${repo.path}`,
+      '--format=%H',
+      '-n',
+      '1',
+    ],
+    {
+      cwd: root,
+      encoding: 'utf-8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    },
+  );
+  return result.status === 0 && result.stdout.trim().length > 0;
+}
+
+function installedManifestEntry(repo) {
+  if (!fs.existsSync(manifestPath)) {
+    return undefined;
+  }
+  try {
+    const manifest = readJson(manifestPath);
+    return manifest.repositories?.find(entry => entry.id === repo.id);
+  } catch {
+    return undefined;
+  }
+}
+
+function assertSubtreePresent(repo) {
+  assertSafeRepoPath(repo.path);
+  const targetPath = path.join(root, repo.path);
+  if (!fs.existsSync(targetPath)) {
+    fail(`${repo.path} is missing`);
+    return undefined;
+  }
+  if (!subtreeCommitExists(repo)) {
+    fail(`${repo.path} is present but has no git-subtree commit evidence`);
+    return undefined;
+  }
+  return (
+    installedManifestEntry(repo) ?? {
+      id: repo.id,
+      name: repo.name,
+      url: repo.url,
+      ref: repo.ref,
+      path: repo.path,
+      readOnly: repo.readOnly !== false,
+      status: 'present',
+      strategy: 'git-subtree-squash',
+    }
+  );
+}
+
+function addSubtree(repo) {
+  assertSafeRepoPath(repo.path);
+  const targetPath = path.join(root, repo.path);
+  const existing = fs.existsSync(targetPath);
+
+  if (existing && !refresh) {
+    return assertSubtreePresent(repo);
+  }
+
+  if (existing && refresh) {
+    fail(
+      `${repo.path} already exists; refresh for subtree references is intentionally manual`,
+    );
+    return undefined;
+  }
+
+  if (checkOnly) {
+    fail(`${repo.path} is missing`);
+    return undefined;
+  }
+
+  const commit = remoteCommit(repo);
+  log(`adding ${repo.name} as git subtree at ${repo.path} (${commit})`);
+  run('git', ['fetch', '--depth', '1', repo.url, repo.ref], {
+    timeout: 300000,
+  });
+  run(
+    'git',
+    [
+      'subtree',
+      'add',
+      '--prefix',
+      repo.path,
+      'FETCH_HEAD',
+      '--squash',
+      '-m',
+      `Add ${repo.name} agent reference repo`,
+    ],
+    { timeout: 600000 },
+  );
+
+  return {
+    schemaVersion: 1,
+    id: repo.id,
+    name: repo.name,
+    url: repo.url,
+    ref: repo.ref,
+    commit,
+    path: repo.path,
+    readOnly: repo.readOnly !== false,
+    strategy: 'git-subtree-squash',
+    status: 'installed',
+    installedAt: new Date().toISOString(),
+  };
+}
+
+function writeManifest(entries) {
+  fs.mkdirSync(path.dirname(manifestPath), { recursive: true });
+  fs.writeFileSync(
+    manifestPath,
+    `${JSON.stringify(
+      {
+        schemaVersion: 1,
+        generatedAt: new Date().toISOString(),
+        strategy: 'git-subtree-squash',
+        installDir: 'repos',
+        repositories: entries,
+      },
+      null,
+      2,
+    )}\n`,
+  );
+}
+
+function commitManifestIfChanged() {
+  const status = run('git', ['status', '--porcelain', '--', manifestPath], {
+    timeout: 30000,
+  });
+  if (!status) {
+    return;
+  }
+  run('git', ['add', manifestPath], { timeout: 30000 });
+  run('git', ['commit', '-m', 'Record agent reference repo manifest'], {
+    timeout: 120000,
+  });
+}
+
+function main() {
+  if (!fs.existsSync(configPath)) {
+    fail('Missing .agents/agent-reference-repos.json');
+    return;
+  }
+
+  const config = readJson(configPath);
+  const enabled = config.defaultEnabled !== false && !skipRequested;
+
+  if (!enabled) {
+    log('setup skipped; set ULTRAMODERN_SKIP_AGENT_REPOS=0 to enable it again');
+    return;
+  }
+
+  if (!hasGit()) {
+    fail('git is required to install agent reference repositories');
+    return;
+  }
+  if (!hasGitSubtree()) {
+    fail('git subtree is required to install agent reference repositories');
+    return;
+  }
+  if (!ensureGitRepository()) {
+    return;
+  }
+
+  const entries = [];
+  for (const repo of config.repositories ?? []) {
+    const result = checkOnly ? assertSubtreePresent(repo) : addSubtree(repo);
+    if (result) {
+      entries.push(result);
+    }
+  }
+
+  if (!checkOnly) {
+    writeManifest(entries);
+    commitManifestIfChanged();
+  }
+}
+
+try {
+  main();
+} catch (error) {
+  if (required || checkOnly) {
+    console.error(`[agent-reference-repos] ${error.message}`);
+    process.exitCode = 1;
+  } else {
+    warn(error.message);
+  }
+}