veryfront 0.1.976 → 0.1.977

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

@@ -8,6 +8,7 @@
  */
 import type { InferSchema } from "../../../src/extensions/schema/index.js";
 import { type ApiClient } from "../../shared/config.js";
+import { type PullSource } from "../pull/index.js";
 /**
  * Schema factory for push command arguments
  */
@@ -72,8 +73,21 @@ export interface BranchResponse {
     name: string;
     projectId: string;
 }
+interface BranchListItem {
+    id: string;
+    name: string;
+}
+interface RemoteFile {
+    path: string;
+}
 export declare function generateBranchName(): 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 uploadFiles(client: ApiClient, projectSlug: string, branchId: string | null, ops: UploadOp[], dryRun: boolean): Promise<{
     uploaded: number;
     failed: number;
@@ -83,4 +97,5 @@ export declare function deleteFiles(client: ApiClient, projectSlug: string, bran
     failed: number;
 }>;
 export declare function pushCommand(options?: PushOptions): Promise<void>;
+export {};
 //# sourceMappingURL=command.d.ts.map

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":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAK3E,OAAO,EACL,KAAK,SAAS,EAKf,MAAM,wBAAwB,CAAC;AAShC;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;GAS7B,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;;;;;;;GAOxB,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sCAAsC;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAkCD,wBAAgB,kBAAkB,IAAI,MAAM,CAG3C;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CAEzB;AAQD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,GAAG,EAAE,QAAQ,EAAE,EACf,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB/C;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB9C;AA+BD,wBAAgB,WAAW,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyKpE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/push/command.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAK3E,OAAO,EACL,KAAK,SAAS,EAKf,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGjE;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;GAS7B,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;;;;;;;GAOxB,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sCAAsC;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AASD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAkCD,wBAAgB,kBAAkB,IAAI,MAAM,CAG3C;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CAEzB;AAoCD,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CAWzB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,UAAU,EAAE,GACtB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC,CAUrF;AAQD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,GAAG,EAAE,QAAQ,EAAE,EACf,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB/C;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB9C;AA+BD,wBAAgB,WAAW,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8KpE"}

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

@@ -13,7 +13,7 @@ import { cwd } from "../../../src/platform/index.js";
 import { createFileSystem } from "../../../src/platform/index.js";
 import { createApiClient, resolveConfigWithAuth, writeProjectSlug, } from "../../shared/config.js";
 import { reserveProjectSlug } from "../../shared/reserve-slug.js";
-import { confirmPrompt, logError, logInfo, logSuccess, logWarning } from "../../utils/index.js";
+import { confirmPrompt, logInfo, logSuccess, logWarning } from "../../utils/index.js";
 import { createNoopSpinner, createSpinner } from "../../ui/index.js";
 import { withSpan } from "../../../src/observability/tracing/otlp-setup.js";
 import { createIgnoreChecker, loadIgnorePatterns } from "../../sync/ignore.js";
@@ -72,6 +72,52 @@ export function generateBranchName() {
 export function createBranch(client, projectSlug, branchName) {
     return client.post(`/projects/${projectSlug}/branches`, { name: branchName });
 }
+function getErrorStatus(error) {
+    if (typeof error !== "object" || error === null)
+        return undefined;
+    const status = error.status;
+    return typeof status === "number" ? status : undefined;
+}
+async function getBranchByName(client, projectSlug, branchName) {
+    let cursor;
+    do {
+        const params = {
+            search: branchName,
+            limit: "100",
+            ...(cursor ? { cursor } : {}),
+        };
+        const response = await client.get(`/projects/${projectSlug}/branches`, params);
+        const branch = response.data.find((candidate) => candidate.name === branchName);
+        if (branch)
+            return branch;
+        cursor = response.page_info?.next;
+    } while (cursor);
+    return null;
+}
+export async function ensureBranch(client, projectSlug, branchName) {
+    try {
+        return await createBranch(client, projectSlug, branchName);
+    }
+    catch (error) {
+        if (getErrorStatus(error) !== 409)
+            throw error;
+        const existingBranch = await getBranchByName(client, projectSlug, branchName);
+        if (existingBranch)
+            return existingBranch;
+        throw error;
+    }
+}
+export async function resolvePushRemoteFiles(client, projectSlug, branchName, mainFiles) {
+    const mainSource = { type: "main" };
+    if (branchName === "main")
+        return { branchId: null, remoteFiles: mainFiles, source: mainSource };
+    const existingBranch = await getBranchByName(client, projectSlug, branchName);
+    if (!existingBranch)
+        return { branchId: null, remoteFiles: mainFiles, source: mainSource };
+    const branchSource = { type: "branch", name: branchName };
+    const remoteFiles = await listAllFiles(client, projectSlug, branchSource);
+    return { branchId: existingBranch.id, remoteFiles, source: branchSource };
+}
 function buildFileUrl(projectSlug, path, branchId) {
     const encodedPath = encodeURIComponent(path);
     const base = `/projects/${projectSlug}/files/${encodedPath}`;
@@ -157,15 +203,16 @@ export function pushCommand(options = {}) {
         const localPaths = new Set(ops.map((op) => op.path));
         spinner.update("Fetching remote files...");
         const client = createApiClient(config);
+        const branchName = branch || generateBranchName();
+        const isMainBranch = branchName === "main";
         // First-push: If project doesn't exist on server yet, create it
-        let remoteFiles = [];
+        let mainFiles = [];
         try {
-            remoteFiles = await listAllFiles(client, config.projectSlug, { type: "main" });
+            mainFiles = await listAllFiles(client, config.projectSlug, { type: "main" });
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
             // Project doesn't exist yet - create it on first push
-            if (message.includes("404") || message.includes("not found")) {
+            if (getErrorStatus(error) === 404) {
                 spinner.update("Creating project...");
                 const reserveResult = await reserveProjectSlug(config.projectSlug, config.apiToken);
                 if (reserveResult.slug !== config.projectSlug) {
@@ -175,18 +222,19 @@ export function pushCommand(options = {}) {
                 config = { ...config, projectSlug: reserveResult.slug };
                 // Now try to get files again (should be empty for new project)
                 try {
-                    remoteFiles = await listAllFiles(client, config.projectSlug, { type: "main" });
+                    mainFiles = await listAllFiles(client, config.projectSlug, { type: "main" });
                 }
                 catch {
                     // Project just created, no files yet
-                    remoteFiles = [];
+                    mainFiles = [];
                 }
             }
             else {
                 throw error;
             }
         }
-        const toDelete = remoteFiles.map((f) => f.path).filter((p) => !localPaths.has(p));
+        const target = await resolvePushRemoteFiles(client, config.projectSlug, branchName, mainFiles);
+        const toDelete = target.remoteFiles.map((f) => f.path).filter((p) => !localPaths.has(p));
         if (ops.length === 0 && toDelete.length === 0) {
             spinner.stop();
             if (!quiet)
@@ -194,8 +242,6 @@ export function pushCommand(options = {}) {
             return;
         }
         spinner.stop();
-        const branchName = branch || generateBranchName();
-        const isMainBranch = branchName === "main";
         if (!quiet) {
             const parts = buildSummaryParts(ops, toDelete);
             cliLogger.info(`\nFound ${formatParts(parts)} for ${isMainBranch ? "main" : `branch "${branchName}"`}.`);
@@ -204,7 +250,9 @@ export function pushCommand(options = {}) {
             const parts = buildConfirmParts(ops, toDelete);
             const confirmMessage = isMainBranch
                 ? `Push to main (${parts.join(", ")} files)?`
-                : `Create branch "${branchName}" and ${parts.join(", ")} files?`;
+                : target.branchId
+                    ? `Push to branch "${branchName}" and ${parts.join(", ")} files?`
+                    : `Create branch "${branchName}" and ${parts.join(", ")} files?`;
             const confirmed = await confirmPrompt(confirmMessage, true);
             if (!confirmed) {
                 cliLogger.info("Push cancelled.");
@@ -212,10 +260,11 @@ export function pushCommand(options = {}) {
             }
         }
         if (dryRun) {
-            if (ops.length > 0)
-                await uploadFiles(client, config.projectSlug, null, ops, true);
+            if (ops.length > 0) {
+                await uploadFiles(client, config.projectSlug, target.branchId, ops, true);
+            }
             if (toDelete.length > 0) {
-                await deleteFiles(client, config.projectSlug, null, toDelete, true);
+                await deleteFiles(client, config.projectSlug, target.branchId, toDelete, true);
             }
             if (!quiet) {
                 const parts = buildConfirmParts(ops, toDelete);
@@ -223,24 +272,22 @@ export function pushCommand(options = {}) {
             }
             return;
         }
-        let branchId = null;
-        const uploadMsg = isMainBranch ? "Pushing to main..." : `Creating branch "${branchName}"...`;
+        let branchId = target.branchId;
+        const uploadMsg = isMainBranch
+            ? "Pushing to main..."
+            : branchId
+                ? `Pushing to branch "${branchName}"...`
+                : `Creating branch "${branchName}"...`;
         spinner = quiet ? createNoopSpinner() : createSpinner(uploadMsg);
-        if (!isMainBranch) {
+        if (!isMainBranch && !branchId) {
             try {
-                const createdBranch = await createBranch(client, config.projectSlug, branchName);
-                branchId = createdBranch.id;
+                const preparedBranch = await ensureBranch(client, config.projectSlug, branchName);
+                branchId = preparedBranch.id;
             }
             catch (error) {
                 spinner.stop();
                 const message = error instanceof Error ? error.message : String(error);
-                if (message.includes("already exists")) {
-                    logError(`Branch "${branchName}" already exists. Use --branch to specify a different name.`);
-                }
-                else {
-                    logError(`Failed to create branch: ${message}`);
-                }
-                return;
+                throw new Error(`Failed to prepare branch "${branchName}": ${message}`);
             }
         }
         let uploadResult = { uploaded: 0, failed: 0 };

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.976",
+    "version": "0.1.977",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {

package/esm/src/utils/version-constant.d.ts

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.976";
+export declare const VERSION = "0.1.977";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.976";
+export const VERSION = "0.1.977";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.976",
+  "version": "0.1.977",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",