fix: expand single-line associative array to multi-line (PHPCS L89)

New eval framework:
- eval/dataset.json: 20 frozen peptide topic eval items
- class-opik-eval-scorer.php: LLM-as-judge using Gemini Flash 1.5
  Scores on: scientific_signal, readability, style_adherence (0-10)
- class-opik-eval-runner.php: orchestrator for full eval pass
  Loads dataset, runs generation (no publish/images), scores, pushes to Opik
  run(int $limit = 0, bool $dry_run = false): array
- class-wp-cli-commands.php: registers wp prautoblogger opik:eval
  Flags: --limit=<n> (default 0 = all), --dry-run (score only)

Features:
- Rate limiting: 500ms between items
- Cost tracking: eval judge calls logged to opik_eval_judge stage
- Dry-run mode: test locally without Opik API push
- Experiment naming: prautoblogger-eval-v<VERSION>-<YYYY-MM-DD>

All files <= 300 lines. Version 0.13.0. Ready for PR.

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['7.4', '8.1', '8.3']
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP ${{ matrix.php }}
@@ -31,7 +31,7 @@ jobs:
           coverage: none
       - name: Syntax check all PHP files
         # Exclude .github/mu-plugins — those run on the production server (PHP 8+)
-        # and may use PHP 8+ syntax (union types etc.) that older versions reject.
+        # and may use PHP 8+ syntax (union types etc.) that 7.4 rejects.
         run: |
           set -e
           find . -name '*.php' \
@@ -44,14 +44,9 @@ jobs:
   phpcs:
     name: PHPCS (WordPress standards)
     runs-on: ubuntu-latest
-    continue-on-error: false  # strict after PHPCS cleanup in v0.8.3
-    permissions:
-      contents: write  # allows phpcbf auto-fix commits back to the PR branch
+    continue-on-error: false  # now strict after PHPCS cleanup in v0.8.3
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref || github.ref_name }}
-          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -60,34 +55,22 @@ jobs:
           tools: composer:v2, phpcs
       - name: Install WordPress Coding Standards
         run: |
+          # Allow the PHPCS composer-installer plugin (auto-registers standards).
           composer global config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+          # WPCS 3.x requires PHPCSExtra (for the Universal.* and NormalizedArrays.* sniffs)
+          # AND phpcsutils. Installing the installer itself lets it auto-register the standards path.
           composer global require --no-interaction \
             "dealerdirect/phpcodesniffer-composer-installer:^1.0" \
             "wp-coding-standards/wpcs:^3.0" \
             "phpcsstandards/phpcsutils:^1.0" \
             "phpcsstandards/phpcsextra:^1.0"
-      - name: Auto-fix with phpcbf (commit back to branch if changed)
-        # phpcbf exits 1 when it makes fixes, 0 when nothing to fix — both are success here.
-        # Commits made via GITHUB_TOKEN do not trigger a new CI run (GitHub prevents loops).
-        run: |
-          phpcbf --standard=phpcs.xml \
-            --extensions=php \
-            --ignore=vendor/*,tests/*,node_modules/* \
-            includes/ prautoblogger.php uninstall.php || true
-          if ! git diff --quiet; then
-            git config user.name "peptiderepo"
-            git config user.email "peptiderepo@users.noreply.github.com"
-            git add -A
-            git commit -m "style: auto-fix PHPCS violations via phpcbf"
-            git push
-          fi
-      - name: Run PHPCS (only non-auto-fixable violations can fail here)
+      - name: Run PHPCS
         run: |
           phpcs --standard=phpcs.xml \
             --extensions=php \
             --ignore=vendor/*,tests/*,node_modules/* \
             --warning-severity=0 \
-            --report=full \
+            --report=summary \
             includes/ prautoblogger.php uninstall.php
 
   phpunit:
@@ -96,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['7.4', '8.1', '8.3']
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP ${{ matrix.php }}

.github/workflows/cto-review.yml

@@ -123,18 +123,17 @@ jobs:
           git fetch origin ${{ github.event.pull_request.base.ref }} --depth=50
           BASE_SHA="${{ github.event.pull_request.base.sha }}"
           HEAD_SHA="${{ github.event.pull_request.head.sha }}"
-          # Write the diff to a file, not a step output / env var. Passing a
-          # ~400KB diff through the process env (execve argv+envp) exceeds the
-          # runner ARG_MAX and fails the next step with "Argument list too long"
-          # (issue #110). File transport also sidesteps the ~1MB step-output cap.
-          git diff --no-color "$BASE_SHA" "$HEAD_SHA" | head -c 400000 > /tmp/cto-review-diff.txt
+          DIFF=$(git diff --no-color "$BASE_SHA" "$HEAD_SHA" | head -c 400000)
           FILES=$(git diff --name-only "$BASE_SHA" "$HEAD_SHA")
-          SIZE=$(wc -c < /tmp/cto-review-diff.txt)
+          SIZE=$(echo -n "$DIFF" | wc -c)
           {
             echo "size=$SIZE"
             echo "files<<EOF_FILES"
             echo "$FILES"
             echo "EOF_FILES"
+            echo "diff<<EOF_DIFF"
+            echo "$DIFF"
+            echo "EOF_DIFF"
           } >> "$GITHUB_OUTPUT"
 
       - name: Load repo conventions
@@ -162,7 +161,7 @@ jobs:
           PR_AUTHOR: ${{ github.event.pull_request.user.login }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           REPO_NAME: ${{ github.event.repository.name }}
-          DIFF_PATH: /tmp/cto-review-diff.txt
+          DIFF: ${{ steps.diff.outputs.diff }}
           DIFF_SIZE: ${{ steps.diff.outputs.size }}
           CHANGED_FILES: ${{ steps.diff.outputs.files }}
           CONVENTIONS: ${{ steps.conventions.outputs.content }}
@@ -230,9 +229,7 @@ jobs:
           user_blocks.append(f"**Changed files:**\n```\n{os.environ['CHANGED_FILES']}\n```\n")
           if os.environ.get("CONVENTIONS", "").strip():
               user_blocks.append(f"# Repo CONVENTIONS.md\n{os.environ['CONVENTIONS']}\n")
-          with open(os.environ["DIFF_PATH"], encoding="utf-8", errors="replace") as _df:
-              _diff_text = _df.read()
-          user_blocks.append(f"# Diff\n```diff\n{_diff_text}\n```\n")
+          user_blocks.append(f"# Diff\n```diff\n{os.environ['DIFF']}\n```\n")
           user_message = "\n\n".join(user_blocks)
 
           tools = [{

.github/workflows/deploy.yml

@@ -4,20 +4,21 @@ on:
   push:
     branches: [main]
 
-concurrency:
-  group: deploy-prautoblogger-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   validate:
     name: PHP Lint Gate
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: shivammathur/setup-php@v2
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
           php-version: '8.1'
           coverage: none
+
       - name: PHP Lint Check
         run: |
           set -e
@@ -29,9 +30,60 @@ jobs:
             -print0 | xargs -0 -n1 -P4 php -l > /dev/null
 
   deploy:
-    name: Deploy (shared pipeline)
     needs: validate
-    uses: peptiderepo/peptide-e2e/.github/workflows/deploy-app.yml@main
-    with:
-      target_path: wp-content/plugins/prautoblogger
-    secrets: inherit
+    name: Deploy to Production
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup SSH key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/deploy_key
+          chmod 600 ~/.ssh/deploy_key
+          ssh-keyscan -p ${{ secrets.SSH_PORT }} ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
+
+      - name: Deploy via rsync
+        run: |
+          rsync -avz --delete \
+            --exclude '.git' \
+            --exclude '.github' \
+            --exclude 'tests' \
+            --exclude 'phpunit.xml.dist' \
+            --exclude 'composer.json' \
+            --exclude 'composer.lock' \
+            --exclude 'vendor' \
+            --exclude '.distignore' \
+            --exclude 'ARCHITECTURE.md' \
+            --exclude 'CONVENTIONS.md' \
+            -e "ssh -i ~/.ssh/deploy_key -p ${{ secrets.SSH_PORT }}" \
+            ./ ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }}:~/domains/peptiderepo.com/public_html/wp-content/plugins/prautoblogger/
+
+      - name: Purge LiteSpeed Cache
+        run: |
+          ssh -i ~/.ssh/deploy_key -p ${{ secrets.SSH_PORT }} \
+            ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }} \
+            "cd ~/domains/peptiderepo.com/public_html && \
+             wp litespeed-purge all 2>/dev/null || \
+             (find wp-content/litespeed/ -type f -delete 2>/dev/null; touch .lscache_purge 2>/dev/null) || true"
+
+      - name: Health check
+        run: |
+          sleep 5
+          STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://peptiderepo.com)
+          # 200 = normal healthy response.
+          # 403 = peptide-starter-theme v1.5.2 CF-peer validator rejecting this
+          #       GHA-runner direct-to-origin request as non-Cloudflare traffic.
+          #       That rejection is the validator working — itself a positive
+          #       liveness signal. Real user traffic via Cloudflare gets 200.
+          if [ "$STATUS" != "200" ] && [ "$STATUS" != "403" ]; then
+            echo "ERROR: Site returned unexpected HTTP $STATUS after deploy"
+            exit 1
+          fi
+          echo "Site is responsive (HTTP $STATUS)"
+
+      - name: Cleanup
+        if: always()
+        run: rm -f ~/.ssh/deploy_key

.github/workflows/main-push-audit.yml

@@ -29,22 +29,12 @@ jobs:
         with:
           script: |
             const sha = context.sha;
-            // Squash-merge -> PR association is eventually-consistent; poll briefly
-            // before concluding this was a direct push (avoids false positives on merges).
-            async function findMergedPR() {
-              for (let attempt = 1; attempt <= 5; attempt++) {
-                const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  commit_sha: sha,
-                });
-                const m = prs.find(p => p.merged_at);
-                if (m) return m;
-                if (attempt < 5) await new Promise(r => setTimeout(r, 10000));
-              }
-              return null;
-            }
-            const merged = await findMergedPR();
+            const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              commit_sha: sha,
+            });
+            const merged = prs.find(p => p.merged_at);
             if (merged) {
               core.info(`OK: commit ${sha.substring(0,7)} came from PR #${merged.number}`);
               return;

ARCHITECTURE.md

@@ -75,11 +75,6 @@ PRAutoBlogger is a WordPress plugin that monitors social media (starting with Re
 │                         │  retried once with a rule-based fallback
 │                         │  prompt via Image_NSFW_Retry; a second block
 │                         │  logs WARNING and publishes without that image.
-│                         │  v0.17.0: results then pass through the local
-│                         │  deterministic Image_Composer (corner mark +
-│                         │  branded OG/square variants for Image A; mark
-│                         │  only for Image B) with a capability ladder
-│                         │  (imagick → GD resize-only → pass-through).
 │                         │  Sideloads to media library, logs costs.
 └────────────┬────────────┘
              │
@@ -108,15 +103,6 @@ prautoblogger/
 ├── CHANGELOG.md                       # Semantic versioning changelog
 │
 ├── assets/
-│   ├── brand/                         # Vendored brand PNGs rasterized from peptide-repo-brand SVGs (composer overlays)
-│   │   ├── logo-mark-small-56.png     # Corner mark, 1x
-│   │   ├── logo-mark-small-112.png    # Corner mark / OG band logo, 2x
-│   │   ├── logo-horizontal-reverse-128.png # Square footer lockup, 1x
-│   │   └── logo-horizontal-reverse-256.png # Square footer lockup, 2x
-│   ├── fonts/                         # Bundled OFL faces for deterministic text rendering
-│   │   ├── Poppins-Bold.ttf           # Square-card caption face
-│   │   ├── Poppins-SemiBold.ttf       # OG band caption face
-│   │   └── OFL.txt                    # SIL Open Font License
 │   ├── css/
 │   │   ├── admin.css                  # Admin page styles (wp-admin conventions)
 │   │   └── posts-widget.css           # Frontend posts widget styles (uses theme CSS vars)
@@ -161,14 +147,6 @@ prautoblogger/
 │   │   ├── class-post-assembler.php   # Post-creation helpers: taxonomy, log linking, images, sanitization
 │   │   ├── class-image-pipeline.php   # Orchestrates A/B image generation (parallel via batch)
 │   │   ├── class-image-prompt-builder.php # Generates visual prompts from article/source data
-│   │   ├── class-image-template-filler.php # Fills the editorial style template's {{ topic_summary }} slot (v0.16.0)
-│   │   ├── interface-image-composer.php    # Contract: provider bytes → featured-first variant list (v0.17.0)
-│   │   ├── class-image-composer.php        # Composer orchestrator: cached capability probe + degradation ladder
-│   │   ├── class-image-composer-imagick.php # Imagick renderer: corner mark, OG band, square card (WP-free)
-│   │   ├── class-image-composer-canvas.php # Imagick primitives: smoke test, cover-crop, logo, deterministic PNG (WP-free)
-│   │   ├── class-image-composer-editor.php # Resize-only rung via wp_get_image_editor (GD path)
-│   │   ├── class-image-composer-layout.php # Geometry defaults + caption clamp (pure, WP-free)
-│   │   ├── class-image-attacher.php        # Sideload + cost log + variant meta-linking + caption prepend
 │   │   ├── class-image-media-sideloader.php # Imports images into WordPress media library
 │   │   ├── class-cost-tracker.php     # Logs all API costs, enforces budget limits
 │   │   ├── class-logger.php           # Structured logging singleton (error/warning/info/debug)
@@ -459,20 +437,15 @@ All prefixed with `prautoblogger_`:
 | `prautoblogger_schedule_time`          | Daily generation time (HH:MM, default: '03:00')       |
 | `prautoblogger_image_model`            | Image model slug from `Image_Model_Registry::get_models()`; provider is derived from this on save |
 | `prautoblogger_image_provider`         | Derived from the chosen model on save (v0.8.0+); not editable in admin UI |
-| `prautoblogger_image_prompt_instructions` | System prompt given to the image rewriter LLM (v0.8.0+); falls back to `Image_Prompt_Builder::REWRITER_SYSTEM_PROMPT` when empty. v0.16.0: the default now instructs the LLM to emit a 1-2 sentence editorial topic/mechanism summary as the SCENE (was a comic gag) |
+| `prautoblogger_image_prompt_instructions` | System prompt given to the image rewriter LLM (v0.8.0+); falls back to `Image_Prompt_Builder::REWRITER_SYSTEM_PROMPT` when empty |
 | `prautoblogger_image_nsfw_retry`       | Toggle: retry NSFW-blocked image slots with a rule-based fallback prompt (default: '1') |
 | `prautoblogger_migrated_image_provider_v080` | One-shot migration flag — auto-heals mismatched provider/model pairs on first admin_init after v0.8.0 upgrade |
 | `prautoblogger_article_font_family`    | Font family key: 'default', 'inter', 'georgia', 'merriweather', 'lora', 'open_sans', 'roboto', 'system' |
 | `prautoblogger_article_font_size`     | Body font size in px (0 = theme default). Recommended: 16–18. |
 | `prautoblogger_table_borders`         | Toggle: add borders/padding/striping to tables (default: '1') |
-| `prautoblogger_image_style_template`   | Full image prompt template (v0.16.0+); contains exactly one `{{ topic_summary }}` token filled per-article with the rewriter scene. Default = `PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE` (editorial scientific illustration). Replaces the Style Suffix. Validated on save (single-token, brief A5) |
-| `prautoblogger_image_style_suffix`     | DEPRECATED (v0.16.0). Former comic style suffix appended to every image prompt; no longer read by the builder. Mirrored to `prautoblogger_image_style_suffix_deprecated` for one cycle and not deleted yet |
+| `prautoblogger_image_style_suffix`     | Text appended to every image prompt (default: CEO-locked 90s infomercial prompt) |
 | `prautoblogger_openrouter_model_registry` | Normalized OpenRouter model list (JSON array, daily refresh, serves as durable cache) |
 | `prautoblogger_openrouter_model_registry_fetched_at` | Unix timestamp of last successful model registry refresh |
-| `prautoblogger_image_compose_enabled`  | Toggle: run the deterministic image composer (default '1'; auto-degrades, never blocks publishing) |
-| `prautoblogger_image_compose_variants` | Comma list of composed variants for Image A (default 'og,square'; whitelisted at point of use) |
-| `prautoblogger_image_featured_mark_enabled` | Toggle: subtle corner mark on featured images (default '1') |
-| `prautoblogger_image_compose_capability` | Cached capability probe `{fingerprint, capability}`; fingerprint = PHP version + imagick/gd presence, so it auto-invalidates on host changes |
 
 ### Post Meta
 
@@ -491,14 +464,6 @@ Stored on every PRAutoBlogger-generated post:
 | `_prautoblogger_editor_notes`         | Chief editor's review notes                   |
 | `_prautoblogger_generated_at`         | ISO 8601 timestamp of generation              |
 | `_prautoblogger_research_sources`     | JSON array of source URLs used                |
-| `_prautoblogger_og_image_id`          | Attachment ID of the composed 1200×630 OG variant (v0.17.0; the rebuilt SEO stage emits `og:image` from this — key name frozen) |
-| `_prautoblogger_square_image_id`      | Attachment ID of the composed 1080×1080 square variant (v0.17.0; stored now, no consumer yet) |
-
-Composed-variant **attachment** meta (v0.17.0): every pipeline attachment gets
-`_prautoblogger_image_role` (`featured`/`og`/`square`); OG/square variants also
-get `_prautoblogger_base_attachment_id` pointing at the featured attachment
-they derive from. All keys keep the `_prautoblogger_` prefix, so the uninstall
-prefix-sweep purges them.
 
 ---
 
@@ -511,7 +476,7 @@ prefix-sweep purges them.
 | Reddit RSS | Primary Reddit data source — Atom feeds for subreddit hot posts | None (unauthenticated) | No known rate limit; reliable from datacenter IPs | `providers/class-reddit-json-client.php` |
 | Reddit .json | Fallback for posts + only source for comments | None (unauthenticated) | ~10 req/min (datacenter IPs often blocked) | `providers/class-reddit-json-client.php` |
 | Google Analytics 4 | Post performance metrics | OAuth2 service account | Standard GA4 limits | `core/class-ga4-client.php`, `core/class-metrics-collector.php` |
-| Runware (FLUX.1 via runware.ai) | **Default** image backend (v0.9.0+): schnell ~$0.0006/image, dev ~$0.02/image. True parallel generation via curl_multi. **v0.15.0: live model catalog sync** from `/v1/models` endpoint (task-based API); normalized to Image_Model_Registry shape; cached with 24h TTL; on-demand refresh via AJAX. | API key (encrypted in wp_options) | Account-level quotas | `providers/class-runware-image-provider.php`, `providers/class-runware-image-pricing.php`, `providers/class-runware-image-support.php`, `providers/class-runware-image-batch.php`, `providers/class-runware-model-catalog.php` |
+| Runware (FLUX.1 via runware.ai) | **Default** image backend (v0.9.0+): schnell ~$0.0006/image, dev ~$0.02/image. True parallel generation via curl_multi. | API key (encrypted in wp_options) | Account-level quotas | `providers/class-runware-image-provider.php`, `providers/class-runware-image-pricing.php`, `providers/class-runware-image-support.php`, `providers/class-runware-image-batch.php` |
 
 ---
 
@@ -610,52 +575,6 @@ Reddit rejected our OAuth API application (April 2026). We initially switched to
 
 The admin model picker (v1) needs to list OpenRouter models with pricing and capabilities. We fetch `https://openrouter.ai/api/v1/models` (free, unauthenticated) once daily and store the normalized payload in a WP option fronted by a 24h transient. On stale-and-fetch-fails, we serve last-good + surface a warning. The registry class (`class-open-router-model-registry.php`) takes all config via constructor (option name, transient name, endpoint URL) — no PRAUTOBLOGGER_* constants inside the class body. Phase 2 lifts it into a shared Composer package with zero internal edits. Phase 3 adds a parallel `Cloudflare_WorkersAI_Model_Registry` behind the same interface. Capability vocabulary: `text→text`, `text+image→text`, `text+audio→text`, `text→image`, `text→audio`, `text→video`, `text→embedding`. Cost: $0/month.
 
-### #20: Editorial illustration prompt + style-template setting (v0.16.0, May 2026)
-
-Commit 1 of the in-plugin editorial image pipeline (brief `docs/proposals/2026-05-29-image-pipeline-in-plugin-brief.md`). The image style pivots from a single-panel newspaper comic to a **text-free editorial scientific illustration**. Two changes ship here; the deterministic PHP composer is a later commit.
-
-1. **Prompt structure.** `Image_Prompt_Builder::REWRITER_SYSTEM_PROMPT` now asks the rewriter LLM for a concise 1-2 sentence topic/mechanism summary (one concrete centered focal subject, no text/people-as-gag/logos) as the SCENE, keeping the short CAPTION line for the unchanged HTML-caption-below-image path. The scene/caption parsing contract (`Image_Scene_Parser`) is unchanged.
-2. **Template substitution.** The old `trim($scene . ' ' . $style_suffix)` concat is replaced by `PRAutoBlogger_Image_Template_Filler::fill($scene)` in all three entry points (`build_article_prompt`, `build_source_prompt`, `build_fallback_prompt`). The filler resolves the active template (admin override → default), strips control chars and clamps the summary length (brief A5), then substitutes the single `{{ topic_summary }}` token. Degradation (brief A5/A6): if the template lacks exactly one token it appends the summary and logs a warning; if the summary is empty it emits the style-only prompt — a blank or token-only prompt is never sent to the provider.
-3. **Setting.** New textarea `prautoblogger_image_style_template` (default `PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE`) replaces the Style Suffix field. On save it is sanitised with `sanitize_textarea_field` and validated to contain exactly one token (`Image_Template_Filler::sanitize_for_save`). The old `prautoblogger_image_style_suffix` is mirrored to `..._deprecated` for one cycle and not deleted (one-time migration `prautoblogger_migrated_style_template_v0160`).
-
-Provider/model are unchanged — only the prompt text changes, so production keeps emitting via Runware FLUX.1 schnell but now produces text-free editorial base images.
-
-### #21: Deterministic PHP image composer with capability ladder (v0.17.0, Jun 2026)
-
-Commit 2 (and final scope) of the in-plugin editorial image pipeline (#20). Small diffusion
-models cannot render clean text (2026-04-21 A/B finding), so base images are text-free —
-but the one image that travels *without* its HTML caption is the social/OG share image.
-A **deterministic local composer** (`PRAutoBlogger_Image_Composer` behind
-`PRAutoBlogger_Image_Composer_Interface`) now runs between provider bytes and sideload:
-
-1. **Variants.** Image A → corner-marked featured (1200×632) + branded OG (1200×630, teal
-   band, brand mark, baked caption in Poppins SemiBold) + square card (1080×1080: full base
-   downscaled into a 1080×569 top slice — no upscaling — cream caption panel in Poppins
-   Bold, teal footer with the horizontal reverse lockup). Image B → corner mark only. The
-   variant set is config-driven (`prautoblogger_image_compose_variants`, default `og,square`;
-   square has no consumer yet — CEO wants it rendered + stored now). Variants are
-   meta-linked via `_prautoblogger_image_role`, `_prautoblogger_base_attachment_id`,
-   `_prautoblogger_og_image_id`, `_prautoblogger_square_image_id`. The og key is **frozen**:
-   the rebuilt SEO stage (pipeline-redesign §4.8) emits `og:image` from it.
-2. **Capability ladder, never fatal.** Imagick is probed once (PNG format + TTF annotate
-   smoke test) and cached in `prautoblogger_image_compose_capability`, fingerprinted by
-   PHP version + imagick/gd presence so host flips (hPanel/cagefs — it has happened)
-   auto-invalidate the cache. Rungs: imagick → `wp_get_image_editor()` resize-only
-   (unbranded, square skipped because it would upscale) → pass-through. Every render is
-   try/caught; degradation logs one WARNING per run; the publish always proceeds with the
-   editable HTML caption intact. Test/ops override: `prautoblogger_image_compose_capability`
-   filter.
-3. **Determinism.** Bundled OFL fonts (no system-font queries), vendored brand PNGs (no
-   runtime SVG delegate variance), `stripImage()` + PNG date/time chunks excluded + fixed
-   compression → byte-stable output **per environment** (not across ImageMagick versions).
-   Composition is local CPU, $0, logged as a duration-only stage on the `image_composer`
-   channel — no cost-tracker rows.
-4. **Layout tuning.** Geometry/opacity are constants in
-   `PRAutoBlogger_Image_Composer_Layout::defaults()` behind the
-   `prautoblogger_image_compose_layout` filter — deliberately not settings; promote only if
-   the CEO asks to tune them. The caption is hard-clamped (word-boundary wrap + ellipsis,
-   multibyte-safe) even though the rewriter LLM is already constrained to <15 words.
-
 ### #17: Runware as default image backend (v0.9.0, Apr 2026)
 
 After a comic-style A/B round in Apr 2026, FLUX.1 schnell via Runware was chosen as the default image backend. Cost is ~$0.0006/image vs ~$0.039/image for Gemini 2.5 Flash Image via OpenRouter (≈65× cheaper), and the looser schnell fidelity reads as editorial-cartoon style — a feature, not a bug, for our single-panel comic aesthetic. FLUX.1 dev (~$0.02/image, 28 steps) remains available as an opt-in for higher-fidelity runs. The Runware layer mirrors the OpenRouter split (interface + provider + support + pricing + batch), all under the 300-line cap. The batch class dispatches `imageInference` POSTs via `curl_multi_init/exec/select` — wall-clock time for the A/B pair drops to ≈ the slowest single image. A v0.9.0 one-time migration (`prautoblogger_migrated_default_image_v090`) flips sites still on the legacy default; explicit user selections are preserved. Cloudflare Workers AI was removed as an image provider in v0.10.0 (see ADR #16 note below).

CHANGELOG.md

@@ -5,214 +5,7 @@ All notable changes to PRAutoBlogger will be documented in this file.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project uses [Semantic Versioning](https://semver.org/).
 
-## [0.17.0] - 2026-06-11
-
-### Added
-- **Deterministic PHP image composer (Commit 2 of the in-plugin editorial image
-  pipeline).** Every generated image now passes through a local, $0,
-  deterministic composer between the provider's bytes and the media sideloader.
-  Image A yields a corner-marked featured image (1200×632) plus a branded
-  **OG/social variant** (1200×630, teal band, brand mark, baked editorial
-  caption in Poppins SemiBold) and a **square card variant** (1080×1080, image
-  slice + cream caption panel in Poppins Bold + teal footer with the horizontal
-  lockup). Image B gets the corner mark only. Variants are sideloaded with a
-  role filename suffix and meta-linked: attachment meta
-  `_prautoblogger_image_role` + `_prautoblogger_base_attachment_id`, post meta
-  `_prautoblogger_og_image_id` + `_prautoblogger_square_image_id` (the rebuilt
-  SEO stage will emit `og:image` from the frozen og key).
-- **Capability ladder with cached probe.** Imagick (full compositing) →
-  `wp_get_image_editor()` GD path (resize-only, unbranded, single WARNING) →
-  pass-through (single WARNING). The probe result is cached in
-  `prautoblogger_image_compose_capability`, fingerprinted by PHP version +
-  imagick/gd presence so it auto-invalidates when the host changes. Override
-  filter: `prautoblogger_image_compose_capability`. Composition failure can
-  never block a publish (per-render try/catch + pipeline safety net).
-- New Images settings: `prautoblogger_image_compose_enabled` (default on),
-  `prautoblogger_image_compose_variants` (default `og,square`),
-  `prautoblogger_image_featured_mark_enabled` (default on). Geometry ships as
-  layout-class constants behind the `prautoblogger_image_compose_layout`
-  filter. All keys keep the `prautoblogger_`/`_prautoblogger_` prefixes, so
-  the existing uninstall prefix-sweep purges them (no uninstall.php changes).
-- Vendored brand rasters (`assets/brand/`, from peptide-repo-brand SVG masters)
-  and bundled OFL fonts (`assets/fonts/`: Poppins Bold + Poppins SemiBold +
-  OFL.txt) — no system-font or runtime-SVG dependency, byte-stable output per
-  environment (metadata stripped, PNG date/time chunks excluded).
-
-### Fixed
-- Featured/Image B **alt text is now the editorial caption** instead of the
-  generation model name (`sideload_and_log()` passed the model as `$alt_text`,
-  contradicting the sideloader docblock). The model keeps persisting in
-  `_prautoblogger_image_model`.
-
-### Changed
-- `PRAutoBlogger_Image_Media_Sideloader::sideload_image()` /
-  `generate_filename()` accept an optional filename role suffix
-  (back-compat default `''`).
-- `PRAutoBlogger_Image_Pipeline` delegates sideload/cost-log, caption
-  prepending, and variant persistence to the new
-  `PRAutoBlogger_Image_Attacher` (300-line compliance); also declares the
-  previously-dynamic `$trace_context` property (PHP 8.2 deprecation).
-
-## [0.16.0] - 2026-05-29
-
-### Changed
-- **Editorial image prompt (Commit 1 of the in-plugin editorial image pipeline).**
-  The image style pivots from a single-panel newspaper comic to a text-free
-  editorial scientific illustration. The rewriter LLM now emits a concise
-  1-2 sentence topic/mechanism summary as the SCENE (one centered focal
-  subject, no text/people-as-gag/logos), keeping the short CAPTION line for the
-  unchanged HTML-caption-below-image behavior. The scene/caption parsing
-  contract is unchanged. Provider/model are unchanged — production keeps
-  generating via Runware FLUX.1 schnell but now produces text-free editorial
-  base images. See `docs/proposals/2026-05-29-image-pipeline-in-plugin-brief.md`.
-- The prompt builder now substitutes the rewriter scene into an editable style
-  template's `{{ topic_summary }}` slot via the new
-  `PRAutoBlogger_Image_Template_Filler`, replacing the old
-  `scene + style suffix` concatenation, across all three entry points
-  (`build_article_prompt`, `build_source_prompt`, `build_fallback_prompt`).
-  Before substitution the scene is stripped of control characters and
-  length-clamped (brief A5). If the template lacks exactly one token the
-  summary is appended and a warning logged; if the summary is empty the
-  style-only prompt is emitted — a blank or token-only prompt is never sent to
-  the provider (brief A5/A6).
-
-### Added
-- New setting **Style Template** (`prautoblogger_image_style_template`,
-  textarea) replacing the Style Suffix field. Default =
-  `PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE` (the editorial template). On save
-  it is validated to contain exactly one `{{ topic_summary }}` token; an invalid
-  template keeps the previous value and surfaces a settings error.
-
-### Deprecated
-- `prautoblogger_image_style_suffix` is deprecated and no longer read by the
-  prompt builder. A one-time migration (`prautoblogger_migrated_style_template_v0160`)
-  mirrors its value to `prautoblogger_image_style_suffix_deprecated` for one
-  version cycle and seeds the new template default. The old option is NOT
-  deleted this cycle.
-
-## [0.15.1] - 2026-05-14
-
-### Fixed
-- Cost preview in AI Models settings tab no longer prints a WordPress database
-  error notice; query now uses canonical column names (`prompt_tokens`,
-  `completion_tokens`, `created_at`). Bug present since v0.11.0 (2026-04-23).
-
-## [0.14.0] - 2026-04-26
-## [0.15.0] - 2026-04-26
-
-### Added
-- **Live Runware Model Catalog Sync**: New `class-runware-model-catalog.php`
-  fetches the live Runware model list via their `/v1` endpoint (task-based API),
-  filters to `taskType=imageInference` (text-to-image only, excluding inpainting),
-  normalizes to the Image_Model_Registry shape, and caches in `prautoblogger_runware_model_cache`
-  with a 24-hour TTL. Fixes the pattern from v0.13.8 and v0.14.0 where the
-  hardcoded Runware model list was a maintenance burden and gaps (missing models,
-  wrong prices) went unnoticed until customer images generation broke.
-- Daily WP-Cron sync (`prautoblogger_sync_runware_models`) scheduled on activation
-  and unscheduled on deactivation.
-- On-demand "Sync now" AJAX button in PRAdmin (Images settings section) with
-  nonce protection and `manage_options` cap check. Refreshes model count and
-  last-synced timestamp in the UI without full page reload.
-- Smart caching + fallback strategy: if cache is < 24h old, use it; if stale,
-  trigger a sync; if sync fails, use the last-known-good cache; if no cache,
-  fall back to hardcoded list (never returns empty array).
-- Pricing merge: Runware API may not expose per-image cost. The catalog pulls
-  costs from `class-runware-image-pricing.php::COST_PER_IMAGE` on every sync,
-  ensuring pricing data is always authoritative and up-to-date.
-- Unit tests for `PRAutoBlogger_Runware_Model_Catalog`: sync success/failure,
-  fallback on API unreachable, stale cache behavior, cost merge logic.
-- `class-image-model-registry.php` refactored: `get_models()` now delegates to
-  the catalog for Runware models + static OpenRouter list. Extracted fallback
-  lists into private `get_runware_fallback_models()` and `get_openrouter_models()`
-  for clarity.
-
-### Fixed
-- Silent model list gaps no longer possible: Runware no longer depends on manual
-  model list maintenance in the pricing class. The live catalog is the source of
-  truth; pricing is merged in on every sync.
-
-### Changed
-- `class-image-model-registry.php`: `get_models()` is now a thin wrapper around
-  the catalog + OpenRouter static list. Breaking change: callers that expect a
-  specific static list should note the new dynamic Runware side.
-
-
-### Fixed
-- Runware image generation now correctly uses the admin-selected model instead
-  of silently falling back to FLUX.1 schnell (runware:100@1) for all non-schnell
-  and non-dev selections. Root cause: `class-runware-image-pricing.php` only
-  had 2 models in its `COST_PER_IMAGE` whitelist (schnell + dev), but the
-  image model registry was expanded to 15 Runware models in v0.13.8 without a
-  matching update to the pricing class. Any model ID not in the whitelist caused
-  `resolve_model()` to fall back to schnell, so every Stable Diffusion, FLUX.2,
-  HiDream, TwinFlow, Z-Image, Qwen-Image, Krea, and GLM-Image selection was
-  silently downgraded.
-- Added all 15 Runware model IDs to `COST_PER_IMAGE` and `DEFAULT_STEPS` with
-  correct per-image costs and step counts sourced from runware.ai/pricing (April 2026).
-- Added `@see` cross-reference to `class-image-model-registry.php` in pricing
-  class docblock to prevent future drift.
-
-## [0.13.9] - 2026-04-26
-
-### Fixed
-- Model picker sort by price now works correctly for image models — previously
-  \`applySort\` always read \`input_price_per_m\` (undefined on image models),
-  so every image had an effective price of 0 and price sort was a no-op.
-  Fix: detect image models via \`cost_per_image\` and use that field instead.
-
-## [0.13.8] - 2026-04-26
-
-### Added
-- Image model picker expanded from 7 to 21 models
-- New Runware text-to-image models: Stable Diffusion 3, HiDream-I1 Full/Dev/Fast,
-  FLUX.1 Krea [dev], Qwen-Image, FLUX.2 [dev], FLUX.2 [klein] 9B, FLUX.2 [klein] 4B,
-  GLM-Image, Z-Image, Z-Image-Turbo, TwinFlow Z-Image-Turbo
-- New OpenRouter model: openai/gpt-5.4-image-2
-- Registry now includes last-verified date and update instructions in source comment
-
-
-All notable changes to PRAutoBlogger will be documented in this file.
-
-Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project uses [Semantic Versioning](https://semver.org/).
-
-## [0.13.7] - 2026-04-24
-
-### Fixed
-- Posts list column layout: title was set to 35% which, combined with 3 fixed-width PRAB columns, left ~50px for every remaining column (Author, Categories, Tags, Date all word-wrapping). Replaced with a balanced budget: title 22%, author 6%, categories 7%, tags 9%, date 8%, PRAB columns 85/85/50px, Peptide Topics 75px.
-
-## [0.13.6] - 2026-04-24
-
-### Fixed
-- Peptide Topics column still rendering vertically: WordPress posts table uses `table-layout: fixed` which ignores `min-width` entirely. Changed to explicit `width: 80px` which is respected under fixed-layout tables.
-
-## [0.13.5] - 2026-04-24
-
-### Fixed
-- Cost column in Posts list was always showing $0.00: a PHP `// phpcs:ignore` comment was embedded inside the SQL string literal, causing a MariaDB syntax error on every query. Moved comment above the `prepare()` call.
-- Peptide Topics column header in Posts list was being squeezed to near-zero width by the fixed-width PRAB columns. Added `min-width: 80px` to `.column-taxonomy-peptide_topic`.
-
-## [0.13.4] - 2026-04-24
-
-### Fixed
-- Model picker price column now consistently right-aligned. Root cause: price and description were siblings inside .ab-mp-row-meta, with description first and variable-length — this shifted price left/right per row. Fix: moved price to last position with flex-shrink: 0 so its right edge is always pinned to the row edge; capped description at max-width 200px with ellipsis; swapped column headers to match new DOM order.
-
-## [0.13.3] - 2026-04-24
-
-### Fixed
-- Price column header now right-aligned with `min-width: 90px` to match data cells — header and prices now track the same column edge.
-
-## [0.13.2] - 2026-04-24
-
-### Changed
-- Model picker: added sortable column headers (Model, Price, Context); clicking a header sorts the list ascending/descending; active column highlighted with sort arrow; sort preference persists while the picker is open.
-
 ## [0.12.3] — 2026-04-24
-## [0.13.1] - 2026-04-24
-
-### Fixed
-- Model picker price column now right-aligned with a minimum width so values like `$0.0006/image` and `$0.0800/image` stack cleanly instead of floating at uneven offsets.
-
 ## [0.13.0] - 2026-04-24
 
 ### Added

CONVENTIONS.md

@@ -150,38 +150,6 @@ interface PRAutoBlogger_Image_Provider_Interface {
 
 ---
 
-## How To: Tune the Image Composer (v0.17.0+)
-
-The deterministic composer (ARCHITECTURE.md #21) renders branded variants between
-provider bytes and sideload. Three rules when touching it:
-
-1. **Geometry lives in code, not settings.** All sizes/colors/opacities come from
-   `PRAutoBlogger_Image_Composer_Layout::defaults()` and can be overridden via the
-   `prautoblogger_image_compose_layout` filter:
-   ```php
-   add_filter( 'prautoblogger_image_compose_layout', function ( array $layout ): array {
-       $layout['featured']['mark_opacity'] = 0.40;
-       return $layout;
-   } );
-   ```
-   Promote a value to a settings field only on explicit CEO request.
-2. **Keep renderer classes WP-free.** `Image_Composer_Imagick`, `Image_Composer_Canvas`,
-   and `Image_Composer_Layout` must not call WordPress functions — they are exercised by
-   a standalone render harness (and the determinism test) without a WP bootstrap. Only
-   the orchestrator (`Image_Composer`) and the GD rung (`Image_Composer_Editor`) may
-   touch WP APIs.
-3. **Never fatal a publish.** Any new render path needs a try/catch that degrades to
-   pass-through and logs at most one WARNING per run (`warn_once()`). Capability checks
-   go through the cached probe (`prautoblogger_image_compose_capability` option +
-   same-named override filter) — never re-probe per image.
-
-Adding a new variant role: extend `Layout::defaults()` + the renderer, whitelist the
-role in `Image_Composer::configured_variants()` and in
-`Image_Attacher::ROLE_POST_META` (new `_prautoblogger_{role}_image_id` post meta keeps
-the uninstall prefix-sweep effective), then cover it in the unit ladder tests.
-
----
-
 ## How To: Add a New Admin Setting
 
 1. Define the option key in the settings array in `admin/class-admin-page.php` → `get_settings_fields()` method

assets/css/model-picker.css

@@ -142,7 +142,6 @@
 	color: var(--ab-text-muted, #64748b);
 	font-variant-numeric: tabular-nums;
 	white-space: nowrap;
-	min-width: 90px; text-align: right; flex-shrink: 0;
 }
 
 .ab-mp-ctx {
@@ -151,7 +150,6 @@
 	background: var(--ab-bg, #f8fafc);
 	padding: 2px 6px; border-radius: 4px;
 	white-space: nowrap; min-width: 36px; text-align: center;
-	max-width: 200px; overflow: hidden; text-overflow: ellipsis;
 }
 
 /* ── Footer ─────────────────────────────────────────────────────────── */
@@ -206,59 +204,3 @@
 	.ab-mp-row { padding: 10px 14px; }
 	.ab-mp-row-meta { gap: 8px; }
 }
-
-/* ── Column headers (sortable) ──────────────────────────────────────── */
-.ab-mp-col-headers {
-	display: flex; align-items: center; justify-content: space-between;
-	padding: 5px 20px;
-	border-bottom: 1px solid var(--ab-border, #e2e8f0);
-	background: var(--ab-bg, #f8fafc);
-	gap: 12px; /* must match .ab-mp-row gap */
-}
-
-.ab-mp-col-headers-meta {
-	display: flex; align-items: center;
-	gap: 16px; /* must match .ab-mp-row-meta gap */
-	flex-shrink: 0;
-}
-
-.ab-mp-col-header {
-	display: inline-flex; align-items: center;
-	font-size: 10px; font-weight: 700; text-transform: uppercase;
-	letter-spacing: 0.05em;
-	color: var(--ab-text-muted, #64748b);
-	cursor: pointer; user-select: none;
-	background: none; border: none; padding: 3px 0;
-	white-space: nowrap; line-height: 1.2;
-	transition: color 0.1s ease;
-}
-.ab-mp-col-header:hover {
-	color: var(--ab-text, #1e293b);
-}
-.ab-mp-col-header.ab-mp-col-active {
-	color: var(--ab-primary, #4f46e5);
-}
-
-/* "Model" header spans the left flex-1 area */
-.ab-mp-col-model {
-	flex: 1; min-width: 0;
-}
-
-/* "Price" header width matches .ab-mp-price */
-.ab-mp-col-price {
-	font-variant-numeric: tabular-nums;
-	min-width: 90px; justify-content: flex-end;
-}
-
-/* "Context" header width matches .ab-mp-ctx (min-width 36px + padding) */
-.ab-mp-col-ctx {
-	min-width: 48px; justify-content: center; text-align: center;
-}
-
-.ab-mp-sort-arrow {
-	font-size: 9px; opacity: 0.5;
-	transition: opacity 0.1s ease;
-}
-.ab-mp-col-header.ab-mp-col-active .ab-mp-sort-arrow {
-	opacity: 1;
-}

assets/fonts/OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

assets/js/model-picker.js

@@ -1,10 +1,9 @@
 /**
  * Model picker popup for PRAutoBlogger admin settings.
  *
- * Fetches the OpenRouter model registry via AJAX, then renders a searchable,
- * sortable popup overlay when the user clicks a model-select trigger button.
- * Columns: Model, Price (in / out per 1M tokens), Context window.
- * Each column header is clickable to sort ascending/descending.
+ * Fetches the OpenRouter model registry via AJAX, then renders a searchable
+ * popup overlay when the user clicks a model-select trigger button. Shows
+ * name, provider, input/output cost, and context window per model.
  *
  * @see admin/class-admin-page.php — Renders model_select fields and localizes config.
  * @see services/class-open-router-model-registry.php — Server-side registry source.
@@ -12,57 +11,54 @@
 (function ($) {
 	'use strict';
 
-	var config          = window.prautobloggerAdmin || {};
-	var cachedModels    = null;
+	var config = window.prautobloggerAdmin || {};
+	var cachedModels = null;
 	var fetchInProgress = null;
 
-	// Persists across open/close so the user's preferred sort is remembered.
-	var sortState = { col: 'name', dir: 'asc' };
-
 	/**
 	 * Fetch models from the server (cached after first call).
 	 *
 	 * @param {string} capability Filter capability (e.g. 'text→text').
 	 * @return {jQuery.Deferred} Resolves with model array.
 	 */
-	function fetchModels( capability ) {
+	function fetchModels(capability) {
 		// Image models are embedded in the page config — no AJAX needed.
-		if ( capability === 'image_generation' ) {
+		if (capability === 'image_generation') {
 			var imgModels = config.imageModels || [];
-			return $.Deferred().resolve( imgModels );
+			return $.Deferred().resolve(imgModels);
 		}
 
-		if ( cachedModels ) {
-			return $.Deferred().resolve( filterModels( cachedModels, capability ) );
+		if (cachedModels) {
+			return $.Deferred().resolve(filterModels(cachedModels, capability));
 		}
 
-		if ( fetchInProgress ) {
-			return fetchInProgress.then( function () {
-				return filterModels( cachedModels, capability );
-			} );
+		if (fetchInProgress) {
+			return fetchInProgress.then(function () {
+				return filterModels(cachedModels, capability);
+			});
 		}
 
-		fetchInProgress = $.ajax( {
-			url:    config.ajaxUrl,
+		fetchInProgress = $.ajax({
+			url: config.ajaxUrl,
 			method: 'POST',
 			data: {
 				action: 'prautoblogger_get_models',
-				nonce:  config.modelsNonce
+				nonce: config.modelsNonce
 			},
 			timeout: 15000
-		} ).then( function ( response ) {
+		}).then(function (response) {
 			fetchInProgress = null;
-			if ( response.success && Array.isArray( response.data ) ) {
+			if (response.success && Array.isArray(response.data)) {
 				cachedModels = response.data;
-				return filterModels( cachedModels, capability );
+				return filterModels(cachedModels, capability);
 			}
 			cachedModels = [];
 			return [];
 		}, function () {
 			fetchInProgress = null;
-			cachedModels    = [];
+			cachedModels = [];
 			return [];
-		} );
+		});
 
 		return fetchInProgress;
 	}
@@ -74,49 +70,11 @@
 	 * @param {string} capability Capability string to match.
 	 * @return {Array} Filtered models.
 	 */
-	function filterModels( models, capability ) {
-		if ( ! capability ) return models;
-		return models.filter( function ( m ) {
-			return m.capabilities && m.capabilities.indexOf( capability ) !== -1;
-		} );
-	}
-
-	/**
-	 * Sort a model array according to the current sortState.
-	 * Deprecated models always sink to the bottom regardless of column.
-	 *
-	 * @param {Array} arr Model array to sort (not mutated — returns a new array).
-	 * @return {Array} Sorted copy.
-	 */
-	function applySort( arr ) {
-		var col = sortState.col;
-		var dir = sortState.dir;
-
-		return arr.slice().sort( function ( a, b ) {
-			// Deprecated always last.
-			if ( a.deprecated !== b.deprecated ) {
-				return a.deprecated ? 1 : -1;
-			}
-
-			var valA, valB;
-
-			if ( col === 'price' ) {
-				// Image models use cost_per_image; text models use input_price_per_m.
-				valA = ( a.cost_per_image !== undefined ) ? a.cost_per_image : ( a.input_price_per_m || 0 );
-				valB = ( b.cost_per_image !== undefined ) ? b.cost_per_image : ( b.input_price_per_m || 0 );
-			} else if ( col === 'context' ) {
-				valA = a.context_length || 0;
-				valB = b.context_length || 0;
-			} else {
-				// Default: sort by model name.
-				valA = ( a.name || '' ).toLowerCase();
-				valB = ( b.name || '' ).toLowerCase();
-			}
-
-			if ( valA < valB ) return dir === 'asc' ? -1 : 1;
-			if ( valA > valB ) return dir === 'asc' ? 1  : -1;
-			return 0;
-		} );
+	function filterModels(models, capability) {
+		if (!capability) return models;
+		return models.filter(function (m) {
+			return m.capabilities && m.capabilities.indexOf(capability) !== -1;
+		});
 	}
 
 	/**
@@ -125,11 +83,11 @@
 	 * @param {number} price Price per 1M tokens.
 	 * @return {string} Formatted string like "$0.25" or "Free".
 	 */
-	function formatPrice( price ) {
-		if ( ! price || price <= 0 ) return 'Free';
-		if ( price < 0.01 )         return '$' + price.toFixed( 4 );
-		if ( price < 1 )            return '$' + price.toFixed( 2 );
-		return '$' + price.toFixed( 2 );
+	function formatPrice(price) {
+		if (!price || price <= 0) return 'Free';
+		if (price < 0.01) return '$' + price.toFixed(4);
+		if (price < 1) return '$' + price.toFixed(2);
+		return '$' + price.toFixed(2);
 	}
 
 	/**
@@ -138,10 +96,10 @@
 	 * @param {number} ctx Context length in tokens.
 	 * @return {string} Formatted string like "128K" or "1M".
 	 */
-	function formatContext( ctx ) {
-		if ( ! ctx )          return '—';
-		if ( ctx >= 1000000 ) return ( ctx / 1000000 ).toFixed( 0 ) + 'M';
-		if ( ctx >= 1000 )    return Math.round( ctx / 1000 ) + 'K';
+	function formatContext(ctx) {
+		if (!ctx) return '—';
+		if (ctx >= 1000000) return (ctx / 1000000).toFixed(0) + 'M';
+		if (ctx >= 1000) return Math.round(ctx / 1000) + 'K';
 		return ctx.toString();
 	}
 
@@ -151,47 +109,45 @@
 	 * @param {Object} model Normalized model record.
 	 * @return {string} HTML string.
 	 */
-	function renderModelRow( model ) {
-		var deprecated   = model.deprecated ? ' ab-mp-deprecated' : '';
+	function renderModelRow(model) {
+		var deprecated = model.deprecated ? ' ab-mp-deprecated' : '';
 		var isImageModel = model.cost_per_image !== undefined && model.cost_per_image > 0;
 		var priceHtml, priceTitle, metaRight;
 
-		if ( isImageModel ) {
-			priceHtml  = '$' + model.cost_per_image.toFixed( 4 ) + '/image';
+		if (isImageModel) {
+			priceHtml  = '$' + model.cost_per_image.toFixed(4) + '/image';
 			priceTitle = 'Cost per generated image';
-			metaRight  = model.description
-				? '<span class="ab-mp-ctx" title="Details">' + escHtml( model.description ) + '</span>'
-				: '';
+			metaRight  = model.description ? '<span class="ab-mp-ctx" title="Details">' + escHtml(model.description) + '</span>' : '';
 		} else {
-			priceHtml  = formatPrice( model.input_price_per_m ) + ' / ' + formatPrice( model.output_price_per_m );
+			priceHtml  = formatPrice(model.input_price_per_m) + ' / ' + formatPrice(model.output_price_per_m);
 			priceTitle = 'Input / Output per 1M tokens';
-			metaRight  = '<span class="ab-mp-ctx" title="Context window">' + formatContext( model.context_length ) + '</span>';
+			metaRight  = '<span class="ab-mp-ctx" title="Context window">' + formatContext(model.context_length) + '</span>';
 		}
 
 		return (
-			'<div class="ab-mp-row' + deprecated + '" data-model-id="' + escAttr( model.id ) + '">' +
+			'<div class="ab-mp-row' + deprecated + '" data-model-id="' + escAttr(model.id) + '">' +
 				'<div class="ab-mp-row-main">' +
-					'<span class="ab-mp-name">' + escHtml( model.name ) + '</span>' +
-					'<span class="ab-mp-provider">' + escHtml( model.provider ) + '</span>' +
-					( model.deprecated ? '<span class="ab-mp-dep-badge">deprecated</span>' : '' ) +
+					'<span class="ab-mp-name">' + escHtml(model.name) + '</span>' +
+					'<span class="ab-mp-provider">' + escHtml(model.provider) + '</span>' +
+					(model.deprecated ? '<span class="ab-mp-dep-badge">deprecated</span>' : '') +
 				'</div>' +
 				'<div class="ab-mp-row-meta">' +
-					metaRight +
 					'<span class="ab-mp-price" title="' + priceTitle + '">' + priceHtml + '</span>' +
+					metaRight +
 				'</div>' +
 			'</div>'
 		);
 	}
 
 	/** Minimal HTML escaping for display. */
-	function escHtml( str ) {
-		if ( ! str ) return '';
-		return str.replace( /&/g, '&amp;' ).replace( /</g, '&lt;' ).replace( />/g, '&gt;' );
+	function escHtml(str) {
+		if (!str) return '';
+		return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 	}
 
 	/** Escape a string for use in an HTML attribute. */
-	function escAttr( str ) {
-		return escHtml( str ).replace( /"/g, '&quot;' );
+	function escAttr(str) {
+		return escHtml(str).replace(/"/g, '&quot;');
 	}
 
 	/**
@@ -199,16 +155,16 @@
 	 *
 	 * @param {jQuery} $trigger The .ab-mp-trigger button that was clicked.
 	 */
-	function openPicker( $trigger ) {
-		var fieldId    = $trigger.data( 'field-id' );
-		var capability = $trigger.data( 'capability' ) || '';
+	function openPicker($trigger) {
+		var fieldId = $trigger.data('field-id');
+		var capability = $trigger.data('capability') || '';
 
+		// Build overlay + popup structure.
 		var isImageCap = capability === 'image_generation';
 		var priceLabel = isImageCap ? 'Cost per generated image' : 'Prices per 1M tokens (in / out)';
 
-		// ── Build overlay + popup ───────────────────────────────────────
-		var $overlay = $( '<div class="ab-mp-overlay"></div>' );
-		var $popup   = $(
+		var $overlay = $('<div class="ab-mp-overlay"></div>');
+		var $popup = $(
 			'<div class="ab-mp-popup">' +
 				'<div class="ab-mp-header">' +
 					'<span class="ab-mp-title">Select Model</span>' +
@@ -217,13 +173,6 @@
 				'<div class="ab-mp-search-wrap">' +
 					'<input type="text" class="ab-mp-search" placeholder="Search models…" autocomplete="off" />' +
 				'</div>' +
-				'<div class="ab-mp-col-headers">' +
-					'<button type="button" class="ab-mp-col-header ab-mp-col-model" data-col="name">Model <span class="ab-mp-sort-arrow"></span></button>' +
-					'<div class="ab-mp-col-headers-meta">' +
-						'<button type="button" class="ab-mp-col-header ab-mp-col-ctx" data-col="context">Context <span class="ab-mp-sort-arrow"></span></button>' +
-						'<button type="button" class="ab-mp-col-header ab-mp-col-price" data-col="price">Price (in / out) <span class="ab-mp-sort-arrow"></span></button>' +
-					'</div>' +
-				'</div>' +
 				'<div class="ab-mp-list"><div class="ab-mp-loading">Loading models…</div></div>' +
 				'<div class="ab-mp-footer">' +
 					'<span class="ab-mp-count"></span>' +
@@ -232,132 +181,105 @@
 			'</div>'
 		);
 
-		$overlay.append( $popup );
-		$( 'body' ).append( $overlay );
+		$overlay.append($popup);
+		$('body').append($overlay);
 
-		var $search      = $popup.find( '.ab-mp-search' );
-		var $list        = $popup.find( '.ab-mp-list' );
-		var $count       = $popup.find( '.ab-mp-count' );
-		var $colHeaders  = $popup.find( '.ab-mp-col-headers' );
-		var allModels    = [];
-		var currentQuery = '';
+		var $search = $popup.find('.ab-mp-search');
+		var $list = $popup.find('.ab-mp-list');
+		var $count = $popup.find('.ab-mp-count');
+		var allModels = [];
 
 		// Focus search after render.
-		setTimeout( function () { $search.focus(); }, 50 );
+		setTimeout(function () { $search.focus(); }, 50);
 
-		// ── Sort header indicators ──────────────────────────────────────
-		/** Update active-column highlight and sort arrow glyphs. */
-		function updateSortHeaders() {
-			$colHeaders.find( '.ab-mp-col-header' ).each( function () {
-				var col    = $( this ).data( 'col' );
-				var $arrow = $( this ).find( '.ab-mp-sort-arrow' );
-				if ( col === sortState.col ) {
-					$( this ).addClass( 'ab-mp-col-active' );
-					$arrow.text( sortState.dir === 'asc' ? ' ▲' : ' ▼' );
-				} else {
-					$( this ).removeClass( 'ab-mp-col-active' );
-					$arrow.text( ' ⇅' );
-				}
-			} );
-		}
+		// Fetch and render model list.
+		fetchModels(capability).then(function (models) {
+			allModels = models;
+			renderList(models, '');
+		});
 
-		// ── Render ──────────────────────────────────────────────────────
-		/** Render filtered + sorted model list. */
-		function renderList( models, query ) {
+		/** Render filtered model list. */
+		function renderList(models, query) {
 			var filtered = models;
-			if ( query ) {
+			if (query) {
 				var q = query.toLowerCase();
-				filtered = models.filter( function ( m ) {
-					return ( m.name     && m.name.toLowerCase().indexOf( q )     !== -1 ) ||
-					       ( m.id       && m.id.toLowerCase().indexOf( q )       !== -1 ) ||
-					       ( m.provider && m.provider.toLowerCase().indexOf( q ) !== -1 );
-				} );
+				filtered = models.filter(function (m) {
+					return (m.name && m.name.toLowerCase().indexOf(q) !== -1) ||
+						(m.id && m.id.toLowerCase().indexOf(q) !== -1) ||
+						(m.provider && m.provider.toLowerCase().indexOf(q) !== -1);
+				});
 			}
 
-			filtered = applySort( filtered );
+			// Sort: non-deprecated first, then by provider + name.
+			filtered.sort(function (a, b) {
+				if (a.deprecated !== b.deprecated) return a.deprecated ? 1 : -1;
+				var pa = (a.provider || '').toLowerCase();
+				var pb = (b.provider || '').toLowerCase();
+				if (pa !== pb) return pa < pb ? -1 : 1;
+				return (a.name || '').toLowerCase().localeCompare((b.name || '').toLowerCase());
+			});
 
-			if ( filtered.length === 0 ) {
-				$list.html( '<div class="ab-mp-empty">No models found.</div>' );
+			if (filtered.length === 0) {
+				$list.html('<div class="ab-mp-empty">No models found.</div>');
 			} else {
 				var html = '';
-				for ( var i = 0; i < filtered.length; i++ ) {
-					html += renderModelRow( filtered[ i ] );
+				for (var i = 0; i < filtered.length; i++) {
+					html += renderModelRow(filtered[i]);
 				}
-				$list.html( html );
+				$list.html(html);
 			}
-			$count.text( filtered.length + ' model' + ( filtered.length !== 1 ? 's' : '' ) );
-			updateSortHeaders();
+			$count.text(filtered.length + ' model' + (filtered.length !== 1 ? 's' : ''));
 		}
 
-		// Initial render after data loads.
-		fetchModels( capability ).then( function ( models ) {
-			allModels = models;
-			renderList( allModels, currentQuery );
-		} );
-
-		// ── Column header sort clicks ───────────────────────────────────
-		$colHeaders.on( 'click', '.ab-mp-col-header', function () {
-			var col = $( this ).data( 'col' );
-			if ( sortState.col === col ) {
-				sortState.dir = sortState.dir === 'asc' ? 'desc' : 'asc';
-			} else {
-				sortState.col = col;
-				sortState.dir = 'asc';
-			}
-			renderList( allModels, currentQuery );
-		} );
-
-		// ── Search (debounced) ──────────────────────────────────────────
+		// Search input handler (debounced).
 		var searchTimer = null;
-		$search.on( 'input', function () {
-			currentQuery = $( this ).val();
-			clearTimeout( searchTimer );
-			searchTimer = setTimeout( function () {
-				renderList( allModels, currentQuery );
-			}, 150 );
-		} );
+		$search.on('input', function () {
+			var q = $(this).val();
+			clearTimeout(searchTimer);
+			searchTimer = setTimeout(function () {
+				renderList(allModels, q);
+			}, 150);
+		});
 
-		// ── Select a model ──────────────────────────────────────────────
-		$list.on( 'click', '.ab-mp-row', function () {
-			var id    = $( this ).data( 'model-id' );
-			var model = null;
-			for ( var i = 0; i < allModels.length; i++ ) {
-				if ( allModels[ i ].id === id ) { model = allModels[ i ]; break; }
-			}
-			if ( ! model ) return;
+		// Select a model.
+		$list.on('click', '.ab-mp-row', function () {
+			var id = $(this).data('model-id');
+			var model = allModels.find(function (m) { return m.id === id; });
+			if (!model) return;
 
-			$( '#' + fieldId ).val( model.id );
-			$trigger.find( '.ab-mp-display-name' ).text( model.name || model.id );
+			// Update hidden input + display.
+			$('#' + fieldId).val(model.id);
+			$trigger.find('.ab-mp-display-name').text(model.name || model.id);
 
 			var isImageModel = model.cost_per_image !== undefined && model.cost_per_image > 0;
-			var priceText    = isImageModel
-				? '$' + model.cost_per_image.toFixed( 4 ) + '/image'
-				: formatPrice( model.input_price_per_m ) + ' / ' + formatPrice( model.output_price_per_m );
-			$trigger.find( '.ab-mp-display-price' ).text( priceText );
+			var priceText = isImageModel
+				? '$' + model.cost_per_image.toFixed(4) + '/image'
+				: formatPrice(model.input_price_per_m) + ' / ' + formatPrice(model.output_price_per_m);
+			$trigger.find('.ab-mp-display-price').text(priceText);
 			closePicker();
-		} );
+		});
 
-		// ── Close ───────────────────────────────────────────────────────
+		// Close handlers.
 		function closePicker() {
 			$overlay.remove();
 		}
 
-		$popup.find( '.ab-mp-close' ).on( 'click', closePicker );
-		$overlay.on( 'click', function ( e ) {
-			if ( $( e.target ).is( '.ab-mp-overlay' ) ) closePicker();
-		} );
-		$( document ).on( 'keydown.abModelPicker', function ( e ) {
-			if ( e.key === 'Escape' ) {
+		$popup.find('.ab-mp-close').on('click', closePicker);
+		$overlay.on('click', function (e) {
+			if ($(e.target).is('.ab-mp-overlay')) closePicker();
+		});
+		$(document).on('keydown.abModelPicker', function (e) {
+			if (e.key === 'Escape') {
 				closePicker();
-				$( document ).off( 'keydown.abModelPicker' );
+				$(document).off('keydown.abModelPicker');
 			}
-		} );
+		});
 	}
 
 	// Bind click on all model picker triggers.
-	$( document ).on( 'click', '.ab-mp-trigger', function ( e ) {
+	$(document).on('click', '.ab-mp-trigger', function (e) {
 		e.preventDefault();
-		openPicker( $( this ) );
-	} );
+		openPicker($(this));
+	});
 
-} )( jQuery );
+})(jQuery);

includes/admin/class-admin-page.php

@@ -330,11 +330,6 @@ class PRAutoBlogger_Admin_Page {
 		if ( 'prautoblogger_image_model' === $option_name ) {
 			return $this->sanitize_image_model( (string) $value );
 		}
-		if ( 'prautoblogger_image_style_template' === $option_name ) {
-			// Multi-line template: validation + textarea-safe sanitisation
-			// (incl. the single-token check, brief A5) lives in the filler.
-			return PRAutoBlogger_Image_Template_Filler::sanitize_for_save( (string) $value );
-		}
 		return sanitize_text_field( (string) $value );
 	}
 

includes/admin/class-image-model-registry.php

@@ -6,25 +6,20 @@ declare(strict_types=1);
  *
  * Static registry of available image generation models.
  *
- * What: Returns a merged list of Runware models (from live catalog sync) and
- *       OpenRouter models (static list). No API discovery for OpenRouter — updated
- *       manually when new models are available.
- *       As of 2026-04-26, registry includes 15 Runware models (live) + 6 OpenRouter
- *       models (static), ordered cheapest-to-most-expensive within each provider.
+ * What: Returns a hardcoded list of image models for the admin model picker.
+ *       No API discovery — updated manually when providers add/remove models.
  * Who calls it: PRAutoBlogger_Admin_Page (model picker UI + save-time provider
  *               derivation) and PRAutoBlogger_Image_Pipeline (provider lookup).
- * Dependencies: PRAutoBlogger_Runware_Model_Catalog (live Runware models),
- *               hardcoded fallback lists for resilience.
+ * Dependencies: None.
  *
  * @see admin/class-settings-fields-extended.php — Image settings reference this registry.
  * @see core/class-image-pipeline.php            — Derives provider from picked model.
  * @see providers/class-runware-image-provider.php — Runware FLUX backend.
- * @see providers/class-runware-model-catalog.php — Live model sync and caching.
  */
 class PRAutoBlogger_Image_Model_Registry {
 
 	/**
-	 * Get all available image generation models (Runware live + OpenRouter static).
+	 * Get all available image generation models.
 	 *
 	 * Each entry contains:
 	 * - id:             Model identifier used in API calls.
@@ -40,10 +35,64 @@ class PRAutoBlogger_Image_Model_Registry {
 	 * @return array<int, array<string, mixed>>
 	 */
 	public static function get_models(): array {
-		$catalog = new PRAutoBlogger_Runware_Model_Catalog();
-		$runware_models = $catalog->get_models();
-		$openrouter_models = self::get_openrouter_models();
-		return array_merge( $runware_models, $openrouter_models );
+		return array(
+			array(
+				'id'             => 'runware:100@1',
+				'name'           => 'FLUX.1 schnell (Runware)',
+				'provider'       => 'runware',
+				'cost_per_image' => 0.0006,
+				'capabilities'   => array( 'image_generation' ),
+				'description'    => __( 'Default. Fast, very cheap, comic-friendly fidelity.', 'prautoblogger' ),
+			),
+			array(
+				'id'             => 'runware:101@1',
+				'name'           => 'FLUX.1 dev (Runware)',
+				'provider'       => 'runware',
+				'cost_per_image' => 0.02,
+				'capabilities'   => array( 'image_generation' ),
+				'description'    => __( 'Higher fidelity FLUX. ~30x schnell cost.', 'prautoblogger' ),
+			),
+			array(
+				'id'             => 'google/gemini-2.5-flash-image',
+				'name'           => 'Gemini 2.5 Flash Image (Nano Banana)',
+				'provider'       => 'openrouter',
+				'cost_per_image' => 0.005,
+				'capabilities'   => array( 'image_generation' ),
+				'description'    => __( 'Mid-tier quality, proven.', 'prautoblogger' ),
+			),
+			array(
+				'id'             => 'google/gemini-3.1-flash-image-preview',
+				'name'           => 'Gemini 3.1 Flash Image (Nano Banana 2)',
+				'provider'       => 'openrouter',
+				'cost_per_image' => 0.008,
+				'capabilities'   => array( 'image_generation' ),
+				'description'    => __( 'Latest Google. Better quality.', 'prautoblogger' ),
+			),
+			array(
+				'id'             => 'google/gemini-3-pro-image-preview',
+				'name'           => 'Gemini 3 Pro Image (Nano Banana Pro)',
+				'provider'       => 'openrouter',
+				'cost_per_image' => 0.03,
+				'capabilities'   => array( 'image_generation' ),
+				'description'    => __( 'Highest quality Google. Premium.', 'prautoblogger' ),
+			),
+			array(
+				'id'             => 'openai/gpt-5-image-mini',
+				'name'           => 'GPT-5 Image Mini',
+				'provider'       => 'openrouter',
+				'cost_per_image' => 0.02,
+				'capabilities'   => array( 'image_generation' ),
+				'description'    => __( 'OpenAI budget image model.', 'prautoblogger' ),
+			),
+			array(
+				'id'             => 'openai/gpt-5-image',
+				'name'           => 'GPT-5 Image',
+				'provider'       => 'openrouter',
+				'cost_per_image' => 0.08,
+				'capabilities'   => array( 'image_generation' ),
+				'description'    => __( 'OpenAI premium. Photorealistic.', 'prautoblogger' ),
+			),
+		);
 	}
 
 	/**
@@ -61,204 +110,4 @@ class PRAutoBlogger_Image_Model_Registry {
 		}
 		return '';
 	}
-
-	/**
-	 * Hardcoded Runware model list used as fallback when the live catalog
-	 * sync fails or API is unreachable. Kept in sync with actual Runware
-	 * pricing page (runware.ai/pricing). This is the source of truth for
-	 * pricing data when the Runware API doesn't expose cost information.
-	 *
-	 * Last verified: 2026-04-26. To update: check runware.ai/pricing for new
-	 * text-to-image models and their costs.
-	 *
-	 * @return array<int, array<string, mixed>>
-	 */
-	public static function get_runware_fallback_models(): array {
-		return array(
-			array(
-				'id'             => 'runware:100@1',
-				'name'           => 'FLUX.1 schnell (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0006,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Default. Fast, very cheap, comic-friendly fidelity.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:twinflow-z-image-turbo@0',
-				'name'           => 'TwinFlow Z-Image-Turbo (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0006,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Fast text-to-image, same cost as schnell.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:400@2',
-				'name'           => 'FLUX.2 klein 9B (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.00078,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'FLUX.2 compact 9B. Stronger than schnell at similar cost.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:400@4',
-				'name'           => 'FLUX.2 klein 4B (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0006,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'FLUX.2 compact 4B. Newer architecture at schnell price.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:5@1',
-				'name'           => 'Stable Diffusion 3 (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0013,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Stable Diffusion 3. Sharp text, complex scenes.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:z-image@turbo',
-				'name'           => 'Z-Image Turbo (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0013,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Fast photorealistic generation.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:101@1',
-				'name'           => 'FLUX.1 dev (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.02,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Higher fidelity FLUX.1. ~30x schnell cost.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:97@3',
-				'name'           => 'HiDream-I1 Fast (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0038,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'HiDream-I1 Fast. Low latency, 17B quality.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:97@2',
-				'name'           => 'HiDream-I1 Dev (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0045,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'HiDream-I1 Dev. Strong prompt alignment.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:z-image@0',
-				'name'           => 'Z-Image (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0045,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'High-quality Z-Image foundation model.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:400@1',
-				'name'           => 'FLUX.2 dev (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0051,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'FLUX.2 dev. Controllable open text-to-image. From $0.0051.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:108@1',
-				'name'           => 'Qwen-Image (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0058,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Alibaba Qwen-Image. Strong text rendering in generated images.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:97@1',
-				'name'           => 'HiDream-I1 Full (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.009,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'HiDream-I1 Full. 17B high-fidelity, LoRA support.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:107@1',
-				'name'           => 'FLUX.1 Krea dev (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0098,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'FLUX.1 Krea Dev. Photorealistic open-weight generation.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'runware:glm-image@0',
-				'name'           => 'GLM-Image (Runware)',
-				'provider'       => 'runware',
-				'cost_per_image' => 0.0225,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'GLM-Image. Hybrid autoregressive+diffusion, excellent text rendering.', 'prautoblogger' ),
-			),
-		);
-	}
-
-	/**
-	 * Hardcoded OpenRouter image model list. Left static for now because
-	 * OpenRouter's catalog is large (hundreds of models) with noisy filtering.
-	 * Future iteration will add smart filtering strategy (output_modalities,
-	 * pricing, rate limits).
-	 *
-	 * Last verified: 2026-04-26. To update: check openrouter.ai/api/v1/models
-	 * filtering to output_modalities containing 'image'.
-	 *
-	 * @return array<int, array<string, mixed>>
-	 */
-	private static function get_openrouter_models(): array {
-		return array(
-			array(
-				'id'             => 'google/gemini-2.5-flash-image',
-				'name'           => 'Gemini 2.5 Flash Image (OpenRouter)',
-				'provider'       => 'openrouter',
-				'cost_per_image' => 0.005,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Mid-tier quality, proven.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'google/gemini-3.1-flash-image-preview',
-				'name'           => 'Gemini 3.1 Flash Image (OpenRouter)',
-				'provider'       => 'openrouter',
-				'cost_per_image' => 0.008,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Latest Google Flash image. Better quality.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'openai/gpt-5-image-mini',
-				'name'           => 'GPT-5 Image Mini (OpenRouter)',
-				'provider'       => 'openrouter',
-				'cost_per_image' => 0.02,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'OpenAI budget image model.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'openai/gpt-5.4-image-2',
-				'name'           => 'GPT-5.4 Image 2 (OpenRouter)',
-				'provider'       => 'openrouter',
-				'cost_per_image' => 0.02,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'OpenAI GPT-5.4 image generation.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'google/gemini-3-pro-image-preview',
-				'name'           => 'Gemini 3 Pro Image (OpenRouter)',
-				'provider'       => 'openrouter',
-				'cost_per_image' => 0.03,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'Highest quality Google image. Premium.', 'prautoblogger' ),
-			),
-			array(
-				'id'             => 'openai/gpt-5-image',
-				'name'           => 'GPT-5 Image (OpenRouter)',
-				'provider'       => 'openrouter',
-				'cost_per_image' => 0.08,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => __( 'OpenAI premium. Photorealistic.', 'prautoblogger' ),
-			),
-		);
-	}
 }

includes/admin/class-post-list-columns.php

@@ -111,15 +111,10 @@ class PRAutoBlogger_Post_List_Columns {
 			return;
 		}
 		echo '<style>'
-			. '.wp-list-table .column-title{width:22%}'
-			. '.column-author{width:6%}'
-			. '.column-categories{width:7%}'
-			. '.column-tags{width:9%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}'
-			. '.column-date{width:8%}'
-			. '.column-prab_writing_model{width:85px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}'
-			. '.column-prab_image_model{width:85px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}'
-			. '.column-prab_cost{width:50px;white-space:nowrap;overflow:visible}'
-			. '.column-taxonomy-peptide_topic{width:75px}'
+			. '.wp-list-table .column-title{width:35%;word-wrap:break-word;overflow-wrap:break-word}'
+			. '.column-prab_writing_model{width:100px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}'
+			. '.column-prab_image_model{width:100px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}'
+			. '.column-prab_cost{width:55px;white-space:nowrap;overflow:visible}'
 			. '.prab-cost-wrap{position:relative;display:inline-block}'
 			. '.prab-cost-trigger{font-size:12px;color:#2271b1;text-decoration:underline;cursor:pointer}'
 			. '.prab-cost-popover{display:none;position:absolute;right:0;top:100%;z-index:9999;'
@@ -187,9 +182,8 @@ class PRAutoBlogger_Post_List_Columns {
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 		$rows = $wpdb->get_results(
 			$wpdb->prepare(
-				// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-				"SELECT stage, model, prompt_tokens, completion_tokens, estimated_cost
-					FROM {$table} WHERE post_id = %d ORDER BY id ASC",
+				"SELECT stage, model, prompt_tokens, completion_tokens, estimated_cost  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+				FROM {$table} WHERE post_id = %d ORDER BY id ASC",
 				$post_id
 			),
 			ARRAY_A

includes/admin/class-settings-fields-extended.php

@@ -8,7 +8,7 @@ declare(strict_types=1);
  *
  * What: Declarative field definitions for operational settings sections.
  * Who calls it: PRAutoBlogger_Settings_Fields::get_fields() merges these in.
- * Dependencies: PRAUTOBLOGGER_DEFAULT_IMAGE_MODEL, PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE constants,
+ * Dependencies: PRAUTOBLOGGER_DEFAULT_IMAGE_MODEL, PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_SUFFIX constants,
  *               PRAutoBlogger_Article_Typography (font choices), PRAutoBlogger_Image_Model_Registry.
  *
  * @see admin/class-settings-fields.php       — Core fields and sections; calls get_extended_fields().
@@ -235,12 +235,12 @@ class PRAutoBlogger_Settings_Fields_Extended {
 				'icon'        => '🔑',
 			),
 			array(
-				'id'          => 'prautoblogger_image_style_template',
-				'label'       => __( 'Style Template', 'prautoblogger' ),
+				'id'          => 'prautoblogger_image_style_suffix',
+				'label'       => __( 'Style Suffix', 'prautoblogger' ),
 				'type'        => 'textarea',
 				'section'     => 'prautoblogger_images',
-				'default'     => PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE,
-				'description' => __( 'The full image prompt template. Must contain exactly one {{ topic_summary }} token, which is filled with a 1-2 sentence topic/mechanism summary per article. The rest is brand-locked editorial style. Replaces the old Style Suffix (now deprecated). Changing mid-run causes visible style drift.', 'prautoblogger' ),
+				'default'     => PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_SUFFIX,
+				'description' => __( 'Appended to every image prompt. Controls visual look. Changing mid-run causes visible style drift.', 'prautoblogger' ),
 			),
 			array(
 				'id'          => 'prautoblogger_image_prompt_instructions',
@@ -248,7 +248,7 @@ class PRAutoBlogger_Settings_Fields_Extended {
 				'type'        => 'textarea',
 				'section'     => 'prautoblogger_images',
 				'default'     => PRAutoBlogger_Image_Prompt_Builder::REWRITER_SYSTEM_PROMPT,
-				'description' => __( 'System prompt given to the rewriter LLM that turns each article into a SCENE (a 1-2 sentence editorial topic/mechanism summary, substituted into the Style Template) plus a CAPTION (HTML text shown below the image). Changing this reshapes the look of all future images. Leave blank to use the default.', 'prautoblogger' ),
+				'description' => __( 'System prompt given to the rewriter LLM that turns each article into a SCENE + CAPTION for the image generator. Changing this reshapes the look of all future images. Leave blank to use the default.', 'prautoblogger' ),
 			),
 			array(
 				'id'          => 'prautoblogger_image_nsfw_retry',
@@ -258,37 +258,6 @@ class PRAutoBlogger_Settings_Fields_Extended {
 				'default'     => '1',
 				'description' => __( 'When the provider rejects an image prompt as NSFW, retry once with a generic fallback scene built from the article title. Disable to fail fast if the filter gets trigger-happy.', 'prautoblogger' ),
 			),
-			array(
-				'id'          => 'prautoblogger_image_compose_enabled',
-				'label'       => __( 'Compose Branded Variants', 'prautoblogger' ),
-				'type'        => 'toggle',
-				'section'     => 'prautoblogger_images',
-				'default'     => '1',
-				'description' => __( 'Render branded social variants (teal band, logo, baked caption) from each generated image via the local deterministic composer. Auto-degrades to plain resizing or pass-through if the server lacks an image library — publishing is never blocked.', 'prautoblogger' ),
-			),
-			array(
-				'id'          => 'prautoblogger_image_compose_variants',
-				'label'       => __( 'Composed Variant Set', 'prautoblogger' ),
-				'type'        => 'text',
-				'section'     => 'prautoblogger_images',
-				'default'     => 'og,square',
-				'description' => __( 'Comma-separated variants to render for Image A. Supported: og (1200×630 social share), square (1080×1080 card). Unknown values are ignored.', 'prautoblogger' ),
-			),
-			array(
-				'id'          => 'prautoblogger_image_featured_mark_enabled',
-				'label'       => __( 'Featured Image Corner Mark', 'prautoblogger' ),
-				'type'        => 'toggle',
-				'section'     => 'prautoblogger_images',
-				'default'     => '1',
-				'description' => __( 'Overlay a small semi-transparent Peptide Repo mark in the bottom-right corner of featured images, so scraped or re-shared images carry attribution.', 'prautoblogger' ),
-			),
-			array(
-				'id'          => 'prautoblogger_runware_model_catalog',
-				'label'       => __( 'Runware Model Catalog', 'prautoblogger' ),
-				'type'        => 'runware_catalog_sync',
-				'section'     => 'prautoblogger_images',
-				'description' => __( 'Live model catalog sync status and on-demand refresh.', 'prautoblogger' ),
-			),
 		);
 	}
 }

includes/class-activator.php

@@ -130,11 +130,6 @@ class PRAutoBlogger_Activator {
 				wp_schedule_event( $tomorrow, 'daily', 'prautoblogger_reap_orphan_research_rows' );
 			}
 		}
-
-		// v0.15.0: daily Runware model catalog sync.
-		if ( ! wp_next_scheduled( 'prautoblogger_sync_runware_models' ) ) {
-			wp_schedule_event( time() + HOUR_IN_SECONDS, 'daily', 'prautoblogger_sync_runware_models' );
-		}
 	}
 
 	/**

includes/class-ajax-handlers.php

@@ -151,53 +151,6 @@ class PRAutoBlogger_Ajax_Handlers {
 		wp_send_json_success( $results );
 	}
 
-	/**
-	 * AJAX handler: sync Runware model catalog on demand.
-	 *
-	 * Nonce-protected and requires manage_options capability.
-	 * Returns the updated cache timestamp and model count.
-	 *
-	 * Side effects: makes HTTP request to Runware API, writes WP options.
-	 */
-	public function on_ajax_sync_runware_models_now(): void {
-		check_ajax_referer( 'prautoblogger_sync_runware_models_now', 'nonce' );
-
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( array( 'message' => __( 'Insufficient permissions.', 'prautoblogger' ) ), 403 );
-			return;
-		}
-
-		try {
-			$catalog = new PRAutoBlogger_Runware_Model_Catalog();
-			$success = $catalog->sync();
-
-			if ( ! $success ) {
-				wp_send_json_error( array( 'message' => __( 'Catalog sync failed. Check logs for details.', 'prautoblogger' ) ) );
-				return;
-			}
-
-			$models = $catalog->get_models();
-			$synced_at = $catalog->get_last_synced_at();
-			$synced_at_str = $synced_at
-				? wp_date( __( 'Y-m-d H:i:s', 'prautoblogger' ), $synced_at )
-				: __( 'Never', 'prautoblogger' );
-
-			wp_send_json_success(
-				array(
-					'message'   => __( 'Runware model catalog synced successfully.', 'prautoblogger' ),
-					'model_count' => count( $models ),
-					'synced_at' => $synced_at_str,
-				)
-			);
-		} catch ( \Throwable $e ) {
-			PRAutoBlogger_Logger::instance()->error(
-				sprintf( 'AJAX sync Runware models failed: %s (%s)', $e->getMessage(), get_class( $e ) ),
-				'runware-catalog'
-			);
-			wp_send_json_error( array( 'message' => $e->getMessage() ) );
-		}
-	}
-
 	/**
 	 * Get the shared model registry instance.
 	 *

includes/class-deactivator.php

@@ -39,7 +39,6 @@ class PRAutoBlogger_Deactivator {
 			'prautoblogger_daily_generation',
 			'prautoblogger_collect_metrics',
 			'prautoblogger_reap_orphan_research_rows',
-			'prautoblogger_sync_runware_models',
 		);
 
 		foreach ( $hooks as $hook ) {

includes/class-prautoblogger.php

@@ -116,8 +116,6 @@ class PRAutoBlogger {
 
 		$registry = $this->executor->get_model_registry();
 		add_action( 'prautoblogger_refresh_model_registry', array( $registry, 'refresh' ) );
-		// v0.15.0: daily Runware model catalog sync to keep the live model list fresh.
-		add_action( 'prautoblogger_sync_runware_models', array( new PRAutoBlogger_Runware_Model_Catalog(), 'sync' ) );
 
 		// Opik observability: async trace/span dispatch.
 		add_action(
@@ -181,7 +179,6 @@ class PRAutoBlogger {
 		add_action( 'wp_ajax_prautoblogger_test_connection', array( $this->ajax_handlers, 'on_ajax_test_connection' ) );
 		add_action( 'wp_ajax_prautoblogger_get_models', array( $this->ajax_handlers, 'on_ajax_get_models' ) );
 		add_action( 'wp_ajax_prautoblogger_refresh_models', array( new PRAutoBlogger_Model_Registry_Refresh( $this->ajax_handlers->get_registry() ), 'handle' ) );
-		add_action( 'wp_ajax_prautoblogger_sync_runware_models_now', array( $this->ajax_handlers, 'on_ajax_sync_runware_models_now' ) );
 
 		$review_queue = new PRAutoBlogger_Review_Queue();
 		add_action( 'wp_ajax_prautoblogger_approve_post', array( $review_queue, 'on_ajax_approve_post' ) );
@@ -267,24 +264,6 @@ class PRAutoBlogger {
 			update_option( 'prautoblogger_migrated_style_suffix_v4', '1' );
 		}
 
-		// One-time migration (v0.16.0): editorial pivot. The comic Style Suffix
-		// is replaced by the editorial Style Template. Mirror the old suffix
-		// value into a deprecated-keyed option for one version cycle (so a
-		// customised value is recoverable / auditable) and seed the new
-		// template with its editorial default. The old option is intentionally
-		// NOT deleted this cycle. See docs/proposals/2026-05-29-image-pipeline-in-plugin-brief.md §8 Commit 1.
-		if ( ! get_option( 'prautoblogger_migrated_style_template_v0160' ) ) {
-			$old_suffix = get_option( 'prautoblogger_image_style_suffix', '' );
-			if ( '' !== $old_suffix && false === get_option( 'prautoblogger_image_style_suffix_deprecated', false ) ) {
-				update_option( 'prautoblogger_image_style_suffix_deprecated', $old_suffix );
-			}
-			// Only seed the new template if the admin has not already set one.
-			if ( '' === (string) get_option( 'prautoblogger_image_style_template', '' ) ) {
-				update_option( 'prautoblogger_image_style_template', PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE );
-			}
-			update_option( 'prautoblogger_migrated_style_template_v0160', '1' );
-		}
-
 		// v0.9.0 — Runware as default image model. v0.10.0 — remove CF Workers AI.
 		PRAutoBlogger_Activator::migrate_default_image_v090();
 		PRAutoBlogger_Migrate_Remove_Cloudflare_V0100::run();

includes/core/class-cost-tracker.php

@@ -235,19 +235,19 @@ class PRAutoBlogger_Cost_Tracker {
 			);
 		}
 
-		$cutoff_datetime = gmdate( 'Y-m-d H:i:s', time() - ( $days * DAY_IN_SECONDS ) );
-		$stage_list      = implode( ',', array_map( array( $wpdb, 'prepare' ), array_fill( 0, count( $stages ), '%s' ), $stages ) );
-		$table_name      = $wpdb->prefix . 'prautoblogger_generation_log';
+		$cutoff_time   = time() - ( $days * DAY_IN_SECONDS );
+		$stage_list    = implode( ',', array_map( array( $wpdb, 'prepare' ), array_fill( 0, count( $stages ), '%s' ), $stages ) );
+		$table_name    = $wpdb->prefix . 'prautoblogger_generation_log';
 
 		// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Prepared stage list via array_map + prepare
 		$query = $wpdb->prepare(
-			"SELECT AVG(prompt_tokens) as avg_prompt,
-                    AVG(completion_tokens) as avg_completion,
+			"SELECT AVG(input_tokens) as avg_input,
+                    AVG(output_tokens) as avg_output,
                     COUNT(*) as sample_count
              FROM $table_name
              WHERE stage IN ( $stage_list )
-             AND created_at >= %s",
-			$cutoff_datetime
+             AND timestamp >= %d",
+			$cutoff_time
 		);
 
 		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- phpcs pragma above
@@ -262,8 +262,8 @@ class PRAutoBlogger_Cost_Tracker {
 		}
 
 		return array(
-			'avg_prompt_tokens'      => (float) ( $result['avg_prompt'] ?? 0 ),
-			'avg_completion_tokens'  => (float) ( $result['avg_completion'] ?? 0 ),
+			'avg_prompt_tokens'      => (float) ( $result['avg_input'] ?? 0 ),
+			'avg_completion_tokens'  => (float) ( $result['avg_output'] ?? 0 ),
 			'sample_size'            => (int) ( $result['sample_count'] ?? 0 ),
 		);
 	}

includes/core/class-image-attacher.php

@@ -1,169 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Persists generated images and composed variants for a post.
- *
- * Owns the media-library side of the image pipeline: sideloading the primary
- * (featured) image with cost logging, sideloading composed OG/square variants
- * with role/base meta-linking (no cost-tracker entries — composition is $0
- * local CPU), and prepending the editable HTML caption to the post. Extracted
- * from PRAutoBlogger_Image_Pipeline in v0.17.0 for 300-line compliance.
- *
- * Triggered by: PRAutoBlogger_Image_Pipeline during content generation run.
- * Dependencies: PRAutoBlogger_Image_Media_Sideloader, PRAutoBlogger_Cost_Tracker,
- *               PRAutoBlogger_Logger.
- *
- * @see core/class-image-pipeline.php         — Sole caller.
- * @see core/class-image-composer.php         — Produces the variants this persists.
- * @see core/class-image-media-sideloader.php — Media library import.
- */
-class PRAutoBlogger_Image_Attacher {
-
-	/** Post meta key per composed variant role. */
-	private const ROLE_POST_META = array(
-		'og'     => '_prautoblogger_og_image_id',
-		'square' => '_prautoblogger_square_image_id',
-	);
-
-	/** @var PRAutoBlogger_Image_Media_Sideloader Imports bytes into the media library. */
-	private PRAutoBlogger_Image_Media_Sideloader $sideloader;
-
-	/** @var PRAutoBlogger_Cost_Tracker Logs primary image generation spend. */
-	private PRAutoBlogger_Cost_Tracker $cost_tracker;
-
-	/**
-	 * Construct with the pipeline's sideloader + cost tracker.
-	 *
-	 * @param PRAutoBlogger_Image_Media_Sideloader $sideloader   Media importer.
-	 * @param PRAutoBlogger_Cost_Tracker           $cost_tracker Spend logger.
-	 */
-	public function __construct( PRAutoBlogger_Image_Media_Sideloader $sideloader, PRAutoBlogger_Cost_Tracker $cost_tracker ) {
-		$this->sideloader   = $sideloader;
-		$this->cost_tracker = $cost_tracker;
-	}
-
-	/**
-	 * Sideload a primary image into the media library and log its cost.
-	 *
-	 * Side effects: media import, cost-tracker row, info log.
-	 *
-	 * @param array  $image_data Provider result with bytes, model, cost_usd.
-	 * @param int    $post_id    Post ID.
-	 * @param string $slot       Cost-tracking slot ('image_a' or 'image_b').
-	 * @param string $label      Human-readable label for logs.
-	 * @param string $alt_text   Alt text — the editorial caption (v0.17.0 bug
-	 *                           fix: previously the model name leaked here).
-	 *
-	 * @return int|\WP_Error Attachment ID on success.
-	 */
-	public function sideload_and_log( array $image_data, int $post_id, string $slot, string $label, string $alt_text = '' ) {
-		$attachment_id = $this->sideloader->sideload_image( $image_data, $post_id, $alt_text );
-
-		if ( is_wp_error( $attachment_id ) ) {
-			return $attachment_id;
-		}
-
-		$this->cost_tracker->log_image_generation(
-			$image_data['cost_usd'],
-			$image_data['model'] ?? 'unknown',
-			$post_id,
-			$slot
-		);
-
-		PRAutoBlogger_Logger::instance()->info(
-			sprintf( '%s for post %d (att %d, $%.4f)', $label, $post_id, $attachment_id, $image_data['cost_usd'] ),
-			'image_pipeline'
-		);
-
-		return $attachment_id;
-	}
-
-	/**
-	 * Sideload composed variants and meta-link them to post + base image.
-	 *
-	 * Each variant attachment gets `_prautoblogger_image_role` and
-	 * `_prautoblogger_base_attachment_id`; the post gets the role-specific
-	 * ID meta (see ROLE_POST_META). No cost-tracker entries — composition is
-	 * a $0 local stage. A failed variant sideload logs a WARNING and is
-	 * skipped; it never blocks the publish.
-	 *
-	 * @param array  $variants           Composed variants (role 'og'/'square' only are persisted).
-	 * @param int    $post_id            Post ID.
-	 * @param int    $base_attachment_id Featured attachment the variants derive from.
-	 * @param string $caption            Editorial caption (used as variant alt text).
-	 * @param string $model              Generation model recorded on the variant attachment.
-	 */
-	public function attach_variants( array $variants, int $post_id, int $base_attachment_id, string $caption, string $model ): void {
-		foreach ( $variants as $variant ) {
-			$role = (string) ( $variant['role'] ?? '' );
-			if ( ! isset( self::ROLE_POST_META[ $role ] ) ) {
-				continue;
-			}
-
-			$attachment_id = $this->sideloader->sideload_image(
-				array(
-					'bytes'      => (string) ( $variant['bytes'] ?? '' ),
-					'mime_type'  => (string) ( $variant['mime_type'] ?? 'image/png' ),
-					'width'      => (int) ( $variant['width'] ?? 0 ),
-					'height'     => (int) ( $variant['height'] ?? 0 ),
-					'model'      => $model,
-					'cost_usd'   => 0.0,
-					'latency_ms' => 0,
-				),
-				$post_id,
-				$caption,
-				$role
-			);
-
-			if ( is_wp_error( $attachment_id ) ) {
-				PRAutoBlogger_Logger::instance()->warning(
-					sprintf( 'Failed to sideload %s variant for post %d: %s', $role, $post_id, $attachment_id->get_error_message() ),
-					'image_composer'
-				);
-				continue;
-			}
-
-			update_post_meta( $attachment_id, '_prautoblogger_image_role', $role );
-			update_post_meta( $attachment_id, '_prautoblogger_base_attachment_id', $base_attachment_id );
-			update_post_meta( $post_id, self::ROLE_POST_META[ $role ], $attachment_id );
-
-			PRAutoBlogger_Logger::instance()->info(
-				sprintf( '%s variant for post %d (att %d, %dx%d)', $role, $post_id, $attachment_id, (int) $variant['width'], (int) $variant['height'] ),
-				'image_composer'
-			);
-		}
-	}
-
-	/**
-	 * Prepend the editorial caption as styled text at the top of the post.
-	 *
-	 * Only inserts the caption — NOT the image. The theme already displays
-	 * the featured image, so embedding it again would cause a duplicate.
-	 *
-	 * @param int    $post_id       Post ID.
-	 * @param int    $attachment_id Featured image attachment ID (unused; kept for parity with meta storage).
-	 * @param string $caption       Caption text shown below the image.
-	 */
-	public function prepend_caption_to_post( int $post_id, int $attachment_id, string $caption ): void {
-		$post = get_post( $post_id );
-		if ( ! $post ) {
-			return;
-		}
-
-		// Caption-only block — the theme handles the featured image display.
-		$caption_html = sprintf(
-			'<p class="prautoblogger-comic-caption" style="text-align:center;font-style:italic;color:#555;font-size:1.1em;margin:0 0 2em 0;">— "%s"</p>',
-			esc_html( $caption )
-		);
-
-		wp_update_post(
-			array(
-				'ID'           => $post_id,
-				'post_content' => $caption_html . "\n\n" . $post->post_content,
-			)
-		);
-	}
-}

includes/core/class-image-composer-canvas.php

@@ -1,186 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Low-level Imagick canvas primitives for the deterministic image composer.
- *
- * Capability smoke test, base-image loading, cover-cropping, logo placement,
- * and deterministic PNG encoding. No WordPress functions anywhere in this
- * class — it runs unchanged inside the standalone render harness used to
- * produce the PR sample images.
- *
- * Triggered by: PRAutoBlogger_Image_Composer_Imagick (renderer) per variant.
- * Dependencies: ext-imagick (callers must gate on is_imagick_usable()).
- *
- * @see core/class-image-composer-imagick.php — Sole consumer.
- * @see core/class-image-composer.php         — Caches the capability probe result.
- */
-class PRAutoBlogger_Image_Composer_Canvas {
-
-	/**
-	 * Probe whether Imagick can do everything the renderer needs: PNG
-	 * encode plus TTF text annotation (the smoke test draws one glyph on a
-	 * tiny in-memory canvas). Cheap to run but callers should cache it.
-	 *
-	 * Side effects: none beyond a transient in-memory Imagick object.
-	 *
-	 * @param string $font_path Absolute path to a bundled TTF used for the smoke test.
-	 *
-	 * @return bool True when full compositing is available.
-	 */
-	public static function is_imagick_usable( string $font_path ): bool {
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( '\Imagick' ) ) {
-			return false;
-		}
-
-		try {
-			$formats = \Imagick::queryFormats( 'PNG' );
-			if ( empty( $formats ) ) {
-				return false;
-			}
-
-			if ( ! is_readable( $font_path ) ) {
-				return false;
-			}
-
-			$probe = new \Imagick();
-			$probe->newImage( 8, 8, new \ImagickPixel( '#ffffff' ), 'png' );
-			$draw = new \ImagickDraw();
-			$draw->setFont( $font_path );
-			$draw->setFontSize( 6 );
-			$probe->annotateImage( $draw, 1, 6, 0.0, 'P' );
-			$probe->clear();
-
-			return true;
-		} catch ( \Throwable $e ) {
-			return false;
-		}
-	}
-
-	/**
-	 * Load base image bytes into an Imagick object (first frame only).
-	 *
-	 * @param string $bytes Raw image bytes (PNG/JPEG/WebP — any readable format).
-	 *
-	 * @return \Imagick Loaded image.
-	 * @throws \RuntimeException When the bytes cannot be decoded.
-	 */
-	public static function load_base( string $bytes ): \Imagick {
-		$image = new \Imagick();
-		if ( ! $image->readImageBlob( $bytes ) ) {
-			throw new \RuntimeException( 'Composer could not decode base image bytes.' );
-		}
-		$image->setIteratorIndex( 0 );
-		$image = $image->coalesceImages()->current();
-		$image->setImagePage( 0, 0, 0, 0 );
-
-		return $image;
-	}
-
-	/**
-	 * Center cover-crop an image to exact target dimensions without upscaling.
-	 *
-	 * Crops the largest centered region matching the target aspect ratio,
-	 * then scales DOWN to the target. Refuses (returns false) when the source
-	 * is too small to fill the target without upscaling.
-	 *
-	 * Side effects: mutates $image in place on success.
-	 *
-	 * @param \Imagick $image  Source image (mutated).
-	 * @param int      $target_w Target width in px.
-	 * @param int      $target_h Target height in px.
-	 *
-	 * @return bool False when the crop would require upscaling.
-	 */
-	public static function cover_crop( \Imagick $image, int $target_w, int $target_h ): bool {
-		$width  = $image->getImageWidth();
-		$height = $image->getImageHeight();
-		if ( $width < 1 || $height < 1 ) {
-			return false;
-		}
-
-		$ratio = max( $target_w / $width, $target_h / $height );
-		if ( $ratio > 1.0 ) {
-			return false;
-		}
-
-		$src_w = min( $width, (int) round( $target_w / $ratio ) );
-		$src_h = min( $height, (int) round( $target_h / $ratio ) );
-		$x     = (int) floor( ( $width - $src_w ) / 2 );
-		$y     = (int) floor( ( $height - $src_h ) / 2 );
-
-		$image->cropImage( $src_w, $src_h, $x, $y );
-		$image->setImagePage( 0, 0, 0, 0 );
-		$image->resizeImage( $target_w, $target_h, \Imagick::FILTER_LANCZOS, 1 );
-
-		return true;
-	}
-
-	/**
-	 * Composite a brand PNG onto the canvas at a target height and opacity.
-	 *
-	 * @param \Imagick $canvas     Destination canvas (mutated).
-	 * @param string   $asset_path Absolute path to the brand PNG.
-	 * @param int      $target_h   Logo height in px (width keeps aspect).
-	 * @param int      $x          Left position on the canvas.
-	 * @param int      $y          Top position on the canvas.
-	 * @param float    $opacity    1.0 = opaque, 0.55 = subtle corner mark.
-	 *
-	 * @return int Rendered logo width in px (useful for caption x-offsets).
-	 * @throws \RuntimeException When the asset is missing or unreadable.
-	 */
-	public static function place_logo( \Imagick $canvas, string $asset_path, int $target_h, int $x, int $y, float $opacity = 1.0 ): int {
-		if ( ! is_readable( $asset_path ) ) {
-			throw new \RuntimeException( 'Composer brand asset missing: ' . basename( $asset_path ) );
-		}
-
-		$logo = new \Imagick( $asset_path );
-		$logo->setImagePage( 0, 0, 0, 0 );
-		$scale    = $target_h / max( 1, $logo->getImageHeight() );
-		$target_w = max( 1, (int) round( $logo->getImageWidth() * $scale ) );
-		$logo->resizeImage( $target_w, $target_h, \Imagick::FILTER_LANCZOS, 1 );
-
-		if ( $opacity < 1.0 ) {
-			$logo->evaluateImage( \Imagick::EVALUATE_MULTIPLY, max( 0.0, $opacity ), \Imagick::CHANNEL_ALPHA );
-		}
-
-		$canvas->compositeImage( $logo, \Imagick::COMPOSITE_OVER, $x, $y );
-		$logo->clear();
-
-		return $target_w;
-	}
-
-	/**
-	 * Encode a canvas as a deterministic PNG variant payload.
-	 *
-	 * Strips all metadata and excludes PNG date/time chunks so identical
-	 * inputs produce byte-identical output in the same environment.
-	 *
-	 * Side effects: destroys the Imagick object after encoding.
-	 *
-	 * @param \Imagick $image Finished canvas.
-	 * @param string   $role  Variant role: 'featured', 'og', or 'square'.
-	 *
-	 * @return array{bytes: string, mime_type: string, width: int, height: int, role: string}
-	 */
-	public static function finalize_png( \Imagick $image, string $role ): array {
-		$image->setImageFormat( 'png' );
-		$image->setImageDepth( 8 );
-		$image->stripImage();
-		$image->setOption( 'png:exclude-chunks', 'date,time' );
-		$image->setOption( 'png:compression-level', '9' );
-
-		$variant = array(
-			'bytes'     => $image->getImageBlob(),
-			'mime_type' => 'image/png',
-			'width'     => $image->getImageWidth(),
-			'height'    => $image->getImageHeight(),
-			'role'      => $role,
-		);
-		$image->clear();
-
-		return $variant;
-	}
-}

includes/core/class-image-composer-editor.php

@@ -1,114 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Resize-only composer rung backed by wp_get_image_editor() (GD path).
- *
- * Used when Imagick is unusable: emits unbranded, caption-free center-crops
- * at each variant's exact dimensions. Variants that would require upscaling
- * (e.g. a 1080×1080 square from a 1200×632 base — WP's editor never upscales
- * on crop-resize) are skipped; the OG crop is always achievable from the
- * standard base. Output is GD PNG, which embeds no timestamps, so this rung
- * is deterministic too.
- *
- * Triggered by: PRAutoBlogger_Image_Composer when the capability probe says 'gd'.
- * Dependencies: wp_get_image_editor(), get_temp_dir(), PRAutoBlogger_Logger.
- *
- * @see core/class-image-composer.php — Orchestrator + degradation ladder.
- * @see core/class-image-composer-imagick.php — The full-fidelity rung this replaces.
- */
-class PRAutoBlogger_Image_Composer_Editor {
-
-	/**
-	 * Render resize-only variants for the requested roles.
-	 *
-	 * Side effects: temp file write/delete per variant; debug log on skips.
-	 *
-	 * @param string                               $bytes  Base image bytes.
-	 * @param string[]                             $roles  Variant roles to attempt ('og', 'square').
-	 * @param array<string, array<string, mixed>>  $layout Layout geometry (for target dimensions).
-	 *
-	 * @return array<int, array{bytes: string, mime_type: string, width: int, height: int, role: string}>
-	 *               Successfully resized variants only (possibly empty).
-	 */
-	public function compose_variants( string $bytes, array $roles, array $layout ): array {
-		$variants = array();
-
-		foreach ( $roles as $role ) {
-			$target_w = (int) ( $layout[ $role ]['width'] ?? 0 );
-			$target_h = (int) ( $layout[ $role ]['height'] ?? 0 );
-			if ( $target_w < 1 || $target_h < 1 ) {
-				continue;
-			}
-
-			$resized = $this->cover_crop( $bytes, $target_w, $target_h );
-			if ( null === $resized ) {
-				PRAutoBlogger_Logger::instance()->debug(
-					sprintf( 'Resize-only %s variant skipped (editor failure or would upscale).', $role ),
-					'image_composer'
-				);
-				continue;
-			}
-
-			$resized['role'] = $role;
-			$variants[]      = $resized;
-		}
-
-		return $variants;
-	}
-
-	/**
-	 * Center-crop bytes to exact dimensions with the portable WP editor.
-	 *
-	 * @param string $bytes    Source image bytes.
-	 * @param int    $target_w Target width in px.
-	 * @param int    $target_h Target height in px.
-	 *
-	 * @return array{bytes: string, mime_type: string, width: int, height: int}|null
-	 *               Null when the editor fails or cannot hit the exact size
-	 *               without upscaling.
-	 */
-	private function cover_crop( string $bytes, int $target_w, int $target_h ): ?array {
-		$temp = get_temp_dir() . uniqid( 'prab_compose_', true ) . '.png';
-		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents -- temp file, same pattern as the sideloader.
-		if ( false === file_put_contents( $temp, $bytes ) ) {
-			return null;
-		}
-
-		try {
-			$editor = wp_get_image_editor( $temp );
-			if ( is_wp_error( $editor ) ) {
-				return null;
-			}
-			if ( is_wp_error( $editor->resize( $target_w, $target_h, true ) ) ) {
-				return null;
-			}
-
-			$size = $editor->get_size();
-			if ( (int) $size['width'] !== $target_w || (int) $size['height'] !== $target_h ) {
-				return null; // Exact size not reachable without upscaling.
-			}
-
-			if ( is_wp_error( $editor->save( $temp, 'image/png' ) ) ) {
-				return null;
-			}
-			// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents -- temp file we just wrote.
-			$out = file_get_contents( $temp );
-
-			return false === $out ? null : array(
-				'bytes'     => $out,
-				'mime_type' => 'image/png',
-				'width'     => $target_w,
-				'height'    => $target_h,
-			);
-		} catch ( \Throwable $e ) {
-			PRAutoBlogger_Logger::instance()->debug( 'WP image editor crop threw: ' . $e->getMessage(), 'image_composer' );
-			return null;
-		} finally {
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- best-effort temp cleanup.
-			@unlink( $temp );
-		}
-	}
-}

includes/core/class-image-composer-imagick.php

@@ -1,250 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Imagick renderer for the deterministic image composer (full-fidelity rung).
- *
- * Renders the three branded variants from one base image: corner-marked
- * featured (1200×632), teal-band OG (1200×630), and card-layout square
- * (1080×1080). No WordPress functions anywhere — layout geometry and asset
- * directories arrive via the constructor, so the class runs unchanged inside
- * the standalone render harness that produced the PR samples. Methods throw
- * on failure; the orchestrator catches and degrades, so a renderer error can
- * never fail a publish.
- *
- * Triggered by: PRAutoBlogger_Image_Composer when the capability probe says 'imagick'.
- * Dependencies: ext-imagick, bundled brand PNGs + OFL fonts,
- *               PRAutoBlogger_Image_Composer_Canvas (primitives),
- *               PRAutoBlogger_Image_Composer_Layout (caption clamp).
- *
- * @see core/class-image-composer.php        — Orchestrator + degradation ladder.
- * @see core/class-image-composer-canvas.php — Crop/logo/PNG primitives.
- * @see core/class-image-composer-layout.php — Geometry defaults + clamp.
- */
-class PRAutoBlogger_Image_Composer_Imagick {
-
-	/** @var array<string, array<string, mixed>> Layout geometry keyed by role. */
-	private array $layout;
-
-	/** @var string Absolute path to the vendored brand PNG directory (trailing slash). */
-	private string $brand_dir;
-
-	/** @var string Absolute path to the bundled font directory (trailing slash). */
-	private string $fonts_dir;
-
-	/**
-	 * Construct with resolved layout + asset locations.
-	 *
-	 * @param array<string, array<string, mixed>> $layout    Filtered layout (see Layout::defaults()).
-	 * @param string                              $brand_dir Brand PNG directory, trailing slash.
-	 * @param string                              $fonts_dir Font directory, trailing slash.
-	 */
-	public function __construct( array $layout, string $brand_dir, string $fonts_dir ) {
-		$this->layout    = $layout;
-		$this->brand_dir = $brand_dir;
-		$this->fonts_dir = $fonts_dir;
-	}
-
-	/**
-	 * Featured variant: base image untouched except a subtle corner mark.
-	 *
-	 * @param string $bytes Base image bytes.
-	 *
-	 * @return array{bytes: string, mime_type: string, width: int, height: int, role: string}
-	 * @throws \RuntimeException|\ImagickException On decode/asset failure.
-	 */
-	public function compose_featured( string $bytes ): array {
-		$conf   = $this->layout['featured'];
-		$canvas = PRAutoBlogger_Image_Composer_Canvas::load_base( $bytes );
-
-		$mark_h = (int) $conf['mark_height'];
-		$inset  = (int) $conf['mark_inset'];
-		// The mark asset is square, so rendered width equals the height.
-		PRAutoBlogger_Image_Composer_Canvas::place_logo(
-			$canvas,
-			$this->brand_dir . $conf['mark_asset'],
-			$mark_h,
-			$canvas->getImageWidth() - $mark_h - $inset,
-			$canvas->getImageHeight() - $mark_h - $inset,
-			(float) $conf['mark_opacity']
-		);
-
-		return PRAutoBlogger_Image_Composer_Canvas::finalize_png( $canvas, 'featured' );
-	}
-
-	/**
-	 * OG variant (1200×630): center-cropped base, bottom teal band with the
-	 * brand mark and the clamped caption in white.
-	 *
-	 * @param string $bytes   Base image bytes.
-	 * @param string $caption Editorial caption (clamped to 2 lines).
-	 *
-	 * @return array{bytes: string, mime_type: string, width: int, height: int, role: string}
-	 * @throws \RuntimeException|\ImagickException On decode/crop/asset failure.
-	 */
-	public function compose_og( string $bytes, string $caption ): array {
-		$conf   = $this->layout['og'];
-		$width  = (int) $conf['width'];
-		$height = (int) $conf['height'];
-		$band_h = (int) $conf['band_height'];
-		$band_y = $height - $band_h;
-
-		$canvas = PRAutoBlogger_Image_Composer_Canvas::load_base( $bytes );
-		if ( ! PRAutoBlogger_Image_Composer_Canvas::cover_crop( $canvas, $width, $height ) ) {
-			$canvas->clear();
-			throw new \RuntimeException( 'OG variant would require upscaling the base image.' );
-		}
-
-		$this->draw_rect( $canvas, 0, $band_y, $width, $height, (string) $conf['band_color'] );
-
-		$logo_h = (int) $conf['logo_height'];
-		$logo_w = PRAutoBlogger_Image_Composer_Canvas::place_logo(
-			$canvas,
-			$this->brand_dir . $conf['logo_asset'],
-			$logo_h,
-			(int) $conf['logo_x'],
-			$band_y + (int) floor( ( $band_h - $logo_h ) / 2 )
-		);
-
-		$lines = PRAutoBlogger_Image_Composer_Layout::clamp_caption(
-			$caption,
-			(int) $conf['caption_chars_per_line'],
-			(int) $conf['caption_max_lines']
-		);
-		$this->draw_lines(
-			$canvas,
-			$lines,
-			array(
-				'font'        => $this->fonts_dir . $conf['caption_font'],
-				'size'        => (float) $conf['caption_size'],
-				'color'       => (string) $conf['caption_color'],
-				'line_height' => (float) $conf['caption_line_height'],
-				'x'           => (int) $conf['logo_x'] + $logo_w + (int) $conf['caption_gap'],
-				'center_y'    => $band_y + (int) floor( $band_h / 2 ),
-				'align'       => \Imagick::ALIGN_LEFT,
-			)
-		);
-
-		return PRAutoBlogger_Image_Composer_Canvas::finalize_png( $canvas, 'og' );
-	}
-
-	/**
-	 * Square variant (1080×1080, card layout, no upscaling): full base
-	 * downscaled into the top slice, cream caption panel in Poppins Bold,
-	 * teal footer band with the horizontal reverse lockup.
-	 *
-	 * @param string $bytes   Base image bytes.
-	 * @param string $caption Editorial caption (clamped to 3 lines).
-	 *
-	 * @return array{bytes: string, mime_type: string, width: int, height: int, role: string}
-	 * @throws \RuntimeException|\ImagickException On decode/crop/asset failure.
-	 */
-	public function compose_square( string $bytes, string $caption ): array {
-		$conf     = $this->layout['square'];
-		$width    = (int) $conf['width'];
-		$height   = (int) $conf['height'];
-		$slice_h  = (int) $conf['slice_height'];
-		$footer_h = (int) $conf['footer_height'];
-		$footer_y = $height - $footer_h;
-
-		$slice = PRAutoBlogger_Image_Composer_Canvas::load_base( $bytes );
-		if ( ! PRAutoBlogger_Image_Composer_Canvas::cover_crop( $slice, $width, $slice_h ) ) {
-			$slice->clear();
-			throw new \RuntimeException( 'Square variant would require upscaling the base image.' );
-		}
-
-		$canvas = new \Imagick();
-		$canvas->newImage( $width, $height, new \ImagickPixel( (string) $conf['panel_color'] ), 'png' );
-		$canvas->compositeImage( $slice, \Imagick::COMPOSITE_OVER, 0, 0 );
-		$slice->clear();
-
-		$this->draw_rect( $canvas, 0, $footer_y, $width, $height, (string) $conf['footer_color'] );
-
-		$logo_h = (int) $conf['footer_logo_height'];
-		$logo   = new \Imagick( $this->brand_dir . $conf['footer_logo_asset'] );
-		$logo_w = (int) round( $logo->getImageWidth() * ( $logo_h / max( 1, $logo->getImageHeight() ) ) );
-		$logo->clear();
-		PRAutoBlogger_Image_Composer_Canvas::place_logo(
-			$canvas,
-			$this->brand_dir . $conf['footer_logo_asset'],
-			$logo_h,
-			(int) floor( ( $width - $logo_w ) / 2 ),
-			$footer_y + (int) floor( ( $footer_h - $logo_h ) / 2 )
-		);
-
-		$lines = PRAutoBlogger_Image_Composer_Layout::clamp_caption(
-			$caption,
-			(int) $conf['caption_chars_per_line'],
-			(int) $conf['caption_max_lines']
-		);
-		$this->draw_lines(
-			$canvas,
-			$lines,
-			array(
-				'font'        => $this->fonts_dir . $conf['caption_font'],
-				'size'        => (float) $conf['caption_size'],
-				'color'       => (string) $conf['caption_color'],
-				'line_height' => (float) $conf['caption_line_height'],
-				'x'           => (int) floor( $width / 2 ),
-				'center_y'    => $slice_h + (int) floor( ( $footer_y - $slice_h ) / 2 ),
-				'align'       => \Imagick::ALIGN_CENTER,
-			)
-		);
-
-		return PRAutoBlogger_Image_Composer_Canvas::finalize_png( $canvas, 'square' );
-	}
-
-	/**
-	 * Fill an axis-aligned rectangle on the canvas.
-	 *
-	 * @param \Imagick $canvas Destination canvas (mutated).
-	 * @param int      $x1     Left.
-	 * @param int      $y1     Top.
-	 * @param int      $x2     Right.
-	 * @param int      $y2     Bottom.
-	 * @param string   $color  Hex fill color.
-	 */
-	private function draw_rect( \Imagick $canvas, int $x1, int $y1, int $x2, int $y2, string $color ): void {
-		$draw = new \ImagickDraw();
-		$draw->setFillColor( new \ImagickPixel( $color ) );
-		$draw->rectangle( (float) $x1, (float) $y1, (float) $x2, (float) $y2 );
-		$canvas->drawImage( $draw );
-	}
-
-	/**
-	 * Draw pre-clamped caption lines vertically centered around center_y.
-	 *
-	 * @param \Imagick $canvas Destination canvas (mutated).
-	 * @param string[] $lines  Already-clamped lines (may be empty — no-op).
-	 * @param array{font: string, size: float, color: string, line_height: float, x: int, center_y: int, align: int} $opts Text options.
-	 *
-	 * @throws \RuntimeException When the bundled font file is missing.
-	 */
-	private function draw_lines( \Imagick $canvas, array $lines, array $opts ): void {
-		if ( empty( $lines ) ) {
-			return;
-		}
-		if ( ! is_readable( $opts['font'] ) ) {
-			throw new \RuntimeException( 'Composer font missing: ' . basename( $opts['font'] ) );
-		}
-
-		$draw = new \ImagickDraw();
-		$draw->setFont( $opts['font'] );
-		$draw->setFontSize( $opts['size'] );
-		$draw->setFillColor( new \ImagickPixel( $opts['color'] ) );
-		$draw->setTextAlignment( $opts['align'] );
-		$draw->setTextAntialias( true );
-
-		$metrics     = $canvas->queryFontMetrics( $draw, 'Hg' );
-		$line_step   = (int) round( $opts['size'] * $opts['line_height'] );
-		$block_h     = ( count( $lines ) - 1 ) * $line_step + (int) round( $metrics['ascender'] - $metrics['descender'] );
-		$baseline    = $opts['center_y'] - (int) floor( $block_h / 2 ) + (int) round( $metrics['ascender'] );
-
-		foreach ( $lines as $line ) {
-			$canvas->annotateImage( $draw, (float) $opts['x'], (float) $baseline, 0.0, $line );
-			$baseline += $line_step;
-		}
-	}
-}

includes/core/class-image-composer-layout.php

@@ -1,173 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Geometry defaults and caption clamping for the deterministic image composer.
- *
- * Pure functions and constants only — no WordPress, no Imagick. This keeps
- * the class unit-testable and usable from a standalone render harness. The
- * orchestrator exposes defaults() through the `prautoblogger_image_compose_layout`
- * filter; geometry is intentionally NOT a settings-page surface (promote to
- * settings only if the CEO asks to tune it — see ARCHITECTURE.md #21).
- *
- * Triggered by: PRAutoBlogger_Image_Composer (orchestrator) at compose time.
- * Dependencies: mbstring (bundled with WordPress via compat polyfills).
- *
- * @see core/class-image-composer.php          — Applies the layout filter.
- * @see core/class-image-composer-imagick.php  — Consumes the geometry values.
- * @see tests/unit/Core/ImageComposerLayoutTest.php — Clamp boundary cases.
- */
-class PRAutoBlogger_Image_Composer_Layout {
-
-	/** Brand tokens (locked — see peptide-repo-brand README). */
-	public const COLOR_TEAL   = '#1B8A92';
-	public const COLOR_LIME   = '#7FD600';
-	public const COLOR_ORANGE = '#FF8A3D';
-	public const COLOR_INK    = '#0D0D0D';
-	public const COLOR_CREAM  = '#FAFAF7';
-
-	/** Ellipsis appended when a caption overflows its line budget. */
-	public const ELLIPSIS = '…';
-
-	/**
-	 * Default geometry for every composed variant.
-	 *
-	 * Asset filenames resolve against assets/brand/ and assets/fonts/ in the
-	 * plugin; sizes are px. Values were tuned against rendered samples (see
-	 * PR #thread 2026-06-image-composer assets).
-	 *
-	 * @return array<string, array<string, mixed>> Keyed by role: featured, og, square.
-	 */
-	public static function defaults(): array {
-		return array(
-			'featured' => array(
-				'mark_asset'   => 'logo-mark-small-56.png',
-				'mark_height'  => 28,
-				'mark_inset'   => 16,
-				'mark_opacity' => 0.55,
-			),
-			'og'       => array(
-				'width'                 => 1200,
-				'height'                => 630,
-				'band_height'           => 120,
-				'band_color'            => self::COLOR_TEAL,
-				'logo_asset'            => 'logo-mark-small-112.png',
-				'logo_height'           => 64,
-				'logo_x'                => 40,
-				'caption_font'          => 'Poppins-SemiBold.ttf',
-				'caption_size'          => 32,
-				'caption_color'         => '#FFFFFF',
-				'caption_gap'           => 24,
-				'caption_margin_right'  => 40,
-				'caption_max_lines'     => 2,
-				'caption_chars_per_line' => 52,
-				'caption_line_height'   => 1.3,
-			),
-			'square'   => array(
-				'width'                 => 1080,
-				'height'                => 1080,
-				'slice_height'          => 569,
-				'panel_color'           => self::COLOR_CREAM,
-				'footer_height'         => 96,
-				'footer_color'          => self::COLOR_TEAL,
-				'footer_logo_asset'     => 'logo-horizontal-reverse-128.png',
-				'footer_logo_height'    => 48,
-				'caption_font'          => 'Poppins-Bold.ttf',
-				'caption_size'          => 48,
-				'caption_color'         => self::COLOR_INK,
-				'caption_max_lines'     => 3,
-				'caption_chars_per_line' => 36,
-				'caption_side_padding'  => 64,
-				'caption_line_height'   => 1.3,
-			),
-		);
-	}
-
-	/**
-	 * Clamp and word-wrap a caption to a hard per-variant budget.
-	 *
-	 * Whitespace is collapsed, words wrap at word boundaries, words longer
-	 * than a full line are hard-split, and overflow beyond max_lines is cut
-	 * with a trailing ellipsis. Multibyte-safe (mb_* functions).
-	 *
-	 * Side effects: none (pure).
-	 *
-	 * @param string $caption        Raw caption text (any length, any script).
-	 * @param int    $chars_per_line Hard character budget per line (min 1).
-	 * @param int    $max_lines      Maximum number of lines (min 1).
-	 *
-	 * @return string[] Wrapped lines; empty array when the caption is blank.
-	 */
-	public static function clamp_caption( string $caption, int $chars_per_line, int $max_lines ): array {
-		$chars_per_line = max( 1, $chars_per_line );
-		$max_lines      = max( 1, $max_lines );
-		$normalized     = trim( (string) preg_replace( '/\s+/u', ' ', $caption ) );
-
-		if ( '' === $normalized ) {
-			return array();
-		}
-
-		$lines = array();
-		$line  = '';
-
-		foreach ( explode( ' ', $normalized ) as $word ) {
-			// Hard-split words longer than a full line so they cannot overflow.
-			while ( mb_strlen( $word ) > $chars_per_line ) {
-				if ( '' !== $line ) {
-					$lines[] = $line;
-					$line    = '';
-					if ( count( $lines ) >= $max_lines ) {
-						return self::ellipsize( $lines, $chars_per_line );
-					}
-				}
-				$lines[] = mb_substr( $word, 0, $chars_per_line );
-				$word    = mb_substr( $word, $chars_per_line );
-				if ( count( $lines ) >= $max_lines ) {
-					return self::ellipsize( $lines, $chars_per_line );
-				}
-			}
-
-			$candidate = ( '' === $line ) ? $word : $line . ' ' . $word;
-			if ( mb_strlen( $candidate ) <= $chars_per_line ) {
-				$line = $candidate;
-				continue;
-			}
-
-			$lines[] = $line;
-			$line    = $word;
-			if ( count( $lines ) >= $max_lines ) {
-				return self::ellipsize( $lines, $chars_per_line );
-			}
-		}
-
-		if ( '' !== $line ) {
-			$lines[] = $line;
-		}
-
-		return $lines;
-	}
-
-	/**
-	 * Append an ellipsis to the final line, trimming first if the line is
-	 * already at the character budget so the result never exceeds it.
-	 *
-	 * @param string[] $lines          Lines already at the max-line count.
-	 * @param int      $chars_per_line Hard character budget per line.
-	 *
-	 * @return string[] Lines with a trailing ellipsis on the last one.
-	 */
-	private static function ellipsize( array $lines, int $chars_per_line ): array {
-		$last_index = count( $lines ) - 1;
-		$last       = $lines[ $last_index ];
-
-		if ( mb_strlen( $last ) + 1 > $chars_per_line ) {
-			$last = rtrim( mb_substr( $last, 0, max( 0, $chars_per_line - 1 ) ) );
-		}
-
-		$lines[ $last_index ] = $last . self::ELLIPSIS;
-
-		return $lines;
-	}
-}

includes/core/class-image-composer.php

@@ -1,298 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Orchestrates deterministic image composition with a capability ladder.
- *
- * Sits between the provider's raw bytes and the media sideloader. Probes the
- * environment once (cached in an option keyed by a PHP/extension fingerprint,
- * so it auto-invalidates when the host changes — Hostinger extension state
- * has flipped before), then renders per the ladder: (1) Imagick usable →
- * full branded compositing; (2) GD via WP editor → resize-only variants, no
- * branding/text, WARNING once; (3) no image library → pass-through, WARNING
- * once. compose() never throws and always returns a featured-first non-empty
- * list, so a composition failure can never block a publish. Local CPU only:
- * $0, no provider call; duration is logged on the image_composer channel.
- *
- * Triggered by: PRAutoBlogger_Image_Pipeline after batch results + NSFW retry,
- *               before sideloading.
- * Dependencies: Image_Composer_Imagick (rung 1), Image_Composer_Editor (rung 2),
- *               Image_Composer_Canvas (probe), Image_Composer_Layout, Logger.
- *
- * @see core/interface-image-composer.php — The contract.
- * @see core/class-image-pipeline.php     — Caller.
- * @see core/class-image-attacher.php     — Persists returned variants.
- * @see ARCHITECTURE.md                   — Decision #21.
- */
-class PRAutoBlogger_Image_Composer implements PRAutoBlogger_Image_Composer_Interface {
-
-	/** Option keys (prautoblogger_ prefix keeps the uninstall sweep effective). */
-	public const OPTION_ENABLED      = 'prautoblogger_image_compose_enabled';
-	public const OPTION_VARIANTS     = 'prautoblogger_image_compose_variants';
-	public const OPTION_MARK_ENABLED = 'prautoblogger_image_featured_mark_enabled';
-	public const OPTION_CAPABILITY   = 'prautoblogger_image_compose_capability';
-
-	/** Capability rungs. */
-	public const CAP_IMAGICK = 'imagick';
-	public const CAP_GD      = 'gd';
-	public const CAP_NONE    = 'none';
-
-	/** @var PRAutoBlogger_Image_Composer_Imagick|null Lazily built; injectable for tests. */
-	private ?PRAutoBlogger_Image_Composer_Imagick $renderer;
-
-	/** @var bool Degradation WARNING fired this run (once per PHP process). */
-	private static bool $warned_this_run = false;
-
-	/**
-	 * Construct, optionally injecting a renderer (tests).
-	 * @param PRAutoBlogger_Image_Composer_Imagick|null $renderer Optional renderer override.
-	 */
-	public function __construct( ?PRAutoBlogger_Image_Composer_Imagick $renderer = null ) {
-		$this->renderer = $renderer;
-	}
-
-	/**
-	 * Compose final variants for one generated image. See the interface for
-	 * the full contract; this implementation never throws.
-	 * Side effects: reads options, may cache the capability probe, logs.
-	 *
-	 * @param array $image_data Provider result (bytes, mime_type, width, height, ...).
-	 * @param array $context    {post_id, caption, title, slot}.
-	 * @return array<int, array{bytes: string, mime_type: string, width: int, height: int, role: string}>
-	 */
-	public function compose( array $image_data, array $context ): array {
-		$passthrough = array( $this->passthrough_variant( $image_data ) );
-
-		if ( '' === $passthrough[0]['bytes'] || '1' !== (string) get_option( self::OPTION_ENABLED, '1' ) ) {
-			return $passthrough;
-		}
-
-		$started    = microtime( true );
-		$bytes      = $passthrough[0]['bytes'];
-		$capability = $this->resolve_capability();
-		$caption    = (string) ( $context['caption'] ?? '' );
-		$roles      = ( 'image_a' === (string) ( $context['slot'] ?? 'image_a' ) )
-			? $this->configured_variants()
-			: array();
-
-		if ( self::CAP_IMAGICK === $capability ) {
-			$variants = $this->compose_via_imagick( $bytes, $caption, $roles, $passthrough[0] );
-		} elseif ( self::CAP_GD === $capability ) {
-			$this->warn_once( 'Imagick unavailable — emitting resize-only variants without branding or caption.' );
-			$editor   = new PRAutoBlogger_Image_Composer_Editor();
-			$variants = array_merge( $passthrough, $editor->compose_variants( $bytes, $roles, $this->layout() ) );
-		} else {
-			$this->warn_once( 'No usable image library — base image passed through unbranded.' );
-			$variants = $passthrough;
-		}
-
-		PRAutoBlogger_Logger::instance()->info(
-			sprintf(
-				'Composed %d variant(s) for post %d in %dms ($0, local, capability: %s).',
-				count( $variants ),
-				(int) ( $context['post_id'] ?? 0 ),
-				(int) round( ( microtime( true ) - $started ) * 1000 ),
-				$capability
-			),
-			'image_composer'
-		);
-
-		return $variants;
-	}
-
-	/**
-	 * Full compositing rung. Each render is individually guarded: a featured
-	 * failure degrades to pass-through, a variant failure skips that variant.
-	 *
-	 * @param string $bytes       Base image bytes.
-	 * @param string $caption     Editorial caption for OG/square.
-	 * @param array  $roles       Variant roles to render ('og', 'square').
-	 * @param array  $passthrough Pass-through featured variant (fallback).
-	 * @return array<int, array<string, mixed>> Featured-first variant list.
-	 */
-	private function compose_via_imagick( string $bytes, string $caption, array $roles, array $passthrough ): array {
-		$variants = array();
-
-		if ( '1' === (string) get_option( self::OPTION_MARK_ENABLED, '1' ) ) {
-			$featured   = $this->try_render( 'featured', $bytes, $caption );
-			$variants[] = null === $featured ? $passthrough : $featured;
-		} else {
-			$variants[] = $passthrough;
-		}
-
-		foreach ( $roles as $role ) {
-			$variant = $this->try_render( $role, $bytes, $caption );
-			if ( null !== $variant ) {
-				$variants[] = $variant;
-			}
-		}
-
-		return $variants;
-	}
-
-	/**
-	 * Render one role via the Imagick renderer. Any throwable or malformed
-	 * result (empty bytes) maps to one per-run WARNING + null (caller degrades).
-	 * @param string $role    'featured', 'og', or 'square'.
-	 * @param string $bytes   Base image bytes.
-	 * @param string $caption Editorial caption.
-	 * @return array<string, mixed>|null Variant payload or null on failure.
-	 */
-	private function try_render( string $role, string $bytes, string $caption ): ?array {
-		try {
-			$renderer = $this->renderer();
-			if ( 'og' === $role ) {
-				$variant = $renderer->compose_og( $bytes, $caption );
-			} elseif ( 'square' === $role ) {
-				$variant = $renderer->compose_square( $bytes, $caption );
-			} else {
-				$variant = $renderer->compose_featured( $bytes );
-			}
-
-			if ( '' === (string) ( $variant['bytes'] ?? '' ) ) {
-				$this->warn_once( sprintf( 'Imagick render for %s variant returned no bytes — degrading.', $role ) );
-				return null;
-			}
-			$variant['role'] = $role;
-
-			return $variant;
-		} catch ( \Throwable $e ) {
-			$this->warn_once( sprintf( 'Imagick render failed for %s variant: %s', $role, $e->getMessage() ) );
-			return null;
-		}
-	}
-
-	/**
-	 * Resolve the capability rung: cached probe + override filter. The
-	 * same-named filter lets tests/ops force a rung (e.g. 'none').
-	 *
-	 * @return string One of the CAP_* constants.
-	 */
-	private function resolve_capability(): string {
-		$fingerprint = md5(
-			PHP_VERSION . '|' . ( extension_loaded( 'imagick' ) ? 'im1' : 'im0' ) . '|' . ( extension_loaded( 'gd' ) ? 'gd1' : 'gd0' )
-		);
-
-		$cached = get_option( self::OPTION_CAPABILITY, array() );
-		if ( is_array( $cached ) && ( $cached['fingerprint'] ?? '' ) === $fingerprint && isset( $cached['capability'] ) ) {
-			$capability = (string) $cached['capability'];
-		} else {
-			$capability = $this->probe_capability();
-			update_option(
-				self::OPTION_CAPABILITY,
-				array(
-					'fingerprint' => $fingerprint,
-					'capability'  => $capability,
-				),
-				false
-			);
-		}
-
-		$capability = (string) apply_filters( 'prautoblogger_image_compose_capability', $capability );
-
-		return in_array( $capability, array( self::CAP_IMAGICK, self::CAP_GD, self::CAP_NONE ), true )
-			? $capability
-			: self::CAP_NONE;
-	}
-
-	/**
-	 * Probe the host for the best available rung (uncached).
-	 * @return string One of the CAP_* constants.
-	 */
-	private function probe_capability(): string {
-		if ( PRAutoBlogger_Image_Composer_Canvas::is_imagick_usable( $this->fonts_dir() . 'Poppins-Bold.ttf' ) ) {
-			return self::CAP_IMAGICK;
-		}
-
-		$png_crop = array(
-			'mime_type' => 'image/png',
-			'methods'   => array( 'resize', 'crop' ),
-		);
-		if ( function_exists( 'wp_image_editor_supports' ) && wp_image_editor_supports( $png_crop ) ) {
-			return self::CAP_GD;
-		}
-
-		return self::CAP_NONE;
-	}
-
-	/**
-	 * Lazily build the Imagick renderer with filtered layout + asset paths.
-	 * @return PRAutoBlogger_Image_Composer_Imagick
-	 */
-	private function renderer(): PRAutoBlogger_Image_Composer_Imagick {
-		if ( null === $this->renderer ) {
-			$this->renderer = new PRAutoBlogger_Image_Composer_Imagick(
-				$this->layout(),
-				dirname( __DIR__, 2 ) . '/assets/brand/',
-				$this->fonts_dir()
-			);
-		}
-		return $this->renderer;
-	}
-
-	/**
-	 * Layout geometry: pure defaults behind the documented override filter.
-	 * @return array<string, array<string, mixed>>
-	 */
-	private function layout(): array {
-		return (array) apply_filters( 'prautoblogger_image_compose_layout', PRAutoBlogger_Image_Composer_Layout::defaults() );
-	}
-
-	/**
-	 * Bundled font directory (path-derived, no constants — unit-test safe).
-	 * @return string Absolute path with trailing slash.
-	 */
-	private function fonts_dir(): string {
-		return dirname( __DIR__, 2 ) . '/assets/fonts/';
-	}
-
-	/**
-	 * Variant roles from settings, whitelisted at point of use.
-	 * @return string[] Subset of ['og', 'square'], deduplicated, in config order.
-	 */
-	private function configured_variants(): array {
-		$raw   = (string) get_option( self::OPTION_VARIANTS, 'og,square' );
-		$roles = array();
-		foreach ( explode( ',', $raw ) as $piece ) {
-			$piece = strtolower( trim( $piece ) );
-			if ( in_array( $piece, array( 'og', 'square' ), true ) && ! in_array( $piece, $roles, true ) ) {
-				$roles[] = $piece;
-			}
-		}
-		return $roles;
-	}
-
-	/**
-	 * Build the pass-through featured variant from the provider result.
-	 * @param array $image_data Provider result.
-	 * @return array{bytes: string, mime_type: string, width: int, height: int, role: string}
-	 */
-	private function passthrough_variant( array $image_data ): array {
-		return array(
-			'bytes'     => (string) ( $image_data['bytes'] ?? '' ),
-			'mime_type' => (string) ( $image_data['mime_type'] ?? 'image/png' ),
-			'width'     => (int) ( $image_data['width'] ?? 0 ),
-			'height'    => (int) ( $image_data['height'] ?? 0 ),
-			'role'      => 'featured',
-		);
-	}
-
-	/**
-	 * Log a degradation WARNING once per run (one row is enough for ops).
-	 * @param string $message Warning text.
-	 */
-	private function warn_once( string $message ): void {
-		if ( self::$warned_this_run ) {
-			return;
-		}
-		self::$warned_this_run = true;
-		PRAutoBlogger_Logger::instance()->warning( $message, 'image_composer' );
-	}
-
-	/** Reset per-run state (unit tests only). */
-	public static function reset_run_state(): void {
-		self::$warned_this_run = false;
-	}
-}

includes/core/class-image-media-sideloader.php

@@ -36,13 +36,11 @@ class PRAutoBlogger_Image_Media_Sideloader {
 	 *     latency_ms: int,
 	 * } $image_data Raw image bytes + metadata from PRAutoBlogger_Image_Provider_Interface.
 	 * @param int    $post_id Target post ID to attach the image to.
-	 * @param string $alt_text Alt text for the image (the editorial caption).
-	 * @param string $filename_suffix Optional role hint appended to the filename
-	 *                                (e.g. 'og', 'square' for composed variants).
+	 * @param string $alt_text Alt text for the image (from the generation prompt).
 	 *
 	 * @return int|\WP_Error Attachment ID on success, WP_Error on failure.
 	 */
-	public function sideload_image( array $image_data, int $post_id, string $alt_text = '', string $filename_suffix = '' ) {
+	public function sideload_image( array $image_data, int $post_id, string $alt_text = '' ) {
 		// WordPress media functions live in wp-admin/includes/ and are NOT
 		// loaded automatically in cron or REST contexts. Load them if missing.
 		// Why: WP-Cron runs as a frontend request, so admin-only files like
@@ -66,7 +64,7 @@ class PRAutoBlogger_Image_Media_Sideloader {
 
 		// Prepare file array for media_handle_sideload().
 		$file_array = array(
-			'name'     => $this->generate_filename( $image_data['model'], $image_data['width'], $image_data['height'], $filename_suffix ),
+			'name'     => $this->generate_filename( $image_data['model'], $image_data['width'], $image_data['height'] ),
 			'tmp_name' => $temp_file,
 		);
 
@@ -137,18 +135,16 @@ class PRAutoBlogger_Image_Media_Sideloader {
 	 * @param string $model Model name (e.g., 'flux-1-schnell').
 	 * @param int    $width Image width.
 	 * @param int    $height Image height.
-	 * @param string $suffix Optional role hint (e.g. 'og', 'square'); back-compat default ''.
 	 *
 	 * @return string Sanitized filename.
 	 */
-	private function generate_filename( string $model, int $width, int $height, string $suffix = '' ): string {
+	private function generate_filename( string $model, int $width, int $height ): string {
 		$base = sprintf(
-			'prautoblogger_%s_%dx%d_%s%s',
+			'prautoblogger_%s_%dx%d_%s',
 			sanitize_title( $model ),
 			$width,
 			$height,
-			gmdate( 'Y-m-d_H-i-s' ),
-			'' !== $suffix ? '_' . sanitize_title( $suffix ) : ''
+			gmdate( 'Y-m-d_H-i-s' )
 		);
 
 		return $base . '.png'; // Default to PNG — most image models output PNG.

includes/core/class-image-pipeline.php

@@ -8,17 +8,13 @@ declare(strict_types=1);
  *
  * Generates two images per article (A/B): Image A (article-driven) as featured
  * image, Image B (source-driven) in post meta. Each is independently fallible.
- * Since v0.17.0 every result passes through the deterministic image composer
- * (branded variants for A, corner mark for B) before sideloading; composition
- * degrades gracefully and never blocks a publish.
  *
  * Triggered by: PRAutoBlogger_Pipeline_Runner after publisher creates the post.
- * Dependencies: Image provider, Prompt builder, Composer, Attacher, Cost tracker, Logger.
+ * Dependencies: Image provider, Prompt builder, Sideloader, Cost tracker, Logger.
  *
  * @see core/class-pipeline-runner.php       — Calls this after publisher.
  * @see core/class-image-prompt-builder.php  — Prompt generation (scene + caption).
- * @see core/class-image-composer.php        — Deterministic variant composition.
- * @see core/class-image-attacher.php        — Sideloading + variant meta-linking.
+ * @see core/class-image-media-sideloader.php — Media library integration.
  */
 class PRAutoBlogger_Image_Pipeline {
 
@@ -38,35 +34,26 @@ class PRAutoBlogger_Image_Pipeline {
 	private PRAutoBlogger_Image_Media_Sideloader $sideloader;
 	/** @var PRAutoBlogger_Cost_Tracker Logs image generation spend. */
 	private PRAutoBlogger_Cost_Tracker $cost_tracker;
-	/** @var PRAutoBlogger_Image_Composer_Interface Composes branded variants pre-sideload. */
-	private PRAutoBlogger_Image_Composer_Interface $composer;
-	/** @var PRAutoBlogger_Image_Attacher Sideloads + meta-links results and variants. */
-	private PRAutoBlogger_Image_Attacher $attacher;
-	/** @var PRAutoBlogger_Opik_Trace_Context|null Optional tracing context. */
-	private ?PRAutoBlogger_Opik_Trace_Context $trace_context;
 
 	/**
-	 * Construct with dependencies. When no provider is injected, the
-	 * `prautoblogger_image_provider` setting picks the concrete class
-	 * ('runware' or 'openrouter').
+	 * Construct with dependencies.
+	 *
+	 * When no provider is injected, the constructor reads the
+	 * `prautoblogger_image_provider` setting and instantiates the
+	 * matching concrete class ('runware' or 'openrouter').
 	 *
 	 * @param PRAutoBlogger_Image_Provider_Interface|null $provider Optional provider override.
 	 * @param PRAutoBlogger_Cost_Tracker|null             $cost_tracker Optional cost tracker.
-	 * @param PRAutoBlogger_Opik_Trace_Context|null       $trace_context Optional tracing context.
-	 * @param PRAutoBlogger_Image_Composer_Interface|null $composer Optional composer override.
 	 */
 	public function __construct(
 		?PRAutoBlogger_Image_Provider_Interface $provider = null,
 		?PRAutoBlogger_Cost_Tracker $cost_tracker = null,
-		?PRAutoBlogger_Opik_Trace_Context $trace_context = null,
-		?PRAutoBlogger_Image_Composer_Interface $composer = null
+		?PRAutoBlogger_Opik_Trace_Context $trace_context = null
 	) {
 		$this->provider       = $provider ?? self::create_default_provider();
 		$this->prompt_builder = new PRAutoBlogger_Image_Prompt_Builder( $trace_context );
 		$this->sideloader     = new PRAutoBlogger_Image_Media_Sideloader();
 		$this->cost_tracker   = $cost_tracker ?? new PRAutoBlogger_Cost_Tracker();
-		$this->composer       = $composer ?? new PRAutoBlogger_Image_Composer();
-		$this->attacher       = new PRAutoBlogger_Image_Attacher( $this->sideloader, $this->cost_tracker );
 		$this->trace_context  = $trace_context;
 	}
 
@@ -162,14 +149,12 @@ class PRAutoBlogger_Image_Pipeline {
 				->retry_blocked_slots( $post_id, $batch_requests, $batch_results, $captions, $article_data, $source_data );
 		}
 
-		$title = (string) ( $article_data['post_title'] ?? $article_data['suggested_title'] ?? '' );
-
 		// Process Image A result.
-		$this->process_slot( 'image_a', $post_id, $batch_results, $captions, $title, $result );
+		$this->process_image_a( $post_id, $batch_results, $captions, $result );
 
 		// Process Image B result (if requested).
 		if ( isset( $batch_results['image_b'] ) ) {
-			$this->process_slot( 'image_b', $post_id, $batch_results, $captions, $title, $result );
+			$this->process_image_b( $post_id, $batch_results, $captions, $result );
 		} elseif ( null === $source_data || empty( $source_data ) ) {
 			PRAutoBlogger_Logger::instance()->info(
 				sprintf( 'Image B skipped for post %d: no source data.', $post_id ),
@@ -181,98 +166,142 @@ class PRAutoBlogger_Image_Pipeline {
 	}
 
 	/**
-	 * Process one slot's batch result: compose, sideload, link to the post.
+	 * Process Image A batch result: sideload, set featured image, insert caption.
 	 *
-	 * Image A becomes the featured image (role meta, caption prepend, and
-	 * composed OG/square variants meta-linked); Image B is stored in post
-	 * meta with a corner mark only. Alt text is the editorial caption
-	 * (v0.17.0 fix — the model name used to leak here).
-	 *
-	 * @param string $slot          'image_a' or 'image_b'.
-	 * @param int    $post_id       Post ID.
-	 * @param array  $batch_results Keyed results from generate_image_batch().
-	 * @param array  $captions      Keyed captions from prompt builder.
-	 * @param string $title         Post title (composer context).
-	 * @param array  $result        Pipeline result array (modified by reference).
+	 * @param int   $post_id       Post ID.
+	 * @param array $batch_results Keyed results from generate_image_batch().
+	 * @param array $captions      Keyed captions from prompt builder.
+	 * @param array $result        Pipeline result array (modified by reference).
 	 */
-	private function process_slot( string $slot, int $post_id, array $batch_results, array $captions, string $title, array &$result ): void {
-		$label      = 'image_a' === $slot ? 'Image A' : 'Image B';
-		$image_data = $batch_results[ $slot ] ?? null;
-
+	private function process_image_a( int $post_id, array $batch_results, array $captions, array &$result ): void {
+		$image_data = $batch_results['image_a'] ?? null;
 		if ( ! $image_data || isset( $image_data['error'] ) ) {
-			$err_msg            = $image_data['error'] ?? sprintf( '%s missing from batch results.', $label );
+			$err_msg            = $image_data['error'] ?? 'Image A missing from batch results.';
 			$result['errors'][] = $err_msg;
 			// Log at WARNING so the path is visible even if the outer catch in the
 			// caller doesn't fire. See thread image-mime-bug Issue 2.
 			PRAutoBlogger_Logger::instance()->warning(
-				sprintf( '%s generation failed for post %d: %s', $label, $post_id, $err_msg ),
+				sprintf( 'Image A generation failed for post %d: %s', $post_id, $err_msg ),
 				'image_pipeline'
 			);
 			return;
 		}
 
-		$caption  = (string) ( $captions[ $slot ] ?? '' );
-		$variants = $this->compose_variants( $image_data, $post_id, $caption, $title, $slot );
-		$featured = array_merge( $image_data, array_shift( $variants ) );
-
-		$attachment_id = $this->attacher->sideload_and_log( $featured, $post_id, $slot, $label, $caption );
+		$attachment_id = $this->sideload_and_log( $image_data, $post_id, 'image_a', 'Image A' );
 		if ( is_wp_error( $attachment_id ) ) {
 			$result['errors'][] = $attachment_id->get_error_message();
 			return;
 		}
 
-		$result[ $slot . '_id' ] = $attachment_id;
-		$result['cost_usd']     += $image_data['cost_usd'];
+		$result['image_a_id'] = $attachment_id;
+		$result['cost_usd']  += $image_data['cost_usd'];
+		set_post_thumbnail( $post_id, $attachment_id );
 
-		if ( '' !== $caption ) {
-			update_post_meta( $attachment_id, '_prautoblogger_image_caption', $caption );
-		}
-
-		if ( 'image_a' === $slot ) {
-			set_post_thumbnail( $post_id, $attachment_id );
-			update_post_meta( $attachment_id, '_prautoblogger_image_role', 'featured' );
-			if ( '' !== $caption ) {
-				$this->attacher->prepend_caption_to_post( $post_id, $attachment_id, $caption );
-			}
-			$this->attacher->attach_variants( $variants, $post_id, $attachment_id, $caption, (string) ( $image_data['model'] ?? 'unknown' ) );
-		} else {
-			update_post_meta( $post_id, '_prautoblogger_image_b_id', $attachment_id );
+		if ( '' !== ( $captions['image_a'] ?? '' ) ) {
+			update_post_meta( $attachment_id, '_prautoblogger_image_caption', $captions['image_a'] );
+			$this->prepend_caption_to_post( $post_id, $attachment_id, $captions['image_a'] );
 		}
 	}
 
 	/**
-	 * Run the composer with a hard safety net: any failure (composer bugs
-	 * included — its own internals already degrade) falls back to passing
-	 * the base image through, so composition can never fail a publish.
+	 * Process Image B batch result: sideload, store meta.
 	 *
-	 * @param array  $image_data Provider result for one slot.
-	 * @param int    $post_id    Post ID (composer context).
-	 * @param string $caption    Editorial caption (composer context).
-	 * @param string $title      Post title (composer context).
-	 * @param string $slot       'image_a' or 'image_b'.
-	 * @return array<int, array<string, mixed>> Featured-first variant list (never empty).
+	 * @param int   $post_id       Post ID.
+	 * @param array $batch_results Keyed results from generate_image_batch().
+	 * @param array $captions      Keyed captions from prompt builder.
+	 * @param array $result        Pipeline result array (modified by reference).
 	 */
-	private function compose_variants( array $image_data, int $post_id, string $caption, string $title, string $slot ): array {
-		try {
-			$variants = $this->composer->compose(
-				$image_data,
-				array(
-					'post_id' => $post_id,
-					'caption' => $caption,
-					'title'   => $title,
-					'slot'    => $slot,
-				)
-			);
-			if ( ! empty( $variants ) ) {
-				return $variants;
-			}
-		} catch ( \Throwable $e ) {
+	private function process_image_b( int $post_id, array $batch_results, array $captions, array &$result ): void {
+		$image_data = $batch_results['image_b'] ?? null;
+		if ( ! $image_data || isset( $image_data['error'] ) ) {
+			$err_msg            = $image_data['error'] ?? 'Image B missing from batch results.';
+			$result['errors'][] = $err_msg;
+			// Log at WARNING so the path is visible even if the outer catch in the
+			// caller doesn't fire. See thread image-mime-bug Issue 2.
 			PRAutoBlogger_Logger::instance()->warning(
-				'Image composition failed, publishing original image: ' . $e->getMessage(),
-				'image_composer'
+				sprintf( 'Image B generation failed for post %d: %s', $post_id, $err_msg ),
+				'image_pipeline'
 			);
+			return;
 		}
 
-		return array( array_merge( $image_data, array( 'role' => 'featured' ) ) );
+		$attachment_id = $this->sideload_and_log( $image_data, $post_id, 'image_b', 'Image B' );
+		if ( is_wp_error( $attachment_id ) ) {
+			$result['errors'][] = $attachment_id->get_error_message();
+			return;
+		}
+
+		$result['image_b_id'] = $attachment_id;
+		$result['cost_usd']  += $image_data['cost_usd'];
+		update_post_meta( $post_id, '_prautoblogger_image_b_id', $attachment_id );
+
+		if ( '' !== ( $captions['image_b'] ?? '' ) ) {
+			update_post_meta( $attachment_id, '_prautoblogger_image_caption', $captions['image_b'] );
+		}
+	}
+
+	/**
+	 * Sideload image bytes into the media library and log the cost.
+	 *
+	 * @param array  $image_data Provider result with bytes, model, cost_usd.
+	 * @param int    $post_id    Post ID.
+	 * @param string $slot       Cost-tracking slot ('image_a' or 'image_b').
+	 * @param string $label      Human-readable label for logs.
+	 * @return int|\WP_Error Attachment ID on success.
+	 */
+	private function sideload_and_log( array $image_data, int $post_id, string $slot, string $label ) {
+		$attachment_id = $this->sideloader->sideload_image(
+			$image_data,
+			$post_id,
+			substr( $image_data['model'] ?? 'image', 0, 100 )
+		);
+
+		if ( is_wp_error( $attachment_id ) ) {
+			return $attachment_id;
+		}
+
+		$this->cost_tracker->log_image_generation(
+			$image_data['cost_usd'],
+			$image_data['model'] ?? 'unknown',
+			$post_id,
+			$slot
+		);
+
+		PRAutoBlogger_Logger::instance()->info(
+			sprintf( '%s for post %d (att %d, $%.4f)', $label, $post_id, $attachment_id, $image_data['cost_usd'] ),
+			'image_pipeline'
+		);
+
+		return $attachment_id;
+	}
+
+	/**
+	 * Prepend the comic caption as styled text at the top of the post content.
+	 *
+	 * Only inserts the caption — NOT the image. The theme already displays the
+	 * featured image, so embedding it again would cause a duplicate.
+	 *
+	 * @param int    $post_id Post ID.
+	 * @param int    $attachment_id Featured image attachment ID (for meta storage only).
+	 * @param string $caption Caption text (the comic punchline).
+	 */
+	private function prepend_caption_to_post( int $post_id, int $attachment_id, string $caption ): void {
+		$post = get_post( $post_id );
+		if ( ! $post ) {
+			return;
+		}
+
+		// Caption-only block — the theme handles the featured image display.
+		$caption_html = sprintf(
+			'<p class="prautoblogger-comic-caption" style="text-align:center;font-style:italic;color:#555;font-size:1.1em;margin:0 0 2em 0;">— "%s"</p>',
+			esc_html( $caption )
+		);
+
+		wp_update_post(
+			array(
+				'ID'           => $post_id,
+				'post_content' => $caption_html . "\n\n" . $post->post_content,
+			)
+		);
 	}
 }

includes/core/class-image-prompt-builder.php

@@ -6,16 +6,13 @@ declare(strict_types=1);
  *
  * Builds image prompts from article content or source data.
  *
- * Uses a cheap LLM (via OpenRouter) to distill article content into a concise
- * 1-2 sentence editorial topic/mechanism summary, then substitutes that summary
- * into the admin-editable editorial style template (the {{ topic_summary }}
- * slot) to produce a text-free image-gen prompt. Falls back to rule-based
+ * Uses a cheap LLM (via OpenRouter) to distill article content into concise
+ * visual scene descriptions optimised for image generation. Falls back to rule-based
  * synthesis if the LLM call fails, so image generation never blocks on a
  * prompt-rewriting outage.
  *
  * Triggered by: PRAutoBlogger_Image_Pipeline during content generation run.
  * Dependencies: PRAutoBlogger_OpenRouter_Provider (LLM call),
- *               PRAutoBlogger_Image_Template_Filler (template substitution),
  *               PRAutoBlogger_Cost_Tracker (logs prompt-rewrite cost),
  *               PRAutoBlogger_Logger (diagnostics).
  *
@@ -30,39 +27,34 @@ class PRAutoBlogger_Image_Prompt_Builder {
 	 * prompts. Exposed as a `public const` so the admin-settings layer can
 	 * use it as the default value for `prautoblogger_image_prompt_instructions`.
 	 * The option, when non-empty, wins at call time (see rewrite_via_llm).
-	 *
-	 * Editorial pivot (v0.16.0): the model emits a concise topic/mechanism
-	 * summary as the SCENE — concrete, single centered focal subject, no text,
-	 * no people-as-gag, no logos — which the prompt builder substitutes into
-	 * the editorial style template's {{ topic_summary }} slot. The CAPTION line
-	 * is preserved unchanged for the existing HTML-caption-below-image path.
 	 */
 	public const REWRITER_SYSTEM_PROMPT = <<<'PROMPT'
-You write subject descriptions for a text-free editorial science illustration about peptides, supplements, or biohacking.
+You are a comedy writer and single-panel cartoon creator, like Gary Larson (The Far Side) meets science humor.
 
-Given an article title and summary, output TWO parts separated by a blank line:
+Given an article title and summary about peptides, supplements, or biohacking, create a SINGLE-PANEL COMIC concept. Output TWO parts separated by a blank line:
 
-SCENE: A concise 1-2 sentence description of the article's core topic or mechanism, written as the SUBJECT of a single editorial illustration. Name ONE concrete, centered focal subject and the few supporting visual elements around it (e.g. a labelled-free vial and dropper, a stylised receptor on a cell membrane, a molecular chain, a dosing syringe, an organ cross-section). Favor a clear central focal point with margin around it so the image crops well. This is image-gen direction, not prose.
+SCENE: One sentence describing the visual gag — a funny, absurd, or ironic situation related to the article's topic. Favor CONCRETE, HUMAN-SCALE scenes: people reacting to things, doctors and patients, scientists in a lab, gym bros with peptide vials, partners at a kitchen table, ordinary objects in ordinary rooms. Keep it simple — one clear visual joke, 1-3 characters max.
 
-CAPTION: A short, informative caption line (under 15 words) for display as HTML text below the image. Plain and editorial, not a joke.
+CAPTION: A short, punchy caption or speech bubble line (under 15 words) that delivers the punchline. The humor should be dry, nerdy, and accessible — the reader should chuckle even if they only half-understand the science.
 
 Rules:
-- The SCENE must depict the article's actual subject/mechanism, not a generic science scene.
-- NO text, words, captions, speech bubbles, labels, or logos described in the SCENE — the illustration is text-free; text is rendered separately.
-- NO people used as a visual gag and NO cartoon/comic framing. A human anatomical element (a cell, an organ, a hand holding a vial) is fine if it is the legitimate subject.
-- Do NOT personify molecules, peptides, hormones, or proteins (no "smiling molecule"); depict them as clean stylised diagrams or structures.
-- Keep the staging simple with one clear focal subject, readable at small sizes.
+- The joke MUST relate to the article's actual subject matter, not generic science humor
+- DO NOT personify molecules, peptides, hormones, proteins, or other chemical structures (no "anthropomorphic molecule", no "cartoon hormone"). Image models render anthropomorphized chemistry as incoherent blobs. If the article is about a substance, show a PERSON reacting to or using the substance; if the article is abstract (a mechanism, a process, a concept), fall back on a human observer reacting to its effect.
+- Characters can have simple cartoon faces (round heads, dot eyes, expressive eyebrows)
+- Keep the scene physically simple — few objects, clear staging, easy to read at thumbnail size
+- The caption should work as a standalone joke even without the image
+- No logos, watermarks, or branding
 - Output ONLY the scene and caption. No preamble, no explanation.
 
 Example output format:
-A single glass peptide vial on a clean surface with a fine dropper above it, a faint stylised molecular chain arcing behind as a backdrop, centered with generous negative space.
+A muscular gym bro stares, deflated, at a tiny glass vial in his hand while his friend squats a barbell effortlessly in the background.
 
-A concentrated look at how the compound is prepared before use.
+"They told me the peptide did the work, not the squats."
 PROMPT;
 
 	/**
-	 * Max tokens for the rewriter response. Enough room for the 1-2 sentence
-	 * topic/mechanism summary plus the short editorial caption line.
+	 * Max tokens for the rewriter response. Comic concepts need more room
+	 * for the scene description plus the caption punchline.
 	 */
 	private const REWRITER_MAX_TOKENS = 180;
 
@@ -93,9 +85,8 @@ PROMPT;
 	 * Build a visual prompt from finished article content.
 	 *
 	 * Tries LLM rewriting first; falls back to rule-based synthesis on
-	 * failure. Splits scene (the topic summary, for image gen) from caption
-	 * (HTML below the image) and substitutes the scene into the editorial
-	 * style template's {{ topic_summary }} slot.
+	 * failure. Splits scene (for image gen) from caption (HTML below the
+	 * image) and appends the style suffix.
 	 *
 	 * @param array{post_title?: string, post_content?: string, suggested_title?: string} $article_data
 	 * @return array{prompt: string, caption: string}
@@ -107,8 +98,10 @@ PROMPT;
 
 		$parsed = $this->rewrite_via_llm( $title, $first_para );
 
+		$style_suffix = $this->get_style_suffix();
+
 		return array(
-			'prompt'  => PRAutoBlogger_Image_Template_Filler::fill( $parsed['scene'] ),
+			'prompt'  => trim( $parsed['scene'] . ' ' . $style_suffix ),
 			'caption' => $parsed['caption'],
 		);
 	}
@@ -127,8 +120,10 @@ PROMPT;
 
 		$parsed = $this->rewrite_via_llm( $title, $context );
 
+		$style_suffix = $this->get_style_suffix();
+
 		return array(
-			'prompt'  => PRAutoBlogger_Image_Template_Filler::fill( $parsed['scene'] ),
+			'prompt'  => trim( $parsed['scene'] . ' ' . $style_suffix ),
 			'caption' => $parsed['caption'],
 		);
 	}
@@ -265,9 +260,10 @@ PROMPT;
 	 * @return array{prompt: string, caption: string}
 	 */
 	public function build_fallback_prompt( string $title ): array {
-		$parsed = PRAutoBlogger_Image_Scene_Parser::synthesize_visual_concepts_fallback( $title, '' );
+		$parsed       = PRAutoBlogger_Image_Scene_Parser::synthesize_visual_concepts_fallback( $title, '' );
+		$style_suffix = $this->get_style_suffix();
 		return array(
-			'prompt'  => PRAutoBlogger_Image_Template_Filler::fill( $parsed['scene'] ),
+			'prompt'  => trim( $parsed['scene'] . ' ' . $style_suffix ),
 			'caption' => $parsed['caption'],
 		);
 	}
@@ -285,4 +281,20 @@ PROMPT;
 		$override = (string) get_option( 'prautoblogger_image_prompt_instructions', '' );
 		return '' !== trim( $override ) ? $override : self::REWRITER_SYSTEM_PROMPT;
 	}
+
+	/**
+	 * Get image style suffix with empty-string safeguard.
+	 *
+	 * Treats both absent and empty string as "use default" to prevent
+	 * silent style loss if the admin settings field is saved empty.
+	 *
+	 * @return string The style suffix with safe fallback.
+	 */
+	private function get_style_suffix(): string {
+		$style_suffix = (string) get_option( 'prautoblogger_image_style_suffix', '' );
+		if ( '' === trim( $style_suffix ) ) {
+			$style_suffix = PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_SUFFIX;
+		}
+		return $style_suffix;
+	}
 }

includes/core/class-image-scene-parser.php

@@ -70,25 +70,22 @@ class PRAutoBlogger_Image_Scene_Parser {
 	/**
 	 * Rule-based fallback when LLM rewriting is unavailable.
 	 *
-	 * Kept deliberately simple — this only runs if OpenRouter is down. Produces
-	 * a text-free editorial-illustration subject (not a comic) so the prompt
-	 * builder always has a non-empty topic summary to substitute into the
-	 * style template, never shipping a blank prompt to the provider (brief A6).
+	 * Kept deliberately simple — this only runs if OpenRouter is down.
 	 *
 	 * @param string $title           Main heading / topic.
 	 * @param string $supporting_text Additional context.
 	 * @return array{scene: string, caption: string} Scene for image gen, caption for HTML.
 	 */
 	public static function synthesize_visual_concepts_fallback( string $title, string $supporting_text ): array {
-		// Fallback produces a simple editorial-illustration subject when the LLM is unavailable.
+		// Fallback produces a simple comic concept when the LLM is unavailable.
 		$scene = sprintf(
-			'A clean, centered editorial science illustration representing the topic of %s, with a single clear focal subject and generous negative space.',
+			'A cartoon scientist in a lab coat looking bewildered while examining something related to: %s.',
 			$title
 		);
 
 		return array(
 			'scene'   => trim( $scene ),
-			'caption' => '',
+			'caption' => 'Science is full of surprises.',
 		);
 	}
 }

includes/core/class-image-template-filler.php

@@ -1,185 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Fills the admin-editable editorial image-prompt template with the
- * rewriter-produced topic summary, replacing the old "scene + style suffix"
- * concatenation.
- *
- * The template (option `prautoblogger_image_style_template`, default
- * PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE) contains exactly one
- * `{{ topic_summary }}` token. This class:
- *   - resolves the active template (admin override wins; blank → default),
- *   - sanitises and length-clamps the topic summary (brief A5),
- *   - substitutes the token, and
- *   - degrades safely (brief A5/A6) so a blank or token-only prompt is never
- *     emitted to the image provider.
- *
- * Who calls it: PRAutoBlogger_Image_Prompt_Builder (static call from each of
- *               build_article_prompt / build_source_prompt / build_fallback_prompt).
- * Dependencies: PRAutoBlogger_Logger (diagnostics only).
- *
- * @see core/class-image-prompt-builder.php — Sole caller.
- * @see ARCHITECTURE.md                      — Image generation data flow.
- */
-class PRAutoBlogger_Image_Template_Filler {
-
-	/** The single substitution token the template must contain. */
-	public const TOKEN = '{{ topic_summary }}';
-
-	/**
-	 * Max characters retained from the rewriter topic summary before it is
-	 * substituted into the template. Keeps the final provider prompt bounded
-	 * even if the rewriter ignores its length guidance.
-	 */
-	public const MAX_SUMMARY_CHARS = 320;
-
-	/**
-	 * Build the final image-generation prompt from a rewriter scene.
-	 *
-	 * @param string $scene Raw topic/mechanism summary from the rewriter (the
-	 *                      "scene" half of the scene/caption contract).
-	 * @return string Provider-ready prompt; never empty.
-	 */
-	public static function fill( string $scene ): string {
-		$template = self::resolve_template();
-		$summary  = self::sanitize_summary( $scene );
-
-		// Brief A6: never ship a blank or token-only prompt. If the rewriter
-		// produced nothing usable, return the template with the token removed
-		// only as a last resort — but the caller guards this by passing a
-		// rule-based fallback scene, so an empty summary here is unexpected.
-		if ( '' === $summary ) {
-			PRAutoBlogger_Logger::instance()->warning(
-				'Editorial prompt fill received an empty topic summary; emitting style-only prompt.',
-				'image_template_filler'
-			);
-			return self::strip_token( $template );
-		}
-
-		$token_count = substr_count( $template, self::TOKEN );
-
-		if ( 1 === $token_count ) {
-			return trim( str_replace( self::TOKEN, $summary, $template ) );
-		}
-
-		// Brief A5: admin removed or duplicated the token. Fall back to
-		// appending the summary to the style text and log a warning rather
-		// than shipping a malformed prompt.
-		PRAutoBlogger_Logger::instance()->warning(
-			sprintf(
-				'Image style template has %d "%s" tokens (expected 1); appending summary instead of substituting.',
-				$token_count,
-				self::TOKEN
-			),
-			'image_template_filler'
-		);
-
-		$base = self::strip_token( $template );
-		return trim( $base . ' ' . $summary );
-	}
-
-	/**
-	 * Sanitise and validate the admin-submitted style template on save.
-	 *
-	 * Multi-line, so sanitised with sanitize_textarea_field() (not
-	 * sanitize_text_field(), which would strip newlines). Per brief A5 the
-	 * template must contain exactly one TOKEN; otherwise the previous value is
-	 * kept and a settings error is surfaced. A blank submission falls back to
-	 * the editorial default so image generation can never be bricked.
-	 *
-	 * @param string $value Submitted template.
-	 * @return string Sanitised, validated template.
-	 */
-	public static function sanitize_for_save( string $value ): string {
-		$clean = sanitize_textarea_field( $value );
-
-		if ( '' === trim( $clean ) ) {
-			return PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE;
-		}
-
-		$token_count = substr_count( $clean, self::TOKEN );
-		if ( 1 !== $token_count ) {
-			add_settings_error(
-				'prautoblogger_image_style_template',
-				'prautoblogger_image_style_template_token',
-				sprintf(
-					/* translators: 1: required token, 2: number of tokens found. */
-					esc_html__( 'The Style Template must contain exactly one %1$s token (found %2$d). Keeping the previous value.', 'prautoblogger' ),
-					esc_html( self::TOKEN ),
-					(int) $token_count
-				)
-			);
-			return (string) get_option( 'prautoblogger_image_style_template', PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE );
-		}
-
-		return $clean;
-	}
-
-	/**
-	 * Resolve the active template: admin override wins; blank → default.
-	 *
-	 * @return string Non-empty template string.
-	 */
-	private static function resolve_template(): string {
-		$override = (string) get_option( 'prautoblogger_image_style_template', '' );
-		if ( '' !== trim( $override ) ) {
-			return $override;
-		}
-		return PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE;
-	}
-
-	/**
-	 * Strip control characters and clamp length of the rewriter summary
-	 * (brief A5). Whitespace runs (including newlines) are collapsed to single
-	 * spaces so the summary sits cleanly inside the template.
-	 *
-	 * @param string $scene Raw rewriter scene.
-	 * @return string Sanitised, length-clamped summary (possibly empty).
-	 */
-	private static function sanitize_summary( string $scene ): string {
-		// Remove control characters (C0/C1) except via whitespace collapse below.
-		$clean = preg_replace( '/[\x00-\x1F\x7F]+/u', ' ', $scene );
-		if ( null === $clean ) {
-			// preg_replace can return null on bad UTF-8; degrade conservatively.
-			$clean = preg_replace( '/[\x00-\x1F\x7F]+/', ' ', $scene );
-			$clean = is_string( $clean ) ? $clean : '';
-		}
-
-		// Collapse whitespace runs to single spaces.
-		$collapsed = preg_replace( '/\s+/u', ' ', $clean );
-		$clean     = is_string( $collapsed ) ? $collapsed : $clean;
-		$clean     = trim( $clean );
-
-		if ( '' === $clean ) {
-			return '';
-		}
-
-		// Clamp length (multibyte-aware where available).
-		if ( function_exists( 'mb_strlen' ) ) {
-			if ( mb_strlen( $clean ) > self::MAX_SUMMARY_CHARS ) {
-				$clean = rtrim( mb_substr( $clean, 0, self::MAX_SUMMARY_CHARS ) ) . '...';
-			}
-		} elseif ( strlen( $clean ) > self::MAX_SUMMARY_CHARS ) {
-			$clean = rtrim( substr( $clean, 0, self::MAX_SUMMARY_CHARS ) ) . '...';
-		}
-
-		return $clean;
-	}
-
-	/**
-	 * Remove every occurrence of the token from a template, tidying the
-	 * leftover whitespace so the residual style text is still well-formed.
-	 *
-	 * @param string $template Template possibly containing the token.
-	 * @return string Token-free, trimmed template.
-	 */
-	private static function strip_token( string $template ): string {
-		$stripped = str_replace( self::TOKEN, '', $template );
-		$stripped = preg_replace( '/[ \t]+/', ' ', $stripped );
-		$stripped = is_string( $stripped ) ? $stripped : $template;
-		return trim( $stripped );
-	}
-}

includes/core/interface-image-composer.php

@@ -1,50 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Contract for image composers that turn raw provider bytes into final variants.
- *
- * A composer sits between the image provider (raw generated bytes) and the
- * media sideloader. It receives one base image plus per-post context and
- * returns one or more finished variants — the first is always the `featured`
- * role (the bytes that become the post thumbnail), optionally followed by
- * social variants (`og`, `square`). Implementations must NEVER throw out of
- * compose(): on any internal failure they degrade to passing the base image
- * through unmodified so publishing is never blocked.
- *
- * Triggered by: PRAutoBlogger_Image_Pipeline between batch results and sideload.
- * Dependencies: none — this is the contract only.
- *
- * @see core/class-image-composer.php  — Default implementation (capability ladder).
- * @see core/class-image-pipeline.php  — Caller.
- * @see core/class-image-attacher.php  — Persists the returned variants.
- */
-interface PRAutoBlogger_Image_Composer_Interface {
-
-	/**
-	 * Compose final image variant(s) from raw provider bytes.
-	 *
-	 * Side effects: implementations may read plugin options and write to the
-	 * activity log; they must not make network calls or fail the publish.
-	 *
-	 * @param array{
-	 *     bytes: string,
-	 *     mime_type: string,
-	 *     width: int,
-	 *     height: int,
-	 * } $image_data Base image bytes + metadata from the provider result.
-	 * @param array{
-	 *     post_id: int,
-	 *     caption: string,
-	 *     title: string,
-	 *     slot: string,
-	 * } $context Post ID, editorial caption, post title, and slot
-	 *            ('image_a' or 'image_b'); only image_a yields variants.
-	 *
-	 * @return array<int, array{bytes: string, mime_type: string, width: int, height: int, role: string}>
-	 *               Non-empty list; index 0 always carries role 'featured'.
-	 */
-	public function compose( array $image_data, array $context ): array;
-}

includes/providers/class-runware-image-pricing.php

@@ -6,87 +6,44 @@ declare(strict_types=1);
  *
  * Pricing + model-id resolution helpers for the Runware image provider.
  *
- * Each Runware model has a flat per-image cost sourced from
+ * Each Runware FLUX model has a flat per-image cost sourced from
  * runware.ai/pricing (April 2026). Unlike OpenRouter models, Runware
  * prices scale slightly with steps — the quoted rate here assumes the
- * provider's default step count for each model.
+ * provider's default step count (4 for schnell, 28 for dev).
  *
  * Triggered by: PRAutoBlogger_Runware_Image_Provider, PRAutoBlogger_Runware_Image_Batch.
  * Dependencies: None — pure calculation + option reads.
  *
  * @see class-runware-image-provider.php — Primary caller.
- * @see class-runware-model-catalog.php — Live model sync; authoritative pricing source.
  * @see class-open-router-image-pricing.php — Sibling pattern for OpenRouter.
- * @see admin/class-image-model-registry.php — Source of truth for model list; keep in sync.
  */
 class PRAutoBlogger_Runware_Image_Pricing {
 
 	/**
 	 * Flat per-image cost (USD) for each supported Runware model, April 2026.
-	 * Update here when Runware reprices or new models launch. Must stay in
-	 * sync with the model list in PRAutoBlogger_Image_Model_Registry — any
-	 * model listed there that is absent here will silently fall back to schnell.
+	 * Update here when Runware reprices or new models launch.
 	 *
-	 * Runware model IDs use `family:variant@version` form.
+	 * Runware model IDs use `family:variant@version` form. The two FLUX
+	 * variants we support are the CEO-sanctioned defaults.
 	 *
 	 * @var array<string, float>
 	 */
 	private const COST_PER_IMAGE = array(
-		// FLUX.1 schnell — 4-step distilled. Default (2026-04-21).
-		'runware:100@1'                => 0.0006,
-		// TwinFlow Z-Image-Turbo — fast text-to-image, same cost as schnell.
-		'runware:twinflow-z-image-turbo@0' => 0.0006,
-		// FLUX.2 klein 4B — newer architecture at schnell price.
-		'runware:400@4'                => 0.0006,
-		// FLUX.2 klein 9B — stronger than schnell, similar cost.
-		'runware:400@2'                => 0.00078,
-		// Stable Diffusion 3 — sharp text, complex scenes.
-		'runware:5@1'                  => 0.0013,
-		// Z-Image Turbo — fast photorealistic generation.
-		'runware:z-image@turbo'        => 0.0013,
-		// HiDream-I1 Fast — low latency, 17B quality.
-		'runware:97@3'                 => 0.0038,
-		// HiDream-I1 Dev — strong prompt alignment.
-		'runware:97@2'                 => 0.0045,
-		// Z-Image — high-quality foundation model.
-		'runware:z-image@0'            => 0.0045,
-		// FLUX.2 dev — controllable open text-to-image.
-		'runware:400@1'                => 0.0051,
-		// Qwen-Image — strong text rendering in generated images.
-		'runware:108@1'                => 0.0058,
-		// HiDream-I1 Full — 17B high-fidelity, LoRA support.
-		'runware:97@1'                 => 0.009,
-		// FLUX.1 Krea dev — photorealistic open-weight generation.
-		'runware:107@1'                => 0.0098,
-		// FLUX.1 dev — 28-step full model. Higher fidelity, ~30x schnell cost.
-		'runware:101@1'                => 0.02,
-		// GLM-Image — hybrid autoregressive+diffusion, excellent text rendering.
-		'runware:glm-image@0'          => 0.0225,
+		// FLUX.1 schnell — 4-step distilled. Our new default (2026-04-21).
+		'runware:100@1' => 0.0006,
+		// FLUX.1 dev — 28-step full model. Higher fidelity, ~30x cost.
+		'runware:101@1' => 0.02,
 	);
 
 	/**
 	 * Default number of inference steps per model. Runware bills per image
 	 * at the model's standard step count; custom step counts may alter price.
-	 * Sources: runware.ai/models (April 2026).
 	 *
 	 * @var array<string, int>
 	 */
 	private const DEFAULT_STEPS = array(
-		'runware:100@1'                    => 4,
-		'runware:twinflow-z-image-turbo@0' => 4,
-		'runware:400@4'                    => 20,
-		'runware:400@2'                    => 20,
-		'runware:5@1'                      => 28,
-		'runware:z-image@turbo'            => 4,
-		'runware:97@3'                     => 16,
-		'runware:97@2'                     => 28,
-		'runware:z-image@0'                => 28,
-		'runware:400@1'                    => 28,
-		'runware:108@1'                    => 20,
-		'runware:97@1'                     => 50,
-		'runware:107@1'                    => 28,
-		'runware:101@1'                    => 28,
-		'runware:glm-image@0'              => 30,
+		'runware:100@1' => 4,
+		'runware:101@1' => 28,
 	);
 
 	/**
@@ -120,9 +77,9 @@ class PRAutoBlogger_Runware_Image_Pricing {
 	/**
 	 * Estimate USD cost for a single image at the given model.
 	 *
-	 * Runware pricing is flat per image at the model's standard step count.
-	 * Width/height are accepted for interface compatibility but do not affect
-	 * cost for the variants we support.
+	 * Runware FLUX pricing is flat per image at the model's standard step
+	 * count. Width/height are accepted for interface compatibility but do
+	 * not affect cost for the variants we support.
 	 *
 	 * @param int    $width  Width in pixels (unused for flat pricing).
 	 * @param int    $height Height in pixels (unused for flat pricing).

includes/providers/class-runware-model-catalog.php

@@ -1,298 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * phpcs:ignore WordPress.Files.FileName.InvalidClassFileName -- class naming convention differs from WordPress standard
- *
- * Runware model catalog sync — fetches live model list via Runware's /v1 endpoint,
- * filters to text-to-image tasks, caches normalized results, and falls back to
- * hardcoded list on API failure.
- *
- * What: Syncs Runware's model catalog periodically (daily cron + on-demand AJAX),
- *       caches the results in WP options, and merges pricing data from the pricing
- *       class when Runware's API doesn't expose it.
- * Who triggers it: Daily cron (prautoblogger_sync_runware_models), AJAX "Sync now"
- *                  button in PRAdmin, and lazy-load via PRAutoBlogger_Image_Model_Registry.
- * Dependencies: PRAutoBlogger_Logger, PRAutoBlogger_Runware_Image_Pricing,
- *               PRAutoBlogger_Image_Model_Registry.
- *
- * @see class-runware-image-pricing.php        — Authoritative pricing source & fallback models.
- * @see admin/class-image-model-registry.php   — Caller; merges Runware + OpenRouter lists.
- * @see class-prautoblogger.php                — Registers daily cron + AJAX hook.
- * @see class-activator.php / class-deactivator.php — Schedule / unschedule on activation/deactivation.
- */
-class PRAutoBlogger_Runware_Model_Catalog {
-
-	private const RUNWARE_API_URL = 'https://api.runware.ai/v1';
-	private const CACHE_TTL_SECONDS = 86400;
-	private const HTTP_TIMEOUT_SECONDS = 30;
-
-	/**
-	 * Fetch the Runware model catalog, normalize to the Image_Model_Registry
-	 * shape, and write to WP options cache. Returns true on success, false on
-	 * API failure or parse error.
-	 *
-	 * Side effects: makes HTTP request to Runware API, writes WP options.
-	 * Error handling: logs via PRAutoBlogger_Logger, never throws, always
-	 *                 returns bool to allow fallback to cached list.
-	 *
-	 * @return bool True on successful fetch and cache update; false on API or parse error.
-	 */
-	public function sync(): bool {
-		try {
-			$api_key = $this->get_api_key();
-			if ( '' === $api_key ) {
-				PRAutoBlogger_Logger::instance()->warning(
-					'Runware model catalog sync: API key not configured. Using cached/fallback models.',
-					'runware-catalog'
-				);
-				return false;
-			}
-
-			$raw_models = $this->fetch_models_from_api( $api_key );
-			if ( empty( $raw_models ) ) {
-				PRAutoBlogger_Logger::instance()->warning(
-					'Runware model catalog fetch returned empty list. Using cached/fallback models.',
-					'runware-catalog'
-				);
-				return false;
-			}
-
-			$normalized = $this->normalize_models( $raw_models );
-			$with_pricing = $this->merge_pricing( $normalized );
-
-			if ( empty( $with_pricing ) ) {
-				PRAutoBlogger_Logger::instance()->warning(
-					'Runware model catalog normalization resulted in empty list. Using cached/fallback models.',
-					'runware-catalog'
-				);
-				return false;
-			}
-
-			update_option( 'prautoblogger_runware_model_cache', $with_pricing, false );
-			update_option( 'prautoblogger_runware_model_cache_updated_at', time(), false );
-
-			PRAutoBlogger_Logger::instance()->info(
-				sprintf( 'Runware model catalog synced: %d models cached.', count( $with_pricing ) ),
-				'runware-catalog'
-			);
-			return true;
-		} catch ( \Throwable $e ) {
-			PRAutoBlogger_Logger::instance()->error(
-				sprintf( 'Runware model catalog sync failed: %s (%s)', $e->getMessage(), get_class( $e ) ),
-				'runware-catalog'
-			);
-			return false;
-		}
-	}
-
-	/**
-	 * Get the normalized model list, with smart caching logic:
-	 * - If cache is fresh (< 24h), return it.
-	 * - If cache is stale or absent, trigger a sync.
-	 * - If sync fails, return the last-known-good cache.
-	 * - If no cache exists, return the hardcoded fallback (never empty).
-	 *
-	 * @return array<int, array<string, mixed>> Normalized model list.
-	 */
-	public function get_models(): array {
-		if ( ! $this->is_stale() ) {
-			$cached = get_option( 'prautoblogger_runware_model_cache', array() );
-			if ( is_array( $cached ) && ! empty( $cached ) ) {
-				return $cached;
-			}
-		}
-
-		if ( $this->sync() ) {
-			$cached = get_option( 'prautoblogger_runware_model_cache', array() );
-			if ( is_array( $cached ) && ! empty( $cached ) ) {
-				return $cached;
-			}
-		}
-
-		$cached = get_option( 'prautoblogger_runware_model_cache', array() );
-		if ( is_array( $cached ) && ! empty( $cached ) ) {
-			PRAutoBlogger_Logger::instance()->info(
-				'Using stale Runware model cache (live sync failed).',
-				'runware-catalog'
-			);
-			return $cached;
-		}
-
-		$fallback = PRAutoBlogger_Image_Model_Registry::get_runware_fallback_models();
-		PRAutoBlogger_Logger::instance()->warning(
-			sprintf(
-				'No Runware model cache available; using hardcoded fallback (%d models).',
-				count( $fallback )
-			),
-			'runware-catalog'
-		);
-		return $fallback;
-	}
-
-	/**
-	 * Get the Unix timestamp of the last successful sync, or null if never synced.
-	 *
-	 * @return int|null Unix timestamp, or null if never synced.
-	 */
-	public function get_last_synced_at(): ?int {
-		$ts = get_option( 'prautoblogger_runware_model_cache_updated_at', null );
-		if ( null === $ts ) {
-			return null;
-		}
-		$ts = (int) $ts;
-		return $ts > 0 ? $ts : null;
-	}
-
-	/**
-	 * Check if the cache is stale (older than 24h) or absent.
-	 *
-	 * @return bool True if cache should be refreshed; false if still fresh.
-	 */
-	public function is_stale(): bool {
-		$updated_at = $this->get_last_synced_at();
-		if ( null === $updated_at ) {
-			return true;
-		}
-		return ( time() - $updated_at ) > self::CACHE_TTL_SECONDS;
-	}
-
-	/**
-	 * Fetch the raw model list from Runware's /v1 endpoint via a models task.
-	 *
-	 * @param string $api_key Decrypted Runware API key.
-	 * @return array Raw model list (may be empty).
-	 * @throws \RuntimeException On HTTP error or malformed response.
-	 */
-	private function fetch_models_from_api( string $api_key ): array {
-		$body = wp_json_encode(
-			array(
-				array(
-					'taskType' => 'models',
-					'apiKey'   => $api_key,
-				),
-			)
-		);
-
-		$response = wp_remote_post(
-			self::RUNWARE_API_URL,
-			array(
-				'timeout' => self::HTTP_TIMEOUT_SECONDS,
-				'headers' => array( 'Content-Type' => 'application/json' ),
-				'body'    => $body,
-			)
-		);
-
-		if ( is_wp_error( $response ) ) {
-			throw new \RuntimeException(
-				sprintf( 'Runware models endpoint unreachable: %s', $response->get_error_message() )
-			);
-		}
-
-		$status = (int) wp_remote_retrieve_response_code( $response );
-		if ( 200 !== $status ) {
-			$raw = wp_remote_retrieve_body( $response );
-			throw new \RuntimeException(
-				sprintf( 'Runware models endpoint returned HTTP %d', $status )
-			);
-		}
-
-		$raw = (string) wp_remote_retrieve_body( $response );
-		$decoded = json_decode( $raw, true );
-
-		if ( ! is_array( $decoded ) ) {
-			throw new \RuntimeException( 'Runware models response is not valid JSON.' );
-		}
-
-		if ( isset( $decoded['errors'] ) && is_array( $decoded['errors'] ) && ! empty( $decoded['errors'] ) ) {
-			throw new \RuntimeException( 'Runware API returned an error.' );
-		}
-
-		$data = $decoded['data'] ?? array();
-		return is_array( $data ) ? $data : array();
-	}
-
-	/**
-	 * Normalize raw Runware model objects to the PRAutoBlogger_Image_Model_Registry
-	 * shape: id, name, provider, cost_per_image, capabilities, description.
-	 *
-	 * Filters to taskType='imageInference' (text-to-image only), excluding
-	 * inpainting (imageInference + requiresImage=true), img2img, video, upscalers.
-	 *
-	 * @param array<int, array<string, mixed>> $raw_models Raw API response.
-	 * @return array<int, array<string, mixed>> Normalized models.
-	 */
-	private function normalize_models( array $raw_models ): array {
-		$normalized = array();
-
-		foreach ( $raw_models as $raw ) {
-			if ( ! is_array( $raw ) ) {
-				continue;
-			}
-
-			$task_type = $raw['taskType'] ?? '';
-			if ( 'imageInference' !== $task_type ) {
-				continue;
-			}
-
-			if ( isset( $raw['requiresImage'] ) && true === $raw['requiresImage'] ) {
-				continue;
-			}
-
-			$model_id = (string) ( $raw['id'] ?? '' );
-			if ( '' === $model_id ) {
-				continue;
-			}
-
-			$normalized[] = array(
-				'id'             => $model_id,
-				'name'           => (string) ( $raw['name'] ?? $model_id ),
-				'provider'       => 'runware',
-				'cost_per_image' => null,
-				'capabilities'   => array( 'image_generation' ),
-				'description'    => (string) ( $raw['description'] ?? '' ),
-			);
-		}
-
-		return $normalized;
-	}
-
-	/**
-	 * Merge pricing data from PRAutoBlogger_Runware_Image_Pricing into the
-	 * normalized catalog. Models without pricing data get cost_per_image=null.
-	 *
-	 * @param array<int, array<string, mixed>> $normalized Normalized models.
-	 * @return array<int, array<string, mixed>> Models with pricing merged.
-	 */
-	private function merge_pricing( array $normalized ): array {
-		$pricing_table = PRAutoBlogger_Runware_Image_Pricing::get_model_costs();
-
-		foreach ( $normalized as &$model ) {
-			$model_id = $model['id'] ?? '';
-			if ( isset( $pricing_table[ $model_id ] ) ) {
-				$model['cost_per_image'] = (float) $pricing_table[ $model_id ];
-			}
-		}
-
-		return $normalized;
-	}
-
-	/**
-	 * Get the decrypted Runware API key from settings.
-	 *
-	 * @return string Plaintext key, or empty string if not configured.
-	 */
-	private function get_api_key(): string {
-		$stored = (string) get_option( 'prautoblogger_runware_api_key', '' );
-		if ( '' === $stored ) {
-			return '';
-		}
-
-		if ( PRAutoBlogger_Encryption::is_encrypted( $stored ) ) {
-			$decrypted = PRAutoBlogger_Encryption::decrypt( $stored );
-			return '' === $decrypted ? '' : $decrypted;
-		}
-
-		return $stored;
-	}
-}

patchwork.json

@@ -1,5 +0,0 @@
-{
-    "redefinable-internals": [
-        "time"
-    ]
-}

prautoblogger.php

@@ -9,7 +9,7 @@
  * Plugin Name:       PRAutoBlogger
  * Plugin URI:        https://peptiderepo.com/prautoblogger
  * Description:       Monitors social media for trending topics, generates SEO-friendly blog posts using AI, and publishes them on a daily schedule with full cost tracking and self-improvement metrics.
- * Version:           0.17.0
+ * Version:           0.13.0
  * Requires at least: 6.0
  * Requires PHP:      7.4
  * Author:            PeptideRepo
@@ -35,7 +35,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 | Defined here so every file in the plugin can reference paths, versions,
 | and limits without magic strings.
 */
-define( 'PRAUTOBLOGGER_VERSION', '0.17.0' );
+define( 'PRAUTOBLOGGER_VERSION', '0.13.0' );
 define( 'PRAUTOBLOGGER_DB_VERSION', '1.1.0' );
 define( 'PRAUTOBLOGGER_PLUGIN_FILE', __FILE__ );
 define( 'PRAUTOBLOGGER_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
@@ -66,22 +66,6 @@ define(
 	'PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_SUFFIX',
 	'Style: a single-panel newspaper comic in classic black ink on white paper, simple clean linework like The Far Side or B.C., slightly yellowed newsprint texture, hand-drawn crosshatching for shading, bold panel border, warm and humorous tone, visible in a newspaper comics section. IMPORTANT: Do not render any text, captions, speech bubbles, or words inside the image.'
 );
-// Default editorial-illustration prompt template for the image generator.
-// Updated 2026-05-29 (v0.16.0): pivot from single-panel comic to text-free
-// editorial scientific illustration. The {{ topic_summary }} token is filled
-// at build time with a 1-2 sentence topic/mechanism description from the
-// rewriter LLM; the rest is brand-locked. Replaces the old Style Suffix.
-// Users may override via Settings -> Images -> Style Template. Per brief A5
-// the template must contain exactly one {{ topic_summary }} token.
-define(
-	'PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE',
-	"Editorial scientific illustration, flat vector aesthetic, limited palette of\n" .
-	"teal (#1B8A92) and cream (#FAF6EE) with ink (#0D0D0D) line work and accents\n" .
-	"of orange (#FF8A3D) and lime (#7FD600). Subject: {{ topic_summary }}.\n" .
-	"Style reference: Quanta Magazine, The Pudding, scientific editorial illustration.\n" .
-	"Composition: clear focal point, balanced negative space, subtle textural detail.\n" .
-	'Mood: authoritative, clinical, calm. NO TEXT. NO PEOPLE. NO LOGOS. NO LABELS.'
-);
 // Opik observability (feature-flag gated).
 // API credentials must be defined in wp-config.php constants:
 // - PRAUTOBLOGGER_OPIK_API_KEY: API key for authentication

tests/bootstrap.php

@@ -63,24 +63,12 @@ if ( ! defined( 'PRAUTOBLOGGER_DEFAULT_EDITOR_MODEL' ) ) {
 if ( ! defined( 'PRAUTOBLOGGER_DEFAULT_IMAGE_MODEL' ) ) {
     define( 'PRAUTOBLOGGER_DEFAULT_IMAGE_MODEL', 'runware:100@1' );
 }
-if ( ! defined( 'PRAUTOBLOGGER_DEFAULT_IMAGE_PROVIDER' ) ) {
-    define( 'PRAUTOBLOGGER_DEFAULT_IMAGE_PROVIDER', 'runware' );
-}
 
-// Default image style suffix used by legacy ImagePromptBuilder paths / settings UI.
+// Default image style suffix used by ImagePromptBuilder and settings UI.
 if ( ! defined( 'PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_SUFFIX' ) ) {
     define( 'PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_SUFFIX', 'Style: test infomercial style.' );
 }
 
-// Editorial style template (v0.16.0): default for prautoblogger_image_style_template.
-// Must contain exactly one {{ topic_summary }} token (brief A5).
-if ( ! defined( 'PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE' ) ) {
-    define(
-        'PRAUTOBLOGGER_DEFAULT_IMAGE_STYLE_TEMPLATE',
-        "Editorial scientific illustration. Subject: {{ topic_summary }}. NO TEXT. NO PEOPLE. NO LOGOS. NO LABELS."
-    );
-}
-
 // WordPress database constants used in $wpdb queries.
 if ( ! defined( 'ARRAY_A' ) ) {
     define( 'ARRAY_A', 'ARRAY_A' );

tests/unit/Core/CostTrackerTest.php

@@ -113,139 +113,4 @@ class CostTrackerTest extends BaseTestCase {
         // If we get here without exception, the method worked.
         $this->assertTrue( true );
     }
-
-    /**
-     * Regression: get_avg_tokens_for_stages must return the documented zero
-     * shape when there is no generation history, without leaving a $wpdb
-     * error behind.
-     *
-     * Load-bearing: asserting $wpdb->last_error === '' alongside the shape
-     * is what would have caught the v0.11.0 column-name drift. The empty-
-     * result fallback silently masked the failure from shape-only tests.
-     */
-    public function test_get_avg_tokens_returns_zero_shape_when_no_history(): void {
-        $captured_query = '';
-        $this->wpdb->method( 'prepare' )->willReturnCallback(
-            function ( $sql, ...$args ) use ( &$captured_query ) {
-                $captured_query = $sql;
-                return $sql; // Simulate prepared SQL passthrough.
-            }
-        );
-        // Empty result row — fallback branch.
-        $this->wpdb->method( 'get_row' )->willReturn( null );
-
-        $tracker = new \PRAutoBlogger_Cost_Tracker();
-        $result  = $tracker->get_avg_tokens_for_stages( [ 'analysis' ], 30 );
-
-        $this->assertSame(
-            [
-                'avg_prompt_tokens'     => 0.0,
-                'avg_completion_tokens' => 0.0,
-                'sample_size'           => 0,
-            ],
-            $result
-        );
-        $this->assertSame( '', $this->wpdb->last_error, 'wpdb->last_error must be empty after the query' );
-
-        // Schema-drift guard: query must reference canonical columns, not the
-        // pre-v0.15.1 names that don't exist on wp_prautoblogger_generation_log.
-        $this->assertStringContainsString( 'prompt_tokens', $captured_query );
-        $this->assertStringContainsString( 'completion_tokens', $captured_query );
-        $this->assertStringContainsString( 'created_at', $captured_query );
-        $this->assertStringNotContainsString( 'input_tokens', $captured_query );
-        $this->assertStringNotContainsString( 'output_tokens', $captured_query );
-        // The bug query had `AND timestamp >= %d`; canonical query uses
-        // `AND created_at >= %s`. Guard against the column reference, not the
-        // bare word (a SQL comment in future code could legitimately mention
-        // "timestamp" in prose).
-        $this->assertStringNotContainsString( 'timestamp >=', $captured_query );
-    }
-
-    /**
-     * Regression: with seeded rows the method returns real averages and the
-     * canonical SELECT aliases (avg_prompt / avg_completion) are extracted
-     * correctly.
-     */
-    public function test_get_avg_tokens_returns_real_averages_with_seeded_rows(): void {
-        $this->wpdb->method( 'prepare' )->willReturnCallback(
-            static function ( $sql ) {
-                return $sql;
-            }
-        );
-        // Simulate three rows averaged: prompt_tokens=100, completion_tokens=50.
-        $this->wpdb->method( 'get_row' )->willReturn(
-            [
-                'avg_prompt'     => '100.0000',
-                'avg_completion' => '50.0000',
-                'sample_count'   => '3',
-            ]
-        );
-
-        $tracker = new \PRAutoBlogger_Cost_Tracker();
-        $result  = $tracker->get_avg_tokens_for_stages( [ 'analysis' ], 30 );
-
-        $this->assertSame( 100.0, $result['avg_prompt_tokens'] );
-        $this->assertSame( 50.0, $result['avg_completion_tokens'] );
-        $this->assertSame( 3, $result['sample_size'] );
-        $this->assertSame( '', $this->wpdb->last_error );
-    }
-
-    /**
-     * Regression: the days cutoff must be a MySQL DATETIME string (compared
-     * against the canonical created_at column), not a unix int. Captured via
-     * the prepare() callback so we can inspect the bound parameter.
-     */
-    public function test_get_avg_tokens_respects_days_cutoff_as_datetime(): void {
-        $captured_args = [];
-        $this->wpdb->method( 'prepare' )->willReturnCallback(
-            function ( $sql, ...$args ) use ( &$captured_args ) {
-                $captured_args = $args;
-                return $sql;
-            }
-        );
-        $this->wpdb->method( 'get_row' )->willReturn( null );
-
-        $tracker = new \PRAutoBlogger_Cost_Tracker();
-        $tracker->get_avg_tokens_for_stages( [ 'analysis' ], 30 );
-
-        // Exactly one bound param: the DATETIME cutoff.
-        $this->assertCount( 1, $captured_args );
-        $this->assertIsString( $captured_args[0], 'Cutoff must be a DATETIME string, not a unix int' );
-        $this->assertMatchesRegularExpression(
-            '/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/',
-            $captured_args[0]
-        );
-    }
-
-    /**
-     * Regression: the stage filter is propagated into the SQL. Calling with
-     * a single stage should result in exactly one prepared %s placeholder
-     * for the IN ( … ) list.
-     */
-    public function test_get_avg_tokens_filters_by_stage(): void {
-        $stage_prepare_calls = 0;
-        $main_query          = '';
-        $this->wpdb->method( 'prepare' )->willReturnCallback(
-            function ( $sql, ...$args ) use ( &$stage_prepare_calls, &$main_query ) {
-                // The method calls $wpdb->prepare twice in two distinct shapes:
-                //  1. per-stage placeholder prep (sql='%s', single arg)
-                //  2. the main SELECT (sql contains 'SELECT', many tokens)
-                if ( strpos( $sql, 'SELECT' ) !== false ) {
-                    $main_query = $sql;
-                } else {
-                    ++$stage_prepare_calls;
-                }
-                return $sql;
-            }
-        );
-        $this->wpdb->method( 'get_row' )->willReturn( null );
-
-        $tracker = new \PRAutoBlogger_Cost_Tracker();
-        $tracker->get_avg_tokens_for_stages( [ 'analysis' ], 30 );
-
-        $this->assertSame( 1, $stage_prepare_calls, 'One stage → one per-stage prepare() call' );
-        $this->assertStringContainsString( 'stage IN', $main_query );
-        $this->assertStringContainsString( 'wp_prautoblogger_generation_log', $main_query );
-        $this->assertSame( '', $this->wpdb->last_error );
-    }
 }

tests/unit/Core/ImageAttacherTest.php

@@ -1,176 +0,0 @@
-<?php
-/**
- * Tests for PRAutoBlogger_Image_Attacher.
- *
- * Validates primary sideload + cost logging (including the v0.17.0 alt-text
- * fix: the caption, not the model name, becomes alt text) and composed
- * variant persistence with role/base meta-linking at $0 cost.
- *
- * @package PRAutoBlogger\Tests\Core
- */
-
-namespace PRAutoBlogger\Tests\Core;
-
-use PRAutoBlogger\Tests\BaseTestCase;
-use Brain\Monkey\Functions;
-
-class ImageAttacherTest extends BaseTestCase {
-
-	/** @var array Captured update_post_meta calls: [object_id, key, value]. */
-	private array $meta_calls = [];
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		Functions\when( 'is_wp_error' )->alias(
-			static function ( $thing ) {
-				return $thing instanceof \WP_Error;
-			}
-		);
-		$this->meta_calls = [];
-		Functions\when( 'update_post_meta' )->alias(
-			function ( $object_id, $key, $value ) {
-				$this->meta_calls[] = [ $object_id, $key, $value ];
-				return true;
-			}
-		);
-		$this->stub_get_option( [] );
-	}
-
-	/** Helper: find a captured meta value by object id + key. */
-	private function meta_value( int $object_id, string $key ) {
-		foreach ( $this->meta_calls as $call ) {
-			if ( $call[0] === $object_id && $call[1] === $key ) {
-				return $call[2];
-			}
-		}
-		return null;
-	}
-
-	/** Helper: primary image fixture. */
-	private function image_data(): array {
-		return [
-			'bytes'      => 'featured_bytes',
-			'mime_type'  => 'image/png',
-			'width'      => 1200,
-			'height'     => 632,
-			'model'      => 'flux-1-schnell',
-			'cost_usd'   => 0.0006,
-			'latency_ms' => 1500,
-		];
-	}
-
-	/**
-	 * sideload_and_log() forwards the caption as alt text (bug fix: the model
-	 * name used to leak into alt text) and logs the generation cost once.
-	 */
-	public function test_sideload_and_log_forwards_caption_as_alt_and_logs_cost(): void {
-		$sideloader = $this->createMock( \PRAutoBlogger_Image_Media_Sideloader::class );
-		$sideloader->expects( $this->once() )
-			->method( 'sideload_image' )
-			->with( $this->image_data(), 7, 'Collagen fragments may aid joint repair' )
-			->willReturn( 42 );
-
-		$cost_tracker = $this->createMock( \PRAutoBlogger_Cost_Tracker::class );
-		$cost_tracker->expects( $this->once() )
-			->method( 'log_image_generation' )
-			->with( 0.0006, 'flux-1-schnell', 7, 'image_a' );
-
-		$attacher = new \PRAutoBlogger_Image_Attacher( $sideloader, $cost_tracker );
-		$result   = $attacher->sideload_and_log( $this->image_data(), 7, 'image_a', 'Image A', 'Collagen fragments may aid joint repair' );
-
-		$this->assertSame( 42, $result );
-	}
-
-	/**
-	 * A failed primary sideload returns the WP_Error untouched and logs no cost.
-	 */
-	public function test_sideload_and_log_propagates_error_without_cost_row(): void {
-		$error      = new \WP_Error( 'sideload_failed', 'disk full' );
-		$sideloader = $this->createMock( \PRAutoBlogger_Image_Media_Sideloader::class );
-		$sideloader->method( 'sideload_image' )->willReturn( $error );
-
-		$cost_tracker = $this->createMock( \PRAutoBlogger_Cost_Tracker::class );
-		$cost_tracker->expects( $this->never() )->method( 'log_image_generation' );
-
-		$attacher = new \PRAutoBlogger_Image_Attacher( $sideloader, $cost_tracker );
-
-		$this->assertSame( $error, $attacher->sideload_and_log( $this->image_data(), 7, 'image_a', 'Image A', 'cap' ) );
-	}
-
-	/**
-	 * attach_variants() sideloads og + square with the role as filename
-	 * suffix and the caption as alt text, writes role/base attachment meta
-	 * and the role-specific post meta, and never logs composition cost.
-	 */
-	public function test_attach_variants_meta_links_og_and_square(): void {
-		$variants = [
-			[
-				'bytes'     => 'og_bytes',
-				'mime_type' => 'image/png',
-				'width'     => 1200,
-				'height'    => 630,
-				'role'      => 'og',
-			],
-			[
-				'bytes'     => 'square_bytes',
-				'mime_type' => 'image/png',
-				'width'     => 1080,
-				'height'    => 1080,
-				'role'      => 'square',
-			],
-		];
-
-		$returned_ids = [ 'og' => 43, 'square' => 44 ];
-		$sideloader   = $this->createMock( \PRAutoBlogger_Image_Media_Sideloader::class );
-		$sideloader->expects( $this->exactly( 2 ) )
-			->method( 'sideload_image' )
-			->willReturnCallback(
-				function ( array $image_data, int $post_id, string $alt, string $suffix ) use ( $returned_ids ) {
-					$this->assertSame( 7, $post_id );
-					$this->assertSame( 'A short caption', $alt );
-					$this->assertSame( 0.0, $image_data['cost_usd'] );
-					$this->assertSame( 'flux-1-schnell', $image_data['model'] );
-					$this->assertArrayHasKey( $suffix, $returned_ids, 'filename suffix must be the role' );
-					return $returned_ids[ $suffix ];
-				}
-			);
-
-		$cost_tracker = $this->createMock( \PRAutoBlogger_Cost_Tracker::class );
-		$cost_tracker->expects( $this->never() )->method( 'log_image_generation' );
-
-		$attacher = new \PRAutoBlogger_Image_Attacher( $sideloader, $cost_tracker );
-		$attacher->attach_variants( $variants, 7, 42, 'A short caption', 'flux-1-schnell' );
-
-		$this->assertSame( 'og', $this->meta_value( 43, '_prautoblogger_image_role' ) );
-		$this->assertSame( 42, $this->meta_value( 43, '_prautoblogger_base_attachment_id' ) );
-		$this->assertSame( 43, $this->meta_value( 7, '_prautoblogger_og_image_id' ) );
-
-		$this->assertSame( 'square', $this->meta_value( 44, '_prautoblogger_image_role' ) );
-		$this->assertSame( 42, $this->meta_value( 44, '_prautoblogger_base_attachment_id' ) );
-		$this->assertSame( 44, $this->meta_value( 7, '_prautoblogger_square_image_id' ) );
-	}
-
-	/**
-	 * Unknown roles (e.g. a stray featured entry) are ignored, and a failed
-	 * variant sideload is skipped without meta writes or exceptions.
-	 */
-	public function test_attach_variants_skips_unknown_roles_and_failed_sideloads(): void {
-		$variants = [
-			[ 'bytes' => 'f', 'mime_type' => 'image/png', 'width' => 1, 'height' => 1, 'role' => 'featured' ],
-			[ 'bytes' => 'o', 'mime_type' => 'image/png', 'width' => 1200, 'height' => 630, 'role' => 'og' ],
-		];
-
-		$sideloader = $this->createMock( \PRAutoBlogger_Image_Media_Sideloader::class );
-		$sideloader->expects( $this->once() ) // Only og — featured is not a variant role here.
-			->method( 'sideload_image' )
-			->willReturn( new \WP_Error( 'sideload_failed', 'nope' ) );
-
-		$cost_tracker = $this->createMock( \PRAutoBlogger_Cost_Tracker::class );
-
-		$attacher = new \PRAutoBlogger_Image_Attacher( $sideloader, $cost_tracker );
-		$attacher->attach_variants( $variants, 7, 42, 'cap', 'model' );
-
-		$this->assertSame( [], $this->meta_calls );
-	}
-}

tests/unit/Core/ImageComposerImagickTest.php

@@ -1,104 +0,0 @@
-<?php
-/**
- * Tests for PRAutoBlogger_Image_Composer_Imagick (real renders).
- *
- * These run only where ext-imagick is loaded (skipped on the standard CI
- * matrix); the same renders are exercised by the standalone harness that
- * produced the PR samples. Asserts the determinism contract — identical
- * inputs yield byte-identical output in the same environment — plus the
- * exact variant geometry.
- *
- * @package PRAutoBlogger\Tests\Core
- */
-
-namespace PRAutoBlogger\Tests\Core;
-
-use PRAutoBlogger\Tests\BaseTestCase;
-
-class ImageComposerImagickTest extends BaseTestCase {
-
-	protected function setUp(): void {
-		parent::setUp();
-		if ( ! extension_loaded( 'imagick' ) ) {
-			$this->markTestSkipped( 'ext-imagick not available — renderer covered by the server-side harness.' );
-		}
-	}
-
-	/** Helper: renderer wired to the real bundled assets. */
-	private function renderer(): \PRAutoBlogger_Image_Composer_Imagick {
-		$root = dirname( __DIR__, 3 );
-
-		return new \PRAutoBlogger_Image_Composer_Imagick(
-			\PRAutoBlogger_Image_Composer_Layout::defaults(),
-			$root . '/assets/brand/',
-			$root . '/assets/fonts/'
-		);
-	}
-
-	/** Helper: deterministic 1200×632 fixture base image (gradient + disc). */
-	private function fixture_bytes(): string {
-		$image = new \Imagick();
-		$image->newPseudoImage( 1200, 632, 'gradient:#1B8A92-#FAFAF7' );
-		$draw = new \ImagickDraw();
-		$draw->setFillColor( new \ImagickPixel( '#FF8A3D' ) );
-		$draw->circle( 600, 316, 600, 470 );
-		$image->drawImage( $draw );
-		$image->setImageFormat( 'png' );
-
-		return $image->getImageBlob();
-	}
-
-	/**
-	 * Determinism: rendering the same input twice yields byte-identical
-	 * variants (metadata stripped, PNG date/time chunks excluded).
-	 */
-	public function test_same_input_renders_byte_identical_output(): void {
-		$bytes   = $this->fixture_bytes();
-		$caption = 'Collagen fragments may aid joint repair';
-
-		$first  = $this->renderer()->compose_og( $bytes, $caption );
-		$second = $this->renderer()->compose_og( $bytes, $caption );
-		$this->assertSame( hash( 'sha256', $first['bytes'] ), hash( 'sha256', $second['bytes'] ), 'OG render must be byte-stable' );
-
-		$first  = $this->renderer()->compose_square( $bytes, $caption );
-		$second = $this->renderer()->compose_square( $bytes, $caption );
-		$this->assertSame( hash( 'sha256', $first['bytes'] ), hash( 'sha256', $second['bytes'] ), 'Square render must be byte-stable' );
-
-		$first  = $this->renderer()->compose_featured( $bytes );
-		$second = $this->renderer()->compose_featured( $bytes );
-		$this->assertSame( hash( 'sha256', $first['bytes'] ), hash( 'sha256', $second['bytes'] ), 'Featured render must be byte-stable' );
-	}
-
-	/**
-	 * Variant geometry matches the spec: featured keeps base dimensions,
-	 * OG is exactly 1200×630, square exactly 1080×1080, all PNG.
-	 */
-	public function test_variant_dimensions_and_mime(): void {
-		$bytes   = $this->fixture_bytes();
-		$caption = 'Collagen fragments may aid joint repair';
-
-		$featured = $this->renderer()->compose_featured( $bytes );
-		$this->assertSame( [ 1200, 632, 'image/png', 'featured' ], [ $featured['width'], $featured['height'], $featured['mime_type'], $featured['role'] ] );
-
-		$og = $this->renderer()->compose_og( $bytes, $caption );
-		$this->assertSame( [ 1200, 630, 'image/png', 'og' ], [ $og['width'], $og['height'], $og['mime_type'], $og['role'] ] );
-
-		$square = $this->renderer()->compose_square( $bytes, $caption );
-		$this->assertSame( [ 1080, 1080, 'image/png', 'square' ], [ $square['width'], $square['height'], $square['mime_type'], $square['role'] ] );
-	}
-
-	/**
-	 * Output PNG bytes embed no date text chunks or tIME chunk, so a render
-	 * is stable across wall-clock time, not just within one process. (We
-	 * scan the raw bytes: Imagick synthesizes `date:*` image properties at
-	 * read time even for chunk-free PNGs, so getImageProperties() can't
-	 * distinguish embedded dates from synthesized ones.)
-	 */
-	public function test_output_contains_no_date_chunks(): void {
-		$og = $this->renderer()->compose_og( $this->fixture_bytes(), 'Short caption' );
-
-		$this->assertFalse( strpos( $og['bytes'], 'date:create' ), 'PNG must not embed a date:create text chunk' );
-		$this->assertFalse( strpos( $og['bytes'], 'date:modify' ), 'PNG must not embed a date:modify text chunk' );
-		$this->assertFalse( strpos( $og['bytes'], 'tIME' ), 'PNG must not embed a tIME chunk' );
-	}
-}

tests/unit/Core/ImageComposerLayoutTest.php

@@ -1,144 +0,0 @@
-<?php
-/**
- * Tests for PRAutoBlogger_Image_Composer_Layout.
- *
- * Validates the caption clamp (word wrap, hard budgets, ellipsis, multibyte)
- * and the shape of the layout defaults consumed by the renderers.
- *
- * @package PRAutoBlogger\Tests\Core
- */
-
-namespace PRAutoBlogger\Tests\Core;
-
-use PRAutoBlogger\Tests\BaseTestCase;
-
-class ImageComposerLayoutTest extends BaseTestCase {
-
-	/**
-	 * Empty and whitespace-only captions clamp to no lines at all.
-	 */
-	public function test_empty_caption_returns_no_lines(): void {
-		$this->assertSame( [], \PRAutoBlogger_Image_Composer_Layout::clamp_caption( '', 52, 2 ) );
-		$this->assertSame( [], \PRAutoBlogger_Image_Composer_Layout::clamp_caption( "  \n\t ", 52, 2 ) );
-	}
-
-	/**
-	 * A single short word stays on one line, untouched.
-	 */
-	public function test_single_word_caption(): void {
-		$this->assertSame(
-			[ 'Collagen' ],
-			\PRAutoBlogger_Image_Composer_Layout::clamp_caption( 'Collagen', 52, 2 )
-		);
-	}
-
-	/**
-	 * A caption exactly at the per-line budget fills the line with no
-	 * ellipsis and no spill.
-	 */
-	public function test_caption_exactly_at_budget_is_not_truncated(): void {
-		$caption = 'abcde fghij'; // 11 chars, budget 11.
-		$lines   = \PRAutoBlogger_Image_Composer_Layout::clamp_caption( $caption, 11, 1 );
-
-		$this->assertSame( [ 'abcde fghij' ], $lines );
-	}
-
-	/**
-	 * A caption exactly filling max_lines is kept in full (boundary: the
-	 * ellipsis only appears when content is actually dropped).
-	 */
-	public function test_caption_exactly_filling_max_lines_keeps_all_words(): void {
-		$lines = \PRAutoBlogger_Image_Composer_Layout::clamp_caption( 'aa bb cc dd', 5, 2 );
-
-		$this->assertSame( [ 'aa bb', 'cc dd' ], $lines );
-	}
-
-	/**
-	 * 3× the budget gets cut at max_lines with a trailing ellipsis, and no
-	 * line ever exceeds the per-line budget.
-	 */
-	public function test_overflowing_caption_is_ellipsized_within_budget(): void {
-		$caption = 'Collagen fragments may aid joint repair according to early trials in athletes';
-		$lines   = \PRAutoBlogger_Image_Composer_Layout::clamp_caption( $caption, 20, 2 );
-
-		$this->assertCount( 2, $lines );
-		$this->assertStringEndsWith( \PRAutoBlogger_Image_Composer_Layout::ELLIPSIS, $lines[1] );
-		foreach ( $lines as $line ) {
-			$this->assertLessThanOrEqual( 20, mb_strlen( $line ) );
-		}
-	}
-
-	/**
-	 * Words wrap at word boundaries — a word never straddles two lines when
-	 * it fits on the next one.
-	 */
-	public function test_wraps_at_word_boundaries(): void {
-		$lines = \PRAutoBlogger_Image_Composer_Layout::clamp_caption( 'peptide bonds form chains', 13, 3 );
-
-		$this->assertSame( [ 'peptide bonds', 'form chains' ], $lines );
-	}
-
-	/**
-	 * A single word longer than a full line is hard-split instead of
-	 * overflowing the canvas.
-	 */
-	public function test_overlong_single_word_is_hard_split(): void {
-		$lines = \PRAutoBlogger_Image_Composer_Layout::clamp_caption( 'abcdefghij', 4, 3 );
-
-		$this->assertSame( [ 'abcd', 'efgh', 'ij' ], $lines );
-	}
-
-	/**
-	 * Multibyte captions are measured in characters, not bytes, and the
-	 * ellipsis path keeps each line within the budget.
-	 */
-	public function test_multibyte_caption_counts_characters_not_bytes(): void {
-		$lines = \PRAutoBlogger_Image_Composer_Layout::clamp_caption( 'ペプチドは結合組織を強化する可能性がある', 6, 2 );
-
-		$this->assertCount( 2, $lines );
-		foreach ( $lines as $line ) {
-			$this->assertLessThanOrEqual( 6, mb_strlen( $line ) );
-		}
-		$this->assertStringEndsWith( \PRAutoBlogger_Image_Composer_Layout::ELLIPSIS, $lines[1] );
-	}
-
-	/**
-	 * Interior whitespace runs (newlines, tabs, doubles) collapse to single
-	 * spaces before wrapping.
-	 */
-	public function test_whitespace_is_collapsed_before_wrapping(): void {
-		$lines = \PRAutoBlogger_Image_Composer_Layout::clamp_caption( "joint \n\t repair", 20, 2 );
-
-		$this->assertSame( [ 'joint repair' ], $lines );
-	}
-
-	/**
-	 * Layout defaults carry every key the renderers consume, with the
-	 * spec'd headline geometry (band 120, square slice 569, footer 96).
-	 */
-	public function test_defaults_shape_matches_renderer_contract(): void {
-		$defaults = \PRAutoBlogger_Image_Composer_Layout::defaults();
-
-		$this->assertSame( [ 'featured', 'og', 'square' ], array_keys( $defaults ) );
-
-		$this->assertSame( 28, $defaults['featured']['mark_height'] );
-		$this->assertSame( 0.55, $defaults['featured']['mark_opacity'] );
-
-		$this->assertSame( 1200, $defaults['og']['width'] );
-		$this->assertSame( 630, $defaults['og']['height'] );
-		$this->assertSame( 120, $defaults['og']['band_height'] );
-		$this->assertSame( 2, $defaults['og']['caption_max_lines'] );
-
-		$this->assertSame( 1080, $defaults['square']['width'] );
-		$this->assertSame( 1080, $defaults['square']['height'] );
-		$this->assertSame( 569, $defaults['square']['slice_height'] );
-		$this->assertSame( 96, $defaults['square']['footer_height'] );
-		$this->assertSame( 3, $defaults['square']['caption_max_lines'] );
-
-		foreach ( [ 'og', 'square' ] as $role ) {
-			foreach ( [ 'caption_font', 'caption_size', 'caption_color', 'caption_chars_per_line', 'caption_line_height' ] as $key ) {
-				$this->assertArrayHasKey( $key, $defaults[ $role ], "$role missing $key" );
-			}
-		}
-	}
-}

tests/unit/Core/ImageComposerTest.php

@@ -1,325 +0,0 @@
-<?php
-/**
- * Tests for PRAutoBlogger_Image_Composer (orchestrator).
- *
- * Validates the degradation ladder (Imagick mocked present/absent via the
- * capability filter), pass-through guarantees, variant config whitelisting,
- * capability caching, and the uninstall prefix contract.
- *
- * @package PRAutoBlogger\Tests\Core
- */
-
-namespace PRAutoBlogger\Tests\Core;
-
-use PRAutoBlogger\Tests\BaseTestCase;
-use Brain\Monkey\Functions;
-use Brain\Monkey\Filters;
-
-class ImageComposerTest extends BaseTestCase {
-
-	/** @var array Default provider-result fixture fed into compose(). */
-	private array $image_data = [
-		'bytes'      => 'raw_base_bytes',
-		'mime_type'  => 'image/png',
-		'width'      => 1200,
-		'height'     => 632,
-		'model'      => 'flux-1-schnell',
-		'cost_usd'   => 0.0006,
-		'latency_ms' => 1500,
-	];
-
-	protected function setUp(): void {
-		parent::setUp();
-		\PRAutoBlogger_Image_Composer::reset_run_state();
-		Functions\when( 'update_option' )->justReturn( true );
-		$this->stub_get_option( [] ); // All composer options fall back to defaults.
-	}
-
-	protected function tearDown(): void {
-		\PRAutoBlogger_Image_Composer::reset_run_state();
-		parent::tearDown();
-	}
-
-	/** Helper: composer context for Image A. */
-	private function context( string $slot = 'image_a' ): array {
-		return [
-			'post_id' => 7,
-			'caption' => 'Collagen fragments may aid joint repair',
-			'title'   => 'Collagen Peptides Explained',
-			'slot'    => $slot,
-		];
-	}
-
-	/** Helper: a fake rendered variant payload. */
-	private function variant( string $role, int $w, int $h ): array {
-		return [
-			'bytes'     => "rendered_{$role}",
-			'mime_type' => 'image/png',
-			'width'     => $w,
-			'height'    => $h,
-			'role'      => $role,
-		];
-	}
-
-	/**
-	 * Compose disabled in settings → single pass-through featured variant,
-	 * renderer untouched.
-	 */
-	public function test_disabled_setting_returns_passthrough_only(): void {
-		$this->stub_get_option( [ \PRAutoBlogger_Image_Composer::OPTION_ENABLED => '0' ] );
-
-		$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
-		$renderer->expects( $this->never() )->method( 'compose_featured' );
-		$renderer->expects( $this->never() )->method( 'compose_og' );
-
-		$composer = new \PRAutoBlogger_Image_Composer( $renderer );
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertCount( 1, $variants );
-		$this->assertSame( 'featured', $variants[0]['role'] );
-		$this->assertSame( 'raw_base_bytes', $variants[0]['bytes'] );
-	}
-
-	/**
-	 * Empty provider bytes short-circuit to pass-through (no probe, no render).
-	 */
-	public function test_empty_bytes_return_passthrough(): void {
-		$composer = new \PRAutoBlogger_Image_Composer(
-			$this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class )
-		);
-		$variants = $composer->compose( [ 'bytes' => '' ], $this->context() );
-
-		$this->assertCount( 1, $variants );
-		$this->assertSame( 'featured', $variants[0]['role'] );
-	}
-
-	/**
-	 * Ladder rung 1 (Imagick "present" via filter + mocked renderer):
-	 * Image A yields marked featured + og + square, featured first, with the
-	 * caption forwarded to both text-bearing variants.
-	 */
-	public function test_imagick_rung_renders_featured_plus_variants(): void {
-		Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'imagick' );
-
-		$caption  = $this->context()['caption'];
-		$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
-		$renderer->expects( $this->once() )->method( 'compose_featured' )
-			->with( 'raw_base_bytes' )->willReturn( $this->variant( 'featured', 1200, 632 ) );
-		$renderer->expects( $this->once() )->method( 'compose_og' )
-			->with( 'raw_base_bytes', $caption )->willReturn( $this->variant( 'og', 1200, 630 ) );
-		$renderer->expects( $this->once() )->method( 'compose_square' )
-			->with( 'raw_base_bytes', $caption )->willReturn( $this->variant( 'square', 1080, 1080 ) );
-
-		$composer = new \PRAutoBlogger_Image_Composer( $renderer );
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertSame( [ 'featured', 'og', 'square' ], array_column( $variants, 'role' ) );
-		$this->assertSame( 'rendered_featured', $variants[0]['bytes'] );
-	}
-
-	/**
-	 * Featured corner mark toggled off → featured stays the untouched base,
-	 * but social variants still render.
-	 */
-	public function test_mark_disabled_passes_featured_through_but_keeps_variants(): void {
-		Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'imagick' );
-		$this->stub_get_option( [ \PRAutoBlogger_Image_Composer::OPTION_MARK_ENABLED => '0' ] );
-
-		$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
-		$renderer->expects( $this->never() )->method( 'compose_featured' );
-		$renderer->method( 'compose_og' )->willReturn( $this->variant( 'og', 1200, 630 ) );
-		$renderer->method( 'compose_square' )->willReturn( $this->variant( 'square', 1080, 1080 ) );
-
-		$composer = new \PRAutoBlogger_Image_Composer( $renderer );
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertSame( 'raw_base_bytes', $variants[0]['bytes'] );
-		$this->assertSame( [ 'featured', 'og', 'square' ], array_column( $variants, 'role' ) );
-	}
-
-	/**
-	 * Image B slot gets the corner mark only — no og/square renders ever.
-	 */
-	public function test_image_b_slot_yields_mark_only(): void {
-		Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'imagick' );
-
-		$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
-		$renderer->expects( $this->once() )->method( 'compose_featured' )
-			->willReturn( $this->variant( 'featured', 1200, 632 ) );
-		$renderer->expects( $this->never() )->method( 'compose_og' );
-		$renderer->expects( $this->never() )->method( 'compose_square' );
-
-		$composer = new \PRAutoBlogger_Image_Composer( $renderer );
-		$variants = $composer->compose( $this->image_data, $this->context( 'image_b' ) );
-
-		$this->assertCount( 1, $variants );
-		$this->assertSame( 'featured', $variants[0]['role'] );
-	}
-
-	/**
-	 * The variant option is whitelisted at point of use: unknown tokens are
-	 * dropped, duplicates deduped, config order preserved.
-	 */
-	public function test_variant_config_is_whitelisted_and_ordered(): void {
-		Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'imagick' );
-		$this->stub_get_option(
-			[ \PRAutoBlogger_Image_Composer::OPTION_VARIANTS => ' square, banana ,og, og' ]
-		);
-
-		$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
-		$renderer->method( 'compose_featured' )->willReturn( $this->variant( 'featured', 1200, 632 ) );
-		$renderer->expects( $this->once() )->method( 'compose_square' )
-			->willReturn( $this->variant( 'square', 1080, 1080 ) );
-		$renderer->expects( $this->once() )->method( 'compose_og' )
-			->willReturn( $this->variant( 'og', 1200, 630 ) );
-
-		$composer = new \PRAutoBlogger_Image_Composer( $renderer );
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertSame( [ 'featured', 'square', 'og' ], array_column( $variants, 'role' ) );
-	}
-
-	/**
-	 * Acceptance: with every render throwing (e.g. probe lied / Imagick
-	 * flipped mid-run), compose() still returns the publishable pass-through
-	 * featured variant and never lets the exception escape.
-	 */
-	public function test_renderer_failure_degrades_to_passthrough(): void {
-		Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'imagick' );
-
-		$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
-		$renderer->method( 'compose_featured' )->willThrowException( new \RuntimeException( 'no imagick after all' ) );
-		$renderer->method( 'compose_og' )->willThrowException( new \RuntimeException( 'no imagick after all' ) );
-		$renderer->method( 'compose_square' )->willThrowException( new \RuntimeException( 'no imagick after all' ) );
-
-		$composer = new \PRAutoBlogger_Image_Composer( $renderer );
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertCount( 1, $variants );
-		$this->assertSame( 'featured', $variants[0]['role'] );
-		$this->assertSame( 'raw_base_bytes', $variants[0]['bytes'] );
-	}
-
-	/**
-	 * Ladder rung 3 forced via the override filter: pass-through, no renderer
-	 * involvement, publish data intact.
-	 */
-	public function test_capability_none_passes_through(): void {
-		Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'none' );
-
-		$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
-		$renderer->expects( $this->never() )->method( 'compose_featured' );
-
-		$composer = new \PRAutoBlogger_Image_Composer( $renderer );
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertCount( 1, $variants );
-		$this->assertSame( 'raw_base_bytes', $variants[0]['bytes'] );
-		$this->assertSame( 1200, $variants[0]['width'] );
-		$this->assertSame( 632, $variants[0]['height'] );
-	}
-
-	/**
-	 * A garbage filter return is coerced to 'none' (pass-through), never an
-	 * undefined rung.
-	 */
-	public function test_unknown_capability_value_is_treated_as_none(): void {
-		Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'webgpu' );
-
-		$composer = new \PRAutoBlogger_Image_Composer(
-			$this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class )
-		);
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertCount( 1, $variants );
-		$this->assertSame( 'featured', $variants[0]['role'] );
-	}
-
-	/**
-	 * A cached probe with a matching environment fingerprint is reused —
-	 * no re-probe, no option write. (update_option calls are captured via a
-	 * when() alias: an expect() here would be shadowed by the setUp stub.)
-	 */
-	public function test_matching_capability_cache_skips_probe_write(): void {
-		$fingerprint = md5(
-			PHP_VERSION . '|' . ( extension_loaded( 'imagick' ) ? 'im1' : 'im0' ) . '|' . ( extension_loaded( 'gd' ) ? 'gd1' : 'gd0' )
-		);
-		$this->stub_get_option(
-			[
-				\PRAutoBlogger_Image_Composer::OPTION_CAPABILITY => [
-					'fingerprint' => $fingerprint,
-					'capability'  => 'none',
-				],
-			]
-		);
-		$writes = [];
-		Functions\when( 'update_option' )->alias(
-			function ( $key, $value = null, $autoload = null ) use ( &$writes ) {
-				$writes[] = $key;
-				return true;
-			}
-		);
-
-		$composer = new \PRAutoBlogger_Image_Composer(
-			$this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class )
-		);
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertSame( 'featured', $variants[0]['role'] );
-		$this->assertSame( [], $writes, 'A matching cache fingerprint must not trigger a probe rewrite.' );
-	}
-
-	/**
-	 * A stale fingerprint (host changed) triggers a fresh probe and a cache
-	 * rewrite — the auto-invalidation the spec requires. (Captured via a
-	 * when() alias: an expect() here would be shadowed by the setUp stub.)
-	 */
-	public function test_stale_capability_cache_reprobes_and_rewrites(): void {
-		$this->stub_get_option(
-			[
-				\PRAutoBlogger_Image_Composer::OPTION_CAPABILITY => [
-					'fingerprint' => 'old-host-fingerprint',
-					'capability'  => 'imagick',
-				],
-			]
-		);
-		$writes = [];
-		Functions\when( 'update_option' )->alias(
-			function ( $key, $value = null, $autoload = null ) use ( &$writes ) {
-				$writes[] = [ $key, $value, $autoload ];
-				return true;
-			}
-		);
-
-		$composer = new \PRAutoBlogger_Image_Composer(
-			$this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class )
-		);
-		$variants = $composer->compose( $this->image_data, $this->context() );
-
-		$this->assertSame( 'featured', $variants[0]['role'] );
-		$this->assertCount( 1, $writes, 'A stale fingerprint must rewrite the capability cache.' );
-		$this->assertSame( \PRAutoBlogger_Image_Composer::OPTION_CAPABILITY, $writes[0][0] );
-		$this->assertIsArray( $writes[0][1] );
-		$this->assertArrayHasKey( 'capability', $writes[0][1] );
-		$this->assertNotSame( 'old-host-fingerprint', $writes[0][1]['fingerprint'] ?? '' );
-		$this->assertFalse( $writes[0][2], 'Capability cache must not autoload.' );
-	}
-
-	/**
-	 * QA note for the uninstall contract: every new option key keeps the
-	 * `prautoblogger_` prefix so uninstall.php's prefix-sweep purges it.
-	 * (Per spec, uninstall.php itself is intentionally untouched.)
-	 */
-	public function test_new_option_keys_keep_uninstall_sweep_prefix(): void {
-		$keys = [
-			\PRAutoBlogger_Image_Composer::OPTION_ENABLED,
-			\PRAutoBlogger_Image_Composer::OPTION_VARIANTS,
-			\PRAutoBlogger_Image_Composer::OPTION_MARK_ENABLED,
-			\PRAutoBlogger_Image_Composer::OPTION_CAPABILITY,
-		];
-
-		foreach ( $keys as $key ) {
-			$this->assertStringStartsWith( 'prautoblogger_', $key );
-		}
-	}
-}

tests/unit/Core/ImagePipelineTest.php

@@ -18,11 +18,6 @@ class ImagePipelineTest extends BaseTestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		// v0.17.0: the composer caches its capability probe via update_option
-		// and keeps a once-per-run warning flag that must not leak between tests.
-		\PRAutoBlogger_Image_Composer::reset_run_state();
-		Functions\when( 'update_option' )->justReturn( true );
-
 		// Mock WordPress functions used by the pipeline and its dependencies.
 		Functions\when( 'is_wp_error' )->alias( function ( $thing ) {
 			return $thing instanceof \WP_Error;
@@ -351,67 +346,6 @@ class ImagePipelineTest extends BaseTestCase {
 		$this->assertNotEmpty( $result['errors'] );
 	}
 
-	/**
-	 * v0.17.0: composed OG/square variants are sideloaded and meta-linked —
-	 * role + base-attachment meta on the variant attachments, role-specific
-	 * image ID meta on the post, and the featured attachment tagged with its
-	 * role. Composition adds no cost-tracker rows beyond the primary image.
-	 */
-	public function test_composed_variants_are_sideloaded_and_meta_linked(): void {
-		$image_result = [
-			'bytes'      => 'fake_image_data',
-			'mime_type'  => 'image/png',
-			'width'      => 1200,
-			'height'     => 632,
-			'model'      => 'test-model',
-			'cost_usd'   => 0.05,
-			'latency_ms' => 2000,
-		];
-
-		$provider = $this->createMock( \PRAutoBlogger_Image_Provider_Interface::class );
-		$provider->method( 'estimate_cost' )->willReturn( 0.05 );
-		$provider->method( 'generate_image_batch' )->willReturn( [ 'image_a' => $image_result ] );
-
-		$cost_tracker = $this->createMock( \PRAutoBlogger_Cost_Tracker::class );
-		$cost_tracker->method( 'would_exceed_budget' )->willReturn( false );
-		// Exactly one cost row: the primary image. Variants are $0 local renders.
-		$cost_tracker->expects( $this->exactly( 1 ) )->method( 'log_image_generation' );
-
-		$composer = new class() implements \PRAutoBlogger_Image_Composer_Interface {
-			public function compose( array $image_data, array $context ): array {
-				return [
-					[ 'bytes' => 'marked', 'mime_type' => 'image/png', 'width' => 1200, 'height' => 632, 'role' => 'featured' ],
-					[ 'bytes' => 'og_png', 'mime_type' => 'image/png', 'width' => 1200, 'height' => 630, 'role' => 'og' ],
-					[ 'bytes' => 'sq_png', 'mime_type' => 'image/png', 'width' => 1080, 'height' => 1080, 'role' => 'square' ],
-				];
-			}
-		};
-
-		Functions\when( 'get_temp_dir' )->justReturn( '/tmp/' );
-		$next_id = 41;
-		Functions\when( 'media_handle_sideload' )->alias( function () use ( &$next_id ) {
-			return ++$next_id; // 42 featured, 43 og, 44 square.
-		} );
-
-		$meta_calls = [];
-		Functions\when( 'update_post_meta' )->alias( function ( $object_id, $key, $value ) use ( &$meta_calls ) {
-			$meta_calls[] = [ $object_id, $key, $value ];
-			return true;
-		} );
-
-		$pipeline = new \PRAutoBlogger_Image_Pipeline( $provider, $cost_tracker, null, $composer );
-		$result   = $pipeline->generate_and_attach_images( 1, [ 'post_title' => 'Test' ], null );
-
-		$this->assertSame( 42, $result['image_a_id'] );
-		$this->assertContains( [ 42, '_prautoblogger_image_role', 'featured' ], $meta_calls );
-		$this->assertContains( [ 43, '_prautoblogger_image_role', 'og' ], $meta_calls );
-		$this->assertContains( [ 43, '_prautoblogger_base_attachment_id', 42 ], $meta_calls );
-		$this->assertContains( [ 1, '_prautoblogger_og_image_id', 43 ], $meta_calls );
-		$this->assertContains( [ 44, '_prautoblogger_image_role', 'square' ], $meta_calls );
-		$this->assertContains( [ 44, '_prautoblogger_base_attachment_id', 42 ], $meta_calls );
-		$this->assertContains( [ 1, '_prautoblogger_square_image_id', 44 ], $meta_calls );
-	}
-
 	/**
 	 * Test graceful handling when one image in the batch returns an error.
 	 */

tests/unit/Core/ImagePromptBuilderTest.php

@@ -3,7 +3,7 @@
  * Tests for PRAutoBlogger_Image_Prompt_Builder.
  *
  * Validates prompt generation from article content and source data,
- * including editorial-template substitution ({{ topic_summary }}) and HTML stripping.
+ * including style suffix appending and HTML stripping.
  *
  * @package PRAutoBlogger\Tests\Core
  */
@@ -68,9 +68,7 @@ class ImagePromptBuilderTest extends BaseTestCase {
 		[ 'prompt' => $scene, 'caption' => $caption ] = $builder->build_article_prompt( $article_data );
 
 		$this->assertStringContainsString( 'How to Train Your Dragon', $scene );
-		// Editorial template wraps the topic summary; token must be substituted.
-		$this->assertStringNotContainsString( '{{ topic_summary }}', $scene );
-		$this->assertStringContainsString( 'Editorial scientific illustration', $scene );
+		// Style suffix should be appended.
 		$this->assertNotEmpty( $scene );
 		$this->assertGreaterThan( 50, strlen( $scene ) );
 		$this->assertIsString( $caption );

tests/unit/Providers/RunwareModelCatalogTest.php

@@ -1,189 +0,0 @@
-<?php
-/**
- * Tests for PRAutoBlogger_Runware_Model_Catalog.
- *
- * Validates live sync, fallback logic, cache staleness, and pricing merge.
- *
- * @package PRAutoBlogger\Tests\Providers
- */
-
-namespace PRAutoBlogger\Tests\Providers;
-
-use PRAutoBlogger\Tests\BaseTestCase;
-use Brain\Monkey\Functions;
-use Brain\Monkey\Actions;
-
-class RunwareModelCatalogTest extends BaseTestCase {
-
-	protected function setUp(): void {
-		parent::setUp();
-		// Mock WP options for cache simulation.
-		Functions\when( 'get_option' )->alias( function ( $key, $default = false ) {
-			static $options = array();
-			return $options[ $key ] ?? $default;
-		} );
-		Functions\when( 'update_option' )->alias( function ( $key, $value ) {
-			static $options = array();
-			$options[ $key ] = $value;
-			return true;
-		} );
-		Functions\when( 'time' )->justReturn( 1704067200 ); // 2024-01-01 00:00:00
-	}
-
-	/** Sync with empty or missing API key returns false. */
-	public function test_sync_no_api_key(): void {
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-		$result = $catalog->sync();
-		$this->assertFalse( $result );
-	}
-
-	/** get_models returns fallback if no cache and sync fails. */
-	public function test_get_models_fallback_on_sync_failure(): void {
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-		$models = $catalog->get_models();
-
-		// Should have the fallback list (15 Runware models).
-		$this->assertIsArray( $models );
-		$this->assertGreaterThan( 0, count( $models ) );
-
-		// Check at least one expected fallback model exists.
-		$schnell_exists = false;
-		foreach ( $models as $model ) {
-			if ( 'runware:100@1' === ( $model['id'] ?? '' ) ) {
-				$schnell_exists = true;
-				$this->assertSame( 'FLUX.1 schnell (Runware)', $model['name'] );
-				$this->assertSame( 'runware', $model['provider'] );
-				break;
-			}
-		}
-		$this->assertTrue( $schnell_exists, 'Fallback should include FLUX.1 schnell' );
-	}
-
-	/** is_stale returns true if never synced. */
-	public function test_is_stale_never_synced(): void {
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-		$this->assertTrue( $catalog->is_stale() );
-	}
-
-	/** get_last_synced_at returns null if never synced. */
-	public function test_get_last_synced_at_never(): void {
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-		$this->assertNull( $catalog->get_last_synced_at() );
-	}
-
-	/** Fallback list is never empty. */
-	public function test_get_models_never_empty(): void {
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-
-		// Even with no cache and failed sync, get_models should return the fallback.
-		$models = $catalog->get_models();
-		$this->assertIsArray( $models );
-		$this->assertNotEmpty( $models );
-
-		// All models should have required fields.
-		foreach ( $models as $model ) {
-			$this->assertArrayHasKey( 'id', $model );
-			$this->assertArrayHasKey( 'name', $model );
-			$this->assertArrayHasKey( 'provider', $model );
-			$this->assertArrayHasKey( 'capabilities', $model );
-		}
-	}
-
-	/** Fallback models have correct pricing. */
-	public function test_fallback_models_have_pricing(): void {
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-		$models = $catalog->get_models();
-
-		$schnell = null;
-		$dev = null;
-		foreach ( $models as $model ) {
-			if ( 'runware:100@1' === $model['id'] ) {
-				$schnell = $model;
-			}
-			if ( 'runware:101@1' === $model['id'] ) {
-				$dev = $model;
-			}
-		}
-
-		$this->assertNotNull( $schnell );
-		$this->assertEqualsWithDelta( 0.0006, $schnell['cost_per_image'], 0.000001 );
-
-		$this->assertNotNull( $dev );
-		$this->assertEqualsWithDelta( 0.02, $dev['cost_per_image'], 0.000001 );
-	}
-
-	/** Fallback models all have 'image_generation' capability. */
-	public function test_fallback_models_have_capabilities(): void {
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-		$models = $catalog->get_models();
-
-		foreach ( $models as $model ) {
-			$this->assertIsArray( $model['capabilities'] );
-			$this->assertContains( 'image_generation', $model['capabilities'] );
-		}
-	}
-
-	/** Happy path: successful sync caches models and get_models returns them. */
-	public function test_sync_success_caches_and_returns_models(): void {
-		// The mocked API response body — models must have taskType=imageInference
-		// so normalize_models() doesn't filter them out.
-		$fake_body = json_encode(
-			array(
-				'data' => array(
-					array(
-						'id'       => 'test-model-1',
-						'name'     => 'Test Model 1',
-						'taskType' => 'imageInference',
-					),
-					array(
-						'id'       => 'test-model-2',
-						'name'     => 'Test Model 2',
-						'taskType' => 'imageInference',
-					),
-				),
-			)
-		);
-
-		$fake_response = array(
-			'response' => array( 'code' => 200 ),
-			'body'     => $fake_body,
-		);
-
-		Functions\when( 'wp_remote_post' )->justReturn( $fake_response );
-		// Alias the WP response-parsing helpers so they work against our array.
-		Functions\when( 'wp_remote_retrieve_response_code' )->alias(
-			function ( $r ) { return (int) ( $r['response']['code'] ?? 0 ); }
-		);
-		Functions\when( 'wp_remote_retrieve_body' )->alias(
-			function ( $r ) { return (string) ( $r['body'] ?? '' ); }
-		);
-		Functions\when( 'is_wp_error' )->justReturn( false );
-
-		// Shared options store so get_option/update_option stay in sync
-		// within this test. The API key must be non-empty for sync() to proceed.
-		$store = array( 'prautoblogger_runware_api_key' => 'test-api-key-plain' );
-		Functions\when( 'get_option' )->alias(
-			function ( $key, $default = false ) use ( &$store ) {
-				return $store[ $key ] ?? $default;
-			}
-		);
-		Functions\when( 'update_option' )->alias(
-			function ( $key, $value ) use ( &$store ) {
-				$store[ $key ] = $value;
-				return true;
-			}
-		);
-
-		// Sync should succeed: API key present, HTTP 200, 2 imageInference models.
-		$catalog = new \PRAutoBlogger_Runware_Model_Catalog();
-		$result = $catalog->sync();
-		$this->assertTrue( $result, 'Sync should return true on HTTP 200 with valid models' );
-
-		// get_models() should now return the synced list from cache.
-		$models = $catalog->get_models();
-		$this->assertIsArray( $models );
-		$this->assertCount( 2, $models );
-		$this->assertSame( 'test-model-1', $models[0]['id'] );
-		$this->assertSame( 'test-model-2', $models[1]['id'] );
-	}
-}

tests/unit/Services/ImageModelRegistryTest.php

@@ -16,18 +16,6 @@ use PRAutoBlogger\Tests\BaseTestCase;
 
 class ImageModelRegistryTest extends BaseTestCase {
 
-	/**
-	 * Stub WP cache functions so the catalog class falls back to the
-	 * hardcoded model list without hitting get_option or update_option.
-	 */
-	protected function setUp(): void {
-		parent::setUp();
-		// Catalog checks for cached data; return false → falls back to hardcoded list.
-		\Brain\Monkey\Functions\when( 'get_option' )->justReturn( false );
-		// Catalog writes cache on sync; stub so it doesn't throw in tests.
-		\Brain\Monkey\Functions\when( 'update_option' )->justReturn( true );
-	}
-
 	/**
 	 * Every entry returned by get_models() must carry a non-empty id and
 	 * a provider of 'runware' or 'openrouter' (Cloudflare Workers AI was
@@ -111,56 +99,4 @@ class ImageModelRegistryTest extends BaseTestCase {
 			\PRAutoBlogger_Image_Model_Registry::provider_for( '' )
 		);
 	}
-
-	/**
-	 * Test that runware:400@4 resolves to runware provider.
-	 */
-	public function test_provider_for_runware_400_at_4(): void {
-		$this->assertSame(
-			'runware',
-			\PRAutoBlogger_Image_Model_Registry::provider_for( 'runware:400@4' )
-		);
-	}
-
-	/**
-	 * Test that runware:glm-image@0 resolves to runware provider.
-	 */
-	public function test_provider_for_runware_glm_image(): void {
-		$this->assertSame(
-			'runware',
-			\PRAutoBlogger_Image_Model_Registry::provider_for( 'runware:glm-image@0' )
-		);
-	}
-
-	/**
-	 * Test that openai/gpt-5.4-image-2 resolves to openrouter provider.
-	 */
-	public function test_provider_for_gpt_5_4_image_2(): void {
-		$this->assertSame(
-			'openrouter',
-			\PRAutoBlogger_Image_Model_Registry::provider_for( 'openai/gpt-5.4-image-2' )
-		);
-	}
-
-	/**
-	 * Test that get_models() returns 21 models.
-	 */
-	public function test_get_models_returns_21_models(): void {
-		$models = \PRAutoBlogger_Image_Model_Registry::get_models();
-		$this->assertCount( 21, $models );
-	}
-
-	/**
-	 * Test that every model has required non-empty fields.
-	 */
-	public function test_every_model_has_required_fields(): void {
-		$models = \PRAutoBlogger_Image_Model_Registry::get_models();
-		foreach ( $models as $model ) {
-			$this->assertNotEmpty( $model['id'] ?? '', 'Model missing id' );
-			$this->assertNotEmpty( $model['name'] ?? '', 'Model missing name' );
-			$this->assertNotEmpty( $model['provider'] ?? '', 'Model missing provider' );
-			$this->assertTrue( isset( $model['cost_per_image'] ), 'Model missing cost_per_image' );
-			$this->assertIsNumeric( $model['cost_per_image'], 'cost_per_image is not numeric' );
-		}
-	}
 }