veryfront 0.1.1238 → 0.1.1239

package/esm/cli/commands/init/init-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/init/init-command.ts"],"names":[],"mappings":"AAAA;;;iCAGiC;AAOjC,OAAO,KAAK,EAAE,WAAW,EAA6B,MAAM,YAAY,CAAC;AAezE,UAAU,uBAAuB;IAC/B,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACzD;AAyFD;;GAEG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,WAAW,EACpB,YAAY,GAAE,uBAA4B,GACzC,OAAO,CAAC,IAAI,CAAC,CAoPf"}
+{"version":3,"file":"init-command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/init/init-command.ts"],"names":[],"mappings":"AAAA;;;iCAGiC;AAOjC,OAAO,KAAK,EAAE,WAAW,EAA6B,MAAM,YAAY,CAAC;AAezE,UAAU,uBAAuB;IAC/B,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACzD;AAyFD;;GAEG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,WAAW,EACpB,YAAY,GAAE,uBAA4B,GACzC,OAAO,CAAC,IAAI,CAAC,CA8Of"}

package/esm/cli/commands/init/init-command.js

@@ -212,47 +212,39 @@ export async function initCommand(options, dependencies = {}) {
         }
         else {
             const { chdir } = await import("../../../src/platform/index.js");
-            const { ensureAuthenticated, readToken } = await import("../../auth/index.js");
+            const { ensureAuthenticated } = await import("../../auth/index.js");
             const { deployCommand } = await import("../deploy/index.js");
-            const authResult = await ensureAuthenticated();
+            const authResult = await ensureAuthenticated(undefined, createdProjectDir);
             if (!authResult) {
                 if (!quiet)
                     console.log();
                 log(`  Authentication required for --deploy. ${manualDeployHint}`);
             }
             else {
-                const token = await readToken();
-                if (!token) {
-                    if (!quiet)
-                        console.log();
-                    log(`  Could not read auth token. ${manualDeployHint}`);
+                if (!quiet)
+                    console.log();
+                log(`  Deploying project...`);
+                try {
+                    chdir(createdProjectDir);
+                    const deployment = await deployCommand({
+                        projectDir: createdProjectDir,
+                        branch: "main",
+                        env: "production",
+                        force: true,
+                        dryRun: false,
+                        quiet: true,
+                    });
+                    if (!deployment) {
+                        throw new Error("Deploy completed without a verified result.");
+                    }
+                    deployedUrl = deployment.url;
                 }
-                else {
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
                     if (!quiet)
                         console.log();
-                    log(`  Deploying project...`);
-                    try {
-                        chdir(createdProjectDir);
-                        const deployment = await deployCommand({
-                            projectDir: createdProjectDir,
-                            branch: "main",
-                            env: "production",
-                            force: true,
-                            dryRun: false,
-                            quiet: true,
-                        });
-                        if (!deployment) {
-                            throw new Error("Deploy completed without a verified result.");
-                        }
-                        deployedUrl = deployment.url;
-                    }
-                    catch (error) {
-                        const message = error instanceof Error ? error.message : String(error);
-                        if (!quiet)
-                            console.log();
-                        log(`  Deploy failed: ${message}`);
-                        log(`  Your project was created locally. ${manualDeployHint}`);
-                    }
+                    log(`  Deploy failed: ${message}`);
+                    log(`  Your project was created locally. ${manualDeployHint}`);
                 }
             }
         }

package/esm/cli/commands/install/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/install/registry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAgC,MAAM,YAAY,CAAC;AA+CtF,eAAO,MAAM,QAAQ,EAAE,MAAM,EAAyD,CAAC;AAEvF,wBAAgB,aAAa,IAAI,QAAQ,EAAE,CAE1C;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAO9C;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,QAAQ,CAExD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWlE"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/install/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAgC,MAAM,YAAY,CAAC;AA+CtF,eAAO,MAAM,QAAQ,EAAE,MAAM,EAAyD,CAAC;AAEvF,wBAAgB,aAAa,IAAI,QAAQ,EAAE,CAE1C;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAO9C;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,QAAQ,CAExD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOlE"}

package/esm/cli/commands/install/registry.js

@@ -1,4 +1,3 @@
-import manifest from "../../../templates/manifest.js";
 import { AIToolIdSchema, AIToolSchema } from "./types.js";
 const AI_TOOLS_RAW = [
     {
@@ -60,12 +59,10 @@ export function isValidToolId(id) {
 }
 export function getTemplateContent(toolId) {
     const { template } = getToolById(toolId);
-    const entry = manifest.templates;
-    const aiRule = entry[`ai-rules:${template}`];
-    if (!aiRule)
-        throw new Error(`Template not found in manifest: ${template}`);
-    const content = aiRule.files[template];
-    if (!content)
-        throw new Error(`Template file not found in manifest: ${template}`);
-    return Promise.resolve(content);
+    return import("../../../templates/loader.js").then(async ({ loadAiRuleTemplate }) => {
+        const content = await loadAiRuleTemplate(template);
+        if (!content)
+            throw new Error(`Template file not found in manifest: ${template}`);
+        return content;
+    });
 }

package/esm/cli/commands/login/command-help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-help.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/login/command-help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,eAAO,MAAM,SAAS,EAAE,WAoCvB,CAAC"}
+{"version":3,"file":"command-help.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/login/command-help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,eAAO,MAAM,SAAS,EAAE,WAsCvB,CAAC"}

package/esm/cli/commands/login/command-help.js

@@ -29,7 +29,9 @@ export const loginHelp = {
         "veryfront login --token",
     ],
     notes: [
-        "Without options, prompts for authentication method",
+        "Without options, a valid session returns immediately. Use an explicit method to sign in again. If veryfront.json contains apiToken, remove or replace it before using another method to switch accounts",
+        "If VERYFRONT_API_TOKEN is set in your shell, unset or replace it before using another method to switch accounts.",
+        "Explicit methods (--google, --github, --microsoft, --token) are not supported with --json. Combining them with --json returns a usage error.",
         "OAuth methods open browser for authentication",
         "Token is stored in ~/.config/veryfront/token",
         "Exits 1 when no credential was obtained, so scripts can gate on it",

package/esm/cli/commands/pull/command.d.ts

@@ -103,6 +103,7 @@ interface ProjectFile {
     type: string;
     created_at: string;
     updated_at: string;
+    version_id?: string;
 }
 /** Validate a remote file path as a canonical relative POSIX path. */
 export declare function validateRemoteFilePath(filePath: string): string;

package/esm/cli/commands/pull/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/pull/command.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAM3E,OAAO,EACL,eAAe,EAIhB,MAAM,wBAAwB,CAAC;AAwBhC;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;GAa7B,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;GAAgC,CAAC;AAE5D,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;GAWxB,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,gCAAgC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU,CAKlE;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAsCD,sEAAsE;AACtE,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmB/D;AAkDD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAcjF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAC1C,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CAoBxB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAoBjG;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAC1C,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,MAAM,CAAC,CAKjB;AA2eD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2LpE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/pull/command.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAM3E,OAAO,EACL,eAAe,EAIhB,MAAM,wBAAwB,CAAC;AA+BhC;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;GAa7B,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;GAAgC,CAAC;AAE5D,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;GAWxB,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,gCAAgC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU,CAKlE;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAuCD,sEAAsE;AACtE,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmB/D;AAkDD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAcjF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAC1C,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CAoBxB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAoBjG;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAC1C,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAgiBD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2LpE"}

package/esm/cli/commands/pull/command.js

@@ -23,6 +23,7 @@ import { CommonArgs, createArgParser } from "../../shared/args.js";
 import { createIgnoreChecker, loadIgnorePatterns } from "../../sync/ignore.js";
 import { getProjectTarget } from "../../shared/deployment-provenance.js";
 import { ensurePulledProjectBootstrap, isPulledProjectBootstrapPath, planPulledProjectBootstrap, preflightPulledProjectBootstrap, } from "./project-bootstrap.js";
+import { computeContentDigest, preflightSyncState, SYNC_STATE_RELATIVE_PATH, writeSyncTarget, } from "../../sync/state.js";
 /**
  * Schema factory for pull command arguments
  */
@@ -317,12 +318,11 @@ async function findGitRoot(projectDir) {
         return null;
     }
 }
-function isUntrackedPushReceipt(statusLine) {
-    if (!statusLine.startsWith("?? "))
+function isLocalMetadataStatus(statusLine) {
+    if (statusLine.length < 4)
         return false;
     const path = statusLine.slice(3).replace(/\\/g, "/");
-    return path === ".veryfront/push-receipt.json" ||
-        path.endsWith("/.veryfront/push-receipt.json");
+    return [".veryfront/push-receipt.json", SYNC_STATE_RELATIVE_PATH].some((relativePath) => path === relativePath || path.endsWith(`/${relativePath}`));
 }
 async function assertCleanGitWorktrees(projectDirs) {
     const gitRoots = new Set();
@@ -349,7 +349,7 @@ async function assertCleanGitWorktrees(projectDirs) {
                 detail: "Veryfront could not verify that the Git worktree is clean before pruning files.",
             });
         }
-        const dirty = (status.stdout ?? "").split("\n").some((line) => line !== "" && !isUntrackedPushReceipt(line));
+        const dirty = (status.stdout ?? "").split("\n").some((line) => line !== "" && !isLocalMetadataStatus(line));
         if (dirty) {
             throw INVALID_ARGUMENT.create({
                 detail: `Pull with --prune requires a clean Git worktree at ${gitRoot}. Commit or stash local changes, then run the command again.`,
@@ -416,6 +416,36 @@ async function confirmPullWrite(projectDir, writeCount, deleteCount, bootstrapWr
     const action = actions.join(" and ");
     return await confirmPrompt(`This will ${action} in ${projectDir}. Continue?`, false);
 }
+function syncBranchForPullSource(source) {
+    switch (source.type) {
+        case "main":
+            return "main";
+        case "branch":
+            return source.name;
+        case "environment":
+        case "release":
+            return null;
+    }
+}
+async function recordPullSyncTarget(projectDir, config, project, source, writeOps) {
+    const branch = syncBranchForPullSource(source);
+    if (!branch)
+        return;
+    const files = {};
+    for (const op of writeOps) {
+        files[op.relativePath] = {
+            digest: await computeContentDigest(op.content),
+            ...(op.versionId ? { versionId: op.versionId } : {}),
+        };
+    }
+    await writeSyncTarget(projectDir, {
+        controlPlane: config.apiUrl,
+        projectId: project.id,
+        projectSlug: project.slug,
+        branch,
+        files,
+    });
+}
 async function pullSingleProject(projectSlug, projectDir, source, force, dryRun, prune, config, quiet = false) {
     const sourceLabel = formatPullSource(source);
     let spinner = quiet
@@ -459,7 +489,11 @@ async function pullSingleProject(projectSlug, projectDir, source, force, dryRun,
                 detail: `Veryfront returned invalid content for file "${file.path}". No local files were changed.`,
             });
         }
-        writeOps.push({ ...op, content: file.content });
+        writeOps.push({
+            ...op,
+            content: file.content,
+            ...(file.version_id ? { versionId: file.version_id } : {}),
+        });
     }
     let deleteOps = [];
     if (prune) {
@@ -499,6 +533,9 @@ async function pullSingleProject(projectSlug, projectDir, source, force, dryRun,
             return { written: 0, deleted: 0, cancelled: true };
         }
     }
+    if (!dryRun && syncBranchForPullSource(source)) {
+        await preflightSyncState(projectDir);
+    }
     if (!hasFileOperations) {
         await ensurePulledProjectBootstrap({
             projectDir,
@@ -510,6 +547,9 @@ async function pullSingleProject(projectSlug, projectDir, source, force, dryRun,
             quiet,
             plan: bootstrapPlan,
         });
+        if (!dryRun) {
+            await recordPullSyncTarget(projectDir, config, project, source, writeOps);
+        }
         return { written: 0, deleted: 0, cancelled: false };
     }
     spinner = quiet ? createNoopSpinner() : createSpinner(`Writing files to ${projectDir}...`);
@@ -533,6 +573,9 @@ async function pullSingleProject(projectSlug, projectDir, source, force, dryRun,
         quiet,
         plan: bootstrapPlan,
     });
+    if (!dryRun) {
+        await recordPullSyncTarget(projectDir, config, project, source, writeOps);
+    }
     if (!quiet) {
         if (dryRun) {
             logInfo(`Dry run complete for ${projectSlug}. Would write ${writeResult.written} and delete ${deleteResult.deleted} files.`);

package/esm/cli/commands/push/command-help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-help.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/push/command-help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,eAAO,MAAM,QAAQ,EAAE,WAgDtB,CAAC"}
+{"version":3,"file":"command-help.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/push/command-help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,eAAO,MAAM,QAAQ,EAAE,WAuDtB,CAAC"}

package/esm/cli/commands/push/command-help.js

@@ -24,6 +24,10 @@ export const pushHelp = {
             flag: "--prune",
             description: "Delete managed remote files that are missing locally",
         },
+        {
+            flag: "-f, --force",
+            description: "Intentionally overwrite remote changes and bypass concurrency guards",
+        },
         {
             flag: "-q, --quiet",
             description: "Suppress progress and summary output",
@@ -40,6 +44,9 @@ export const pushHelp = {
         "Use --branch to create or update an isolated branch preview",
         "Preview branch names use lowercase letters, numbers, and hyphens",
         "By default, push uploads local files and preserves remote-only files",
+        "Push rejects files changed remotely since the last pull or push",
+        "Run pull and reconcile changes with Git before retrying a rejected push",
+        "Use --force only when you intend to overwrite remote changes",
         "Use --prune to remove managed remote files that are missing locally",
         "Run veryfront deploy when the preview is ready for an environment",
         ".vfignore excludes matching local files and preserves matching remote files",

package/esm/cli/commands/push/command.d.ts

@@ -3,6 +3,7 @@ import { type ApiClient, type ResolvedConfig } from "../../shared/config.js";
 import { type IgnoreChecker } from "../../sync/ignore.js";
 import { type PullSource } from "../pull/index.js";
 import { type GitSource } from "../../shared/deployment-provenance.js";
+import { type PlannedDelete, type PlannedUpload } from "./plan.js";
 /**
  * Schema factory for push command arguments
  */
@@ -10,7 +11,7 @@ export declare const getPushArgsSchema: () => import("../../../src/internal-agen
     projectSlug: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     branch: import("../../../src/internal-agents/schema.js").Schema<string>;
-    /** Deprecated compatibility flag; invoking push already authorizes the operation. */
+    /** Intentionally overwrite remote changes and bypass concurrency guards. */
     force: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     prune: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     dryRun: import("../../../src/internal-agents/schema.js").Schema<boolean>;
@@ -20,7 +21,7 @@ export declare const PushArgsSchema: import("../../../src/internal-agents/schema
     projectSlug: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     branch: import("../../../src/internal-agents/schema.js").Schema<string>;
-    /** Deprecated compatibility flag; invoking push already authorizes the operation. */
+    /** Intentionally overwrite remote changes and bypass concurrency guards. */
     force: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     prune: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     dryRun: import("../../../src/internal-agents/schema.js").Schema<boolean>;
@@ -34,7 +35,7 @@ declare const parseKnownPushArgs: (args: import("../../shared/types.js").ParsedA
     projectSlug: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     branch: import("../../../src/internal-agents/schema.js").Schema<string>;
-    /** Deprecated compatibility flag; invoking push already authorizes the operation. */
+    /** Intentionally overwrite remote changes and bypass concurrency guards. */
     force: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     prune: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     dryRun: import("../../../src/internal-agents/schema.js").Schema<boolean>;
@@ -51,7 +52,7 @@ export interface PushOptions {
     projectDir?: string;
     /** Branch name to update (defaults to main) */
     branch?: string;
-    /** Deprecated compatibility flag; invoking push already authorizes the operation. */
+    /** Intentionally overwrite remote changes and bypass concurrency guards. */
     force?: boolean;
     /** Prune remote files that are missing locally. */
     prune?: boolean;
@@ -63,7 +64,7 @@ export interface PushOptions {
 /**
  * File upload operation
  */
-export interface UploadOp {
+export interface UploadOp extends PlannedUpload {
     /** Relative path from project root (sent to API) */
     path: string;
     content: string;
@@ -85,9 +86,19 @@ interface BranchListItem {
     id: string;
     name: string;
 }
+interface EnsuredBranch extends BranchListItem {
+    created: boolean;
+}
+interface PushRemoteTarget {
+    branchId: string | null;
+    remoteFiles: RemoteFile[];
+    source: PullSource;
+    branchExists: boolean;
+}
 interface RemoteFile {
     path: string;
     content?: string;
+    version_id?: string;
 }
 export declare function scanLocalFiles(projectDir: string, ignoreChecker: IgnoreChecker): Promise<UploadOp[]>;
 export declare function capturePushSourceSnapshot(projectDir: string, ignoreChecker: IgnoreChecker): Promise<PushSourceSnapshot>;
@@ -113,19 +124,19 @@ export declare function buildPushUrls(projectSlug: string, branchName: string):
     preview: string;
 };
 export declare function createBranch(client: ApiClient, projectSlug: string, branchName: string): Promise<BranchResponse>;
-export declare function ensureBranch(client: ApiClient, projectSlug: string, branchName: string): Promise<BranchListItem>;
-export declare function resolvePushRemoteFiles(client: ApiClient, projectSlug: string, branchName: string, mainFiles: RemoteFile[]): Promise<{
-    branchId: string | null;
-    remoteFiles: RemoteFile[];
-    source: PullSource;
-}>;
+export declare function ensureBranch(client: ApiClient, projectSlug: string, branchName: string): Promise<EnsuredBranch>;
+export declare function resolvePushRemoteFiles(client: ApiClient, projectSlug: string, branchName: string, mainFiles: RemoteFile[]): Promise<PushRemoteTarget>;
 export declare function uploadFiles(client: ApiClient, projectSlug: string, branchId: string | null, ops: UploadOp[], dryRun: boolean): Promise<{
     uploaded: number;
     failed: number;
+    conflicts: string[];
+    applied: string[];
 }>;
-export declare function deleteFiles(client: ApiClient, projectSlug: string, branchId: string | null, paths: string[], dryRun: boolean): Promise<{
+export declare function deleteFiles(client: ApiClient, projectSlug: string, branchId: string | null, ops: PlannedDelete[], dryRun: boolean): Promise<{
     deleted: number;
     failed: number;
+    conflicts: string[];
+    applied: string[];
 }>;
 export declare function recordPushReceipt(client: ApiClient, config: ResolvedConfig, projectDir: string, branch: string, snapshot: PushSourceSnapshot, ignoreChecker: IgnoreChecker, pushedSourceDigest?: string): Promise<void>;
 export declare function pushCommand(options?: PushOptions): Promise<void>;

package/esm/cli/commands/push/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/push/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/push/command.ts"],"names":[],"mappings":"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"}