@quonfig/cli 0.0.34 → 0.0.35

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @quonfig/cli
 $ qfg COMMAND
 running command...
 $ qfg (--version)
-@quonfig/cli/0.0.34 linux-x64 node-v24.4.1
+@quonfig/cli/0.0.35 linux-x64 node-v24.4.1
 $ qfg --help [COMMAND]
 USAGE
   $ qfg COMMAND
@@ -91,7 +91,7 @@ EXAMPLES
   $ qfg config-schema --json-schema    # full JSON Schema document (copy into your editor)
 ```
 
-_See code: [src/commands/config-schema.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/config-schema.ts)_
+_See code: [src/commands/config-schema.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/config-schema.ts)_
 
 ## `qfg create NAME`
 
@@ -176,7 +176,7 @@ EXAMPLES
   $ qfg set-rollout my.new.flag --environment production --true-percent 20
 ```
 
-_See code: [src/commands/create.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/create.ts)_
+_See code: [src/commands/create.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/create.ts)_
 
 ## `qfg delete NAME`
 
@@ -222,7 +222,7 @@ EXAMPLES
   $ qfg delete my.config --yes
 ```
 
-_See code: [src/commands/delete.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/delete.ts)_
+_See code: [src/commands/delete.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/delete.ts)_
 
 ## `qfg flag info [NAME]`
 
@@ -425,7 +425,7 @@ EXAMPLES
   $ qfg generate --targets node-ts -o ./dist # combine with targets
 ```
 
-_See code: [src/commands/generate.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/generate.ts)_
 
 ## `qfg generate-new-hex-key`
 
@@ -448,7 +448,7 @@ EXAMPLES
   $ qfg generate-new-hex-key
 ```
 
-_See code: [src/commands/generate-new-hex-key.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/generate-new-hex-key.ts)_
+_See code: [src/commands/generate-new-hex-key.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/generate-new-hex-key.ts)_
 
 ## `qfg get [NAME]`
 
@@ -480,7 +480,7 @@ EXAMPLES
   $ qfg get my.config.name --environment=production
 ```
 
-_See code: [src/commands/get.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/get.ts)_
+_See code: [src/commands/get.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/get.ts)_
 
 ## `qfg info [NAME]`
 
@@ -528,7 +528,7 @@ EXAMPLES
   $ qfg info my.config.name --exclude-evaluations   # skip 24h stats
 ```
 
-_See code: [src/commands/info.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/info.ts)_
 
 ## `qfg init [DIRECTORY]`
 
@@ -568,7 +568,7 @@ EXAMPLES
   $ qfg init --dry-run
 ```
 
-_See code: [src/commands/init.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/init.ts)_
 
 ## `qfg interactive`
 
@@ -598,7 +598,7 @@ EXAMPLES
   $ qfg
 ```
 
-_See code: [src/commands/interactive.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/interactive.ts)_
+_See code: [src/commands/interactive.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/interactive.ts)_
 
 ## `qfg list`
 
@@ -638,7 +638,7 @@ EXAMPLES
   $ qfg list --feature-flags
 ```
 
-_See code: [src/commands/list.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/list.ts)_
+_See code: [src/commands/list.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/list.ts)_
 
 ## `qfg log-level NAME`
 
@@ -703,7 +703,7 @@ EXAMPLES
   $ qfg log-level log-level.my-app --target=Chatty --value=INFO --environment=production
 ```
 
-_See code: [src/commands/log-level.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/log-level.ts)_
+_See code: [src/commands/log-level.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/log-level.ts)_
 
 ## `qfg login`
 
@@ -728,7 +728,7 @@ EXAMPLES
   $ qfg login --profile myprofile
 ```
 
-_See code: [src/commands/login.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/login.ts)_
 
 ## `qfg logout`
 
@@ -751,7 +751,7 @@ EXAMPLES
   $ qfg logout
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/logout.ts)_
 
 ## `qfg migrate`
 
@@ -805,7 +805,7 @@ EXAMPLES
   $ qfg migrate --from launch --api-key $LAUNCH_API_KEY --dir ./quonfig-repo --staging
 ```
 
-_See code: [src/commands/migrate.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/migrate.ts)_
+_See code: [src/commands/migrate.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/migrate.ts)_
 
 ## `qfg migrate doctor`
 
@@ -843,7 +843,7 @@ EXAMPLES
   $ qfg migrate doctor --json
 ```
 
-_See code: [src/commands/migrate/doctor.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/migrate/doctor.ts)_
+_See code: [src/commands/migrate/doctor.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/migrate/doctor.ts)_
 
 ## `qfg migrate my-code`
 
@@ -875,7 +875,7 @@ EXAMPLES
   $ qfg migrate my-code --dry-run
 ```
 
-_See code: [src/commands/migrate/my-code.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/migrate/my-code.ts)_
+_See code: [src/commands/migrate/my-code.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/migrate/my-code.ts)_
 
 ## `qfg migrate status`
 
@@ -906,7 +906,7 @@ EXAMPLES
   $ qfg migrate status --json
 ```
 
-_See code: [src/commands/migrate/status.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/migrate/status.ts)_
+_See code: [src/commands/migrate/status.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/migrate/status.ts)_
 
 ## `qfg override [NAME] [VALUE]`
 
@@ -961,7 +961,7 @@ EXAMPLES
   $ qfg override my.flag true --env=staging
 ```
 
-_See code: [src/commands/override.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/override.ts)_
+_See code: [src/commands/override.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/override.ts)_
 
 ## `qfg pull`
 
@@ -1008,7 +1008,7 @@ EXAMPLES
   $ qfg pull  # uses QUONFIG_DIR env var
 ```
 
-_See code: [src/commands/pull.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/pull.ts)_
+_See code: [src/commands/pull.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/pull.ts)_
 
 ## `qfg push`
 
@@ -1056,7 +1056,7 @@ EXAMPLES
   $ qfg push --dir ./our-config --yes
 ```
 
-_See code: [src/commands/push.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/push.ts)_
+_See code: [src/commands/push.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/push.ts)_
 
 ## `qfg schema NAME`
 
@@ -1094,7 +1094,7 @@ EXAMPLES
   $ qfg schema my-schema --set-json-schema=@schemas/my-schema.json --protected
 ```
 
-_See code: [src/commands/schema.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/schema.ts)_
+_See code: [src/commands/schema.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/schema.ts)_
 
 ## `qfg sdk-key`
 
@@ -1121,7 +1121,7 @@ EXAMPLES
   $ qfg sdk-key revoke <key-id>
 ```
 
-_See code: [src/commands/sdk-key.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/sdk-key.ts)_
+_See code: [src/commands/sdk-key.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/sdk-key.ts)_
 
 ## `qfg sdk-key create`
 
@@ -1153,7 +1153,7 @@ EXAMPLES
   $ qfg sdk-key create --environment staging --type browser
 ```
 
-_See code: [src/commands/sdk-key/create.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/sdk-key/create.ts)_
+_See code: [src/commands/sdk-key/create.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/sdk-key/create.ts)_
 
 ## `qfg sdk-key list`
 
@@ -1182,7 +1182,7 @@ EXAMPLES
   $ qfg sdk-key list --environment production
 ```
 
-_See code: [src/commands/sdk-key/list.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/sdk-key/list.ts)_
+_See code: [src/commands/sdk-key/list.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/sdk-key/list.ts)_
 
 ## `qfg sdk-key revoke KEYID`
 
@@ -1209,7 +1209,7 @@ EXAMPLES
   $ qfg sdk-key revoke a1b2c3d4-e5f6-7890-abcd-ef1234567890
 ```
 
-_See code: [src/commands/sdk-key/revoke.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/sdk-key/revoke.ts)_
+_See code: [src/commands/sdk-key/revoke.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/sdk-key/revoke.ts)_
 
 ## `qfg set-default [NAME]`
 
@@ -1280,7 +1280,7 @@ EXAMPLES
   $ qfg pull && qfg config-schema
 ```
 
-_See code: [src/commands/set-default.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/set-default.ts)_
+_See code: [src/commands/set-default.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/set-default.ts)_
 
 ## `qfg set-rollout [NAME]`
 
@@ -1357,7 +1357,7 @@ EXAMPLES
   $ qfg set-rollout my.variant.flag --environment production --weights "a:33,b:33,c:34" --hash-by user.id
 ```
 
-_See code: [src/commands/set-rollout.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/set-rollout.ts)_
+_See code: [src/commands/set-rollout.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/set-rollout.ts)_
 
 ## `qfg sync`
 
@@ -1389,7 +1389,7 @@ EXAMPLES
   $ qfg sync --watch --dir ./our-config --interval 30
 ```
 
-_See code: [src/commands/sync.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/sync.ts)_
+_See code: [src/commands/sync.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/sync.ts)_
 
 ## `qfg toggle [NAME]`
 
@@ -1491,7 +1491,7 @@ EXAMPLES
   $ qfg verify --json
 ```
 
-_See code: [src/commands/verify.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/verify.ts)_
+_See code: [src/commands/verify.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/verify.ts)_
 
 ## `qfg whoami`
 
@@ -1514,7 +1514,7 @@ EXAMPLES
   $ qfg whoami
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/whoami.ts)_
+_See code: [src/commands/whoami.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/whoami.ts)_
 
 ## `qfg workspace`
 
@@ -1537,7 +1537,7 @@ EXAMPLES
   $ qfg workspace
 ```
 
-_See code: [src/commands/workspace.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/workspace.ts)_
+_See code: [src/commands/workspace.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/workspace.ts)_
 
 ## `qfg workspace bootstrap`
 
@@ -1570,7 +1570,7 @@ EXAMPLES
   $ qfg workspace bootstrap --dir ./our-config --skip-validate
 ```
 
-_See code: [src/commands/workspace/bootstrap.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/workspace/bootstrap.ts)_
+_See code: [src/commands/workspace/bootstrap.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/workspace/bootstrap.ts)_
 
 ## `qfg workspace create SLUG`
 
@@ -1604,7 +1604,7 @@ EXAMPLES
   $ qfg workspace create my-team --org 11111111-1111-1111-1111-111111111111
 ```
 
-_See code: [src/commands/workspace/create.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/workspace/create.ts)_
+_See code: [src/commands/workspace/create.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/workspace/create.ts)_
 
 ## `qfg workspace switch [SLUG]`
 
@@ -1632,7 +1632,7 @@ EXAMPLES
   $ qfg workspace switch acme/production
 ```
 
-_See code: [src/commands/workspace/switch.ts](https://github.com/quonfig/cli/blob/v0.0.34/src/commands/workspace/switch.ts)_
+_See code: [src/commands/workspace/switch.ts](https://github.com/quonfig/cli/blob/v0.0.35/src/commands/workspace/switch.ts)_
 <!-- commandsstop -->
 
 ## Local Development

package/dist/commands/migrate.js

@@ -3,7 +3,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { BaseCommand } from '../index.js';
 import { CrossSourceError, assertSourceMatches, readImportState } from '../migrate/import-state.js';
-import { applyLocalMigration } from '../migrate/local-write.js';
+import { applyLocalMigration, MigratorKeyCollisionError } from '../migrate/local-write.js';
 import { buildPushConflictSuggestion } from '../migrate/migrate-suggestion.js';
 import { PushConflictError, PushHookRejectedError } from '../util/clone-and-stack-push.js';
 import { MigratorVerifyError, pushMigrationToCloud } from '../migrate/push-to-cloud.js';
@@ -150,12 +150,11 @@ export default class Migrate extends BaseCommand {
                 try {
                     const result = await pushMigrationToCloud({
                         changes: toProcess,
-                        commitMessage: buildCommitMessage(flags.from, toProcess.length),
                         environments,
                         importState,
                         localDir: dir,
                         remoteUrl: repoUrl,
-                        reportData: buildReportData(flags.from, toProcess.length),
+                        reportData: buildReportData(flags.from),
                         source,
                     });
                     duplicateResolutionsForWarn = result.duplicateResolutions;
@@ -183,6 +182,9 @@ export default class Migrate extends BaseCommand {
                             `Fix the issues above (typically in the source system or by editing the local files), then re-run with --push. ` +
                             `You can re-run \`qfg verify ${dir}\` locally to confirm the fixes before pushing.`);
                     }
+                    if (error instanceof MigratorKeyCollisionError) {
+                        return this.err(error.message);
+                    }
                     throw error;
                 }
             }
@@ -194,11 +196,10 @@ export default class Migrate extends BaseCommand {
             this.log(`Fetched ${changes.length} change(s) from ${flags.from}; processing ${toProcess.length} into ${dir}.`);
             const localResult = await applyLocalMigration({
                 changes: toProcess,
-                commitMessage: buildCommitMessage(flags.from, toProcess.length),
                 environments,
                 importState: localImportState,
                 localDir: dir,
-                reportData: buildReportData(flags.from, toProcess.length),
+                reportData: buildReportData(flags.from),
                 source,
             });
             duplicateResolutionsForWarn = localResult.duplicateResolutions;
@@ -215,6 +216,8 @@ export default class Migrate extends BaseCommand {
         catch (error) {
             if (error instanceof NotYetImplementedError)
                 return this.err(error.message);
+            if (error instanceof MigratorKeyCollisionError)
+                return this.err(error.message);
             throw error;
         }
         finally {
@@ -247,16 +250,20 @@ function latestChangedAtOf(changes, fallback) {
     }
     return latest ?? fallback;
 }
-function buildCommitMessage(source, count) {
-    return `migrator: import ${count} change(s) from ${source}`;
-}
-function buildReportData(source, count) {
+function buildReportData(source) {
+    // Counts are placeholders; applyLocalMigration / pushMigrationToCloud
+    // override `counts` after writing files so they reflect what actually
+    // landed on disk (qfg-7eig). The commit message is also derived from those
+    // counts inside the apply function — it is not built here.
     return {
         cleanMappings: [],
         counts: {
+            configsMigrated: 0,
             environmentsMapped: 0,
-            flagsMigrated: count,
+            flagsMigrated: 0,
             itemsSkipped: 0,
+            logLevelsMigrated: 0,
+            schemasMigrated: 0,
             segmentsMigrated: 0,
         },
         dryRun: false,

package/dist/migrate/local-write.d.ts

@@ -1,18 +1,21 @@
 import { type ImportState } from './import-state.js';
 import { type MigrationReportData } from './migration-report.js';
 import { type PushIdentity } from '../util/clone-and-stack-push.js';
-import type { CoercedSentinelSummary, DroppedOverrideSummary, DuplicateResolutionSummary, LegacyChange, MigrationSource, SkippedConfigSummary } from './source.js';
+import type { CoercedSentinelSummary, DroppedOverrideSummary, DuplicateResolution, DuplicateResolutionSummary, LegacyChange, MigrationSource, SkippedConfigSummary } from './source.js';
 export interface ApplyLocalMigrationOptions {
     /** Commit author. Defaults to the migrator identity. */
     author?: PushIdentity;
     /** Initial branch name when initializing a fresh repo. Defaults to `main`. */
     branch?: string;
     changes: LegacyChange[];
-    commitMessage: string;
     /** Environments discovered from the source (slugified). Written to `quonfig.json` if missing. */
     environments: string[];
     importState: ImportState;
     localDir: string;
+    /**
+     * Base report data. The migrator overrides `counts` after writing files,
+     * since counts must reflect what was actually written to disk (qfg-7eig).
+     */
     reportData: MigrationReportData;
     source: MigrationSource;
 }
@@ -31,4 +34,18 @@ export interface ApplyLocalMigrationResult {
     /** Configs soft-skipped during translate due to invalid source data. Null if none. */
     skippedConfigs: SkippedConfigSummary | null;
 }
+export declare class MigratorKeyCollisionError extends Error {
+    readonly destPath: string;
+    readonly firstSourceKey: string;
+    readonly secondSourceKey: string;
+    constructor(destPath: string, firstSourceKey: string, secondSourceKey: string);
+}
+export declare const writeQuonfigFiles: (dir: string, changes: LegacyChange[], source: MigrationSource) => WriteQuonfigFilesResult;
+interface WriteQuonfigFilesResult {
+    livePaths: string[];
+    resolutions: DuplicateResolution[];
+}
+export declare const buildMigrationCounts: (livePaths: string[], environmentsMapped: number, itemsSkipped: number) => import("./migration-report.js").MigrationReportCounts;
+export declare const buildMigrationCommitMessage: (source: string, counts: import("./migration-report.js").MigrationReportCounts) => string;
 export declare const applyLocalMigration: (opts: ApplyLocalMigrationOptions) => Promise<ApplyLocalMigrationResult>;
+export {};

package/dist/migrate/local-write.js

@@ -32,11 +32,54 @@ const ensureLocalRepo = async (localDir, branch) => {
     await runGit(['init', `--initial-branch=${branch}`, localDir]);
     return 'initialized';
 };
-const writeQuonfigFiles = (dir, changes, source) => {
+export class MigratorKeyCollisionError extends Error {
+    destPath;
+    firstSourceKey;
+    secondSourceKey;
+    constructor(destPath, firstSourceKey, secondSourceKey) {
+        super(`Two source keys collide on destination ${destPath} after key normalization: ` +
+            `"${firstSourceKey}" and "${secondSourceKey}". Quonfig keys must be globally unique within a type tree. ` +
+            `Rename one in the source system and re-run.`);
+        this.destPath = destPath;
+        this.firstSourceKey = firstSourceKey;
+        this.secondSourceKey = secondSourceKey;
+        this.name = 'MigratorKeyCollisionError';
+    }
+}
+const ensureNoNestedPath = (relativePath) => {
+    // qfg-qhk1: every output must be exactly `<type-dir>/<flat-key>.json` —
+    // never nested. If we ever emit a nested path, refuse to write so we surface
+    // it loudly rather than silently producing dirs that lose the flat-file
+    // contract (and break tombstone cleanup on subsequent runs).
+    const parts = relativePath.split('/');
+    if (parts.length !== 2) {
+        throw new Error(`Migrator refusing to write nested path "${relativePath}" — outputs must be flat <type-dir>/<key>.json. ` +
+            `This is a bug in the source's translate() — it should normalize key separators before computing the path.`);
+    }
+};
+const rmdirIfEmpty = (dir) => {
+    try {
+        fs.rmdirSync(dir);
+    }
+    catch (error) {
+        const e = error;
+        // ENOTEMPTY: still has contents (expected, leave alone). ENOENT: already gone.
+        if (e.code !== 'ENOTEMPTY' && e.code !== 'ENOENT')
+            throw error;
+    }
+};
+export const writeQuonfigFiles = (dir, changes, source) => {
     const livePaths = new Map();
+    // qfg-qhk1: track which source key wrote each destination path. If a second,
+    // different source key tries to write to the same destination, that is a
+    // post-normalization collision (e.g. source had keys `foo/bar` and `foo.bar`,
+    // both normalize to `foo.bar`). Throw with a clear message.
+    const pathOwners = new Map();
     for (const change of changes) {
         const files = source.translate(change);
+        const sourceKey = change.key ?? '(unknown)';
         for (const file of files) {
+            ensureNoNestedPath(file.path);
             const full = path.join(dir, file.path);
             if (file.deleted) {
                 try {
@@ -47,14 +90,25 @@ const writeQuonfigFiles = (dir, changes, source) => {
                         throw error;
                 }
                 livePaths.delete(file.path);
+                pathOwners.delete(file.path);
+                // qfg-qhk1: clean up any empty parent dirs left over from prior runs
+                // that wrote under a nested layout. (New runs never create nested
+                // dirs because of normalizeKey + ensureNoNestedPath, but stale dirs
+                // from older versions on disk would otherwise persist.)
+                rmdirIfEmpty(path.dirname(full));
             }
             else {
                 if (file.contents === undefined) {
                     throw new Error(`translate() emitted a write op for ${file.path} without contents`);
                 }
+                const existingOwner = pathOwners.get(file.path);
+                if (existingOwner !== undefined && existingOwner !== sourceKey) {
+                    throw new MigratorKeyCollisionError(file.path, existingOwner, sourceKey);
+                }
                 fs.mkdirSync(path.dirname(full), { recursive: true });
                 fs.writeFileSync(full, file.contents);
                 livePaths.set(file.path, true);
+                pathOwners.set(file.path, sourceKey);
             }
         }
     }
@@ -71,7 +125,47 @@ const writeQuonfigFiles = (dir, changes, source) => {
             livePaths.delete(toDelete);
         }
     }
-    return resolutions;
+    return { livePaths: [...livePaths.keys()], resolutions };
+};
+const countsFromLivePaths = (livePaths) => {
+    let flagsMigrated = 0;
+    let configsMigrated = 0;
+    let segmentsMigrated = 0;
+    let schemasMigrated = 0;
+    let logLevelsMigrated = 0;
+    for (const p of livePaths) {
+        if (p.startsWith('feature-flags/'))
+            flagsMigrated++;
+        else if (p.startsWith('configs/'))
+            configsMigrated++;
+        else if (p.startsWith('segments/'))
+            segmentsMigrated++;
+        else if (p.startsWith('schemas/'))
+            schemasMigrated++;
+        else if (p.startsWith('log-levels/'))
+            logLevelsMigrated++;
+    }
+    return { configsMigrated, flagsMigrated, logLevelsMigrated, schemasMigrated, segmentsMigrated };
+};
+export const buildMigrationCounts = (livePaths, environmentsMapped, itemsSkipped) => ({
+    ...countsFromLivePaths(livePaths),
+    environmentsMapped,
+    itemsSkipped,
+});
+export const buildMigrationCommitMessage = (source, counts) => {
+    const parts = [];
+    if (counts.flagsMigrated > 0)
+        parts.push(`${counts.flagsMigrated} flag(s)`);
+    if (counts.configsMigrated > 0)
+        parts.push(`${counts.configsMigrated} config(s)`);
+    if (counts.segmentsMigrated > 0)
+        parts.push(`${counts.segmentsMigrated} segment(s)`);
+    if (counts.schemasMigrated > 0)
+        parts.push(`${counts.schemasMigrated} schema(s)`);
+    if (counts.logLevelsMigrated > 0)
+        parts.push(`${counts.logLevelsMigrated} log-level(s)`);
+    const summary = parts.length === 0 ? 'no objects' : parts.join(', ');
+    return `migrator: imported ${summary} from ${source}`;
 };
 export const applyLocalMigration = async (opts) => {
     const branch = opts.branch ?? 'main';
@@ -80,15 +174,18 @@ export const applyLocalMigration = async (opts) => {
     await runGit(['-C', opts.localDir, 'config', 'user.name', author.name]);
     await runGit(['-C', opts.localDir, 'config', 'user.email', author.email]);
     ensureQuonfigJson(opts.localDir, opts.environments);
-    const resolutionEntries = writeQuonfigFiles(opts.localDir, opts.changes, opts.source);
+    const { livePaths, resolutions: resolutionEntries } = writeQuonfigFiles(opts.localDir, opts.changes, opts.source);
     removeQfFromGitignore(opts.localDir);
     writeImportState(opts.localDir, opts.importState);
     const droppedOverrides = opts.source.getDroppedOverrides?.() ?? null;
     const skippedConfigs = opts.source.getSkippedConfigs?.() ?? null;
     const coercedSentinels = opts.source.getCoercedSentinels?.() ?? null;
     const duplicateResolutions = resolutionEntries.length > 0 ? { entries: resolutionEntries, total: resolutionEntries.length } : null;
+    const skippedTotal = (skippedConfigs?.total ?? 0) + resolutionEntries.reduce((sum, r) => sum + r.deleted.length, 0);
+    const counts = buildMigrationCounts(livePaths, opts.environments.length, skippedTotal);
     const reportData = {
         ...opts.reportData,
+        counts,
         ...(coercedSentinels ? { coercedSentinels } : {}),
         ...(droppedOverrides ? { droppedOverrides } : {}),
         ...(duplicateResolutions ? { duplicateResolutions } : {}),
@@ -107,8 +204,9 @@ export const applyLocalMigration = async (opts) => {
             skippedConfigs,
         };
     }
+    const commitMessage = buildMigrationCommitMessage(opts.source.name, counts);
     await spawnGit(['-C', opts.localDir, 'commit', '-F', '-'], {
-        stdin: opts.commitMessage,
+        stdin: commitMessage,
         env: {
             GIT_AUTHOR_EMAIL: author.email,
             GIT_AUTHOR_NAME: author.name,

package/dist/migrate/migration-report.d.ts

@@ -1,9 +1,12 @@
 import type { IdentifierMap } from './identifier-map.js';
 import type { CoercedSentinelSummary, DroppedOverrideSummary, DuplicateResolutionSummary, SkippedConfigSummary } from './source.js';
 export interface MigrationReportCounts {
+    configsMigrated: number;
     environmentsMapped: number;
     flagsMigrated: number;
     itemsSkipped: number;
+    logLevelsMigrated: number;
+    schemasMigrated: number;
     segmentsMigrated: number;
 }
 export interface CleanMapping {

package/dist/migrate/migration-report.js

@@ -5,7 +5,10 @@ const renderCounts = (counts) => [
     '## Counts',
     '',
     `- Flags migrated: ${counts.flagsMigrated}`,
+    `- Configs migrated: ${counts.configsMigrated}`,
     `- Segments migrated: ${counts.segmentsMigrated}`,
+    `- Schemas migrated: ${counts.schemasMigrated}`,
+    `- Log levels migrated: ${counts.logLevelsMigrated}`,
     `- Environments mapped: ${counts.environmentsMapped}`,
     `- Items skipped: ${counts.itemsSkipped}`,
 ].join('\n');

package/dist/migrate/push-to-cloud.d.ts

@@ -17,7 +17,6 @@ export declare class MigratorVerifyError extends Error {
 export interface PushMigrationToCloudOptions {
     branch?: string;
     changes: LegacyChange[];
-    commitMessage: string;
     /**
      * Source-side environments (slugified). Additively merged into the target
      * workspace's quonfig.json so flag files that reference these envs verify
@@ -27,6 +26,10 @@ export interface PushMigrationToCloudOptions {
     importState: ImportState;
     localDir: string;
     remoteUrl: string;
+    /**
+     * Base report data. The migrator overrides `counts` after writing files,
+     * since counts must reflect what was actually written to disk (qfg-7eig).
+     */
     reportData: MigrationReportData;
     source: MigrationSource;
 }

package/dist/migrate/push-to-cloud.js

@@ -1,8 +1,8 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { removeQfFromGitignore, writeImportState } from './import-state.js';
+import { buildMigrationCommitMessage, buildMigrationCounts, writeQuonfigFiles } from './local-write.js';
 import { writeMigrationReport } from './migration-report.js';
-import { detectDuplicateKeys } from './sources/launch/translate.js';
 import { cloneAndStackPush, } from '../util/clone-and-stack-push.js';
 import { formatResult, validateWorkspace } from '../verify/validate.js';
 /**
@@ -23,47 +23,6 @@ export class MigratorVerifyError extends Error {
         this.result = result;
     }
 }
-const writeQuonfigFiles = (dir, changes, source) => {
-    const livePaths = new Map();
-    for (const change of changes) {
-        const files = source.translate(change);
-        for (const file of files) {
-            const full = path.join(dir, file.path);
-            if (file.deleted) {
-                try {
-                    fs.unlinkSync(full);
-                }
-                catch (error) {
-                    if (error.code !== 'ENOENT')
-                        throw error;
-                }
-                livePaths.delete(file.path);
-            }
-            else {
-                if (file.contents === undefined) {
-                    throw new Error(`translate() emitted a write op for ${file.path} without contents`);
-                }
-                fs.mkdirSync(path.dirname(full), { recursive: true });
-                fs.writeFileSync(full, file.contents);
-                livePaths.set(file.path, true);
-            }
-        }
-    }
-    const resolutions = detectDuplicateKeys([...livePaths.keys()].map((p) => ({ path: p })));
-    for (const resolution of resolutions) {
-        for (const toDelete of resolution.deleted) {
-            try {
-                fs.unlinkSync(path.join(dir, toDelete));
-            }
-            catch (error) {
-                if (error.code !== 'ENOENT')
-                    throw error;
-            }
-            livePaths.delete(toDelete);
-        }
-    }
-    return resolutions;
-};
 const QUONFIG_JSON_FILENAME = 'quonfig.json';
 const mergeEnvironmentsIntoQuonfigJson = (dir, sourceEnvs) => {
     const quonfigPath = path.join(dir, QUONFIG_JSON_FILENAME);
@@ -88,12 +47,13 @@ export const pushMigrationToCloud = async (opts) => {
     let droppedOverrides = null;
     let duplicateResolutions = null;
     let skippedConfigs = null;
+    let computedCommitMessage = `migrator: imported 0 objects from ${opts.source.name}`;
     const cloneOpts = {
         applyDelta(dir) {
             if (opts.environments && opts.environments.length > 0) {
                 mergeEnvironmentsIntoQuonfigJson(dir, opts.environments);
             }
-            const resolutionEntries = writeQuonfigFiles(dir, opts.changes, opts.source);
+            const { livePaths, resolutions: resolutionEntries } = writeQuonfigFiles(dir, opts.changes, opts.source);
             removeQfFromGitignore(dir);
             writeImportState(dir, opts.importState);
             droppedOverrides = opts.source.getDroppedOverrides?.() ?? null;
@@ -101,8 +61,13 @@ export const pushMigrationToCloud = async (opts) => {
             coercedSentinels = opts.source.getCoercedSentinels?.() ?? null;
             duplicateResolutions =
                 resolutionEntries.length > 0 ? { entries: resolutionEntries, total: resolutionEntries.length } : null;
+            const skippedTotal = (skippedConfigs?.total ?? 0) + resolutionEntries.reduce((sum, r) => sum + r.deleted.length, 0);
+            const environmentsCount = opts.environments?.length ?? 0;
+            const counts = buildMigrationCounts(livePaths, environmentsCount, skippedTotal);
+            computedCommitMessage = buildMigrationCommitMessage(opts.source.name, counts);
             const reportData = {
                 ...opts.reportData,
+                counts,
                 ...(coercedSentinels ? { coercedSentinels } : {}),
                 ...(droppedOverrides ? { droppedOverrides } : {}),
                 ...(duplicateResolutions ? { duplicateResolutions } : {}),
@@ -117,7 +82,7 @@ export const pushMigrationToCloud = async (opts) => {
             if (!verifyResult.valid)
                 throw new MigratorVerifyError(verifyResult);
         },
-        commitMessage: opts.commitMessage,
+        commitMessage: () => computedCommitMessage,
         localDir: opts.localDir,
         remoteUrl: opts.remoteUrl,
     };

package/dist/migrate/sources/launch/translate.d.ts

@@ -11,6 +11,22 @@ export declare class InvalidSourceConfigError extends Error {
 export declare function slugify(value: string): string;
 export declare function isLegacyLogLevel(type: string): boolean;
 export declare function normalizeLogLevelKey(key: string): string;
+/**
+ * qfg-qhk1: Quonfig keys cannot contain `/` — keys are stored as flat dotted
+ * filenames, and a `/` in a source key would create a nested directory tree
+ * (data-loss-on-tombstone, cross-key collisions). Normalize `/` to `.` so the
+ * destination is always flat.
+ */
+export declare function normalizeKey(key: string): string;
+/**
+ * qfg-l18w: Operators Quonfig accepts in rule criteria. Mirrors the
+ * `OperatorSchema` enum in cli/src/verify/validate.ts (and app-quonfig's
+ * config-schemas.ts). If we emit an operator outside this set, qfg verify
+ * fails — which is what was happening for `PROP_SEMVER_*` in the FormHealth
+ * dry-run before this check existed. Keep this list in lockstep with the
+ * verify schema; a CI test in this file enforces parity.
+ */
+export declare const QUONFIG_SUPPORTED_OPERATORS: Set<string>;
 export declare function transformConfig(config: LaunchConfig, envIdMap: Record<string, string>, onDroppedEnv?: (envId: string) => void, onCoercedSentinel?: (envId: string, valueType: string) => void): Record<string, unknown>;
 export declare function getOutputPath(type: string, key: string): string;
 /**

package/dist/migrate/sources/launch/translate.js

@@ -23,6 +23,106 @@ export function isLegacyLogLevel(type) {
 export function normalizeLogLevelKey(key) {
     return key.startsWith('log-level.') ? key : `log-level.${key}`;
 }
+/**
+ * qfg-qhk1: Quonfig keys cannot contain `/` — keys are stored as flat dotted
+ * filenames, and a `/` in a source key would create a nested directory tree
+ * (data-loss-on-tombstone, cross-key collisions). Normalize `/` to `.` so the
+ * destination is always flat.
+ */
+export function normalizeKey(key) {
+    return key.replaceAll('/', '.');
+}
+/**
+ * qfg-l18w: Operators Quonfig accepts in rule criteria. Mirrors the
+ * `OperatorSchema` enum in cli/src/verify/validate.ts (and app-quonfig's
+ * config-schemas.ts). If we emit an operator outside this set, qfg verify
+ * fails — which is what was happening for `PROP_SEMVER_*` in the FormHealth
+ * dry-run before this check existed. Keep this list in lockstep with the
+ * verify schema; a CI test in this file enforces parity.
+ */
+export const QUONFIG_SUPPORTED_OPERATORS = new Set([
+    'ALWAYS_TRUE',
+    'PROP_IS_ONE_OF',
+    'PROP_IS_NOT_ONE_OF',
+    'PROP_STARTS_WITH_ONE_OF',
+    'PROP_DOES_NOT_START_WITH_ONE_OF',
+    'PROP_ENDS_WITH_ONE_OF',
+    'PROP_DOES_NOT_END_WITH_ONE_OF',
+    'PROP_CONTAINS_ONE_OF',
+    'PROP_DOES_NOT_CONTAIN_ONE_OF',
+    'PROP_LESS_THAN',
+    'PROP_LESS_THAN_OR_EQUAL',
+    'PROP_GREATER_THAN',
+    'PROP_GREATER_THAN_OR_EQUAL',
+    'PROP_BEFORE',
+    'PROP_AFTER',
+    'PROP_MATCHES',
+    'PROP_DOES_NOT_MATCH',
+    'IN_SEG',
+    'NOT_IN_SEG',
+    'IN_INT_RANGE',
+    'LOOKUP_KEY_IN',
+    'LOOKUP_KEY_NOT_IN',
+]);
+/**
+ * qfg-l18w: Walk every rule criterion in a transformed config and fail-fast at
+ * migrate time if it carries an operator Quonfig does not understand. The
+ * primary offender today is `PROP_SEMVER_*` (Launch supports semver
+ * comparisons; Quonfig does not have a semver operator at all). Without this
+ * check the migrator silently writes invalid JSON and the failure surfaces
+ * later at qfg-verify — the customer's local file is broken and re-runs
+ * re-clobber any manual fix.
+ *
+ * Routes through `InvalidSourceConfigError` so the failure is per-config (the
+ * rest of the run still produces a usable workspace, and the offending key
+ * lands in MIGRATION_REPORT.md's "Skipped invalid configs" section with a
+ * specific reason — exactly what the customer needs to take to support).
+ */
+function collectUnsupportedOperators(rules) {
+    if (!Array.isArray(rules))
+        return [];
+    const found = [];
+    for (const rule of rules) {
+        if (!rule || typeof rule !== 'object')
+            continue;
+        const r = rule;
+        if (!Array.isArray(r.criteria))
+            continue;
+        for (const crit of r.criteria) {
+            if (!crit || typeof crit !== 'object')
+                continue;
+            const c = crit;
+            if (typeof c.operator !== 'string')
+                continue;
+            if (!QUONFIG_SUPPORTED_OPERATORS.has(c.operator)) {
+                found.push(c.operator);
+            }
+        }
+    }
+    return found;
+}
+function validateOperators(out) {
+    const offenders = new Set();
+    const defaultSection = out.default;
+    if (defaultSection) {
+        for (const op of collectUnsupportedOperators(defaultSection.rules))
+            offenders.add(op);
+    }
+    if (Array.isArray(out.environments)) {
+        for (const env of out.environments) {
+            for (const op of collectUnsupportedOperators(env.rules))
+                offenders.add(op);
+        }
+    }
+    if (offenders.size === 0)
+        return;
+    const key = String(out.key ?? 'unknown');
+    const sorted = [...offenders].sort();
+    throw new InvalidSourceConfigError(`Unsupported operator(s) for "${key}": ${sorted.join(', ')}. ` +
+        `Quonfig does not currently translate these from the source schema. ` +
+        `Recreate the rule in the source system using a supported operator (see qfg config-schema), ` +
+        `or contact support@quonfig.com if you need this operator added to Quonfig.`);
+}
 function zeroValue(valueType) {
     switch (valueType) {
         case 'bool': {
@@ -148,6 +248,11 @@ function normalizeJsonValuesInConfig(out) {
 }
 export function transformConfig(config, envIdMap, onDroppedEnv, onCoercedSentinel) {
     const out = JSON.parse(JSON.stringify(config));
+    // qfg-qhk1: normalize `/` to `.` in the key so the JSON `key` field matches
+    // the flat dotted filename the migrator will write.
+    if (typeof out.key === 'string') {
+        out.key = normalizeKey(out.key);
+    }
     delete out.changedBy;
     delete out.modifiedAt;
     delete out.createdAt;
@@ -244,25 +349,27 @@ export function transformConfig(config, envIdMap, onDroppedEnv, onCoercedSentine
         }
     }
     normalizeJsonValuesInConfig(out);
+    validateOperators(out);
     return out;
 }
 export function getOutputPath(type, key) {
     const normalizedType = type.toUpperCase();
+    const k = normalizeKey(key);
     switch (normalizedType) {
         case 'FEATURE_FLAG': {
-            return `feature-flags/${key}.json`;
+            return `feature-flags/${k}.json`;
         }
         case 'LOG_LEVEL_V2': {
-            return `log-levels/${normalizeLogLevelKey(key)}.json`;
+            return `log-levels/${normalizeLogLevelKey(k)}.json`;
         }
         case 'SCHEMA': {
-            return `schemas/${key}.json`;
+            return `schemas/${k}.json`;
         }
         case 'SEGMENT': {
-            return `segments/${key}.json`;
+            return `segments/${k}.json`;
         }
         default: {
-            return `configs/${key}.json`;
+            return `configs/${k}.json`;
         }
     }
 }

package/dist/util/clone-and-stack-push.d.ts

@@ -13,8 +13,12 @@ export interface CloneAndStackPushOptions {
     author?: PushIdentity;
     /** Branch to track and push. Defaults to `main`. */
     branch?: string;
-    /** Single commit message for the delta. */
-    commitMessage: string;
+    /**
+     * Commit message for the delta. Pass a function when the message depends on
+     * counts that are only known after `applyDelta` runs (qfg-7eig). The function
+     * is invoked after applyDelta but before commit.
+     */
+    commitMessage: string | (() => string);
     /** Where to clone into, or an existing clone to reuse. */
     localDir: string;
     /** Gitea repo URL (may include token). */

package/dist/util/clone-and-stack-push.js

@@ -62,7 +62,13 @@ const ensureCloneOrReuse = async (remoteUrl, localDir, branch) => {
             await runGit(localDir, ['merge', '--ff-only', `origin/${branch}`]);
             return 'reused';
         }
-        throw new Error(`Local dir ${localDir} is a git repo but its origin (${origin ? redactToken(origin) : 'unset'}) does not match the target remote. Refuse to clobber — pass an empty/non-existent path or a matching clone.`);
+        throw new Error(`Local dir ${localDir} is a git repo but its origin (${origin ? redactToken(origin) : 'unset'}) does not match the target remote.\n` +
+            `Refuse to clobber.\n\n` +
+            `Most likely cause: you ran \`qfg migrate --dir ${localDir}\` first (which \`git init\`s a fresh repo with no remote) and are now trying to \`--push\` from the same dir.\n\n` +
+            `Pick one of:\n` +
+            `  - Re-run with \`--push\` against a NEW empty/non-existent path (the canonical flow).\n` +
+            `  - Run \`qfg pull --workspace <org/slug> --dir ${localDir}-clone\` to seed a fresh clone, then \`qfg migrate --dir ${localDir}-clone --workspace <org/slug> --push\`.\n` +
+            `Docs: https://docs.quonfig.com/docs/migrating/from-launch (Flow B).`);
     }
     if (fs.existsSync(localDir)) {
         const entries = fs.readdirSync(localDir);
@@ -90,8 +96,9 @@ export const cloneAndStackPush = async (opts) => {
     if (!(await hasStagedChanges(opts.localDir))) {
         return { action, committed: false, commitSha: null };
     }
+    const commitMessage = typeof opts.commitMessage === 'function' ? opts.commitMessage() : opts.commitMessage;
     await spawnGit(['-C', opts.localDir, 'commit', '-F', '-'], {
-        stdin: opts.commitMessage,
+        stdin: commitMessage,
         env: {
             GIT_AUTHOR_NAME: author.name,
             GIT_AUTHOR_EMAIL: author.email,

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.0.34";
+declare const _default: "0.0.35";
 export default _default;

package/dist/version.js

@@ -1,2 +1,2 @@
 // AUTO-GENERATED from package.json by scripts/generate-version.mjs — do not edit.
-export default '0.0.34';
+export default '0.0.35';

package/oclif.manifest.json

@@ -2916,5 +2916,5 @@
       ]
     }
   },
-  "version": "0.0.34"
+  "version": "0.0.35"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "packageManager": "yarn@4.11.0+sha512.4e54aeace9141df2f0177c266b05ec50dc044638157dae128c471ba65994ac802122d7ab35bcd9e81641228b7dcf24867d28e750e0bcae8a05277d600008ad54",
   "name": "@quonfig/cli",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "bugs": {
     "url": "https://github.com/quonfig/cli/issues"
   },