@vm0/cli 9.228.0 → 9.229.1

package/{generate-OIQ4ULPQ.js → generate-A7RUXCIY.js}

@@ -11,6 +11,7 @@ import {
   findPresentationRunbookPackage,
   findTemplate,
   findVideoTemplate,
+  findWebsiteTemplateResource,
   listDesignSystems,
   listImageStyles,
   listPresentationRunbookPackages,
@@ -19,12 +20,12 @@ import {
   resolvePresentationRunbookColorToken,
   selectResourceCandidates,
   toGenerationTarget
-} from "./chunk-YYR5LIJY.js";
+} from "./chunk-DKOCDBW4.js";
 import {
   getZeroAgentUserConnectors,
   listZeroConnectorCatalog,
   listZeroConnectorCatalogStatus
-} from "./chunk-WHUOCWWJ.js";
+} from "./chunk-GDZUIP3I.js";
 import "./chunk-LTDQISD7.js";
 import {
   generateWebImage,
@@ -56,37 +57,22 @@ init_esm_shims();
 
 // src/commands/zero/shared/image-style-authoring.ts
 init_esm_shims();
-
-// src/commands/zero/shared/resource-registry.ts
-init_esm_shims();
-
-// src/commands/zero/shared/image-style-authoring.ts
-function formatCandidateSource(source) {
+function formatStyleSource(source) {
   if ("repo" in source) {
-    return `- \`${source.repo}@${source.ref}\``;
+    return [
+      `- Repository: \`${source.repo}@${source.ref}\``,
+      `- Path: \`${source.path}\``
+    ];
   }
-  return `- ${source.description}`;
+  return [`- Path: \`${source.path}\``];
 }
 var outputDir = "./generated/images";
 var artifactRules = [
-  "Resolve the selected style source before generating the image.",
-  "Use the style skill's referenced assets and generation path when it provides one.",
-  "Produce a single final image file and keep any temporary metadata under the output directory."
+  "Compile the user prompt into a final image prompt before generating.",
+  "Use the style source, referenced assets, and generation path when they are available.",
+  "Generate with `--compiled-prompt`; do not pass `--style` during final image generation."
 ];
-function createStyledImageAuthoringPacket(options) {
-  const baseSlice = selectResourceCandidates();
-  const candidateSlice = {
-    ...baseSlice,
-    candidates: {
-      ...baseSlice.candidates,
-      imageStyles: [options.style]
-    }
-  };
-  const selectionSchema = {
-    imageStyle: "string",
-    skills: "string[]",
-    rationale: "string"
-  };
+function createStyledImageCompilationPacket(options) {
   const artifact = {
     outputMode: "primary-image",
     primaryArtifact: {
@@ -104,47 +90,27 @@ function createStyledImageAuthoringPacket(options) {
     outputDir
   };
   const instructions = [
-    `# Zero generate image --style ${options.style.id}`,
+    `# Zero generate image prompt compile ${options.style.id}`,
     "",
-    "This is a federated generation source-selection packet for the current agent.",
-    "Zero is not generating this image on the server yet. The image style has already been selected by the caller \u2014 resolve it and generate the styled image.",
+    "This is an image prompt-compilation packet for the current agent.",
+    "Zero is not generating this image yet. The image style has already been selected \u2014 compile the user prompt into a final image prompt, then generate with `--compiled-prompt`.",
     "",
     "## User Prompt",
     options.prompt,
     "",
     "## Selected Image Style",
     `- \`${options.style.id}\` \u2014 ${options.style.name}`,
+    `- ${options.style.description}`,
     "",
-    "## Stage 1: Supporting Resource Selection",
-    "- The image style is locked. Optionally pick supporting skills/templates from the candidate slice below.",
-    "- Choose only IDs present in this packet; do not invent registry IDs.",
-    "- Treat the selection JSON as internal working state, then continue to generation.",
-    "",
-    "## Selection Output Schema",
-    "```json",
-    JSON.stringify(selectionSchema, null, 2),
-    "```",
-    "",
-    "## Candidate Registry Slice",
-    `Registry: \`${candidateSlice.registryVersion}\``,
-    "Sources:",
-    ...candidateSlice.sources.map(formatCandidateSource),
+    "## Style Source",
+    ...formatStyleSource(options.style.source),
     "",
-    "```json",
-    JSON.stringify(candidateSlice.candidates, null, 2),
-    "```",
-    "",
-    "## Stage 2: Resolve Selected Resources",
-    "- Fetch or read the selected resource source before generation.",
-    "- Each candidate carries a `source` object with `path` and optional `repo`/`ref`; when `repo`/`ref` are omitted, fall back to the registry-level source above.",
-    "- If `source.archive` is present, pull the private R2 archive with `zero resource pull <resource-id> --dir ./generated/resources`; the CLI requests an authenticated short-lived download URL, verifies the digest, and then extracts `source.path`.",
-    "- For directory refs, inspect the most relevant files such as `SKILL.md`, references, examples, and templates.",
-    "- If a source file cannot be fetched, state that limitation and fall back to the registry metadata for that resource.",
-    "",
-    "## Stage 3: Generate Image",
-    "- Generate one production-quality image using the selected style.",
-    "- Follow the selected style skill's generation path when it defines one.",
-    "- If the style skill delegates to a model or connector, use that flow directly instead of restating the style text manually.",
+    "## Prompt Compiler Task",
+    "- Read the selected style source when available, especially `SKILL.md`, references, examples, and templates.",
+    "- Rewrite the user prompt into one final image-generation prompt that obeys the selected style.",
+    "- Include style-specific composition, medium, palette, subject handling, reference usage, and must-avoid constraints in the final prompt.",
+    "- Keep user intent intact; expand only the visual details needed to satisfy the style.",
+    "- Return only the compiled prompt text when preparing the next command.",
     "",
     "## Artifact Output Model",
     `- Primary artifact: \`${artifact.primaryArtifact.kind}\` under \`${artifact.primaryArtifact.path}\`.`,
@@ -161,21 +127,21 @@ function createStyledImageAuthoringPacket(options) {
       return `- ${rule}`;
     }),
     "",
+    "## Next Command Template",
+    "```bash",
+    'zero generate image --compiled-prompt "<compiled prompt>"',
+    "```",
+    "",
     "## Verification",
     "- Verify the final image exists and is nonblank.",
     "- Check that the selected style's required reference anchors or source assets were used when applicable.",
     "- Report the final image URL or path and the selected registry resource ID."
   ].join("\n");
   return {
-    type: "generation-source-selection",
+    type: "image-prompt-compilation",
     kind: "image",
     prompt: options.prompt,
-    registryVersion: candidateSlice.registryVersion,
     artifact,
-    selection: {
-      candidates: candidateSlice.candidates,
-      outputSchema: selectionSchema
-    },
     authoring: {
       details: options.details,
       artifactRules
@@ -185,6 +151,9 @@ function createStyledImageAuthoringPacket(options) {
   };
 }
 
+// src/commands/zero/shared/resource-registry.ts
+init_esm_shims();
+
 // src/commands/zero/shared/resource-listing.ts
 init_esm_shims();
 function formatRegistryListing(entries, emptyLabel) {
@@ -733,6 +702,9 @@ async function dispatchGenerate(options) {
   }
   const resolvedPrompt = resolvePrompt(options.prompt);
   if (resolvedPrompt === null) {
+    if (options.listOnMissingPrompt === false) {
+      throw new Error(options.missingPromptError ?? "Prompt is required");
+    }
     await runLister(options.generationType, {
       all: options.all
     });
@@ -757,17 +729,18 @@ function resolvePrompt(prompt) {
 }
 
 // src/commands/zero/shared/image-generate.ts
-function requireStyleError(usageCommand) {
+function requireImageModeError(usageCommand) {
   const styles = listImageStyles();
   const message = [
-    "--style <id> or --skip-style is required",
+    "Choose one image prompt mode",
     "",
-    "Available styles:",
-    formatRegistryListing(styles, "image styles"),
+    "Modes:",
+    `  Compile styled prompt: ${usageCommand} --style ${styles[0]?.id ?? "<style-id>"} --prompt "..." --compile`,
+    `  Generate compiled prompt: ${usageCommand} --compiled-prompt "..."`,
+    `  Generate raw prompt: ${usageCommand} --raw-prompt "..."`,
     "",
-    `Examples:`,
-    `  ${usageCommand} --style ${styles[0]?.id ?? "<style-id>"} --prompt "..."`,
-    `  ${usageCommand} --skip-style --prompt "..."`
+    "Available styles:",
+    formatRegistryListing(styles, "image styles")
   ].join("\n");
   return new Error(message);
 }
@@ -780,7 +753,7 @@ function unknownStyleError(id, usageCommand) {
     formatRegistryListing(styles, "image styles"),
     "",
     `Example:`,
-    `  ${usageCommand} --style ${styles[0]?.id ?? "<style-id>"} --prompt "..."`
+    `  ${usageCommand} --style ${styles[0]?.id ?? "<style-id>"} --prompt "..." --compile`
   ].join("\n");
   return new Error(message);
 }
@@ -823,8 +796,49 @@ function parseImagePromptStrength(value) {
   }
   return strength;
 }
+function resolvePromptInput(options) {
+  return options.compiledPrompt ?? options.rawPrompt ?? options.prompt;
+}
+function hasImagePromptModeRequest(options) {
+  return options.style !== void 0 || options.compile === true || options.prompt !== void 0 || options.compiledPrompt !== void 0 || options.rawPrompt !== void 0;
+}
+function resolveImagePromptMode(options, usageCommand) {
+  const hasCompiledPrompt = options.compiledPrompt !== void 0;
+  const hasRawPrompt = options.rawPrompt !== void 0;
+  const compile = options.compile === true;
+  if (!compile && options.style) {
+    throw new Error("--style can only be used with --compile");
+  }
+  if ([compile, hasCompiledPrompt, hasRawPrompt].filter(Boolean).length !== 1) {
+    throw requireImageModeError(usageCommand);
+  }
+  if (compile && !options.style) {
+    throw new Error("--compile requires --style <id>");
+  }
+  if (!compile && options.prompt !== void 0) {
+    throw new Error(
+      "--prompt can only be used with --style <id> --compile; use --compiled-prompt or --raw-prompt to generate"
+    );
+  }
+  if (compile) {
+    return "compile";
+  }
+  if (hasCompiledPrompt) {
+    return "compiled";
+  }
+  return "raw";
+}
 function createImageGenerateCommand(config) {
-  return new Command().name(config.name).description("Generate a billed image file from a prompt").option("--prompt <text>", "Image prompt; can also be piped via stdin").option(
+  return new Command().name(config.name).description("Generate a billed image file from a prompt").option(
+    "--prompt <text>",
+    "User prompt to compile with --style and --compile; can also be piped via stdin"
+  ).option(
+    "--compiled-prompt <text>",
+    "Final image prompt produced from a prompt-compilation packet"
+  ).option(
+    "--raw-prompt <text>",
+    "Final image prompt for unstyled/model-native generation"
+  ).option(
     "--provider <name>",
     "Provider: 'built-in' to run vm0's pipeline, or a connector name to get its skill-invocation guidance"
   ).option(
@@ -866,10 +880,10 @@ function createImageGenerateCommand(config) {
     "Reference strength override for Flux Redux"
   ).option(
     "--style <id>",
-    "Image style id from the registry (see Image Styles below)"
+    "Image style id to compile from the registry (see Image Styles below)"
   ).option(
-    "--skip-style",
-    "Opt out of styled image generation for this invocation"
+    "--compile",
+    "Resolve the selected style and print a prompt-compilation packet"
   ).addHelpText("after", () => {
     const styles = listImageStyles();
     return `
@@ -877,9 +891,9 @@ Examples:
 ${config.examples}
 
 Output:
-  Prints the generated /f/ image file URL and metadata. With --style <id>,
-  prints a source-selection packet for the current agent
-  with the selected style locked in.
+  Prints the generated /f/ image file URL and metadata with --compiled-prompt
+  or --raw-prompt. With --style <id> --prompt "..." --compile, prints a
+  prompt-compilation packet for the current agent.
 
 Notes:
   - Authenticates via ZERO_TOKEN (requires file:write capability)
@@ -895,9 +909,10 @@ Models:
     megapixel, depending on the model.
 
 Options:
-  - Prompt: required, up to 32,000 characters; stdin is supported.
-  - Style: required. Pass --style <id> to generate in a registered style
-    or --skip-style to bypass styled generation entirely.
+  - Prompt modes: choose exactly one mode. Use --style <id> --prompt "..."
+    --compile to prepare a styled prompt-compilation packet, --compiled-prompt
+    to generate from an agent-compiled prompt, or --raw-prompt to generate
+    without a style. stdin is supported for --prompt in compile mode.
   - Size: gpt-image-2 accepts auto or WIDTHxHEIGHT. Popular sizes include
     1024x1024,
     1536x1024, 1024x1536, 2048x2048, 2048x1152, 3840x2160,
@@ -925,24 +940,25 @@ ${formatRegistryListing(styles, "image styles")}`;
       const dispatch = await dispatchGenerate({
         generationType: config.generationType,
         provider: options.provider,
-        prompt: options.prompt,
-        all: options.all
+        prompt: resolvePromptInput(options),
+        all: options.all,
+        listOnMissingPrompt: !hasImagePromptModeRequest(options),
+        missingPromptError: options.compile || options.style ? "--compile requires --prompt <text> or piped stdin" : void 0
       });
       if (dispatch.outcome === "handled") return;
-      const prompt = dispatch.prompt;
-      if (options.style && options.skipStyle) {
-        throw new Error("--style and --skip-style cannot be combined");
-      }
-      if (!options.style && !options.skipStyle) {
-        throw requireStyleError(config.usageCommand);
-      }
-      if (options.style) {
-        const style = findImageStyle(options.style);
+      const resolvedPrompt = dispatch.prompt;
+      const mode = resolveImagePromptMode(options, config.usageCommand);
+      if (mode === "compile") {
+        const styleId = options.style;
+        if (!styleId) {
+          throw new Error("--compile requires --style <id>");
+        }
+        const style = findImageStyle(styleId);
         if (!style) {
-          throw unknownStyleError(options.style, config.usageCommand);
+          throw unknownStyleError(styleId, config.usageCommand);
         }
-        const packet = createStyledImageAuthoringPacket({
-          prompt,
+        const packet = createStyledImageCompilationPacket({
+          prompt: resolvedPrompt,
           style,
           details: [
             `Model preference if direct image generation is used: ${options.model}`,
@@ -965,7 +981,7 @@ ${formatRegistryListing(styles, "image styles")}`;
       const hasSourceImage = options.imageUrl.length > 0;
       const size = hasSourceImage && command.getOptionValueSource("size") === "default" ? "auto" : options.size;
       const result = await generateWebImage({
-        prompt,
+        prompt: resolvedPrompt,
         model: options.model,
         size,
         quality: options.quality,
@@ -1012,13 +1028,14 @@ var imageCommand = createImageGenerateCommand({
   name: "image",
   generationType: "image",
   usageCommand: "zero generate image",
-  examples: `  Styled image:          zero generate image --style vm0:image-style:notion-illustration --prompt "A product manager mapping a launch plan"
-  Skip style:            zero generate image --skip-style --prompt "A watercolor fox"
-  Pipe prompt:           cat prompt.txt | zero generate image --skip-style
-  GPT Image model:       zero generate image --skip-style --model gpt-image-1.5 --prompt "A poster" --size 1024x1536 --quality high
-  Flux model:            zero generate image --skip-style --model flux-pro-1.1 --prompt "A product hero shot" --seed 42
-  Nano Banana 2:         zero generate image --skip-style --model nano-banana-2 --prompt "A crisp launch poster with readable typography"
-  Image-to-image:        zero generate image --skip-style --model flux-pro-1.1 --image-url https://example.com/mockup.png --prompt "Turn this mockup into a polished product shot"
+  examples: `  Compile styled prompt: zero generate image --style image-style:notion-illustration --prompt "A product manager mapping a launch plan" --compile
+  Generate compiled:     zero generate image --compiled-prompt "A Notion-style brush-pen illustration..."
+  Generate raw:          zero generate image --raw-prompt "A watercolor fox"
+  Pipe compile prompt:   cat prompt.txt | zero generate image --style image-style:notion-illustration --compile
+  GPT Image model:       zero generate image --compiled-prompt "A poster" --model gpt-image-1.5 --size 1024x1536 --quality high
+  Flux model:            zero generate image --raw-prompt "A product hero shot" --model flux-pro-1.1 --seed 42
+  Nano Banana 2:         zero generate image --compiled-prompt "A crisp launch poster with readable typography" --model nano-banana-2
+  Image-to-image:        zero generate image --compiled-prompt "Turn this mockup into a polished product shot" --model flux-pro-1.1 --image-url https://example.com/mockup.png
   List providers:        zero generate image
   Use a connector:       zero generate image --provider replicate`
 });
@@ -1052,7 +1069,7 @@ function titleForKind(kind) {
 function outputDirForSite(site) {
   return `./generated/mockups/${site}`;
 }
-function formatCandidateSource2(source) {
+function formatCandidateSource(source) {
   if ("repo" in source) {
     return `- \`${source.repo}@${source.ref}\``;
   }
@@ -1130,7 +1147,7 @@ function createHtmlArtifactAuthoringPacket(options) {
     "## Candidate Registry Slice",
     `Registry: \`${candidateSlice.registryVersion}\``,
     "Sources:",
-    ...candidateSlice.sources.map(formatCandidateSource2),
+    ...candidateSlice.sources.map(formatCandidateSource),
     "",
     "```json",
     JSON.stringify(candidateSlice.candidates, null, 2),
@@ -1651,7 +1668,7 @@ function createSpriteAuthoringPacket(options) {
     `- Output name: ${plan.name}`,
     "",
     "## Recommended Model",
-    `- Use \`${plan.model}\` for every raw sheet via built-in image generation (\`zero generate image --provider built-in --model ${plan.model} --skip-style --prompt "..."\`, or the in-context image tool).`,
+    `- Use \`${plan.model}\` for every raw sheet via built-in image generation (\`zero generate image --provider built-in --model ${plan.model} --raw-prompt "..."\`, or the in-context image tool).`,
     "- gpt-image-2 is recommended for sprite sheets: it accepts flexible WIDTHxHEIGHT sizes and high quality for crisp, evenly-spaced grids. It does not emit transparent backgrounds, which is expected here \u2014 the solid magenta background is chroma-keyed by the local processor.",
     "- Pick a sheet-friendly square or grid-aligned size (for example 1024x1024 for 2x2/3x3/4x4) so each cell stays evenly spaced.",
     "",
@@ -1885,7 +1902,7 @@ init_esm_shims();
 
 // src/commands/zero/shared/video-template-authoring.ts
 init_esm_shims();
-function formatCandidateSource3(source) {
+function formatCandidateSource2(source) {
   if ("repo" in source) {
     return `- \`${source.repo}@${source.ref}\``;
   }
@@ -1969,7 +1986,7 @@ function createVideoTemplateAuthoringPacket(options) {
     "## Locked Template Source",
     `Registry: \`${candidateSlice.registryVersion}\``,
     "Sources:",
-    ...candidateSlice.sources.map(formatCandidateSource3),
+    ...candidateSlice.sources.map(formatCandidateSource2),
     "",
     "```json",
     JSON.stringify(candidateSlice.candidates, null, 2),
@@ -2406,6 +2423,18 @@ var videoCommand = createVideoGenerateCommand({
 init_esm_shims();
 var WEBSITE_TARGET = "website";
 var WEBSITE_USAGE_COMMAND = "zero generate website";
+function selectedTemplateDetails(template) {
+  if (!template) {
+    return ["Selected template: agent decides"];
+  }
+  const details = [`Selected template: ${template.id} (${template.name})`];
+  if (template.source.archive) {
+    details.push(
+      `Selected template package: zero resource pull ${template.id} --dir ./generated/resources`
+    );
+  }
+  return details;
+}
 function unknownDesignSystemError2(id) {
   const designSystems = listDesignSystems();
   const message = [
@@ -2486,7 +2515,7 @@ ${formatRegistryListing(templates, "website templates")}`;
     let resolvedTemplate;
     if (options.template !== void 0) {
       const canonical = canonicalizeRegistryId("template", options.template);
-      const entry = findTemplate(canonical);
+      const entry = findWebsiteTemplateResource(options.template) ?? findTemplate(canonical);
       if (!entry || !entry.targets?.includes(WEBSITE_TARGET)) {
         throw unknownTemplateError4(options.template);
       }
@@ -2500,7 +2529,7 @@ ${formatRegistryListing(templates, "website templates")}`;
       details: [
         `Requested title/site name: ${options.title ?? "not specified"}`,
         `Selected design system: ${resolvedDesignSystem ? `${resolvedDesignSystem.id} (${resolvedDesignSystem.name})` : "agent decides"}`,
-        `Selected template: ${resolvedTemplate ? `${resolvedTemplate.id} (${resolvedTemplate.name})` : "agent decides"}`
+        ...selectedTemplateDetails(resolvedTemplate)
       ],
       artifactRules: [
         "Build the usable website as the first screen; do not output a landing-page plan.",
@@ -2636,7 +2665,7 @@ var documentCommand = createListerOnlyCommand({
 });
 function buildGenerateHelpText() {
   const examples = [
-    '  Generate image:        zero generate image --prompt "A watercolor fox"',
+    '  Generate image:        zero generate image --raw-prompt "A watercolor fox"',
     '  Generate deck:         zero generate presentation --prompt "A product roadmap"',
     '  Generate report:       zero generate report --prompt "A Q2 usage report"',
     '  Generate docs:         zero generate docs-design --prompt "A setup guide"',
@@ -2649,7 +2678,7 @@ function buildGenerateHelpText() {
     "  Show image choices:    zero generate image",
     "  Show report choices:   zero generate report",
     "  Use a connector:       zero generate video --provider heygen",
-    "  Force built-in:        zero generate image --provider built-in --model gpt-image-1.5 --prompt ..."
+    "  Force built-in:        zero generate image --provider built-in --model gpt-image-1.5 --raw-prompt ..."
   ];
   return `
 Examples:
@@ -2666,4 +2695,4 @@ var generateCommand = new Command().name("generate").description(
 export {
   generateCommand
 };
-//# sourceMappingURL=generate-OIQ4ULPQ.js.map
+//# sourceMappingURL=generate-A7RUXCIY.js.map