@cosmicdrift/kumiko-framework 0.320.0 → 0.321.0

package/src/pipeline/multi-stream-apply-context.ts

@@ -1,5 +1,6 @@
 import type { DerivativesContext } from "@cosmicdrift/kumiko-types/derivatives-types";
 import type { MultiStreamApplyContext } from "@cosmicdrift/kumiko-types/multi-stream-apply-context-types";
+import type { SecretsContext } from "@cosmicdrift/kumiko-types/secrets-types";
 import type { DbRunner } from "../db/connection";
 import type { AppendEventArgs, AppendEventFn, Registry, TenantId } from "../engine/types";
 import { loadAggregate, loadAggregateAsOf } from "../event-store/event-store";
@@ -32,6 +33,8 @@ export type MultiStreamApplyContextDeps = {
   readonly files?: FileContext;
   // Same DerivativesContext the outer AppContext carries — mirrors `files`.
   readonly derivatives?: DerivativesContext;
+  // Same SecretsContext the outer AppContext carries, mirrors `files`.
+  readonly secrets?: SecretsContext;
 };
 
 export function createMultiStreamApplyContext(
@@ -41,6 +44,7 @@ export function createMultiStreamApplyContext(
     registry: deps.registry,
     ...(deps.files ? { files: deps.files } : {}),
     ...(deps.derivatives ? { derivatives: deps.derivatives } : {}),
+    ...(deps.secrets ? { secrets: deps.secrets } : {}),
     appendEvent: (async (args: AppendEventArgs) => {
       await appendDomainEventCore(
         {

package/src/schema-cli.ts

@@ -115,7 +115,11 @@ export async function runSchemaCli(
   // migration, since the crashed process still records the migration as
   // applied and the rebuild is never retried.
   await ensureTemporalPolyfill();
-  const sub = argv[0];
+  // `--help`/`-h`/`help` fall through to the same "no subcommand" usage
+  // branch below (undefined) — a real request for help, not a typo that
+  // should fail loud like an unrecognized subcommand does.
+  const rawSub = argv[0];
+  const sub = rawSub === "--help" || rawSub === "-h" || rawSub === "help" ? undefined : rawSub;
   const schemaFile = resolvePath(appCwd, "kumiko/schema.ts");
   const migrationsDir = resolvePath(appCwd, "kumiko/migrations");
 

package/src/upgrade-cli.ts

@@ -100,22 +100,49 @@ function collectChangelogs(featuresDir: string): ChangelogEntry[] {
   return entries;
 }
 
-// Framework core changes belong to no feature — they live in a single
-// changes.json next to the framework sources.
-export function findCoreChangelogFile(cwd: string): string | null {
-  const repoPath = join(cwd, "packages/framework/src/changes.json");
-  if (existsSync(repoPath)) return repoPath;
-
+// bundled-features is excluded: findFeaturesDirs collects it per feature
+// (src/<feature>/changes.json), every other package has one src/changes.json.
+export function findPackageChangelogFiles(cwd: string): string[] {
+  const isFrameworkRepo = existsSync(join(cwd, "packages/framework"));
+  if (isFrameworkRepo) {
+    const packagesDir = join(cwd, "packages");
+    return readdirSync(packagesDir, { withFileTypes: true })
+      .filter((d) => d.isDirectory() && d.name !== "bundled-features")
+      .map((d) => join(packagesDir, d.name, "src", "changes.json"))
+      .filter((p) => existsSync(p));
+  }
+
+  // Consumer/app repo: walk up (same 10-level cap as the other node_modules
+  // walks) collecting every hoisted @cosmicdrift package's changes.json.
+  // Dedupe by package dir name — the nearest node_modules to cwd wins, same
+  // precedence as findCodemodScriptsRoot/readPackageVersion. realpath also
+  // dedupes a workspace symlink that resolves to an already-collected file.
+  const files: string[] = [];
+  const seenNames = new Set<string>();
+  const seenRealPaths = new Set<string>();
   let dir = cwd;
   for (let i = 0; i < 10; i++) {
-    const nmPath = join(dir, "node_modules/@cosmicdrift/kumiko-framework/src/changes.json");
-    if (existsSync(nmPath)) return nmPath;
+    const scopeDir = join(dir, "node_modules/@cosmicdrift");
+    if (existsSync(scopeDir)) {
+      const pkgNames = readdirSync(scopeDir, { withFileTypes: true })
+        .filter((d) => d.isDirectory() && d.name !== "kumiko-bundled-features")
+        .map((d) => d.name);
+      for (const name of pkgNames) {
+        if (seenNames.has(name)) continue;
+        const changelogPath = join(scopeDir, name, "src", "changes.json");
+        if (!existsSync(changelogPath)) continue;
+        seenNames.add(name);
+        const realPath = realpathSync(changelogPath);
+        if (seenRealPaths.has(realPath)) continue;
+        seenRealPaths.add(realPath);
+        files.push(changelogPath);
+      }
+    }
     const parent = join(dir, "..");
     if (parent === dir) break;
     dir = parent;
   }
-
-  return null;
+  return files;
 }
 
 export function findFeaturesDirs(cwd: string): string[] {
@@ -129,10 +156,9 @@ export function findFeaturesDirs(cwd: string): string[] {
   // Detected by presence of changes.json, not a package-name prefix — a
   // prefix heuristic silently stops matching once packages are renamed or a
   // differently-named package is added (fw#1605). Skipped inside the
-  // framework repo itself (packages/framework present): its own
-  // packages/framework/src/changes.json is the core changelog (already
-  // collected via findCoreChangelogFile), not a feature package, and would
-  // otherwise get double-counted as one here.
+  // framework repo itself (packages/framework present): every package's own
+  // changes.json is already collected via findPackageChangelogFiles, and
+  // would otherwise get double-counted as one here.
   const isFrameworkRepo = existsSync(join(cwd, "packages/framework"));
   const entDir = join(cwd, "packages");
   if (!isFrameworkRepo && existsSync(entDir)) {
@@ -459,6 +485,16 @@ async function applyCodemods(
   return 0;
 }
 
+const UPGRADE_USAGE = `kumiko-upgrade [--from <version>] [--dir <path>] [--json] [--verbose] [--apply [--dry-run]]
+
+  --from <version>   filter baseline version (default: last applied marker, or the installed version)
+  --dir <path>       target directory to check/apply against (default: cwd)
+  --json             machine-readable output
+  --verbose          include full migration details for each pending entry
+  --apply            run codemods for pending breaking changes and write the upgrade marker
+  --dry-run          with --apply, report what would run without writing anything
+  --help, -h         print this usage and exit`;
+
 // kumiko-lint-ignore complexity-budget CLI orchestration moved from bin/commands/upgrade.ts — same branching surface, shared by kumiko upgrade + published kumiko-upgrade bin
 export async function runUpgradeCli(
   argv: readonly string[],
@@ -466,6 +502,10 @@ export async function runUpgradeCli(
   out: UpgradeCliOut,
   options?: { readonly repoRoot?: string },
 ): Promise<number> {
+  if (argv.includes("--help") || argv.includes("-h")) {
+    out.log(UPGRADE_USAGE);
+    return 0;
+  }
   // Standalone CLI entry, not booted via runProdApp/runDevApp — Temporal needs an explicit polyfill here.
   await ensureTemporalPolyfill();
   const repoRoot = options?.repoRoot ?? cwd;
@@ -513,8 +553,8 @@ export async function runUpgradeCli(
   }
 
   const featuresDirs = findFeaturesDirs(cwd);
-  const coreChangelogFile = findCoreChangelogFile(cwd);
-  if (featuresDirs.length === 0 && !coreChangelogFile) {
+  const packageChangelogFiles = findPackageChangelogFiles(cwd);
+  if (featuresDirs.length === 0 && packageChangelogFiles.length === 0) {
     out.err("");
     out.err("  Could not find bundled-features directory.");
     out.err("  Run from framework/enterprise repo or an app with node_modules.");
@@ -526,8 +566,8 @@ export async function runUpgradeCli(
   for (const dir of featuresDirs) {
     allEntries.push(...collectChangelogs(dir));
   }
-  if (coreChangelogFile) {
-    allEntries.push(...readChangelogFile(coreChangelogFile));
+  for (const changelogFile of packageChangelogFiles) {
+    allEntries.push(...readChangelogFile(changelogFile));
   }
   const pending = sortEntries(filterEntriesAfter(allEntries, currentVersion));