@quonfig/cli 0.0.21 → 0.0.23

package/dist/commands/push.js

@@ -5,9 +5,10 @@ import * as util from 'node:util';
 import { Flags } from '@oclif/core';
 import { BaseCommand } from '../index.js';
 import { mintGiteaToken } from '../util/gitea-api.js';
-import { getRemoteUrl, gitFetch, gitSetRemote, isGitRepo, } from '../util/git-ops.js';
-import { PushFatalError, runPush } from '../push/run-push.js';
+import { getRemoteUrl, gitFetch, gitSetRemote, isGitRepo } 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';
 import { resolveWorkspaceUuid } from '../util/resolve-workspace.js';
 const execFile = util.promisify(execFileCb);
 export default class Push extends BaseCommand {
@@ -127,6 +128,11 @@ export function giteaResponseToMintResult(resp) {
  *
  * Returns a `{deps, cleanup}` pair. The caller MUST call `cleanup()` in a
  * finally block so the bare-path probe clone is removed even on errors.
+ *
+ * As of qfg-azk.13 the push code path no longer mints a write-scoped Gitea
+ * token; the actual commit is performed server-side by the `configs.push`
+ * oRPC procedure. We still mint a READ token to authenticate the bare-path
+ * probe-clone and the clone-path `git fetch`.
  */
 export function buildRealDeps(cmd) {
     const log = (line) => cmd.log(line);
@@ -187,12 +193,6 @@ export function buildRealDeps(cmd) {
             const probe = await ensureBarePathProbe(dir);
             return probe.deltas;
         },
-        async push(dir) {
-            await execFile('git', ['-C', dir, 'push', 'origin', 'main']);
-        },
-        async getLocalAuthor(dir) {
-            return readLocalAuthor(dir);
-        },
         async countFilesInRemote(dir) {
             if (await isGitRepo(dir)) {
                 const fromGit = await countTrackedFilesAtRef(dir, 'origin/main');
@@ -207,9 +207,11 @@ export function buildRealDeps(cmd) {
     };
     const deps = {
         async mintWriteToken(requestedTarget) {
-            const resp = await mintGiteaToken(requestedTarget, 'write', 'push');
-            // Stash the authenticated URL so the bare-path gitOps methods can
-            // probe-clone it without a second mint.
+            // Read scope: this token authenticates probe-clone and clone-path
+            // fetch. The actual commit goes through the server via configs.push,
+            // which is authorized off the user's WorkOS session — no write PAT
+            // needed in the push code path (qfg-azk.13).
+            const resp = await mintGiteaToken(requestedTarget, 'read', 'pull');
             authenticatedRepoUrl = resp.repoUrl;
             return giteaResponseToMintResult(resp);
         },
@@ -220,7 +222,7 @@ export function buildRealDeps(cmd) {
             return { errors };
         },
         gitOps,
-        copyDirMirror,
+        pushToServer: callConfigsPush,
         log,
         errLog,
     };
@@ -237,26 +239,20 @@ export function buildRealDeps(cmd) {
     return { deps, cleanup };
 }
 /**
- * Diff the working tree (what we are about to push) against origin/main. We
- * use `git diff --name-status HEAD..origin/main` with inverted semantics:
- *   Added here  = present locally (in HEAD), absent in origin/main.
- *   Deleted     = absent locally, present in origin/main.
- *   Modified    = content differs.
+ * Diff the working tree (what we are about to push) against origin/main and
+ * fill in before/after JSON content for each delta as required by the
+ * `configs.push` wire shape (qfg-azk.13).
+ *
+ *   Added    — afterJson = working tree
+ *   Modified — beforeJson = `git show origin/main:<path>`, afterJson = working tree
+ *   Deleted  — beforeJson = `git show origin/main:<path>`
  *
  * `git diff A..B` reports B relative to A. So `HEAD..origin/main` tells us
  * what origin has that we don't. We want "local vs remote" with local as the
  * baseline — i.e. origin/main..HEAD.
  */
 async function diffHeadVsOrigin(dir) {
-    // origin/main..HEAD reports changes HEAD has relative to origin/main.
-    // 'A' -> added locally, 'D' -> deleted locally, 'M' -> modified locally.
-    const { stdout } = await execFile('git', [
-        '-C',
-        dir,
-        'diff',
-        '--name-status',
-        'origin/main..HEAD',
-    ]);
+    const { stdout } = await execFile('git', ['-C', dir, 'diff', '--name-status', 'origin/main..HEAD']);
     const deltas = [];
     for (const raw of stdout.split('\n')) {
         const line = raw.trim();
@@ -266,95 +262,54 @@ async function diffHeadVsOrigin(dir) {
         const pathStr = rest.join(' ');
         if (!pathStr)
             continue;
-        if (status.startsWith('A'))
-            deltas.push({ kind: 'added', path: pathStr });
-        else if (status.startsWith('D'))
-            deltas.push({ kind: 'deleted', path: pathStr });
+        if (status.startsWith('A')) {
+            // eslint-disable-next-line no-await-in-loop
+            const afterJson = await readWorkingTreeFile(dir, pathStr);
+            deltas.push({ kind: 'added', path: pathStr, ...(afterJson === undefined ? {} : { afterJson }) });
+        }
+        else if (status.startsWith('D')) {
+            // eslint-disable-next-line no-await-in-loop
+            const beforeJson = await showAtRef(dir, 'origin/main', pathStr);
+            deltas.push({ kind: 'deleted', path: pathStr, ...(beforeJson === undefined ? {} : { beforeJson }) });
+        }
         else if (status.startsWith('M') || status.startsWith('R') || status.startsWith('C')) {
-            // Treat renames / copies as modifications for diff-summary purposes.
-            deltas.push({ kind: 'modified', path: pathStr });
+            // eslint-disable-next-line no-await-in-loop
+            const beforeJson = await showAtRef(dir, 'origin/main', pathStr);
+            // eslint-disable-next-line no-await-in-loop
+            const afterJson = await readWorkingTreeFile(dir, pathStr);
+            deltas.push({
+                kind: 'modified',
+                path: pathStr,
+                ...(beforeJson === undefined ? {} : { beforeJson }),
+                ...(afterJson === undefined ? {} : { afterJson }),
+            });
         }
     }
     return deltas;
 }
-async function countTrackedFilesAtRef(dir, ref) {
+async function showAtRef(dir, ref, relPath) {
     try {
-        const { stdout } = await execFile('git', ['-C', dir, 'ls-tree', '-r', '--name-only', ref]);
-        return stdout.split('\n').filter((l) => l.trim().length > 0).length;
+        const { stdout } = await execFile('git', ['-C', dir, 'show', `${ref}:${relPath}`]);
+        return stdout;
     }
     catch {
-        return 0;
+        return undefined;
     }
 }
-async function readLocalAuthor(dir) {
+async function readWorkingTreeFile(dir, relPath) {
     try {
-        const { stdout: name } = await execFile('git', ['-C', dir, 'config', 'user.name']);
-        const { stdout: email } = await execFile('git', ['-C', dir, 'config', 'user.email']);
-        const n = name.trim();
-        const e = email.trim();
-        if (!n || !e)
-            return undefined;
-        return { name: n, email: e };
+        return await fs.promises.readFile(path.join(dir, relPath), 'utf8');
     }
     catch {
         return undefined;
     }
 }
-/**
- * Copy the contents of `sourceDir` into `destDir`, skipping `.git/` and any
- * temp push-clone scratch directories. Used as the `applyDelta` callback for
- * bare-path pushes — we mirror local files into a fresh clone so that
- * `cloneAndStackPush`'s `git add --all` + diff will reflect the union of
- * (deletes, modifies, adds) we intend.
- *
- * IMPORTANT: this deletes files in destDir that are not in sourceDir so that
- * deletions make it into the push. Without this the clone-and-stack produces
- * an "adds-only" delta and destructive heuristics would never fire in the UI.
- */
-export async function copyDirMirror(sourceDir, destDir) {
-    // Collect source entries (except .git, .quonfig-push-clone-*)
-    const sourceRel = collectRelPaths(sourceDir);
-    const destRel = collectRelPaths(destDir);
-    // Delete anything in dest that isn't in source
-    for (const rel of destRel) {
-        if (!sourceRel.has(rel)) {
-            const full = path.join(destDir, rel);
-            try {
-                fs.rmSync(full, { force: true });
-            }
-            catch {
-                /* ignore */
-            }
-        }
+async function countTrackedFilesAtRef(dir, ref) {
+    try {
+        const { stdout } = await execFile('git', ['-C', dir, 'ls-tree', '-r', '--name-only', ref]);
+        return stdout.split('\n').filter((l) => l.trim().length > 0).length;
     }
-    // Copy / overwrite everything from source into dest
-    for (const rel of sourceRel) {
-        const src = path.join(sourceDir, rel);
-        const dst = path.join(destDir, rel);
-        fs.mkdirSync(path.dirname(dst), { recursive: true });
-        fs.copyFileSync(src, dst);
+    catch {
+        return 0;
     }
 }
-function collectRelPaths(root) {
-    const out = new Set();
-    if (!fs.existsSync(root))
-        return out;
-    const walk = (dir, prefix) => {
-        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            if (entry.name === '.git')
-                continue;
-            if (entry.name.startsWith('.quonfig-push-clone-'))
-                continue;
-            const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
-            const full = path.join(dir, entry.name);
-            if (entry.isDirectory()) {
-                walk(full, rel);
-            }
-            else if (entry.isFile() || entry.isSymbolicLink()) {
-                out.add(rel);
-            }
-        }
-    };
-    walk(root, '');
-    return out;
-}

package/dist/init/schema.js

@@ -298,8 +298,10 @@ export function storedConfigJsonSchema() {
                 type: 'string',
                 description: 'References a schema in schemas/ or schemas-protected/. The referenced file must exist.',
             },
-            accessLevel: { type: 'string' },
-            protection: { type: 'string' },
+            access: {
+                enum: ['support', 'standard', 'protected-env', 'protected-all-envs'],
+                description: 'Edit-access tier for this config. Defaults to "standard" when absent. See protecting-access.md.',
+            },
             tags: {
                 type: 'array',
                 items: { type: 'string' },

package/dist/push/bare-path-diff.js

@@ -54,35 +54,37 @@ export async function computeBarePathDiff(localDir, remoteUrl) {
         }
         throw error;
     }
-    const localFiles = collectFilesWithHash(localDir);
-    const remoteFiles = collectFilesWithHash(scratchDir);
+    const localFiles = collectFiles(localDir);
+    const remoteFiles = collectFiles(scratchDir);
     const deltas = [];
-    for (const [rel, localHash] of localFiles) {
-        const remoteHash = remoteFiles.get(rel);
-        if (remoteHash === undefined) {
-            deltas.push({ kind: 'added', path: rel });
+    for (const [rel, local] of localFiles) {
+        const remote = remoteFiles.get(rel);
+        if (remote === undefined) {
+            deltas.push({ kind: 'added', path: rel, afterJson: local.content });
         }
-        else if (remoteHash !== localHash) {
-            deltas.push({ kind: 'modified', path: rel });
+        else if (remote.hash !== local.hash) {
+            deltas.push({ kind: 'modified', path: rel, beforeJson: remote.content, afterJson: local.content });
         }
     }
-    for (const rel of remoteFiles.keys()) {
+    for (const [rel, remote] of remoteFiles) {
         if (!localFiles.has(rel)) {
-            deltas.push({ kind: 'deleted', path: rel });
+            deltas.push({ kind: 'deleted', path: rel, beforeJson: remote.content });
         }
     }
     return { deltas, scratchDir, totalRemoteFiles: remoteFiles.size };
 }
 /**
- * Walk `root` and return a map of relative-path -> content-hash for every
- * non-dotfile file under it.
+ * Walk `root` and return a map of relative-path -> {content, hash} for every
+ * non-dotfile file under it. The content string is needed by qfg-azk.13's
+ * `configs.push` wire shape; the hash is used to short-circuit the
+ * unchanged-file case without comparing full bodies.
  *
  * We skip any entry whose name starts with a `.`, which covers `.git/`,
  * `.DS_Store`, and the transient `.quonfig-push-clone-*` scratch dirs that
  * `run-push.ts` creates next to the local workspace. Keeping the rule simple
  * and symmetric on both sides prevents one-off false positives.
  */
-function collectFilesWithHash(root) {
+function collectFiles(root) {
     const out = new Map();
     if (!fs.existsSync(root))
         return out;
@@ -104,8 +106,8 @@ function collectFilesWithHash(root) {
             }
             else if (entry.isFile() || entry.isSymbolicLink()) {
                 try {
-                    const buf = fs.readFileSync(full);
-                    out.set(rel, hashBytes(buf));
+                    const content = fs.readFileSync(full, 'utf8');
+                    out.set(rel, { content, hash: hashString(content) });
                 }
                 catch {
                     /* ignore unreadable files — they won't appear on either side */
@@ -121,6 +123,6 @@ function collectFilesWithHash(root) {
  * fingerprint so we can say "file A on local matches file A on remote". The
  * contents are small JSON in practice, so sha1 is plenty fast.
  */
-function hashBytes(buf) {
-    return createHash('sha1').update(buf).digest('hex');
+function hashString(s) {
+    return createHash('sha1').update(s).digest('hex');
 }

package/dist/push/config-push-client.d.ts

@@ -0,0 +1,18 @@
+/**
+ * HTTP client for the `configs.push` oRPC procedure (qfg-azk.13).
+ *
+ * Server-side spec lives at
+ * `app-quonfig/src/lib/orpc/routes/config-push-handler.ts`. We translate the
+ * oRPC error shape into a tagged union the CLI can pattern-match on:
+ *
+ *   - 200 → `{kind: 'success', commitSha}`
+ *   - 403 with `data.denials` → `{kind: 'denied', denials}`
+ *   - 409 → `{kind: 'conflict', message}`
+ *   - 400 → `{kind: 'bad-request', message}`
+ *   - anything else → throws so runPush surfaces a generic PushFatalError.
+ *
+ * The auth header is a WorkOS access token (or a `qf_uk_*` API key when
+ * `QUONFIG_API_KEY` is set in the environment); see `getValidAccessToken`.
+ */
+import type { ConfigPushInput, ConfigPushResult } from './run-push.js';
+export declare const callConfigsPush: (input: ConfigPushInput) => Promise<ConfigPushResult>;

package/dist/push/config-push-client.js

@@ -0,0 +1,82 @@
+/**
+ * HTTP client for the `configs.push` oRPC procedure (qfg-azk.13).
+ *
+ * Server-side spec lives at
+ * `app-quonfig/src/lib/orpc/routes/config-push-handler.ts`. We translate the
+ * oRPC error shape into a tagged union the CLI can pattern-match on:
+ *
+ *   - 200 → `{kind: 'success', commitSha}`
+ *   - 403 with `data.denials` → `{kind: 'denied', denials}`
+ *   - 409 → `{kind: 'conflict', message}`
+ *   - 400 → `{kind: 'bad-request', message}`
+ *   - anything else → throws so runPush surfaces a generic PushFatalError.
+ *
+ * The auth header is a WorkOS access token (or a `qf_uk_*` API key when
+ * `QUONFIG_API_KEY` is set in the environment); see `getValidAccessToken`.
+ */
+import { getApiUrl } from '../util/domain-urls.js';
+import { getValidAccessToken } from '../util/get-valid-token.js';
+export const callConfigsPush = async (input) => {
+    const accessToken = await getValidAccessToken();
+    const apiUrl = getApiUrl();
+    const res = await fetch(`${apiUrl}/api/v1/configs/push`, {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${accessToken}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ json: input }),
+    });
+    if (res.ok) {
+        const body = (await res.json());
+        const commitSha = body.json?.commitSha;
+        if (!commitSha) {
+            throw new Error(`configs.push returned 200 but no commitSha (body=${JSON.stringify(body)})`);
+        }
+        return { kind: 'success', commitSha };
+    }
+    const text = await res.text().catch(() => '');
+    let parsed;
+    try {
+        const body = JSON.parse(text);
+        parsed = body.json ?? body;
+    }
+    catch {
+        /* keep parsed undefined */
+    }
+    const message = parsed?.message ?? text ?? `HTTP ${res.status}`;
+    if (res.status === 403) {
+        const denials = extractDenials(parsed?.data);
+        if (denials.length > 0) {
+            return { kind: 'denied', denials };
+        }
+    }
+    if (res.status === 409) {
+        return { kind: 'conflict', message };
+    }
+    if (res.status === 400) {
+        return { kind: 'bad-request', message };
+    }
+    throw new Error(`configs.push failed (HTTP ${res.status}): ${message}`);
+};
+function extractDenials(data) {
+    if (!data || typeof data !== 'object')
+        return [];
+    const denials = data.denials;
+    if (!Array.isArray(denials))
+        return [];
+    const out = [];
+    for (const raw of denials) {
+        if (!raw || typeof raw !== 'object')
+            continue;
+        const r = raw;
+        if (typeof r.path !== 'string' || typeof r.requiredPermission !== 'string')
+            continue;
+        out.push({
+            path: r.path,
+            reason: typeof r.reason === 'string' ? r.reason : `Missing required permission: ${r.requiredPermission}`,
+            requiredPermission: r.requiredPermission,
+        });
+    }
+    return out;
+}

package/dist/push/diff-summary.d.ts

@@ -14,6 +14,17 @@
  */
 /** A single file-level change between the local working tree and remote HEAD. */
 export interface FileDelta {
+    /**
+     * Local content for `added`/`modified`. Absent for `deleted`. Required by
+     * the `configs.push` server endpoint when sending the delta over the wire.
+     */
+    afterJson?: string;
+    /**
+     * Remote content for `modified`/`deleted`. Absent for `added`. Required by
+     * the `configs.push` server endpoint to deep-diff per-environment rule
+     * changes for authorization.
+     */
+    beforeJson?: string;
     /**
      * `added`    — present locally, absent on remote
      * `modified` — present in both, content differs

package/dist/push/diff-summary.js

@@ -16,14 +16,7 @@
  * Top-level directories we present as named rows. Anything else funnels into
  * `other`. Keeping this closed-set avoids one-off typos silently looking fine.
  */
-const KNOWN_GROUPS = [
-    'configs',
-    'feature-flags',
-    'segments',
-    'schemas',
-    'schemas-protected',
-    'log-levels',
-];
+const KNOWN_GROUPS = ['configs', 'feature-flags', 'segments', 'schemas', 'schemas-protected', 'log-levels'];
 const DESTRUCTIVE_DELETE_COUNT = 10;
 const DESTRUCTIVE_DELETE_RATIO = 0.25;
 function emptyCounts() {

package/dist/push/run-push.d.ts

@@ -18,7 +18,6 @@
  * `--yes` skips the normal Y/N confirmation. It NEVER skips a typed-slug
  * confirmation — that prompt is the destructive-change brake.
  */
-import { PushIdentity } from '../util/clone-and-stack-push.js';
 import { FileDelta } from './diff-summary.js';
 export interface GiteaTokenMintResult {
     expiresAt: string | null;
@@ -32,23 +31,52 @@ export interface GitOps {
     countFilesInRemote(dir: string): Promise<number>;
     /**
      * Produce the list of file deltas to render in the Guard 3 summary and
-     * (for the bare path) commit. For the clone path this is HEAD vs origin/main.
-     * For the bare path the caller hands us the deltas itself.
+     * send to the server. Each delta carries before/after JSON content per
+     * the `configs.push` wire shape (qfg-azk.13). For the clone path this is
+     * HEAD vs origin/main; for the bare path it's local vs probe-clone.
      */
     diffHeadVsOrigin(dir: string): Promise<FileDelta[]>;
     /** `git fetch origin` in the given dir. */
     fetch(dir: string): Promise<void>;
-    /** Read local git config for author identity (used for bare-path commits). */
-    getLocalAuthor(dir: string): Promise<PushIdentity | undefined>;
     /** Returns the `remote.origin.url` for the repo, or undefined if unset / not a repo. */
     getRemoteOriginUrl(dir: string): Promise<string | undefined>;
     /** Returns true if the dir has a `.git/` (worktree or repo). */
     isGitRepo(dir: string): Promise<boolean>;
-    /** `git push origin main`. Throws with a PushConflict-ish message on non-ff. */
-    push(dir: string): Promise<void>;
     /** Set origin to `url` (add if missing, set-url if present). */
     setRemoteOrigin(dir: string, url: string): Promise<void>;
 }
+/** Server-side `kind` enum (matches `FileDeltaSchema` in app-quonfig). */
+export type ServerFileKind = 'add' | 'delete' | 'modify';
+export interface ServerFileDelta {
+    afterJson?: string;
+    beforeJson?: string;
+    kind: ServerFileKind;
+    path: string;
+}
+export interface ConfigPushInput {
+    expectedSha?: string;
+    files: ServerFileDelta[];
+    message?: string;
+    workspaceId: string;
+}
+export type ConfigPushResult = {
+    kind: 'bad-request';
+    message: string;
+} | {
+    kind: 'conflict';
+    message: string;
+} | {
+    commitSha: string;
+    kind: 'success';
+} | {
+    denials: PushDenial[];
+    kind: 'denied';
+};
+export interface PushDenial {
+    path: string;
+    reason: string;
+    requiredPermission: string;
+}
 export type ConfirmIO = {
     input?: NodeJS.ReadableStream;
     output?: NodeJS.WritableStream;
@@ -70,18 +98,30 @@ export interface RunPushInput {
 export interface RunPushDeps {
     /** Optional io streams for confirmation prompts. Defaults to process stdin/stdout. */
     confirmIO?: ConfirmIO;
-    /**
-     * Copy files from `sourceDir` into `destDir`, skipping `.git/`. Used by the
-     * bare path as the `applyDelta` callback handed to `cloneAndStackPush`.
-     */
-    copyDirMirror(sourceDir: string, destDir: string): Promise<void>;
     /** Error logger; defaults to console.error. */
     errLog?: (line: string) => void;
     gitOps: GitOps;
     /** Logger; defaults to console.log. */
     log?: (line: string) => void;
-    /** Mint a write token via the backend. */
+    /**
+     * Resolve the backend's identity for this workspace. Returns repoUrl,
+     * workspaceSlug, workspaceId — used by the identity check and (for
+     * read-only auth) by the bare-path probe-clone and clone-path fetch.
+     *
+     * Named `mintWriteToken` for historical reasons; as of qfg-azk.13 the
+     * push code path no longer mints a write-scoped Gitea token (server-side
+     * commit via `configs.push`), so the real implementation now mints a
+     * read-scope token. The name is preserved to keep the test harness shape
+     * stable across the qfg-azk.13 transition.
+     */
     mintWriteToken(requestedTarget: string): Promise<GiteaTokenMintResult>;
+    /**
+     * Call the server-side `configs.push` oRPC procedure. Returns a tagged
+     * union so callers can distinguish success / per-file denials / a stale
+     * expectedSha conflict / a path allow-list violation without parsing
+     * HTTP status codes.
+     */
+    pushToServer(input: ConfigPushInput): Promise<ConfigPushResult>;
     /** Run `qfg validate` semantics. Should throw on error. */
     validate(dir: string): Promise<{
         errors: string[];