@mevdragon/vidfarm-devcli 0.2.0 → 0.2.1

package/dist/src/app.js

@@ -70,6 +70,17 @@ const listJobsQuerySchema = z.object({
 function getLoginMode(value) {
     return value === "password" ? "password" : "otp";
 }
+function readRootSkillFile(...filenames) {
+    for (const filename of filenames) {
+        try {
+            return readFileSync(path.resolve(filename), "utf8");
+        }
+        catch {
+            continue;
+        }
+    }
+    return "";
+}
 const allowedAttachmentExtensions = new Set([
     ".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg",
     ".mp4", ".mov", ".webm", ".m4v",
@@ -361,23 +372,9 @@ app.get("/settings", (c) => {
     if (!customer) {
         return redirect(c, "/login");
     }
-    const directorSkill = (() => {
-        try {
-            return readFileSync(path.resolve("SKILL.user.md"), "utf8");
-        }
-        catch {
-            return "";
-        }
-    })();
+    const directorSkill = readRootSkillFile("SKILL.director.md", "SKILL.user.md");
     const developerSkill = customer.isDeveloper
-        ? (() => {
-            try {
-                return readFileSync(path.resolve("SKILL.developer.md"), "utf8");
-            }
-            catch {
-                return null;
-            }
-        })()
+        ? readRootSkillFile("SKILL.developer.md") || null
         : null;
     return c.html(renderSettingsPage({
         notice: c.req.query("notice") ?? null,
@@ -476,7 +473,7 @@ app.post("/settings/attachments", async (c) => {
             const arrayBuffer = await file.arrayBuffer();
             const buffer = Buffer.from(arrayBuffer);
             const attachmentId = createId("att");
-            const storageKey = `user/${customer.id}/attachments/${attachmentId}/${fileName}`;
+            const storageKey = storage.userAttachmentKey(customer.id, attachmentId, fileName);
             const stored = await storage.putBuffer(storageKey, buffer, contentType, { publicRead: true });
             database.createUserAttachment({
                 id: attachmentId,
@@ -610,14 +607,17 @@ function buildAbsoluteUrl(c, pathname) {
 }
 function resolveTemplateAboutStorageKey(templateId, entry) {
     const normalizedEntry = entry.replace(/^\/+/, "");
+    const templateAboutPrefix = storage.templateAboutKey(templateId, "");
     if (!/^https?:\/\//i.test(entry)) {
-        const templateAboutPrefix = `templates/${templateId}/about/`;
+        if (normalizedEntry.startsWith("templates/")) {
+            return normalizedEntry;
+        }
         if (normalizedEntry.startsWith(templateAboutPrefix)) {
             return normalizedEntry;
         }
         return normalizedEntry.startsWith("about/")
-            ? `templates/${templateId}/${normalizedEntry}`
-            : `templates/${templateId}/about/${normalizedEntry}`;
+            ? joinStoragePath("templates", templateId, normalizedEntry)
+            : storage.templateAboutKey(templateId, normalizedEntry);
     }
     try {
         const url = new URL(entry);
@@ -657,7 +657,7 @@ async function serveTemplateAboutAsset(c, templateId, assetPath) {
     if (!normalizedAssetPath) {
         return c.json({ error: "Template about asset path is required" }, 400);
     }
-    const key = `templates/${template.id}/about/${normalizedAssetPath}`;
+    const key = storage.templateAboutKey(template.id, normalizedAssetPath);
     const readUrl = await storage.getReadUrl(key);
     if (config.STORAGE_DRIVER === "s3" && readUrl) {
         return c.redirect(readUrl, 302);
@@ -742,7 +742,10 @@ function resolveTemplateAboutMediaUrl(c, templateId, entry) {
         return entry;
     }
     const normalizedEntry = entry.replace(/^\/+/, "");
-    const templateAboutPrefix = `templates/${templateId}/about/`;
+    if (normalizedEntry.startsWith("templates/")) {
+        return buildAbsoluteUrl(c, `/template-media?key=${encodeURIComponent(normalizedEntry)}`);
+    }
+    const templateAboutPrefix = storage.templateAboutKey(templateId, "");
     const aboutPath = normalizedEntry.startsWith(templateAboutPrefix)
         ? `about/${normalizedEntry.slice(templateAboutPrefix.length)}`
         : normalizedEntry.startsWith("about/")
@@ -750,6 +753,13 @@ function resolveTemplateAboutMediaUrl(c, templateId, entry) {
             : `about/${normalizedEntry}`;
     return buildAbsoluteUrl(c, `${TEMPLATES_PREFIX}/${templateId}/${aboutPath}`);
 }
+function joinStoragePath(...parts) {
+    return parts
+        .flatMap((part) => part.split("/"))
+        .map((part) => part.trim())
+        .filter(Boolean)
+        .join("/");
+}
 app.get(TEMPLATES_PREFIX, (c) => c.json({
     templates: templateRegistry.list().map((template) => ({
         ...serializeTemplate(c, template),

package/dist/src/config.js

@@ -26,7 +26,7 @@ const schema = z.object({
     AWS_SECRET_ACCESS_KEY: z.string().optional(),
     PUBLIC_BASE_URL: z.string().optional(),
     RESEND_API_KEY: z.string().optional(),
-    RESEND_FROM_EMAIL: z.string().default("noreply@example.com"),
+    RESEND_FROM_EMAIL: z.string().default("vidfarm@fwd.zoomgtm.com"),
     OPENAI_API_KEY: z.string().optional(),
     OPENROUTER_API_KEY: z.string().optional(),
     GEMINI_API_KEY: z.string().optional(),

package/dist/src/context.js

@@ -3,7 +3,7 @@ import { database } from "./db.js";
 import { createId } from "./lib/ids.js";
 export function createTemplateJobContext(input) {
     const templateConfig = database.getTemplateConfig(input.customer.id, input.template.id);
-    const prefix = `templates/${input.template.id}/users/${input.customer.id}/jobs/${input.job.id}`;
+    const prefix = input.storage.templateJobPrefix(input.template.id, input.customer.id, input.job.id);
     return {
         env: config.isProduction ? "production" : "development",
         customer: input.customer,

package/dist/src/services/storage.js

@@ -14,6 +14,21 @@ export class StorageService {
     constructor() {
         mkdirSync(this.localRoot, { recursive: true });
     }
+    userAttachmentKey(customerId, attachmentId, fileName) {
+        return joinStorageKey("user", customerId, "attachments", attachmentId, fileName);
+    }
+    developerAttachmentKey(customerId, attachmentId, fileName) {
+        return joinStorageKey("developer", customerId, "attachments", attachmentId, fileName);
+    }
+    templateJobPrefix(templateId, customerId, jobId) {
+        return joinStorageKey("templates", templateId, "users", customerId, "jobs", jobId);
+    }
+    templateJobKey(templateId, customerId, jobId, key) {
+        return joinStorageKey(this.templateJobPrefix(templateId, customerId, jobId), key);
+    }
+    templateAboutKey(templateId, assetPath) {
+        return joinStorageKey("templates", templateId, "about", assetPath);
+    }
     async putJson(key, value, options) {
         const body = JSON.stringify(value, null, 2);
         return this.putBuffer(key, Buffer.from(body, "utf8"), "application/json", options);
@@ -86,6 +101,13 @@ export class StorageService {
         return this.getPublicUrl(key);
     }
 }
+function joinStorageKey(...parts) {
+    return parts
+        .flatMap((part) => part.split("/"))
+        .map((part) => part.trim())
+        .filter(Boolean)
+        .join("/");
+}
 function inferContentType(filePath) {
     switch (path.extname(filePath).toLowerCase()) {
         case ".json":

package/dist/templates/template_0000/src/template.js

@@ -11,7 +11,7 @@ const TEMPLATE_ID = "4c7a7e1a-7f35-4f30-9f86-9c8a63c7f2db";
 const TEMPLATE_SLUG_ID = "template_0000";
 const COMPOSITION_ID = "template-0000";
 const TEMPLATE_PREVIEW_MEDIA = [
-    "https://vidfarmprodstack-vidfarmbucket335ee12f-0vsvtd5earqy.s3.us-east-1.amazonaws.com/templates/template-0000/about/preview-01.jpg",
+    "templates/template-0000/about/preview-01.jpg",
 ];
 const FRAME = { width: 1080, height: 1920 };
 const TIKTOK_SAFE_AREA = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mevdragon/vidfarm-devcli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Developer CLI for running the Vidfarm local template platform.",
   "type": "module",
   "bin": {
@@ -11,6 +11,7 @@
     "dist",
     "templates/template_0000",
     "README.md",
+    "SKILL.director.md",
     "SKILL.developer.md",
     "PLATFORM_SPEC.md",
     "AWS_REMOTION_HANDOFF.md",