@mevdragon/vidfarm-devcli 0.20.1 → 0.20.3

package/dist/src/app.js

@@ -24,6 +24,7 @@ import { writeForkManifest } from "./services/fork-manifest.js";
 import { renderHelpPage } from "./help-page.js";
 import { renderHomepage } from "./homepage.js";
 import { renderLandingPage } from "./landing-page.js";
+import { createTemplateJobContext } from "./context.js";
 import { renderReskinIndex } from "./reskin/index-page.js";
 import { renderReskinSettings } from "./reskin/settings-page.js";
 import { renderReskinLibrary } from "./reskin/library-page.js";
@@ -76,7 +77,7 @@ import { clipRecords, makeUserPreset } from "./services/clip-records.js";
 import { matchScenesToClips, searchUserClips, vectorIndex } from "./services/clip-search.js";
 import { ATTACHMENTS_FOLDER_SCOPE, buildDirectoryPath, DIRECTORY_ROOTS, DIRECTORY_ROOT_KEYS, folderItem, immediateChildFolders, normalizeFolderPath, parseDirectoryPath } from "./services/file-directory.js";
 import { applyHuntSpecDefaults, BUILTIN_PRESETS, buildClipEmbeddingText, buildEffectiveGuidance, ClipModelClient, cosineSimilarity, detectLocalAgent, effectiveHuntDurationSec, ACTIVE_TAXONOMY_VERSION, estimateScanCostFromDuration, extractAudioClip, extractClip, extractThumbnail, extractWaveformThumbnail, hasFfmpeg, LocalAgentClipClient, normalizeCropFocus, normalizeHuntSpec, parseClipHuntPrompt, pickBestVideoMedia, probeVideo, resolveDurationBand, resolveTargetClipCount, scanVideo } from "./services/clip-curation/index.js";
-import { analyzeCastMembers, annotateScenesFromSource, buildBlankCompositionHtml, buildSmartDecomposedHtml, DEFAULT_EDITOR_HARNESS, HyperframesService, smartDecomposeVideo, stampCompositionIdentity } from "./services/hyperframes.js";
+import { analyzeCastMembers, annotateScenesFromSource, buildBlankCompositionHtml, buildSmartDecomposedData, buildSmartDecomposedHtml, DEFAULT_EDITOR_HARNESS, DEFAULT_VIRAL_DNA, HyperframesService, smartDecomposeVideo, stampCompositionIdentity } from "./services/hyperframes.js";
 import { buildPendingSceneAnnotationsState } from "./services/scene-annotations.js";
 import { createPrimitiveJobContext } from "./primitive-context.js";
 import { buildPendingCastState, castMemberFromRaw, extractCastStill, isolateCastMember } from "./services/cast.js";
@@ -7805,7 +7806,7 @@ async function publishCompositionToRenderer(input) {
         fps: 30,
         chunk_size: 240,
         max_parallel_chunks: 8,
-        output_key: `renders/vidfarm/${slugId}/${Date.now().toString(36)}/output.mp4`,
+        output_key: "output.mp4",
         project_files: projectFiles,
         composition_data: compositionData ?? undefined
     });
@@ -7894,6 +7895,48 @@ async function runPrimitiveJobInProcess(jobId) {
         throw error;
     }
 }
+async function runTemplateJobInProcess(jobId) {
+    const job = await jobs.getJobAsync(jobId);
+    if (!job)
+        throw new Error(`Job not found: ${jobId}`);
+    const failContract = async (message) => {
+        await jobs.failJob(job.id, { message, type: "local_runner_contract_error" });
+        throw new Error(message);
+    };
+    const customer = await serverlessRecords.getCustomerById(job.customerId);
+    if (!customer)
+        return failContract(`Customer not found: ${job.customerId}`);
+    const template = await templateRegistry.getExecutable(job.templateId);
+    if (!template)
+        return failContract(`Template not found: ${job.templateId}`);
+    const workflow = template.jobs[job.workflowName];
+    if (!workflow)
+        return failContract(`Template workflow not found: ${job.workflowName}`);
+    const workerId = createId("local_worker");
+    try {
+        await jobs.markRunning(job.id);
+        const ctx = createTemplateJobContext({
+            customer,
+            job,
+            template,
+            workerId,
+            storage,
+            jobs,
+            billing,
+            providers,
+            hyperframes
+        });
+        const result = await workflow(ctx, job.payload);
+        await jobs.succeedJob(job.id, result.output ?? {}, result.progress ?? 1);
+    }
+    catch (error) {
+        await jobs.failJob(job.id, {
+            message: error instanceof Error ? error.message : "Local template job failed",
+            type: "local_render_failed"
+        });
+        throw error;
+    }
+}
 function mapJobStatusToPublishPhase(status) {
     const normalized = String(status ?? "").toLowerCase();
     if (normalized === "completed" || normalized === "succeeded")
@@ -7977,6 +8020,7 @@ function adaptJobToPublishStatus(job, fallbackTitle) {
         cost,
         outputS3Uri: readNonEmptyString(asRecord(result.output)?.s3_uri) ?? readNonEmptyString(renderBlock.output_s3_uri),
         outputUrl,
+        expectedOutputPublicUrl: readNonEmptyString(record.expected_output_public_url) ?? expectedHyperframesRenderOutputPublicUrl(job),
         title: readNonEmptyString(asRecord(record.payload)?.title) ?? fallbackTitle,
         fatalErrorEncountered: Boolean(publishErrorMessage),
         errors: publishErrorMessage ? [{ error: publishErrorMessage }] : []
@@ -8807,6 +8851,7 @@ app.post(`${INSPIRATIONS_PREFIX}/:inspirationId/decompose`, async (c) => {
                 result: smart
             });
             await storage.putText(storage.compositionForkWorkingKey(canonicalFork.id, "composition.html"), nextHtml, "text/html; charset=utf-8");
+            await storage.putJson(storage.compositionForkWorkingKey(canonicalFork.id, "composition.json"), buildSmartDecomposedData({ sourceUrl, result: smart }));
             // Persist placement surfaces on the canonical fork too, before the
             // snapshot, so they travel with v1 and seed every downstream fork.
             try {
@@ -9296,6 +9341,7 @@ app.post(`${COMPOSITIONS_PREFIX}/:forkId/auto-decompose`, async (c) => {
         }
         const nextHtml = buildSmartDecomposedHtml({ compositionId, sourceUrl, title, result: smart });
         await storage.putText(storage.compositionForkWorkingKey(fork.id, "composition.html"), nextHtml, "text/html; charset=utf-8");
+        await storage.putJson(storage.compositionForkWorkingKey(fork.id, "composition.json"), buildSmartDecomposedData({ sourceUrl, result: smart }));
         // Persist the raw smart-decompose result so the async /remove-video-captions-poll
         // handler can rebuild the composition HTML pointing at the cleaned
         // (ghostcut-mirrored) video URL — with the ORIGINAL captions, positions,
@@ -9685,10 +9731,7 @@ async function rebuildDecomposedCompositionAgainstCleanVideo(input) {
         title: persisted.title ?? fork.title ?? fork.id,
         result: {
             summary: persisted.result.summary ?? "",
-            viralDna: persisted.result.viralDna ?? {
-                trend_tagline: "", hook: "", retention: "", payoff: "",
-                preserve: [], avoid: [], promotions: [], keywords: []
-            },
+            viralDna: persisted.result.viralDna ?? DEFAULT_VIRAL_DNA,
             transcript: persisted.result.transcript ?? null,
             durationSeconds: Number(persisted.result.durationSeconds ?? 0),
             width: Number(persisted.result.width ?? 720),
@@ -9704,6 +9747,21 @@ async function rebuildDecomposedCompositionAgainstCleanVideo(input) {
         }
     });
     await storage.putText(storage.compositionForkWorkingKey(fork.id, "composition.html"), rebuilt, "text/html; charset=utf-8");
+    await storage.putJson(storage.compositionForkWorkingKey(fork.id, "composition.json"), buildSmartDecomposedData({
+        sourceUrl: cleanedSourceUrl,
+        result: {
+            summary: persisted.result.summary ?? "",
+            viralDna: persisted.result.viralDna ?? DEFAULT_VIRAL_DNA,
+            transcript: persisted.result.transcript ?? null,
+            durationSeconds: Number(persisted.result.durationSeconds ?? 0),
+            width: Number(persisted.result.width ?? 720),
+            height: Number(persisted.result.height ?? 1280),
+            scenes: persisted.result.scenes,
+            captions: Array.isArray(persisted.result.captions) ? persisted.result.captions : [],
+            placementSurfaces: [],
+            editorHarness: persisted.result.editorHarness ?? DEFAULT_EDITOR_HARNESS
+        }
+    }));
     await snapshotForkVersion({
         fork,
         callerCustomerId,
@@ -10238,7 +10296,7 @@ app.post(`${COMPOSITIONS_PREFIX}/:forkId/scene-annotations-poll`, async (c) => {
                 sourceUrl: state.sourceUrl,
                 keys,
                 scenes,
-                viralDna: viralDna ?? { trend_tagline: "", hook: "", retention: "", payoff: "", preserve: [], avoid: [], promotions: [], keywords: [] },
+                viralDna: viralDna ?? DEFAULT_VIRAL_DNA,
                 summary,
                 transcript,
                 userPrompt
@@ -16449,8 +16507,10 @@ async function serializeJob(job) {
         customerId: job.customerId,
         templateId: job.templateId
     });
+    const expectedOutputPublicUrl = expectedHyperframesRenderOutputPublicUrl(job);
     return {
         job_id: job.id,
+        customer_id: job.customerId,
         template_id: job.templateId,
         operation_name: job.operationName,
         workflow_name: job.workflowName,
@@ -16466,6 +16526,7 @@ async function serializeJob(job) {
             event_count: jobBilling.eventCount,
             consumed_usd: jobBilling.totalChargeUsd
         },
+        expected_output_public_url: expectedOutputPublicUrl,
         parent_job_id: job.parentJobId,
         created_at: job.createdAt,
         updated_at: job.updatedAt,
@@ -16485,6 +16546,19 @@ function serializeArtifact(artifact) {
         created_at: artifact.createdAt
     };
 }
+function expectedHyperframesRenderOutputPublicUrl(job) {
+    const record = asRecord(job);
+    if (!record)
+        return null;
+    const templateId = readNonEmptyString(record.templateId) ?? readNonEmptyString(record.template_id);
+    const customerId = readNonEmptyString(record.customerId) ?? readNonEmptyString(record.customer_id);
+    const jobId = readNonEmptyString(record.id) ?? readNonEmptyString(record.job_id);
+    if (templateId !== "primitive:hyperframes_render" || !customerId || !jobId)
+        return null;
+    const outputKey = readNonEmptyString(asRecord(record.payload)?.output_key) ?? "output.mp4";
+    const storageKey = storage.primitiveJobKey(templateId, customerId, jobId, outputKey);
+    return storage.getPublicUrl(storageKey);
+}
 async function buildJobDebugBundle(input) {
     const job = input.job;
     const startTime = input.startTime ?? offsetIso(job.createdAt, -60_000);
@@ -17020,7 +17094,7 @@ async function deriveProviderHint(input) {
     ];
     return useHintIfAvailable(configCandidates.find(isProviderType));
 }
-async function listPrimitiveJobsForCustomer(input) {
+async function listJobsForCustomerByTemplateId(input) {
     const target = clampPageLimit(input.limit, 100) + 1;
     const collected = [];
     let cursor = input.cursor ?? null;
@@ -17037,7 +17111,8 @@ async function listPrimitiveJobsForCustomer(input) {
             break;
         }
         for (const job of batch) {
-            if (job.templateId.startsWith("primitive:") && (!input.primitiveId || job.templateId === input.primitiveId)) {
+            if ((!input.templateId || job.templateId === input.templateId) &&
+                (!input.templateIdPrefix || job.templateId.startsWith(input.templateIdPrefix))) {
                 collected.push(job);
                 if (collected.length >= target) {
                     break;
@@ -17058,6 +17133,16 @@ async function listPrimitiveJobsForCustomer(input) {
     }
     return collected;
 }
+async function getJobForCustomerByTemplateId(input) {
+    const job = await jobs.getJobAsync(input.jobId);
+    if (!job || job.customerId !== input.customerId) {
+        return null;
+    }
+    if (input.templateId && job.templateId !== input.templateId) {
+        return null;
+    }
+    return job;
+}
 async function createPrimitiveJob(c, input) {
     const customer = requireCustomer(c);
     const primitive = primitiveRegistry.get(input.primitiveId);
@@ -17145,6 +17230,90 @@ async function createPrimitiveJob(c, input) {
         operation_name: input.operationName
     }, 202);
 }
+async function createTemplateJob(c, input) {
+    const customer = requireCustomer(c);
+    const template = await templateRegistry.getExecutable(input.templateId);
+    if (!template) {
+        return c.json({ error: "Template not found" }, 404);
+    }
+    const operation = template.operations[input.operationName];
+    if (!operation) {
+        return c.json({ error: "Template operation not found" }, 404);
+    }
+    let body;
+    let payload;
+    try {
+        body = primitiveEnvelopeSchema.parse(await c.req.json());
+        payload = operation.inputSchema.parse(body.payload);
+    }
+    catch (error) {
+        if (error instanceof z.ZodError) {
+            return c.json({
+                error: "Invalid template request.",
+                issues: error.issues
+            }, 400);
+        }
+        if (isJsonBodyParseError(error)) {
+            return c.json({
+                error: "Invalid template request.",
+                detail: "Request body must be valid JSON with top-level tracer and payload fields."
+            }, 400);
+        }
+        throw error;
+    }
+    const providerPreflight = await preflightAiProviderKeys({
+        customerId: customer.id,
+        templateId: template.id,
+        operationName: input.operationName,
+        operationHint: operation.providerHint,
+        payload
+    });
+    if (providerPreflight) {
+        return c.json(providerPreflight, 412);
+    }
+    let job;
+    try {
+        await assertWalletCanQueueJobs(customer.id);
+        job = await jobs.createRootJob({
+            templateId: template.id,
+            operationName: input.operationName,
+            workflowName: operation.workflow,
+            tracer: body.tracer,
+            payload,
+            webhookUrl: body.webhook_url,
+            customer,
+            providerHint: await deriveProviderHint({
+                customerId: customer.id,
+                templateId: template.id,
+                operationName: input.operationName,
+                operationHint: operation.providerHint,
+                payload
+            })
+        });
+    }
+    catch (error) {
+        if (error instanceof InsufficientWalletFundsError) {
+            return insufficientFundsResponse(c, error);
+        }
+        if (error instanceof ActiveJobLimitExceededError) {
+            return activeJobLimitExceededResponse(c, error);
+        }
+        throw error;
+    }
+    if (!config.VIDFARM_JOB_STATE_MACHINE_ARN) {
+        void runTemplateJobInProcess(job.id).catch((error) => {
+            console.error("local template job failed", job.id, error instanceof Error ? error.message : error);
+        });
+    }
+    return c.json({
+        job_id: job.id,
+        tracer: job.tracer,
+        status: job.status,
+        template_id: template.id,
+        template_type: "template",
+        operation_name: input.operationName
+    }, 202);
+}
 function resolvePrimitiveRouteTarget(primitiveParam) {
     const normalized = primitiveParam.trim();
     if (!normalized) {
@@ -17185,6 +17354,12 @@ app.post(`${PRIMITIVES_PREFIX}/:primitiveKind/operations/:operationName`, async
         operationName: c.req.param("operationName")
     });
 });
+app.post(`${TEMPLATES_PREFIX}/:templateId/operations/:operationName`, async (c) => {
+    return createTemplateJob(c, {
+        templateId: c.req.param("templateId"),
+        operationName: c.req.param("operationName")
+    });
+});
 app.get(`${PRIMITIVES_PREFIX}/jobs`, async (c) => {
     const customer = requireCustomer(c);
     const query = listJobsQuerySchema.parse({
@@ -17195,8 +17370,9 @@ app.get(`${PRIMITIVES_PREFIX}/jobs`, async (c) => {
         limit: c.req.query("limit")
     });
     const limit = clampPageLimit(query.limit, 100);
-    const listedJobs = await listPrimitiveJobsForCustomer({
+    const listedJobs = await listJobsForCustomerByTemplateId({
         customerId: customer.id,
+        templateIdPrefix: "primitive:",
         tracer: query.tracer,
         startTime: query.start_time,
         endTime: query.end_time,
@@ -17206,9 +17382,40 @@ app.get(`${PRIMITIVES_PREFIX}/jobs`, async (c) => {
     const page = paginateDescendingByCreatedAt(listedJobs, limit);
     return c.json({ primitive_jobs: await Promise.all(page.items.map(serializePrimitiveJob)), next_cursor: page.nextCursor });
 });
+app.get(`${TEMPLATES_PREFIX}/:templateId/jobs`, async (c) => {
+    const customer = requireCustomer(c);
+    const template = await templateRegistry.getExecutable(c.req.param("templateId"));
+    if (!template) {
+        return c.json({ error: "Template not found" }, 404);
+    }
+    const query = listJobsQuerySchema.parse({
+        tracer: c.req.query("tracer"),
+        start_time: c.req.query("start_time"),
+        end_time: c.req.query("end_time"),
+        cursor: c.req.query("cursor"),
+        limit: c.req.query("limit")
+    });
+    const limit = clampPageLimit(query.limit, 100);
+    const listedJobs = await listJobsForCustomerByTemplateId({
+        customerId: customer.id,
+        templateId: template.id,
+        tracer: query.tracer,
+        startTime: query.start_time,
+        endTime: query.end_time,
+        limit,
+        cursor: parseCreatedAtIdCursor(query.cursor)
+    });
+    const page = paginateDescendingByCreatedAt(listedJobs, limit);
+    return c.json({
+        template_id: template.id,
+        template_type: "template",
+        jobs: await Promise.all(page.items.map(serializeJob)),
+        next_cursor: page.nextCursor
+    });
+});
 app.get(`${PRIMITIVES_PREFIX}/jobs/:jobId`, async (c) => {
     const customer = requireCustomer(c);
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id
     });
@@ -17217,9 +17424,25 @@ app.get(`${PRIMITIVES_PREFIX}/jobs/:jobId`, async (c) => {
     }
     return c.json(await serializePrimitiveJob(job));
 });
+app.get(`${TEMPLATES_PREFIX}/:templateId/jobs/:jobId`, async (c) => {
+    const customer = requireCustomer(c);
+    const template = await templateRegistry.getExecutable(c.req.param("templateId"));
+    if (!template) {
+        return c.json({ error: "Template not found" }, 404);
+    }
+    const job = await getJobForCustomerByTemplateId({
+        jobId: c.req.param("jobId"),
+        customerId: customer.id,
+        templateId: template.id
+    });
+    if (!job) {
+        return c.json({ error: "Template job not found" }, 404);
+    }
+    return c.json(await serializeJob(job));
+});
 app.get(`${PRIMITIVES_PREFIX}/jobs/:jobId/artifacts`, async (c) => {
     const customer = requireCustomer(c);
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id
     });
@@ -17242,9 +17465,40 @@ app.get(`${PRIMITIVES_PREFIX}/jobs/:jobId/artifacts`, async (c) => {
         next_cursor: page.nextCursor
     });
 });
+app.get(`${TEMPLATES_PREFIX}/:templateId/jobs/:jobId/artifacts`, async (c) => {
+    const customer = requireCustomer(c);
+    const template = await templateRegistry.getExecutable(c.req.param("templateId"));
+    if (!template) {
+        return c.json({ error: "Template not found" }, 404);
+    }
+    const job = await getJobForCustomerByTemplateId({
+        jobId: c.req.param("jobId"),
+        customerId: customer.id,
+        templateId: template.id
+    });
+    if (!job) {
+        return c.json({ error: "Template job not found" }, 404);
+    }
+    const limit = clampPageLimit(Number(c.req.query("limit") || "100"), 100);
+    const page = await listArtifactsForJobPage({
+        jobId: job.id,
+        customerId: customer.id,
+        templateId: job.templateId,
+        limit,
+        cursor: parseCreatedAtIdCursor(c.req.query("cursor"))
+    });
+    return c.json({
+        job_id: job.id,
+        tracer: job.tracer,
+        template_id: job.templateId,
+        template_type: "template",
+        artifacts: page.items.map(serializeArtifact),
+        next_cursor: page.nextCursor
+    });
+});
 app.get(`${PRIMITIVES_PREFIX}/jobs/:jobId/logs`, async (c) => {
     const customer = requireCustomer(c);
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id
     });
@@ -17268,9 +17522,40 @@ app.get(`${PRIMITIVES_PREFIX}/jobs/:jobId/logs`, async (c) => {
     const page = paginateDescendingByCreatedAt(logs, limit);
     return c.json({ job_id: job.id, tracer: job.tracer, logs: page.items, next_cursor: page.nextCursor });
 });
+app.get(`${TEMPLATES_PREFIX}/:templateId/jobs/:jobId/logs`, async (c) => {
+    const customer = requireCustomer(c);
+    const template = await templateRegistry.getExecutable(c.req.param("templateId"));
+    if (!template) {
+        return c.json({ error: "Template not found" }, 404);
+    }
+    const job = await getJobForCustomerByTemplateId({
+        jobId: c.req.param("jobId"),
+        customerId: customer.id,
+        templateId: template.id
+    });
+    if (!job) {
+        return c.json({ error: "Template job not found" }, 404);
+    }
+    const query = listJobsQuerySchema.parse({
+        start_time: c.req.query("start_time"),
+        end_time: c.req.query("end_time"),
+        cursor: c.req.query("cursor"),
+        limit: c.req.query("limit")
+    });
+    const limit = clampPageLimit(query.limit, 100);
+    const logs = await jobs.listLogs({
+        jobId: job.id,
+        startTime: query.start_time,
+        endTime: query.end_time,
+        limit: limit + 1,
+        cursor: parseCreatedAtIdCursor(query.cursor)
+    });
+    const page = paginateDescendingByCreatedAt(logs, limit);
+    return c.json({ job_id: job.id, tracer: job.tracer, logs: page.items, next_cursor: page.nextCursor });
+});
 app.post(`${PRIMITIVES_PREFIX}/jobs/:jobId/cancel`, async (c) => {
     const customer = requireCustomer(c);
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id
     });
@@ -17280,6 +17565,23 @@ app.post(`${PRIMITIVES_PREFIX}/jobs/:jobId/cancel`, async (c) => {
     await jobs.cancelJobAsync(job.id);
     return c.json({ ok: true, job_id: job.id, status: "cancelled" });
 });
+app.post(`${TEMPLATES_PREFIX}/:templateId/jobs/:jobId/cancel`, async (c) => {
+    const customer = requireCustomer(c);
+    const template = await templateRegistry.getExecutable(c.req.param("templateId"));
+    if (!template) {
+        return c.json({ error: "Template not found" }, 404);
+    }
+    const job = await getJobForCustomerByTemplateId({
+        jobId: c.req.param("jobId"),
+        customerId: customer.id,
+        templateId: template.id
+    });
+    if (!job) {
+        return c.json({ error: "Template job not found" }, 404);
+    }
+    await jobs.cancelJobAsync(job.id);
+    return c.json({ ok: true, job_id: job.id, status: "cancelled" });
+});
 app.get(`${PRIMITIVES_PREFIX}/:primitiveKind/jobs`, async (c) => {
     const customer = requireCustomer(c);
     const primitive = resolvePrimitiveRouteTarget(c.req.param("primitiveKind"));
@@ -17294,9 +17596,9 @@ app.get(`${PRIMITIVES_PREFIX}/:primitiveKind/jobs`, async (c) => {
         limit: c.req.query("limit")
     });
     const limit = clampPageLimit(query.limit, 100);
-    const listedJobs = await listPrimitiveJobsForCustomer({
+    const listedJobs = await listJobsForCustomerByTemplateId({
         customerId: customer.id,
-        primitiveId: primitive.id,
+        templateId: primitive.id,
         tracer: query.tracer,
         startTime: query.start_time,
         endTime: query.end_time,
@@ -17317,10 +17619,10 @@ app.get(`${PRIMITIVES_PREFIX}/:primitiveKind/jobs/:jobId`, async (c) => {
     if (!primitive) {
         return c.json({ error: "Primitive not found" }, 404);
     }
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id,
-        primitiveId: primitive.id
+        templateId: primitive.id
     });
     if (!job) {
         return c.json({ error: "Primitive job not found" }, 404);
@@ -17333,10 +17635,10 @@ app.get(`${PRIMITIVES_PREFIX}/:primitiveKind/jobs/:jobId/artifacts`, async (c) =
     if (!primitive) {
         return c.json({ error: "Primitive not found" }, 404);
     }
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id,
-        primitiveId: primitive.id
+        templateId: primitive.id
     });
     if (!job) {
         return c.json({ error: "Primitive job not found" }, 404);
@@ -17364,10 +17666,10 @@ app.get(`${PRIMITIVES_PREFIX}/:primitiveKind/jobs/:jobId/logs`, async (c) => {
     if (!primitive) {
         return c.json({ error: "Primitive not found" }, 404);
     }
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id,
-        primitiveId: primitive.id
+        templateId: primitive.id
     });
     if (!job) {
         return c.json({ error: "Primitive job not found" }, 404);
@@ -17402,10 +17704,10 @@ app.post(`${PRIMITIVES_PREFIX}/:primitiveKind/jobs/:jobId/cancel`, async (c) =>
     if (!primitive) {
         return c.json({ error: "Primitive not found" }, 404);
     }
-    const job = await getPrimitiveJobForCustomer({
+    const job = await getJobForCustomerByTemplateId({
         jobId: c.req.param("jobId"),
         customerId: customer.id,
-        primitiveId: primitive.id
+        templateId: primitive.id
     });
     if (!job) {
         return c.json({ error: "Primitive job not found" }, 404);