@cliangdev/conductor 0.36.2 → 0.38.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/claude/agents/conductor-content-art-director.md +12 -3
- package/assets/claude/agents/conductor-content-scriptwriter.md +8 -2
- package/assets/claude/agents/conductor-content-strategist.md +6 -3
- package/assets/claude/skills/conductor-content-studio/SKILL.md +51 -13
- package/assets/claude/skills/conductor-content-studio/references/compliance-checklist.md +21 -0
- package/assets/claude/skills/conductor-content-studio/references/layout-guide.md +21 -0
- package/assets/claude/skills/conductor-content-studio/references/publish-pack-template.md +14 -0
- package/assets/claude/skills/conductor-content-studio/references/realism-check.md +70 -28
- package/assets/claude/skills/conductor-content-studio/references/slideshow-formats.md +9 -0
- package/assets/claude/skills/conductor-creative/SKILL.md +26 -12
- package/assets/claude/skills/conductor-creative/references/layout-guide.md +21 -0
- package/assets/claude/skills/conductor-creative/references/realism-check.md +70 -28
- package/assets/claude/skills/conductor-creative/references/slideshow-formats.md +9 -0
- package/dist/lib/codex-image.d.ts +2 -2
- package/dist/lib/codex-image.d.ts.map +1 -1
- package/dist/lib/codex-image.js +7 -6
- package/dist/lib/codex-image.js.map +1 -1
- package/dist/lib/image-common.d.ts +54 -3
- package/dist/lib/image-common.d.ts.map +1 -1
- package/dist/lib/image-common.js +82 -3
- package/dist/lib/image-common.js.map +1 -1
- package/dist/lib/image-generation.d.ts +3 -1
- package/dist/lib/image-generation.d.ts.map +1 -1
- package/dist/lib/image-generation.js +7 -3
- package/dist/lib/image-generation.js.map +1 -1
- package/dist/lib/openai-image.d.ts.map +1 -1
- package/dist/lib/openai-image.js +4 -4
- package/dist/lib/openai-image.js.map +1 -1
- package/dist/mcp/index.d.ts +4 -1
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/mcp/index.js +3 -2
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/tools/creative-images.d.ts +7 -1
- package/dist/mcp/tools/creative-images.d.ts.map +1 -1
- package/dist/mcp/tools/creative-images.js +22 -6
- package/dist/mcp/tools/creative-images.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,53 +1,95 @@
|
|
|
1
1
|
<!-- Keep identical to the copy in the other creative skill (conductor-creative / conductor-content-studio references/realism-check.md). Skills install independently and cannot reference each other. -->
|
|
2
|
-
#
|
|
2
|
+
# Make it real, then check it
|
|
3
3
|
|
|
4
4
|
This is about image quality, not concealment. The `aiGenerated: true` provenance and the platform's
|
|
5
5
|
AI label still apply to every generated photo, however real it looks.
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
A realistic photo comes from the prompt first and the check second. Write the prompt with the rules
|
|
8
|
+
below, then check the result at the size it will be seen.
|
|
9
|
+
|
|
10
|
+
## Write the prompt
|
|
11
|
+
|
|
12
|
+
These rules apply to every `generate_creative_image` call, from the art director and from the
|
|
13
|
+
orchestrator.
|
|
14
|
+
|
|
15
|
+
- **Shoot it like a home cook's phone photo, not an ad.**
|
|
16
|
+
- Light: ordinary kitchen or window light. Normal dynamic range, a slightly off white balance, a
|
|
17
|
+
little sensor noise.
|
|
18
|
+
- Banned prompt words: cinematic, stunning, perfect, hyper-detailed, 8k, award-winning, golden
|
|
19
|
+
hour, dramatic lighting, professional food photography, bokeh, glossy, studio.
|
|
20
|
+
- **Every repeated item is different.** When a dish has several of something (stuffed peppers,
|
|
21
|
+
tacos, cookies, dumplings, slices), the prompt names how they differ:
|
|
22
|
+
- size, shape and lean;
|
|
23
|
+
- how each is cut or carved;
|
|
24
|
+
- char and blistering on one side only, a split skin on one;
|
|
25
|
+
- filling heaped on one and sunk on another;
|
|
26
|
+
- cheese melted unevenly, with one spot browner;
|
|
27
|
+
- one slightly collapsed.
|
|
28
|
+
|
|
29
|
+
Example for jack-o'-lantern stuffed peppers: "four peppers of different sizes and shades of
|
|
30
|
+
orange, one leaning against another, each with a differently carved face (one lopsided, one with a
|
|
31
|
+
missing tooth, one with small round eyes), the tallest has blistered skin on one side, filling
|
|
32
|
+
spilling over the rim of one, cheese melted unevenly."
|
|
33
|
+
- **Texture over shine.** Food that is matte in life stays matte. Sauces are a little broken or
|
|
34
|
+
dried at the edges. There are crumbs, drips and a smear on the dish rim. No steam wisps, no perfect
|
|
35
|
+
cheese pulls, no scattered garnish confetti.
|
|
36
|
+
- **A real setting, lightly used.** Choose things a home has:
|
|
37
|
+
- a sheet pan or baking dish with scorch marks, or a scratched enamel pot;
|
|
38
|
+
- a worn wooden board, a laminate counter, a dish towel, a fork already in it.
|
|
39
|
+
- Do not stage it. Something is slightly cut off at the frame edge.
|
|
40
|
+
- **Off-center and imperfect framing.** No symmetrical hero composition. A slight tilt, an ordinary
|
|
41
|
+
handheld angle (overhead or about 45 degrees, not low and dramatic).
|
|
42
|
+
- **Vary across a batch.** Each image in a set gets its own surface, angle and light; only the
|
|
43
|
+
realism and the absence of on-image text are shared. One prompt with the dish name swapped in is a
|
|
44
|
+
defect.
|
|
45
|
+
- **No people's faces, hands only if needed.** No text, logos or packaging brands in the image.
|
|
46
|
+
|
|
47
|
+
For a subject that is not food, keep the same spirit: ordinary light, a lived-in setting, every
|
|
48
|
+
repeated object different, imperfect framing.
|
|
49
|
+
|
|
50
|
+
## When to check
|
|
51
|
+
|
|
52
|
+
Every image from `generate_creative_image`, before it is used as `photoPath`. Photos already in a
|
|
53
|
+
library are not exempt: an existing recipe photo gets the same check, whoever made it.
|
|
11
54
|
|
|
12
55
|
## How to look
|
|
13
56
|
|
|
14
|
-
|
|
15
|
-
|
|
57
|
+
Check a 100% crop of the region that will be on screen, at the size and crop of each placement:
|
|
58
|
+
4:5, 9:16 and, for a MOTION, the video zoom (up to 1.12x). Open the full-size file with Read and
|
|
59
|
+
crop it. Never judge from a contact sheet: it hides exactly the tells below.
|
|
16
60
|
|
|
17
61
|
## Tells
|
|
18
62
|
|
|
19
|
-
- **
|
|
20
|
-
|
|
21
|
-
- **
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
63
|
+
- **Light**: golden-hour or HDR glow, halos, dramatic or studio lighting, perfect white balance,
|
|
64
|
+
colours too saturated, over-sharpening.
|
|
65
|
+
- **Repeated items**: identical copies of the same item, the same garnish or prop twice.
|
|
66
|
+
- **Objects and physics**: melted or merged objects, floating items, utensils or handles that do not
|
|
67
|
+
connect to anything, impossible reflections, steam or liquid that looks painted, wrong scale.
|
|
68
|
+
- **Text**: pseudo-text, garbled labels, invented logos, a fake product or app screen.
|
|
69
|
+
- **Texture**: plastic or waxy food, skin or fabric; everything glossy; over-smoothed surfaces;
|
|
70
|
+
perfect cheese pulls.
|
|
71
|
+
- **Anatomy**: hands and fingers (count, joints), teeth, eyes, hair edges merging into the
|
|
72
|
+
background.
|
|
73
|
+
- **Detail under zoom**: smeared or mushy detail, repeating textures, a staged stock-photo look.
|
|
29
74
|
|
|
30
75
|
## Verdict
|
|
31
76
|
|
|
32
|
-
PASS
|
|
33
|
-
with a note.
|
|
77
|
+
Write PASS or FAIL for each placement crop, naming the tell on a FAIL. Any tell above that shows in
|
|
78
|
+
a crop is a FAIL. A flaw that shows in no placement crop can PASS with a note.
|
|
34
79
|
|
|
35
80
|
## On FAIL
|
|
36
81
|
|
|
37
|
-
Regenerate with the
|
|
38
|
-
two", "matte
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
If the third image still fails, stop. Tell the person what looks generated and offer a library
|
|
44
|
-
photo, a reference photo (`referenceImagePaths`), or filming.
|
|
82
|
+
Regenerate with the failed tells named in the new prompt, for example "four different peppers, no
|
|
83
|
+
two alike", "matte sauce, dried at the edges, soft window light", "hands out of frame". At most two
|
|
84
|
+
regenerations per image (larger sizes cost more on the API, and the Codex route spends the allowance
|
|
85
|
+
the person has already agreed to). Then stop. Tell the person what still looks generated and offer a
|
|
86
|
+
library photo, a reference photo (`referenceImagePaths`), or filming. Never ship a FAIL.
|
|
45
87
|
|
|
46
88
|
## Report
|
|
47
89
|
|
|
48
90
|
When showing the draft for approval, give a one-line realism verdict per generated photo:
|
|
49
91
|
|
|
50
92
|
- "Realism: passed — natural light, believable clutter"
|
|
51
|
-
- "Realism: passed with a note —
|
|
93
|
+
- "Realism: passed with a note — a smudge at the far edge, outside every placement crop"
|
|
52
94
|
|
|
53
95
|
The person's approval remains the final check.
|
|
@@ -91,6 +91,15 @@ Pick one per post and name it in the idea. Change one thing per post so results
|
|
|
91
91
|
- The first text of every slide needs `y`.
|
|
92
92
|
- Read the composer's `checks`; an `error` severity blocks the preview.
|
|
93
93
|
|
|
94
|
+
## Resolution
|
|
95
|
+
|
|
96
|
+
Slides are 1080x1920 (and 1080x1350 for Instagram). Never upscale a background photo: the full-bleed
|
|
97
|
+
scale is `max(1080/w, 1920/h)` for a photo of w x h (use `max(1080/w, 1350/h)` for the 4:5 cut). A 1200x1200
|
|
98
|
+
photo full-bleed at 9:16 uses 675x1200 source pixels, a 1.6x upscale. Check every `bg` and
|
|
99
|
+
`photos[].src` before composing and refuse a full-bleed use above 1.0x. The fixes are: generate at
|
|
100
|
+
the largest size in that aspect (`aspect: "9:16"`), use a different photo, or use a slide type that
|
|
101
|
+
shows the photo framed at or below native size (such as `grid` or `stack`).
|
|
102
|
+
|
|
94
103
|
## Honesty and brand
|
|
95
104
|
|
|
96
105
|
- No logo, badge or offer on the slides. The offer, if any, goes in the caption.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type GeneratedImage, type GenerateImagesParams, type GenerateImagesResult, type ImageAspect, type ImageQuality, ASPECT_SIZES } from './image-common.js';
|
|
1
|
+
import { type GeneratedImage, type GenerateImagesParams, type GenerateImagesResult, type ImageAspect, type ImageAspectInput, type ImageQuality, ASPECT_SIZES } from './image-common.js';
|
|
2
2
|
export { ASPECT_SIZES, type ImageAspect, type GenerateImagesParams, type GeneratedImage, type GenerateImagesResult };
|
|
3
3
|
export declare const NO_CODEX_HINT = "Codex CLI not found \u2014 install it (npm i -g @openai/codex) and run `codex login`, or set CONDUCTOR_CODEX_PATH.";
|
|
4
4
|
export declare const NOT_LOGGED_IN_HINT = "Codex CLI is not logged in \u2014 run `codex login` (see `conductor doctor`).";
|
|
@@ -22,6 +22,6 @@ export type CodexStatus = {
|
|
|
22
22
|
};
|
|
23
23
|
/** For `conductor doctor`: never throws. */
|
|
24
24
|
export declare function checkCodexCli(): Promise<CodexStatus>;
|
|
25
|
-
export declare function buildPrompt(scene: string, aspect:
|
|
25
|
+
export declare function buildPrompt(scene: string, aspect: ImageAspectInput, count: number, hasReferences: boolean, quality?: ImageQuality, size?: string): string;
|
|
26
26
|
export declare function generateImagesWithCodex(params: GenerateImagesParams): Promise<GenerateImagesResult>;
|
|
27
27
|
//# sourceMappingURL=codex-image.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-image.d.ts","sourceRoot":"","sources":["../../src/lib/codex-image.ts"],"names":[],"mappings":"AAcA,OAAO,EAAiB,KAAK,cAAc,EAAE,KAAK,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"codex-image.d.ts","sourceRoot":"","sources":["../../src/lib/codex-image.ts"],"names":[],"mappings":"AAcA,OAAO,EAAiB,KAAK,cAAc,EAAE,KAAK,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,KAAK,WAAW,EAAE,KAAK,gBAAgB,EAAE,KAAK,YAAY,EAAE,YAAY,EAAqF,MAAM,mBAAmB,CAAA;AAIzR,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,oBAAoB,EAAE,KAAK,cAAc,EAAE,KAAK,oBAAoB,EAAE,CAAA;AAEpH,eAAO,MAAM,aAAa,uHACuF,CAAA;AACjH,eAAO,MAAM,kBAAkB,kFAA6E,CAAA;AAE5G,oHAAoH;AACpH,eAAO,MAAM,mBAAmB,eAAe,CAAA;AAC/C,eAAO,MAAM,uBAAuB,QAAQ,CAAA;AAE5C,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAmBD,qFAAqF;AACrF,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAQxD;AAED,wFAAwF;AACxF,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAYD,MAAM,MAAM,WAAW,GACnB;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,KAAK,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,CAAA;AAExB,4CAA4C;AAC5C,wBAAsB,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,CAoB1D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,GAAE,YAAqB,EAAE,IAAI,GAAE,MAAsC,GAAG,MAAM,CAOhM;AAsGD,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA+FzG"}
|
package/dist/lib/codex-image.js
CHANGED
|
@@ -12,7 +12,7 @@ import { spawn } from 'node:child_process';
|
|
|
12
12
|
import { copyFile, mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
|
|
13
13
|
import { homedir } from 'node:os';
|
|
14
14
|
import { extname, join, resolve, sep } from 'node:path';
|
|
15
|
-
import { ASPECT_SIZES, jpegPreview, runCapture, sceneRules, validImage } from './image-common.js';
|
|
15
|
+
import { ASPECT_SIZES, DEFAULT_ASPECT, jpegPreview, resolveImageSize, runCapture, sceneRules, validImage } from './image-common.js';
|
|
16
16
|
import { binaryAvailable } from './media-probe.js';
|
|
17
17
|
import { writeProvenanceSidecar } from './provenance-sidecar.js';
|
|
18
18
|
export { ASPECT_SIZES };
|
|
@@ -91,10 +91,10 @@ export async function checkCodexCli() {
|
|
|
91
91
|
return { state: 'logged-out', version };
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
|
-
export function buildPrompt(scene, aspect, count, hasReferences, quality = 'high') {
|
|
94
|
+
export function buildPrompt(scene, aspect, count, hasReferences, quality = 'high', size = resolveImageSize(aspect).size) {
|
|
95
95
|
return [
|
|
96
96
|
sceneRules(scene, aspect, hasReferences),
|
|
97
|
-
`- Use the image_gen tool to create exactly ${count} image${count === 1 ? '' : 's'} at size ${
|
|
97
|
+
`- Use the image_gen tool to create exactly ${count} image${count === 1 ? '' : 's'} at size ${size}, ${quality} quality.`,
|
|
98
98
|
`- Then copy each generated file into the current directory as ${Array.from({ length: Math.min(count, 2) }, (_, i) => `image-${i + 1}.png`).join(', ')}${count > 2 ? '…' : ''}.`,
|
|
99
99
|
'- Reply with JSON: {"files": [absolute paths of the copies], "revisedPrompt": "the prompt the image tool actually used"}.',
|
|
100
100
|
].join('\n');
|
|
@@ -203,7 +203,8 @@ function runCodexExec(codex, args, prompt, timeoutMs, onProgress) {
|
|
|
203
203
|
}
|
|
204
204
|
export async function generateImagesWithCodex(params) {
|
|
205
205
|
const { outDir, onProgress } = params;
|
|
206
|
-
const aspect = params.aspect ??
|
|
206
|
+
const aspect = params.aspect ?? DEFAULT_ASPECT;
|
|
207
|
+
const { size, note: sizeNote } = resolveImageSize(aspect, params.size);
|
|
207
208
|
const count = params.count ?? 1;
|
|
208
209
|
const refs = params.referenceImagePaths ?? [];
|
|
209
210
|
const timeoutMs = params.timeoutMs ?? 300000;
|
|
@@ -227,7 +228,7 @@ export async function generateImagesWithCodex(params) {
|
|
|
227
228
|
...refs.flatMap((r) => ['-i', r]),
|
|
228
229
|
'-',
|
|
229
230
|
];
|
|
230
|
-
const prompt = buildPrompt(params.prompt, aspect, count, refs.length > 0, quality);
|
|
231
|
+
const prompt = buildPrompt(params.prompt, aspect, count, refs.length > 0, quality, size);
|
|
231
232
|
let model = requestedModel;
|
|
232
233
|
onProgress?.(`Starting Codex image generation (model ${requestedModel}, ${quality} quality)`);
|
|
233
234
|
let outcome;
|
|
@@ -291,6 +292,6 @@ export async function generateImagesWithCodex(params) {
|
|
|
291
292
|
await writeProvenanceSidecar(img.path, { ...provenance, prompt: params.prompt, revisedPrompt, model, quality });
|
|
292
293
|
}
|
|
293
294
|
const preview = await jpegPreview(found[0].path, outRoot);
|
|
294
|
-
return { files: found, provenance, revisedPrompt, outDir: outRoot, quality, model, ...(preview ? { preview } : {}) };
|
|
295
|
+
return { files: found, provenance, revisedPrompt, outDir: outRoot, size, ...(sizeNote ? { sizeNote } : {}), quality, model, ...(preview ? { preview } : {}) };
|
|
295
296
|
}
|
|
296
297
|
//# sourceMappingURL=codex-image.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-image.js","sourceRoot":"","sources":["../../src/lib/codex-image.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-image.js","sourceRoot":"","sources":["../../src/lib/codex-image.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,56 @@
|
|
|
1
|
-
export type ImageAspect = '
|
|
1
|
+
export type ImageAspect = '9:16' | '4:5' | '1:1' | '2:3' | '3:2' | '16:9';
|
|
2
|
+
export declare const IMAGE_ASPECTS: readonly ImageAspect[];
|
|
3
|
+
export declare const DEFAULT_ASPECT: ImageAspect;
|
|
4
|
+
/** Older names for the 2:3 / 1:1 / 3:2 ratios. */
|
|
5
|
+
export declare const ASPECT_ALIASES: {
|
|
6
|
+
readonly portrait: "2:3";
|
|
7
|
+
readonly square: "1:1";
|
|
8
|
+
readonly landscape: "3:2";
|
|
9
|
+
};
|
|
10
|
+
export type ImageAspectInput = ImageAspect | keyof typeof ASPECT_ALIASES;
|
|
2
11
|
export type ImageQuality = 'low' | 'medium' | 'high';
|
|
3
12
|
export declare const IMAGE_QUALITIES: readonly ImageQuality[];
|
|
13
|
+
/** Largest non-experimental size per ratio: exact ratio, both edges multiples of 16, at most 2560x1440 px in total. */
|
|
4
14
|
export declare const ASPECT_SIZES: Record<ImageAspect, string>;
|
|
15
|
+
/** Accepts a ratio or an alias; throws naming the valid values. */
|
|
16
|
+
export declare function normalizeAspect(input: string | undefined): ImageAspect;
|
|
17
|
+
/** Parses 'WIDTHxHEIGHT' against OpenAI's custom-size rules; throws on a violation. */
|
|
18
|
+
export declare function parseSize(size: string): {
|
|
19
|
+
width: number;
|
|
20
|
+
height: number;
|
|
21
|
+
experimental: boolean;
|
|
22
|
+
};
|
|
23
|
+
export interface ResolvedSize {
|
|
24
|
+
size: string;
|
|
25
|
+
/** Set on a fallback or an experimental size. */
|
|
26
|
+
note?: string;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* The size to request. `size` (custom) wins over `aspect`, but only on a model that takes custom sizes
|
|
30
|
+
* (`model` undefined means yes: the Codex route asks in its prompt); otherwise the closest standard size by orientation.
|
|
31
|
+
*/
|
|
32
|
+
export declare function resolveImageSize(aspect: ImageAspectInput | undefined, size?: string, model?: string): ResolvedSize;
|
|
33
|
+
/** Placement sizes mirror conductor-creative/placements.json; the video zoom mirrors ZOOM_IN in conductor-creative/motion.js. */
|
|
34
|
+
declare const PLACEMENT_SIZES: {
|
|
35
|
+
readonly '9x16': readonly [1080, 1920];
|
|
36
|
+
readonly '4x5': readonly [1080, 1350];
|
|
37
|
+
readonly '1x1': readonly [1080, 1080];
|
|
38
|
+
};
|
|
39
|
+
export declare const VIDEO_ZOOM = 1.12;
|
|
40
|
+
export interface PlacementFit {
|
|
41
|
+
/** Full-bleed cover scale: above 1.0 means the photo is upscaled. */
|
|
42
|
+
scale: number;
|
|
43
|
+
/** The same with the video zoom-in applied. */
|
|
44
|
+
videoScale: number;
|
|
45
|
+
ok: boolean;
|
|
46
|
+
videoOk: boolean;
|
|
47
|
+
}
|
|
48
|
+
export declare function placementFit(width: number, height: number): Record<keyof typeof PLACEMENT_SIZES, PlacementFit>;
|
|
5
49
|
export interface GenerateImagesParams {
|
|
6
50
|
prompt: string;
|
|
7
|
-
aspect?:
|
|
51
|
+
aspect?: ImageAspectInput;
|
|
52
|
+
/** Custom WIDTHxHEIGHT; wins over aspect on models that take it. */
|
|
53
|
+
size?: string;
|
|
8
54
|
count?: number;
|
|
9
55
|
quality?: ImageQuality;
|
|
10
56
|
referenceImagePaths?: string[];
|
|
@@ -26,6 +72,10 @@ export interface GenerateImagesResult {
|
|
|
26
72
|
};
|
|
27
73
|
revisedPrompt: string;
|
|
28
74
|
outDir: string;
|
|
75
|
+
/** Size requested from the model; the files' own width/height are what you actually got. */
|
|
76
|
+
size: string;
|
|
77
|
+
/** Why the size differs from the request, or that it is experimental. */
|
|
78
|
+
sizeNote?: string;
|
|
29
79
|
/** Image quality used. */
|
|
30
80
|
quality: ImageQuality;
|
|
31
81
|
/** Model that did the work: the image model (OpenAI) or the Codex agent model ('default' after the no-model retry). */
|
|
@@ -42,10 +92,11 @@ export interface Captured {
|
|
|
42
92
|
}
|
|
43
93
|
export declare function runCapture(command: string, args: string[]): Promise<Captured>;
|
|
44
94
|
/** The scene plus the rules every image route shares. */
|
|
45
|
-
export declare function sceneRules(scene: string, _aspect:
|
|
95
|
+
export declare function sceneRules(scene: string, _aspect: ImageAspectInput, hasReferences: boolean): string;
|
|
46
96
|
export declare function validImage(path: string): Promise<GeneratedImage | null>;
|
|
47
97
|
export declare function jpegPreview(png: string, outDir: string): Promise<{
|
|
48
98
|
data: Buffer;
|
|
49
99
|
mimeType: string;
|
|
50
100
|
} | undefined>;
|
|
101
|
+
export {};
|
|
51
102
|
//# sourceMappingURL=image-common.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-common.d.ts","sourceRoot":"","sources":["../../src/lib/image-common.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"image-common.d.ts","sourceRoot":"","sources":["../../src/lib/image-common.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/image-common.js
CHANGED
|
@@ -3,12 +3,91 @@ import { readFile } from 'node:fs/promises';
|
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { readImageDimensions } from './image-dimensions.js';
|
|
5
5
|
import { resolveFfmpegPath } from './media-probe.js';
|
|
6
|
+
export const IMAGE_ASPECTS = ['9:16', '4:5', '1:1', '2:3', '3:2', '16:9'];
|
|
7
|
+
export const DEFAULT_ASPECT = '9:16';
|
|
8
|
+
/** Older names for the 2:3 / 1:1 / 3:2 ratios. */
|
|
9
|
+
export const ASPECT_ALIASES = { portrait: '2:3', square: '1:1', landscape: '3:2' };
|
|
6
10
|
export const IMAGE_QUALITIES = ['low', 'medium', 'high'];
|
|
11
|
+
/** Largest non-experimental size per ratio: exact ratio, both edges multiples of 16, at most 2560x1440 px in total. */
|
|
7
12
|
export const ASPECT_SIZES = {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
13
|
+
'9:16': '1440x2560',
|
|
14
|
+
'4:5': '1664x2080',
|
|
15
|
+
'1:1': '1920x1920',
|
|
16
|
+
'2:3': '1536x2304',
|
|
17
|
+
'3:2': '2304x1536',
|
|
18
|
+
'16:9': '2560x1440',
|
|
11
19
|
};
|
|
20
|
+
/** Sizes any image model takes, used when custom sizes are not available. */
|
|
21
|
+
const STANDARD_SIZES = { portrait: '1024x1536', square: '1024x1024', landscape: '1536x1024' };
|
|
22
|
+
/** Only these models take a custom WIDTHxHEIGHT. */
|
|
23
|
+
const CUSTOM_SIZE_MODEL = /^gpt-image-2\.5/;
|
|
24
|
+
const MAX_EDGE = 3840;
|
|
25
|
+
const MIN_PIXELS = 655360;
|
|
26
|
+
const MAX_PIXELS = 8294400;
|
|
27
|
+
/** Above 2560x1440 OpenAI marks a size experimental. */
|
|
28
|
+
const EXPERIMENTAL_PIXELS = 3686400;
|
|
29
|
+
/** Accepts a ratio or an alias; throws naming the valid values. */
|
|
30
|
+
export function normalizeAspect(input) {
|
|
31
|
+
if (input === undefined)
|
|
32
|
+
return DEFAULT_ASPECT;
|
|
33
|
+
if (IMAGE_ASPECTS.includes(input))
|
|
34
|
+
return input;
|
|
35
|
+
const alias = ASPECT_ALIASES[input];
|
|
36
|
+
if (alias)
|
|
37
|
+
return alias;
|
|
38
|
+
throw new Error(`aspect must be one of ${IMAGE_ASPECTS.join(', ')} (or portrait, square, landscape).`);
|
|
39
|
+
}
|
|
40
|
+
/** Parses 'WIDTHxHEIGHT' against OpenAI's custom-size rules; throws on a violation. */
|
|
41
|
+
export function parseSize(size) {
|
|
42
|
+
const m = /^(\d+)x(\d+)$/.exec(size.trim().toLowerCase());
|
|
43
|
+
if (!m)
|
|
44
|
+
throw new Error('size must look like WIDTHxHEIGHT, e.g. 1440x2560.');
|
|
45
|
+
const width = Number(m[1]);
|
|
46
|
+
const height = Number(m[2]);
|
|
47
|
+
if (width % 16 !== 0 || height % 16 !== 0)
|
|
48
|
+
throw new Error('size: both edges must be multiples of 16.');
|
|
49
|
+
if (width > MAX_EDGE || height > MAX_EDGE)
|
|
50
|
+
throw new Error(`size: no edge may be over ${MAX_EDGE}.`);
|
|
51
|
+
if (width > height * 3 || height > width * 3)
|
|
52
|
+
throw new Error('size: the aspect ratio must be between 1:3 and 3:1.');
|
|
53
|
+
const pixels = width * height;
|
|
54
|
+
if (pixels < MIN_PIXELS || pixels > MAX_PIXELS)
|
|
55
|
+
throw new Error(`size: total pixels must be ${MIN_PIXELS} to ${MAX_PIXELS}.`);
|
|
56
|
+
return { width, height, experimental: pixels > EXPERIMENTAL_PIXELS };
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* The size to request. `size` (custom) wins over `aspect`, but only on a model that takes custom sizes
|
|
60
|
+
* (`model` undefined means yes: the Codex route asks in its prompt); otherwise the closest standard size by orientation.
|
|
61
|
+
*/
|
|
62
|
+
export function resolveImageSize(aspect, size, model) {
|
|
63
|
+
const ratio = normalizeAspect(aspect);
|
|
64
|
+
const custom = size === undefined ? undefined : parseSize(size);
|
|
65
|
+
const customOk = model === undefined || CUSTOM_SIZE_MODEL.test(model);
|
|
66
|
+
if (customOk) {
|
|
67
|
+
if (!custom)
|
|
68
|
+
return { size: ASPECT_SIZES[ratio] };
|
|
69
|
+
const out = `${custom.width}x${custom.height}`;
|
|
70
|
+
return custom.experimental ? { size: out, note: `${out} is above 2560x1440 and experimental in OpenAI's size rules; results may vary.` } : { size: out };
|
|
71
|
+
}
|
|
72
|
+
const [w, h] = custom ? [custom.width, custom.height] : ASPECT_SIZES[ratio].split('x').map(Number);
|
|
73
|
+
const standard = STANDARD_SIZES[w === h ? 'square' : w < h ? 'portrait' : 'landscape'];
|
|
74
|
+
return {
|
|
75
|
+
size: standard,
|
|
76
|
+
note: `Model ${model} does not take custom sizes, so ${custom ? `${custom.width}x${custom.height}` : ratio} fell back to ${standard}; the photo is smaller than the default; check placementFit before using it full-bleed.`,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
/** Placement sizes mirror conductor-creative/placements.json; the video zoom mirrors ZOOM_IN in conductor-creative/motion.js. */
|
|
80
|
+
const PLACEMENT_SIZES = { '9x16': [1080, 1920], '4x5': [1080, 1350], '1x1': [1080, 1080] };
|
|
81
|
+
export const VIDEO_ZOOM = 1.12;
|
|
82
|
+
const round2 = (n) => Math.round(n * 100) / 100;
|
|
83
|
+
export function placementFit(width, height) {
|
|
84
|
+
const fit = ([pw, ph]) => {
|
|
85
|
+
const scale = Math.max(pw / width, ph / height);
|
|
86
|
+
const videoScale = scale * VIDEO_ZOOM;
|
|
87
|
+
return { scale: round2(scale), videoScale: round2(videoScale), ok: scale <= 1, videoOk: videoScale <= 1 };
|
|
88
|
+
};
|
|
89
|
+
return { '9x16': fit(PLACEMENT_SIZES['9x16']), '4x5': fit(PLACEMENT_SIZES['4x5']), '1x1': fit(PLACEMENT_SIZES['1x1']) };
|
|
90
|
+
}
|
|
12
91
|
export function runCapture(command, args) {
|
|
13
92
|
return new Promise((resolvePromise, reject) => {
|
|
14
93
|
const child = spawn(command, args, { stdio: ['ignore', 'pipe', 'pipe'] });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-common.js","sourceRoot":"","sources":["../../src/lib/image-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"image-common.js","sourceRoot":"","sources":["../../src/lib/image-common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type GenerateImagesParams, type GenerateImagesResult, type ImageQuality } from './image-common.js';
|
|
1
|
+
import { type PlacementFit, type GenerateImagesParams, type GenerateImagesResult, type ImageQuality } from './image-common.js';
|
|
2
2
|
export declare const DEFAULT_IMAGE_MODEL = "gpt-image-2.5-sunburst";
|
|
3
3
|
export declare const DEFAULT_IMAGE_QUALITY: ImageQuality;
|
|
4
4
|
export declare const CODEX_MODEL_LABEL = "gpt-image-2";
|
|
@@ -22,6 +22,8 @@ export interface GenerateImagesRouteResult extends GenerateImagesResult {
|
|
|
22
22
|
route: 'openai-api' | 'codex';
|
|
23
23
|
model: string;
|
|
24
24
|
};
|
|
25
|
+
/** Full-bleed scale per placement for the first file's actual dimensions; absent when there is none. */
|
|
26
|
+
placementFit?: Record<string, PlacementFit>;
|
|
25
27
|
}
|
|
26
28
|
export declare function generateImages(params: GenerateImagesParams & {
|
|
27
29
|
useCodex?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-generation.d.ts","sourceRoot":"","sources":["../../src/lib/image-generation.ts"],"names":[],"mappings":"AAMA,OAAO,
|
|
1
|
+
{"version":3,"file":"image-generation.d.ts","sourceRoot":"","sources":["../../src/lib/image-generation.ts"],"names":[],"mappings":"AAMA,OAAO,EAAiC,KAAK,YAAY,EAAE,KAAK,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAG7J,eAAO,MAAM,mBAAmB,2BAA2B,CAAA;AAC3D,eAAO,MAAM,qBAAqB,EAAE,YAAqB,CAAA;AACzD,eAAO,MAAM,iBAAiB,gBAAgB,CAAA;AAE9C,MAAM,MAAM,eAAe,GAAG,0BAA0B,GAAG,gBAAgB,GAAG,QAAQ,CAAA;AAEtF,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,QAAQ,CAAC,IAAI,iCAAgC;;CAK9C;AAED,wBAAgB,gBAAgB,IAAI;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE,GAAG,IAAI,CAOlF;AAID,4HAA4H;AAC5H,wBAAgB,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAO9D;AAED,wBAAgB,oBAAoB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAKvG;AAED,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB;IACrE,SAAS,EAAE;QAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC3D,wGAAwG;IACxG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAC5C;AAOD,wBAAsB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAa9H"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { readConfig } from './config.js';
|
|
6
6
|
import { generateImagesWithCodex } from './codex-image.js';
|
|
7
|
-
import { IMAGE_QUALITIES } from './image-common.js';
|
|
7
|
+
import { IMAGE_QUALITIES, placementFit } from './image-common.js';
|
|
8
8
|
import { generateImagesWithOpenAi } from './openai-image.js';
|
|
9
9
|
export const DEFAULT_IMAGE_MODEL = 'gpt-image-2.5-sunburst';
|
|
10
10
|
export const DEFAULT_IMAGE_QUALITY = 'high';
|
|
@@ -42,6 +42,10 @@ export function resolveImageSettings(explicitQuality) {
|
|
|
42
42
|
quality: resolveQuality(explicitQuality),
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
|
+
const withFit = (r) => {
|
|
46
|
+
const first = r.files[0];
|
|
47
|
+
return first ? { placementFit: placementFit(first.width, first.height) } : {};
|
|
48
|
+
};
|
|
45
49
|
export async function generateImages(params) {
|
|
46
50
|
const { useCodex, ...input } = params;
|
|
47
51
|
const { model, quality } = resolveImageSettings(input.quality);
|
|
@@ -49,12 +53,12 @@ export async function generateImages(params) {
|
|
|
49
53
|
if (useCodex === true) {
|
|
50
54
|
const result = await generateImagesWithCodex(rest);
|
|
51
55
|
const agent = result.model === 'default' ? 'Codex default' : `Codex ${result.model}`;
|
|
52
|
-
return { ...result, generator: { route: 'codex', model: `${CODEX_MODEL_LABEL} via ${agent}` } };
|
|
56
|
+
return { ...result, ...withFit(result), generator: { route: 'codex', model: `${CODEX_MODEL_LABEL} via ${agent}` } };
|
|
53
57
|
}
|
|
54
58
|
const found = resolveOpenAiKey();
|
|
55
59
|
if (!found)
|
|
56
60
|
throw new CodexConfirmationRequired();
|
|
57
61
|
const result = await generateImagesWithOpenAi(rest, { apiKey: found.key, model, quality, keySource: found.source });
|
|
58
|
-
return { ...result, generator: { route: 'openai-api', model } };
|
|
62
|
+
return { ...result, ...withFit(result), generator: { route: 'openai-api', model } };
|
|
59
63
|
}
|
|
60
64
|
//# sourceMappingURL=image-generation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-generation.js","sourceRoot":"","sources":["../../src/lib/image-generation.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"image-generation.js","sourceRoot":"","sources":["../../src/lib/image-generation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-image.d.ts","sourceRoot":"","sources":["../../src/lib/openai-image.ts"],"names":[],"mappings":"AAQA,OAAO,
|
|
1
|
+
{"version":3,"file":"openai-image.d.ts","sourceRoot":"","sources":["../../src/lib/openai-image.ts"],"names":[],"mappings":"AAQA,OAAO,EAAiH,KAAK,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAKvM,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,8DAA8D;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAqCD,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuElI"}
|
package/dist/lib/openai-image.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
8
8
|
import { basename, extname, join, resolve } from 'node:path';
|
|
9
|
-
import {
|
|
9
|
+
import { DEFAULT_ASPECT, jpegPreview, resolveImageSize, sceneRules, validImage } from './image-common.js';
|
|
10
10
|
import { writeProvenanceSidecar } from './provenance-sidecar.js';
|
|
11
11
|
const API_BASE = 'https://api.openai.com/v1';
|
|
12
12
|
const MIME = {
|
|
@@ -36,12 +36,12 @@ function failure(res, err, keySource) {
|
|
|
36
36
|
}
|
|
37
37
|
export async function generateImagesWithOpenAi(params, cfg) {
|
|
38
38
|
const { outDir, onProgress } = params;
|
|
39
|
-
const aspect = params.aspect ??
|
|
39
|
+
const aspect = params.aspect ?? DEFAULT_ASPECT;
|
|
40
40
|
const count = params.count ?? 1;
|
|
41
41
|
const refs = params.referenceImagePaths ?? [];
|
|
42
42
|
const timeoutMs = params.timeoutMs ?? 300000;
|
|
43
43
|
const prompt = sceneRules(params.prompt, aspect, refs.length > 0);
|
|
44
|
-
const size =
|
|
44
|
+
const { size, note: sizeNote } = resolveImageSize(aspect, params.size, cfg.model);
|
|
45
45
|
const quality = params.quality ?? cfg.quality;
|
|
46
46
|
await mkdir(outDir, { recursive: true });
|
|
47
47
|
const outRoot = resolve(outDir);
|
|
@@ -104,6 +104,6 @@ export async function generateImagesWithOpenAi(params, cfg) {
|
|
|
104
104
|
await writeProvenanceSidecar(img.path, { ...provenance, prompt: params.prompt, revisedPrompt, model: cfg.model, quality });
|
|
105
105
|
}
|
|
106
106
|
const preview = await jpegPreview(found[0].path, outRoot);
|
|
107
|
-
return { files: found, provenance, revisedPrompt, outDir: outRoot, quality: quality, model: cfg.model, ...(preview ? { preview } : {}) };
|
|
107
|
+
return { files: found, provenance, revisedPrompt, outDir: outRoot, size, ...(sizeNote ? { sizeNote } : {}), quality: quality, model: cfg.model, ...(preview ? { preview } : {}) };
|
|
108
108
|
}
|
|
109
109
|
//# sourceMappingURL=openai-image.js.map
|