@cliangdev/conductor 0.29.1 → 0.31.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/commands/conductor/creative.md +1 -1
- package/assets/claude/skills/conductor-content-studio/SKILL.md +8 -5
- package/assets/claude/skills/conductor-content-studio/references/capabilities.md +1 -1
- package/assets/claude/skills/conductor-creative/SKILL.md +6 -3
- package/assets/claude/skills/conductor-publisher/SKILL.md +2 -0
- package/assets/cli-manifest.json +3 -3
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +33 -0
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/doctor.d.ts +4 -0
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +34 -7
- package/dist/commands/doctor.js.map +1 -1
- package/dist/lib/codex-image.d.ts +9 -33
- package/dist/lib/codex-image.d.ts.map +1 -1
- package/dist/lib/codex-image.js +40 -73
- package/dist/lib/codex-image.js.map +1 -1
- package/dist/lib/config.d.ts +3 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/image-common.d.ts +51 -0
- package/dist/lib/image-common.d.ts.map +1 -0
- package/dist/lib/image-common.js +75 -0
- package/dist/lib/image-common.js.map +1 -0
- package/dist/lib/image-generation.d.ts +29 -0
- package/dist/lib/image-generation.d.ts.map +1 -0
- package/dist/lib/image-generation.js +60 -0
- package/dist/lib/image-generation.js.map +1 -0
- package/dist/lib/openai-image.d.ts +10 -0
- package/dist/lib/openai-image.d.ts.map +1 -0
- package/dist/lib/openai-image.js +109 -0
- package/dist/lib/openai-image.js.map +1 -0
- package/dist/lib/provenance-sidecar.d.ts +2 -0
- package/dist/lib/provenance-sidecar.d.ts.map +1 -1
- package/dist/lib/provenance-sidecar.js.map +1 -1
- package/dist/mcp/index.d.ts +232 -0
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/mcp/index.js +31 -9
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/tools/creative-images.d.ts +11 -2
- package/dist/mcp/tools/creative-images.d.ts.map +1 -1
- package/dist/mcp/tools/creative-images.js +13 -2
- package/dist/mcp/tools/creative-images.js.map +1 -1
- package/dist/mcp/tools/creatives.js +1 -1
- package/dist/mcp/tools/creatives.js.map +1 -1
- package/dist/mcp/tools/marketing.d.ts +1 -0
- package/dist/mcp/tools/marketing.d.ts.map +1 -1
- package/dist/mcp/tools/marketing.js +15 -2
- package/dist/mcp/tools/marketing.js.map +1 -1
- package/dist/mcp/tools/posts.d.ts +2 -0
- package/dist/mcp/tools/posts.d.ts.map +1 -1
- package/dist/mcp/tools/posts.js +25 -1
- package/dist/mcp/tools/posts.js.map +1 -1
- package/package.json +1 -1
package/dist/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACvC;;oEAEgE;IAChE,oBAAoB,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACvC;;oEAEgE;IAChE,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B;mGAC+F;IAC/F,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,eAAO,MAAM,WAAW,QAAuD,CAAA;AAE/E,wBAAgB,UAAU,IAAI,MAAM,GAAG,IAAI,CAqB1C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAQhD;AAED,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAOzC"}
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AA0BxB,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,aAAa,CAAC,CAAA;AAE/E,MAAM,UAAU,UAAU;IACxB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAA;QACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAA;QAClC,iFAAiF;QACjF,wEAAwE;QACxE,+EAA+E;QAC/E,IACE,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;YAC/D,MAAM,CAAC,SAAS;YAChB,MAAM,CAAC,SAAS,EAChB,CAAC;YACD,MAAM,CAAC,QAAQ,GAAG;gBAChB,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;aACrF,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACrC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtC,uEAAuE;IACvE,sEAAsE;IACtE,kEAAkE;IAClE,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IACjG,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,kCAAkC;IACpC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAA;IAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAC5D,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,GAAG,GAAG,KAAgC,CAAA;IAC5C,OAAO,CACL,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ;QACjC,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,QAAQ;QACpC,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,QAAQ;QACtC,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,QAAQ;QAChC,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAClC,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
export type ImageAspect = 'portrait' | 'square' | 'landscape';
|
|
2
|
+
export type ImageQuality = 'low' | 'medium' | 'high';
|
|
3
|
+
export declare const IMAGE_QUALITIES: readonly ImageQuality[];
|
|
4
|
+
export declare const ASPECT_SIZES: Record<ImageAspect, string>;
|
|
5
|
+
export interface GenerateImagesParams {
|
|
6
|
+
prompt: string;
|
|
7
|
+
aspect?: ImageAspect;
|
|
8
|
+
count?: number;
|
|
9
|
+
quality?: ImageQuality;
|
|
10
|
+
referenceImagePaths?: string[];
|
|
11
|
+
outDir: string;
|
|
12
|
+
onProgress?: (message: string) => void;
|
|
13
|
+
timeoutMs?: number;
|
|
14
|
+
}
|
|
15
|
+
export interface GeneratedImage {
|
|
16
|
+
path: string;
|
|
17
|
+
width: number;
|
|
18
|
+
height: number;
|
|
19
|
+
}
|
|
20
|
+
export interface GenerateImagesResult {
|
|
21
|
+
files: GeneratedImage[];
|
|
22
|
+
provenance: {
|
|
23
|
+
source: string;
|
|
24
|
+
licence: string;
|
|
25
|
+
aiGenerated: true;
|
|
26
|
+
};
|
|
27
|
+
revisedPrompt: string;
|
|
28
|
+
outDir: string;
|
|
29
|
+
/** Image quality used. */
|
|
30
|
+
quality: ImageQuality;
|
|
31
|
+
/** Model that did the work: the image model (OpenAI) or the Codex agent model ('default' after the no-model retry). */
|
|
32
|
+
model: string;
|
|
33
|
+
/** JPEG (or small PNG) of the first image for inline display; absent when none fits ~1 MB. */
|
|
34
|
+
preview?: {
|
|
35
|
+
data: Buffer;
|
|
36
|
+
mimeType: string;
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
export interface Captured {
|
|
40
|
+
code: number | null;
|
|
41
|
+
output: string;
|
|
42
|
+
}
|
|
43
|
+
export declare function runCapture(command: string, args: string[]): Promise<Captured>;
|
|
44
|
+
/** The scene plus the rules every image route shares. */
|
|
45
|
+
export declare function sceneRules(scene: string, _aspect: ImageAspect, hasReferences: boolean): string;
|
|
46
|
+
export declare function validImage(path: string): Promise<GeneratedImage | null>;
|
|
47
|
+
export declare function jpegPreview(png: string, outDir: string): Promise<{
|
|
48
|
+
data: Buffer;
|
|
49
|
+
mimeType: string;
|
|
50
|
+
} | undefined>;
|
|
51
|
+
//# sourceMappingURL=image-common.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-common.d.ts","sourceRoot":"","sources":["../../src/lib/image-common.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,CAAA;AAE7D,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;AACpD,eAAO,MAAM,eAAe,EAAE,SAAS,YAAY,EAA8B,CAAA;AAEjF,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAIpD,CAAA;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,cAAc,EAAE,CAAA;IACvB,UAAU,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE,CAAA;IAClE,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,0BAA0B;IAC1B,OAAO,EAAE,YAAY,CAAA;IACrB,uHAAuH;IACvH,KAAK,EAAE,MAAM,CAAA;IACb,8FAA8F;IAC9F,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;CAC7C;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAS7E;AAID,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,GAAG,MAAM,CAU9F;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAO7E;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAyBtH"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { spawn } from 'node:child_process';
|
|
2
|
+
import { readFile } from 'node:fs/promises';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { readImageDimensions } from './image-dimensions.js';
|
|
5
|
+
import { resolveFfmpegPath } from './media-probe.js';
|
|
6
|
+
export const IMAGE_QUALITIES = ['low', 'medium', 'high'];
|
|
7
|
+
export const ASPECT_SIZES = {
|
|
8
|
+
portrait: '1024x1536',
|
|
9
|
+
square: '1024x1024',
|
|
10
|
+
landscape: '1536x1024',
|
|
11
|
+
};
|
|
12
|
+
export function runCapture(command, args) {
|
|
13
|
+
return new Promise((resolvePromise, reject) => {
|
|
14
|
+
const child = spawn(command, args, { stdio: ['ignore', 'pipe', 'pipe'] });
|
|
15
|
+
let output = '';
|
|
16
|
+
child.stdout?.on('data', (d) => (output += d));
|
|
17
|
+
child.stderr?.on('data', (d) => (output += d));
|
|
18
|
+
child.on('error', reject);
|
|
19
|
+
child.on('exit', (code) => resolvePromise({ code, output }));
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
const MAX_INLINE_IMAGE_BYTES = 1000000;
|
|
23
|
+
/** The scene plus the rules every image route shares. */
|
|
24
|
+
export function sceneRules(scene, _aspect, hasReferences) {
|
|
25
|
+
return [
|
|
26
|
+
scene.trim(),
|
|
27
|
+
'',
|
|
28
|
+
'Rules:',
|
|
29
|
+
'- Photographic unless the scene above asks for another style.',
|
|
30
|
+
'- NO text, letters, numbers, logos, watermarks, UI, or phone/computer screens anywhere in the image.',
|
|
31
|
+
'- Leave clean negative space for a headline.',
|
|
32
|
+
...(hasReferences ? ['- Use the attached images as references.'] : []),
|
|
33
|
+
].join('\n');
|
|
34
|
+
}
|
|
35
|
+
export async function validImage(path) {
|
|
36
|
+
try {
|
|
37
|
+
const info = readImageDimensions(await readFile(path));
|
|
38
|
+
return info ? { path, width: info.width, height: info.height } : null;
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
export async function jpegPreview(png, outDir) {
|
|
45
|
+
try {
|
|
46
|
+
const ffmpeg = await resolveFfmpegPath();
|
|
47
|
+
const out = join(outDir, '.preview.jpg');
|
|
48
|
+
for (const q of ['4', '10']) {
|
|
49
|
+
const res = await runCapture(ffmpeg, [
|
|
50
|
+
'-y', '-v', 'error', '-i', png,
|
|
51
|
+
'-vf', "scale='if(gt(iw,ih),min(1024,iw),-2)':'if(gt(iw,ih),-2,min(1024,ih))'",
|
|
52
|
+
'-q:v', q, out,
|
|
53
|
+
]);
|
|
54
|
+
if (res.code !== 0)
|
|
55
|
+
break;
|
|
56
|
+
const data = await readFile(out);
|
|
57
|
+
if (data.length <= MAX_INLINE_IMAGE_BYTES)
|
|
58
|
+
return { data, mimeType: 'image/jpeg' };
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
/* fall through to the PNG */
|
|
63
|
+
}
|
|
64
|
+
try {
|
|
65
|
+
const data = await readFile(png);
|
|
66
|
+
const info = readImageDimensions(data);
|
|
67
|
+
if (info && data.length < MAX_INLINE_IMAGE_BYTES)
|
|
68
|
+
return { data, mimeType: info.contentType };
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
/* no preview */
|
|
72
|
+
}
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=image-common.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-common.js","sourceRoot":"","sources":["../../src/lib/image-common.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { type GenerateImagesParams, type GenerateImagesResult, type ImageQuality } from './image-common.js';
|
|
2
|
+
export declare const DEFAULT_IMAGE_MODEL = "gpt-image-2.5-sunburst";
|
|
3
|
+
export declare const DEFAULT_IMAGE_QUALITY: ImageQuality;
|
|
4
|
+
export declare const CODEX_MODEL_LABEL = "gpt-image-2";
|
|
5
|
+
export type OpenAiKeySource = 'CONDUCTOR_OPENAI_API_KEY' | 'OPENAI_API_KEY' | 'config';
|
|
6
|
+
export declare class CodexConfirmationRequired extends Error {
|
|
7
|
+
readonly code = "CODEX_CONFIRMATION_REQUIRED";
|
|
8
|
+
constructor();
|
|
9
|
+
}
|
|
10
|
+
export declare function resolveOpenAiKey(): {
|
|
11
|
+
key: string;
|
|
12
|
+
source: OpenAiKeySource;
|
|
13
|
+
} | null;
|
|
14
|
+
/** Explicit value, else `CONDUCTOR_IMAGE_QUALITY` (ignored unless valid), else `high`. An invalid explicit value throws. */
|
|
15
|
+
export declare function resolveQuality(explicit?: string): ImageQuality;
|
|
16
|
+
export declare function resolveImageSettings(explicitQuality?: string): {
|
|
17
|
+
model: string;
|
|
18
|
+
quality: ImageQuality;
|
|
19
|
+
};
|
|
20
|
+
export interface GenerateImagesRouteResult extends GenerateImagesResult {
|
|
21
|
+
generator: {
|
|
22
|
+
route: 'openai-api' | 'codex';
|
|
23
|
+
model: string;
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
export declare function generateImages(params: GenerateImagesParams & {
|
|
27
|
+
useCodex?: boolean;
|
|
28
|
+
}): Promise<GenerateImagesRouteResult>;
|
|
29
|
+
//# sourceMappingURL=image-generation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-generation.d.ts","sourceRoot":"","sources":["../../src/lib/image-generation.ts"],"names":[],"mappings":"AAMA,OAAO,EAAmB,KAAK,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAG5H,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;CAC5D;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAa9H"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Picks the photo route: the OpenAI Images API when the person has a key, Codex only when the caller
|
|
3
|
+
* says the person agreed to spend their Codex quota. With neither, nothing runs.
|
|
4
|
+
*/
|
|
5
|
+
import { readConfig } from './config.js';
|
|
6
|
+
import { generateImagesWithCodex } from './codex-image.js';
|
|
7
|
+
import { IMAGE_QUALITIES } from './image-common.js';
|
|
8
|
+
import { generateImagesWithOpenAi } from './openai-image.js';
|
|
9
|
+
export const DEFAULT_IMAGE_MODEL = 'gpt-image-2.5-sunburst';
|
|
10
|
+
export const DEFAULT_IMAGE_QUALITY = 'high';
|
|
11
|
+
export const CODEX_MODEL_LABEL = 'gpt-image-2';
|
|
12
|
+
export class CodexConfirmationRequired extends Error {
|
|
13
|
+
constructor() {
|
|
14
|
+
super('No OpenAI API key is configured; Codex needs the person to confirm first.');
|
|
15
|
+
this.code = 'CODEX_CONFIRMATION_REQUIRED';
|
|
16
|
+
this.name = 'CodexConfirmationRequired';
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export function resolveOpenAiKey() {
|
|
20
|
+
for (const source of ['CONDUCTOR_OPENAI_API_KEY', 'OPENAI_API_KEY']) {
|
|
21
|
+
const key = process.env[source]?.trim();
|
|
22
|
+
if (key)
|
|
23
|
+
return { key, source };
|
|
24
|
+
}
|
|
25
|
+
const key = readConfig()?.openaiApiKey?.trim();
|
|
26
|
+
return key ? { key, source: 'config' } : null;
|
|
27
|
+
}
|
|
28
|
+
const isQuality = (v) => !!v && IMAGE_QUALITIES.includes(v);
|
|
29
|
+
/** Explicit value, else `CONDUCTOR_IMAGE_QUALITY` (ignored unless valid), else `high`. An invalid explicit value throws. */
|
|
30
|
+
export function resolveQuality(explicit) {
|
|
31
|
+
if (explicit !== undefined) {
|
|
32
|
+
if (!isQuality(explicit))
|
|
33
|
+
throw new Error(`quality must be one of ${IMAGE_QUALITIES.join(', ')}.`);
|
|
34
|
+
return explicit;
|
|
35
|
+
}
|
|
36
|
+
const env = process.env['CONDUCTOR_IMAGE_QUALITY']?.trim().toLowerCase();
|
|
37
|
+
return isQuality(env) ? env : DEFAULT_IMAGE_QUALITY;
|
|
38
|
+
}
|
|
39
|
+
export function resolveImageSettings(explicitQuality) {
|
|
40
|
+
return {
|
|
41
|
+
model: process.env['CONDUCTOR_IMAGE_MODEL']?.trim() || DEFAULT_IMAGE_MODEL,
|
|
42
|
+
quality: resolveQuality(explicitQuality),
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
export async function generateImages(params) {
|
|
46
|
+
const { useCodex, ...input } = params;
|
|
47
|
+
const { model, quality } = resolveImageSettings(input.quality);
|
|
48
|
+
const rest = { ...input, quality };
|
|
49
|
+
if (useCodex === true) {
|
|
50
|
+
const result = await generateImagesWithCodex(rest);
|
|
51
|
+
const agent = result.model === 'default' ? 'Codex default' : `Codex ${result.model}`;
|
|
52
|
+
return { ...result, generator: { route: 'codex', model: `${CODEX_MODEL_LABEL} via ${agent}` } };
|
|
53
|
+
}
|
|
54
|
+
const found = resolveOpenAiKey();
|
|
55
|
+
if (!found)
|
|
56
|
+
throw new CodexConfirmationRequired();
|
|
57
|
+
const result = await generateImagesWithOpenAi(rest, { apiKey: found.key, model, quality, keySource: found.source });
|
|
58
|
+
return { ...result, generator: { route: 'openai-api', model } };
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=image-generation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-generation.js","sourceRoot":"","sources":["../../src/lib/image-generation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type GenerateImagesParams, type GenerateImagesResult } from './image-common.js';
|
|
2
|
+
export interface OpenAiImageConfig {
|
|
3
|
+
apiKey: string;
|
|
4
|
+
model: string;
|
|
5
|
+
quality: string;
|
|
6
|
+
/** Where the key came from, named in the "rejected" error. */
|
|
7
|
+
keySource?: string;
|
|
8
|
+
}
|
|
9
|
+
export declare function generateImagesWithOpenAi(params: GenerateImagesParams, cfg: OpenAiImageConfig): Promise<GenerateImagesResult>;
|
|
10
|
+
//# sourceMappingURL=openai-image.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-image.d.ts","sourceRoot":"","sources":["../../src/lib/openai-image.ts"],"names":[],"mappings":"AAQA,OAAO,EAA6F,KAAK,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAKnL,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"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Photo generation through the OpenAI Images API. The key comes from the person (env or
|
|
3
|
+
* `conductor config set-openai-api-key`) and is billed to them directly; nothing goes through Conductor.
|
|
4
|
+
* Text-only scenes use /images/generations; scenes with reference photos use /images/edits.
|
|
5
|
+
* Each image gets a `<file>.provenance.json` sidecar, same as the Codex route.
|
|
6
|
+
*/
|
|
7
|
+
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
8
|
+
import { basename, extname, join, resolve } from 'node:path';
|
|
9
|
+
import { ASPECT_SIZES, jpegPreview, sceneRules, validImage } from './image-common.js';
|
|
10
|
+
import { writeProvenanceSidecar } from './provenance-sidecar.js';
|
|
11
|
+
const API_BASE = 'https://api.openai.com/v1';
|
|
12
|
+
const MIME = {
|
|
13
|
+
'.png': 'image/png',
|
|
14
|
+
'.jpg': 'image/jpeg',
|
|
15
|
+
'.jpeg': 'image/jpeg',
|
|
16
|
+
'.webp': 'image/webp',
|
|
17
|
+
};
|
|
18
|
+
async function readApiError(res) {
|
|
19
|
+
try {
|
|
20
|
+
const body = (await res.json());
|
|
21
|
+
return body.error ?? {};
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return {};
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
function failure(res, err, keySource) {
|
|
28
|
+
const message = err.message ?? res.statusText ?? 'unknown error';
|
|
29
|
+
if (res.status === 401) {
|
|
30
|
+
return new Error(`OpenAI API key was rejected${keySource ? ` (from ${keySource})` : ''} — check it, or set a new one with \`conductor config set-openai-api-key <key>\`.`);
|
|
31
|
+
}
|
|
32
|
+
if (res.status === 429 || err.code === 'insufficient_quota' || err.code === 'billing_hard_limit_reached') {
|
|
33
|
+
return new Error(`OpenAI refused the request: out of quota, over a billing limit or rate limited (${res.status}). OpenAI says: ${message}`);
|
|
34
|
+
}
|
|
35
|
+
return new Error(`OpenAI image generation failed (${res.status}): ${message}`);
|
|
36
|
+
}
|
|
37
|
+
export async function generateImagesWithOpenAi(params, cfg) {
|
|
38
|
+
const { outDir, onProgress } = params;
|
|
39
|
+
const aspect = params.aspect ?? 'portrait';
|
|
40
|
+
const count = params.count ?? 1;
|
|
41
|
+
const refs = params.referenceImagePaths ?? [];
|
|
42
|
+
const timeoutMs = params.timeoutMs ?? 300000;
|
|
43
|
+
const prompt = sceneRules(params.prompt, aspect, refs.length > 0);
|
|
44
|
+
const size = ASPECT_SIZES[aspect];
|
|
45
|
+
const quality = params.quality ?? cfg.quality;
|
|
46
|
+
await mkdir(outDir, { recursive: true });
|
|
47
|
+
const outRoot = resolve(outDir);
|
|
48
|
+
let url;
|
|
49
|
+
let init;
|
|
50
|
+
if (refs.length === 0) {
|
|
51
|
+
url = `${API_BASE}/images/generations`;
|
|
52
|
+
init = {
|
|
53
|
+
method: 'POST',
|
|
54
|
+
headers: { Authorization: `Bearer ${cfg.apiKey}`, 'Content-Type': 'application/json' },
|
|
55
|
+
body: JSON.stringify({ model: cfg.model, prompt, size, quality, n: count }),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
url = `${API_BASE}/images/edits`;
|
|
60
|
+
const form = new FormData();
|
|
61
|
+
form.append('model', cfg.model);
|
|
62
|
+
form.append('prompt', prompt);
|
|
63
|
+
form.append('size', size);
|
|
64
|
+
form.append('quality', quality);
|
|
65
|
+
form.append('n', String(count));
|
|
66
|
+
for (const ref of refs) {
|
|
67
|
+
const type = MIME[extname(ref).toLowerCase()] ?? 'image/png';
|
|
68
|
+
form.append('image[]', new Blob([new Uint8Array(await readFile(ref))], { type }), basename(ref));
|
|
69
|
+
}
|
|
70
|
+
init = { method: 'POST', headers: { Authorization: `Bearer ${cfg.apiKey}` }, body: form };
|
|
71
|
+
}
|
|
72
|
+
onProgress?.(`Calling OpenAI ${cfg.model} (${quality})`);
|
|
73
|
+
let res;
|
|
74
|
+
try {
|
|
75
|
+
res = await fetch(url, { ...init, signal: AbortSignal.timeout(timeoutMs) });
|
|
76
|
+
}
|
|
77
|
+
catch (err) {
|
|
78
|
+
const name = err.name;
|
|
79
|
+
if (name === 'TimeoutError' || name === 'AbortError') {
|
|
80
|
+
throw new Error(`OpenAI image generation timed out after ${Math.round(timeoutMs / 1000)} s`);
|
|
81
|
+
}
|
|
82
|
+
throw new Error(`OpenAI image generation failed: ${err.message}`);
|
|
83
|
+
}
|
|
84
|
+
if (!res.ok)
|
|
85
|
+
throw failure(res, await readApiError(res), cfg.keySource);
|
|
86
|
+
const body = (await res.json());
|
|
87
|
+
const data = body.data ?? [];
|
|
88
|
+
const found = [];
|
|
89
|
+
for (const item of data) {
|
|
90
|
+
if (found.length >= count || typeof item.b64_json !== 'string')
|
|
91
|
+
continue;
|
|
92
|
+
const dest = join(outRoot, `image-${found.length + 1}.png`);
|
|
93
|
+
await writeFile(dest, Buffer.from(item.b64_json, 'base64'));
|
|
94
|
+
const img = await validImage(dest);
|
|
95
|
+
if (img)
|
|
96
|
+
found.push(img);
|
|
97
|
+
}
|
|
98
|
+
if (found.length === 0)
|
|
99
|
+
throw new Error('OpenAI returned no usable image.');
|
|
100
|
+
const revisedPrompt = data[0]?.revised_prompt ?? '';
|
|
101
|
+
const date = new Date().toISOString().slice(0, 10);
|
|
102
|
+
const provenance = { source: `Generated with OpenAI ${cfg.model} (API) on ${date}`, licence: 'Generated, house use', aiGenerated: true };
|
|
103
|
+
for (const img of found) {
|
|
104
|
+
await writeProvenanceSidecar(img.path, { ...provenance, prompt: params.prompt, revisedPrompt, model: cfg.model, quality });
|
|
105
|
+
}
|
|
106
|
+
const preview = await jpegPreview(found[0].path, outRoot);
|
|
107
|
+
return { files: found, provenance, revisedPrompt, outDir: outRoot, quality: quality, model: cfg.model, ...(preview ? { preview } : {}) };
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=openai-image.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-image.js","sourceRoot":"","sources":["../../src/lib/openai-image.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provenance-sidecar.d.ts","sourceRoot":"","sources":["../../src/lib/provenance-sidecar.ts"],"names":[],"mappings":"AAEA,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,OAAO,CAAA;CACrB;AAED,yFAAyF;AACzF,MAAM,WAAW,WAAY,SAAQ,iBAAiB;IACpD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"provenance-sidecar.d.ts","sourceRoot":"","sources":["../../src/lib/provenance-sidecar.ts"],"names":[],"mappings":"AAEA,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,OAAO,CAAA;CACrB;AAED,yFAAyF;AACzF,MAAM,WAAW,WAAY,SAAQ,iBAAiB;IACpD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,WAAW,GAAI,UAAU,MAAM,KAAG,MAAuC,CAAA;AAEtF;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAqB/F;AAED,wBAAsB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provenance-sidecar.js","sourceRoot":"","sources":["../../src/lib/provenance-sidecar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"provenance-sidecar.js","sourceRoot":"","sources":["../../src/lib/provenance-sidecar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAiBtD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,GAAG,QAAQ,kBAAkB,CAAA;AAEtF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,QAAgB;IAC1D,MAAM,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC/B,IAAI,GAAW,CAAA;IACf,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QACjE,MAAM,GAAG,CAAA;IACX,CAAC;IACD,IAAI,IAAa,CAAA;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;IAC5C,CAAC;IACD,MAAM,CAAC,GAAG,IAA+B,CAAA;IACzC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;IACnG,IAAI,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;IACxF,IAAI,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;IAC1F,IAAI,OAAO,CAAC,CAAC,aAAa,CAAC,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;IACpG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,CAAA;AACtF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,QAAgB,EAAE,IAAiB;IAC9E,MAAM,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;AAC9E,CAAC"}
|