@quonfig/cli 0.0.33 → 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.33 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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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.33/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`
 
@@ -969,10 +969,13 @@ Clone or update a local copy of your workspace config files.
 
 ```
 USAGE
-  $ qfg pull [--json] [--interactive] [--no-color] [--verbose] [--dir <value>] [--workspace <value>]
+  $ qfg pull [--json] [--interactive] [--no-color] [--verbose] [--dir <value>] [--rebase] [--workspace
+    <value>]
 
 FLAGS
   --dir=<value>        Local directory to clone/update (defaults to QUONFIG_DIR env var)
+  --rebase             Replay local commits on top of origin/main when the two have diverged. Conflicts are surfaced via
+                       standard git markers; resolve with `git rebase --continue`.
   --workspace=<value>  Workspace ID (defaults to active profile)
 
 GLOBAL FLAGS
@@ -1005,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.33/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`
 
@@ -1053,7 +1056,7 @@ EXAMPLES
   $ qfg push --dir ./our-config --yes
 ```
 
-_See code: [src/commands/push.ts](https://github.com/quonfig/cli/blob/v0.0.33/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`
 
@@ -1091,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.33/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`
 
@@ -1118,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.33/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`
 
@@ -1150,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.33/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`
 
@@ -1179,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.33/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`
 
@@ -1206,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.33/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]`
 
@@ -1277,7 +1280,7 @@ EXAMPLES
   $ qfg pull && qfg config-schema
 ```
 
-_See code: [src/commands/set-default.ts](https://github.com/quonfig/cli/blob/v0.0.33/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]`
 
@@ -1354,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.33/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`
 
@@ -1386,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.33/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]`
 
@@ -1488,7 +1491,7 @@ EXAMPLES
   $ qfg verify --json
 ```
 
-_See code: [src/commands/verify.ts](https://github.com/quonfig/cli/blob/v0.0.33/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`
 
@@ -1511,7 +1514,7 @@ EXAMPLES
   $ qfg whoami
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/quonfig/cli/blob/v0.0.33/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`
 
@@ -1534,7 +1537,7 @@ EXAMPLES
   $ qfg workspace
 ```
 
-_See code: [src/commands/workspace.ts](https://github.com/quonfig/cli/blob/v0.0.33/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`
 
@@ -1567,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.33/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`
 
@@ -1601,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.33/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]`
 
@@ -1629,7 +1632,7 @@ EXAMPLES
   $ qfg workspace switch acme/production
 ```
 
-_See code: [src/commands/workspace/switch.ts](https://github.com/quonfig/cli/blob/v0.0.33/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/commands/pull.d.ts

@@ -5,6 +5,7 @@ export default class Pull extends BaseCommand {
     static examples: string[];
     static flags: {
         dir: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        rebase: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         workspace: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     run(): Promise<JsonObj | void>;

package/dist/commands/pull.js

@@ -6,7 +6,7 @@ import { loadGiteaToken, isGiteaTokenExpired, saveGiteaToken } from '../util/git
 import { mintAndStoreGiteaReadToken, mintGiteaToken } from '../util/gitea-api.js';
 import { readWorkspaceSlug, tryParseWorkspacePin, writeWorkspaceSlug } from '../util/quonfig-json.js';
 import { resolveWorkspaceUuid } from '../util/resolve-workspace.js';
-import { isGitRepo, getRemoteUrl, gitFetch, gitSetRemote, canFastForward, hasDivergedFromRemote, gitMergeFfOnly, gitClone, displayUrl, addAndCommitFile, dirtyTrackedFiles, } from '../util/git-ops.js';
+import { isGitRepo, getRemoteUrl, gitFetch, gitSetRemote, canFastForward, hasDivergedFromRemote, gitMergeFfOnly, gitPullRebase, gitClone, displayUrl, addAndCommitFile, dirtyTrackedFiles, } from '../util/git-ops.js';
 export default class Pull extends BaseCommand {
     static description = `Clone or update a local copy of your workspace config files.
 
@@ -29,6 +29,10 @@ CLI shortcuts (no JSON editing needed for simple cases):
         dir: Flags.string({
             description: 'Local directory to clone/update (defaults to QUONFIG_DIR env var)',
         }),
+        rebase: Flags.boolean({
+            default: false,
+            description: 'Replay local commits on top of origin/main when the two have diverged. Conflicts are surfaced via standard git markers; resolve with `git rebase --continue`.',
+        }),
         workspace: Flags.string({
             description: 'Workspace ID (defaults to active profile)',
         }),
@@ -85,7 +89,43 @@ CLI shortcuts (no JSON editing needed for simple cases):
             const ff = await canFastForward(resolvedDir);
             const diverged = !ff && (await hasDivergedFromRemote(resolvedDir));
             if (diverged) {
-                return this.err('Local commits diverge from remote — resolve manually.');
+                if (flags.rebase) {
+                    this.log('Local and origin/main have diverged. Rebasing local commits on top of origin/main...');
+                    const result = await gitPullRebase(resolvedDir);
+                    if (result.kind === 'clean') {
+                        this.log(`Rebased ${result.commitsRebased} local commit(s) onto origin/main. Run \`qfg push\` to publish.`);
+                        // Fall through to post-pull work (QUONFIG_DIR write, pin backfill).
+                    }
+                    else if (result.kind === 'conflicts') {
+                        this.log('');
+                        this.log('Rebase paused with conflicts in:');
+                        for (const f of result.conflictedFiles)
+                            this.log(`  ${f}`);
+                        this.log('');
+                        this.log('To finish the rebase:');
+                        this.log(`  1. Edit each file above and pick the values you want; remove the git conflict markers.`);
+                        this.log(`  2. git -C ${resolvedDir} add <files>`);
+                        this.log(`  3. git -C ${resolvedDir} rebase --continue`);
+                        this.log(`  4. qfg push`);
+                        this.log('');
+                        this.log('To abort the rebase and try a different approach:');
+                        this.log(`  git -C ${resolvedDir} rebase --abort`);
+                        return this.err('Rebase paused on conflicts — see instructions above.');
+                    }
+                    else {
+                        return this.err(`Rebase could not start: ${result.reason}\n\n` +
+                            `Most likely the working tree has uncommitted edits. Commit or stash them, then re-run \`qfg pull --rebase\`.`);
+                    }
+                }
+                else {
+                    return this.err(`Local commits diverge from origin/main.\n\n` +
+                        `Your local branch has commits that are not on origin, and origin has commits that are not local. ` +
+                        `qfg pull will not merge automatically. Pick one:\n\n` +
+                        `  Replay your local commits on top of origin/main:\n` +
+                        `    qfg pull --rebase --dir ${resolvedDir}\n\n` +
+                        `  Discard your local commits and take origin/main as-is (LOSES local work):\n` +
+                        `    git -C ${resolvedDir} reset --hard origin/main`);
+                }
             }
             if (ff) {
                 const newCommits = await gitMergeFfOnly(resolvedDir);

package/dist/commands/push.js

@@ -3,7 +3,7 @@ import * as path from 'node:path';
 import { Flags } from '@oclif/core';
 import { BaseCommand } from '../index.js';
 import { mintGiteaToken } from '../util/gitea-api.js';
-import { getRemoteUrl, gitFetch, gitSetRemote, isGitRepo, runGit } from '../util/git-ops.js';
+import { dirtyTrackedFiles, getRemoteUrl, gitFetch, gitSetRemote, isGitRepo, isLocalBehindOrDivergedFromRemote, runGit } from '../util/git-ops.js';
 import { PushFatalError, runPush, } from '../push/run-push.js';
 import { computeBarePathDiff } from '../push/bare-path-diff.js';
 import { callConfigsPush } from '../push/config-push-client.js';
@@ -202,6 +202,29 @@ export function buildRealDeps(cmd, orgSlug) {
             const probe = await ensureBarePathProbe(dir);
             return probe.totalRemoteFiles;
         },
+        async isLocalBehindRemote(dir) {
+            // qfg-fboj: stale-HEAD guard for the clone path. Implementation
+            // lives in git-ops.ts so it can be unit-tested against a real
+            // local git repo. We still gate on isGitRepo here because the
+            // helper does not (it returns false on any error, but we want to
+            // skip the rev-parse cost on the bare path entirely).
+            if (!(await isGitRepo(dir)))
+                return false;
+            return isLocalBehindOrDivergedFromRemote(dir);
+        },
+        async dirtyTrackedFiles(dir) {
+            // qfg-fboj: surface uncommitted edits so the user sees they were
+            // not included in this push. Only meaningful on the clone path —
+            // bare path doesn't have a .git/ to status.
+            if (!(await isGitRepo(dir)))
+                return [];
+            try {
+                return await dirtyTrackedFiles(dir);
+            }
+            catch {
+                return [];
+            }
+        },
     };
     const deps = {
         async mintWriteToken(requestedTarget) {

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 {};