@quonfig/cli 0.0.21 → 0.0.23

package/dist/push/run-push.js

@@ -19,8 +19,6 @@
  * confirmation — that prompt is the destructive-change brake.
  */
 import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { MIGRATOR_IDENTITY, cloneAndStackPush } from '../util/clone-and-stack-push.js';
 import { readWorkspaceSlug, writeWorkspaceSlug } from '../util/quonfig-json.js';
 import { checkIdentity } from './identity-check.js';
 import { confirmTypedSlug, confirmYesNo } from './confirm.js';
@@ -118,19 +116,18 @@ export async function runPush(input, deps) {
     // repo into a scratch dir inside `.quonfig-push-clone/` and stack a commit
     // that mirrors the local dir's contents on top.
     const isClonePath = hasGit && remoteOriginUrl !== undefined && sameRepo(remoteOriginUrl, backend.repoUrl);
+    const dispatchedAs = isClonePath ? 'clone-path' : 'bare-path';
+    // Clone path: align origin with the backend so the gitOps.fetch + diff
+    // walk authenticates against the read URL we minted. The bare path's
+    // probe-clone path bypasses local origin entirely.
     if (isClonePath) {
-        return doClonePath(input, deps, backend, requiresTypedSlug, repoPinSlug === undefined, log);
+        await deps.gitOps.setRemoteOrigin(input.dir, backend.repoUrl);
+        log('Fetching from remote...');
+        await deps.gitOps.fetch(input.dir);
     }
-    return doBarePath(input, deps, backend, requiresTypedSlug, repoPinSlug === undefined, log);
-}
-async function doClonePath(input, deps, backend, requiresTypedSlug, unpinned, log) {
-    // Point origin at the authenticated URL so `git fetch` / `git push` work
-    // without touching global credential helpers.
-    await deps.gitOps.setRemoteOrigin(input.dir, backend.repoUrl);
-    log('Fetching from remote...');
-    await deps.gitOps.fetch(input.dir);
     const deltas = await deps.gitOps.diffHeadVsOrigin(input.dir);
     const totalFilesInRemote = await deps.gitOps.countFilesInRemote(input.dir);
+    const unpinned = repoPinSlug === undefined;
     const summary = summarizeDiff(deltas, { totalFilesInRemote, unpinned });
     log('');
     log(summary.renderText({
@@ -140,7 +137,6 @@ async function doClonePath(input, deps, backend, requiresTypedSlug, unpinned, lo
         localDir: input.dir,
     }));
     log('');
-    // Short-circuit: literally nothing to push.
     if (summary.totals.filesTouched === 0) {
         return { kind: 'no-op', reason: 'Local tree matches remote HEAD. Nothing to push.' };
     }
@@ -155,141 +151,57 @@ async function doClonePath(input, deps, backend, requiresTypedSlug, unpinned, lo
         log('Aborted, nothing pushed.');
         return { kind: 'aborted', reason: 'user declined at confirm prompt' };
     }
-    log('Pushing to origin/main...');
-    try {
-        await deps.gitOps.push(input.dir);
-    }
-    catch (error) {
-        const msg = error instanceof Error ? error.message : String(error);
-        if (/non-fast-forward|fetch first|rejected/i.test(msg)) {
-            throw new PushFatalError('Remote has changes not in local — run `qfg pull` first, then re-run `qfg push`.', 'NON_FAST_FORWARD');
+    const baseMessage = input.message ?? `qfg push: ${summary.totals.filesTouched} file change(s)`;
+    const commitMessage = withPushedViaTrailer(baseMessage);
+    const serverFiles = deltas.map((d) => ({
+        path: d.path,
+        kind: toServerKind(d.kind),
+        ...(d.beforeJson === undefined ? {} : { beforeJson: d.beforeJson }),
+        ...(d.afterJson === undefined ? {} : { afterJson: d.afterJson }),
+    }));
+    log('Sending push to Quonfig cloud...');
+    const result = await deps.pushToServer({
+        workspaceId: backend.workspaceId,
+        files: serverFiles,
+        message: commitMessage,
+    });
+    if (result.kind === 'denied') {
+        errLog(`Push denied for ${result.denials.length} file(s):`);
+        for (const d of result.denials) {
+            errLog(`  ${d.path}: missing permission ${d.requiredPermission}`);
         }
-        throw new PushFatalError(`Push failed: ${msg}`, 'PUSH_FAILED');
+        throw new PushFatalError(`Push denied for ${result.denials.length} file(s). See errors above.`, 'PUSH_DENIED');
+    }
+    if (result.kind === 'conflict') {
+        throw new PushFatalError(`Remote moved while preparing this push (${result.message}). Run \`qfg pull\` and retry.`, 'CONFLICT');
+    }
+    if (result.kind === 'bad-request') {
+        throw new PushFatalError(`Push rejected by server: ${result.message}`, 'BAD_REQUEST');
     }
-    // Offer to pin the workspace slug in quonfig.json if missing. Non-fatal.
     if (unpinned && !input.noPinWrite) {
         try {
             await writeWorkspaceSlug(input.dir, backend.workspaceSlug);
             log(`Wrote workspace = "${backend.workspaceSlug}" into quonfig.json`);
         }
         catch {
-            // non-fatal; pin is advisory
+            /* non-fatal; pin is advisory */
         }
     }
-    return { kind: 'pushed', dispatchedAs: 'clone-path' };
+    return { kind: 'pushed', dispatchedAs, commitSha: result.commitSha };
 }
-async function doBarePath(input, deps, backend, requiresTypedSlug, unpinned, log) {
-    // Scratch clone location: sibling `.quonfig-push-clone-<timestamp>` so we
-    // don't clobber or re-use anything from a previous run.
-    const scratchDir = path.join(path.dirname(path.resolve(input.dir)), `.quonfig-push-clone-${Date.now()}`);
-    // Local author for the migrated commit. Prefer the local git config in
-    // `input.dir` so attribution matches what the user has set. If it is not
-    // available, fall back to the migrator identity but tell the user — the plan
-    // requires this be loud.
-    let author = MIGRATOR_IDENTITY;
-    try {
-        const local = await deps.gitOps.getLocalAuthor(input.dir);
-        if (local && local.name && local.email) {
-            author = local;
-        }
-        else {
-            log(`Warning: no local git user.name/user.email in ${input.dir}; commits will be attributed to ${MIGRATOR_IDENTITY.name} <${MIGRATOR_IDENTITY.email}>.`);
-        }
-    }
-    catch {
-        log(`Warning: could not read local git user identity; commits will be attributed to ${MIGRATOR_IDENTITY.name} <${MIGRATOR_IDENTITY.email}>.`);
-    }
-    // We need the deltas for the Guard 3 summary BEFORE we decide to commit and
-    // push. To produce them we need the scratch clone in hand (so we can compare
-    // file-by-file). We clone into the scratch dir, take the diff, show the
-    // summary, confirm, then apply the delta via `cloneAndStackPush`.
-    //
-    // Rather than re-implement cloneAndStackPush's clone step here, we let it
-    // own the clone-commit-push pipeline and pass a deltas callback that runs
-    // AFTER the clone (it receives the localDir/scratchDir) but BEFORE the
-    // commit. `cloneAndStackPush` only exposes an `applyDelta` hook (write files
-    // then return), so we split the flow: first a probe clone to take the
-    // diff, then the real clone-and-stack-push. This is simpler than rewiring
-    // cloneAndStackPush's API.
-    // Probe clone.
-    await deps.gitOps.fetch(input.dir) // no-op for bare path if not a repo; deps.gitOps may short-circuit
-        .catch(() => {
-        // bare-path doesn't require a local fetch — swallow the error
-    });
-    // We don't have a probe clone helper; instead, ask the deps for a bare-path
-    // delta computation. The test double will produce this from a fixture; the
-    // real implementation walks both trees after ensuring a scratch clone exists.
-    // This is provided by the command glue layer.
-    const deltas = await deps.gitOps.diffHeadVsOrigin(input.dir);
-    const totalFilesInRemote = await deps.gitOps.countFilesInRemote(input.dir);
-    const summary = summarizeDiff(deltas, { totalFilesInRemote, unpinned });
-    log('');
-    log(summary.renderText({
-        workspaceSlug: backend.workspaceSlug,
-        repoUrl: stripAuth(backend.repoUrl),
-        branch: 'main',
-        localDir: input.dir,
-    }));
-    log('');
-    if (summary.totals.filesTouched === 0) {
-        return { kind: 'no-op', reason: 'Local tree matches remote HEAD. Nothing to push.' };
-    }
-    const ok = await decideConfirm({
-        destructive: summary.isDestructive,
-        requiresTypedSlug,
-        yes: input.yes,
-        workspaceSlug: backend.workspaceSlug,
-        confirmIO: deps.confirmIO,
-    });
-    if (!ok) {
-        log('Aborted, nothing pushed.');
-        return { kind: 'aborted', reason: 'user declined at confirm prompt' };
-    }
-    const baseMessage = input.message ?? `qfg push: ${summary.totals.filesTouched} file change(s)`;
-    const commitMessage = withPushedViaTrailer(baseMessage);
-    log('Pushing via clone-and-stack...');
-    try {
-        const result = await cloneAndStackPush({
-            remoteUrl: backend.repoUrl,
-            localDir: scratchDir,
-            author,
-            commitMessage,
-            async applyDelta(clonedDir) {
-                // The caller promised deps.copyDirMirror copies `input.dir` into
-                // `clonedDir`, skipping `.git/`. cloneAndStackPush will `git add --all`
-                // after this returns.
-                await deps.copyDirMirror(input.dir, clonedDir);
-            },
-        });
-        if (unpinned && !input.noPinWrite) {
-            try {
-                await writeWorkspaceSlug(input.dir, backend.workspaceSlug);
-                log(`Wrote workspace = "${backend.workspaceSlug}" into quonfig.json`);
-            }
-            catch {
-                // non-fatal
-            }
+const toServerKind = (kind) => {
+    switch (kind) {
+        case 'added': {
+            return 'add';
         }
-        return { kind: 'pushed', dispatchedAs: 'bare-path', commitSha: result.commitSha };
-    }
-    catch (error) {
-        const msg = error instanceof Error ? error.message : String(error);
-        if (/non-fast-forward|fetch first|rejected/i.test(msg)) {
-            throw new PushFatalError('Remote has changes not in local — run `qfg pull` first, then re-run `qfg push`.', 'NON_FAST_FORWARD');
+        case 'deleted': {
+            return 'delete';
         }
-        throw new PushFatalError(`Push failed: ${msg}`, 'PUSH_FAILED');
-    }
-    finally {
-        // Best-effort cleanup of the scratch clone. Ignore failures so a cleanup
-        // problem doesn't mask a real error.
-        try {
-            fs.rmSync(scratchDir, { recursive: true, force: true });
-        }
-        catch {
-            /* ignore */
+        case 'modified': {
+            return 'modify';
         }
     }
-}
+};
 /**
  * Map the guard outputs to the right prompt:
  *   - Typed-slug (always, never skipped by --yes) when identity demanded it

package/dist/quonfig.js

@@ -1,4 +1,5 @@
 import { Quonfig } from '@quonfig/node';
+import { getDeliveryUrl } from './util/domain-urls.js';
 let quonfig;
 const DEFAULT_CONTEXT_USER_ID_NAMESPACE = 'prefab-api-key';
 const DEFAULT_CONTEXT_USER_ID = 'user-id';
@@ -14,7 +15,7 @@ export const initQuonfig = async (_ctx, flagsOrDatafile) => {
         }
         sdkKey = flagsOrDatafile['sdk-key'];
     }
-    const apiUrl = process.env.QUONFIG_API_URL || 'https://api.quonfig.com';
+    const apiUrl = getDeliveryUrl();
     quonfig = new Quonfig({
         sdkKey,
         collectEvaluationSummaries: false,

package/dist/util/domain-urls.d.ts

@@ -1,3 +1,4 @@
 export declare const getDomain: () => string;
 export declare const getApiUrl: (domain?: string) => string;
 export declare const getAppUrl: (domain?: string) => string;
+export declare const getDeliveryUrl: (domain?: string) => string;

package/dist/util/domain-urls.js

@@ -16,3 +16,10 @@ export const getAppUrl = (domain) => {
     const actualDomain = domain || getDomain();
     return `https://app.${actualDomain}`;
 };
+export const getDeliveryUrl = (domain) => {
+    if (process.env.QUONFIG_API_URL) {
+        return process.env.QUONFIG_API_URL;
+    }
+    const actualDomain = domain || getDomain();
+    return `https://primary.${actualDomain}`;
+};

package/dist/util/gitea-token-storage.js

@@ -1,9 +1,9 @@
 import * as fs from 'node:fs';
-import * as os from 'node:os';
 import * as path from 'node:path';
 import { getDomain } from './domain-urls.js';
+import { getQuonfigConfigHome } from './quonfig-home.js';
 const BUFFER_MS = 5 * 60 * 1000; // 5 minutes
-const getQuonfigDir = () => path.join(os.homedir(), '.quonfig');
+const getQuonfigDir = () => getQuonfigConfigHome();
 const getGiteaTokenFile = () => {
     const domain = getDomain();
     const filename = domain === 'quonfig.com' ? 'gitea-tokens.json' : `gitea-tokens-${domain.replaceAll('.', '-')}.json`;

package/dist/util/quonfig-home.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Resolve the directory the CLI uses for tokens, profile config, and gitea
+ * tokens. Honors `QUONFIG_CONFIG_HOME` so tests (and anyone who wants an
+ * isolated config dir) can redirect away from `~/.quonfig/`.
+ */
+export declare const getQuonfigConfigHome: () => string;

package/dist/util/quonfig-home.js

@@ -0,0 +1,8 @@
+import * as os from 'node:os';
+import * as path from 'node:path';
+/**
+ * Resolve the directory the CLI uses for tokens, profile config, and gitea
+ * tokens. Honors `QUONFIG_CONFIG_HOME` so tests (and anyone who wants an
+ * isolated config dir) can redirect away from `~/.quonfig/`.
+ */
+export const getQuonfigConfigHome = () => process.env.QUONFIG_CONFIG_HOME || path.join(os.homedir(), '.quonfig');

package/dist/util/token-storage.js

@@ -1,8 +1,8 @@
 import * as fs from 'node:fs';
-import * as os from 'node:os';
 import * as path from 'node:path';
 import { getDomain } from './domain-urls.js';
-const getQuonfigDir = (options) => options?.quonfigDir || path.join(os.homedir(), '.quonfig');
+import { getQuonfigConfigHome } from './quonfig-home.js';
+const getQuonfigDir = (options) => options?.quonfigDir || getQuonfigConfigHome();
 const getTokenFile = (options) => {
     const domain = getDomain();
     const filename = domain === 'quonfig.com' ? 'tokens.json' : `tokens-${domain.replaceAll('.', '-')}.json`;

package/dist/verify/validate.js

@@ -118,6 +118,7 @@ const VariantSchema = z.object({
     value: ValueSchema,
     description: z.string().optional(),
 });
+const AccessSchema = z.enum(['support', 'standard', 'protected-env', 'protected-all-envs']);
 const StoredConfigSchema = z
     .object({
     id: z.string().optional(),
@@ -129,8 +130,7 @@ const StoredConfigSchema = z
     description: z.string().optional(),
     sendToClientSdk: z.boolean().optional(),
     schemaKey: z.string().optional(),
-    accessLevel: z.string().optional(),
-    protection: z.string().optional(),
+    access: AccessSchema.optional(),
     default: z.object({
         rules: z.array(ConfigRuleSchema),
     }),

package/oclif.manifest.json

@@ -202,6 +202,93 @@
         "create.js"
       ]
     },
+    "delete": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "flag/config/log-level key to delete",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "Delete a flag, config, or log-level from the workspace.\n\nDESTRUCTIVE — removes the underlying JSON file from the workspace git repo\nand commits with the actor's identity. The commit history preserves the\nprior content; this is a hard-delete on the file but a soft-delete on\nhistory.\n\nConfirmation is required:\n  --yes                       skip the prompt (for scripts and CI)\n  interactive (default)       you'll be asked to type the key name back\n\nExamples\n  qfg delete my.flag --yes\n  qfg delete my.flag                          # interactive: type the key back to confirm\n  qfg delete my.config --yes",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> my.flag --yes",
+        "<%= config.bin %> <%= command.id %> my.config --yes"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "interactive": {
+          "description": "Force interactive mode",
+          "helpGroup": "GLOBAL",
+          "name": "interactive",
+          "allowNo": true,
+          "type": "boolean"
+        },
+        "no-color": {
+          "description": "Do not colorize output",
+          "env": "NO_COLOR",
+          "helpGroup": "GLOBAL",
+          "name": "no-color",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "description": "Verbose output",
+          "helpGroup": "GLOBAL",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "Workspace slug to use (overrides QUONFIG_WORKSPACE env var and saved default)",
+          "helpGroup": "GLOBAL",
+          "name": "workspace",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "profile": {
+          "char": "p",
+          "description": "Deprecated: use --workspace instead",
+          "helpGroup": "GLOBAL",
+          "hidden": true,
+          "name": "profile",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "yes": {
+          "description": "skip confirmation prompt",
+          "name": "yes",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "delete",
+      "pluginAlias": "@quonfig/cli",
+      "pluginName": "@quonfig/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "delete.js"
+      ]
+    },
     "generate-new-hex-key": {
       "aliases": [],
       "args": {},
@@ -2896,5 +2983,5 @@
       ]
     }
   },
-  "version": "0.0.21"
+  "version": "0.0.23"
 }

package/package.json

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