peptide-repo/prautoblogger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: VPS-orchestrated generation reliability — generate --sync, reaper TZ fix, maintenance-cron self-heal (v0.22.1) (#171)

Browse Source 
Synchronous --sync CLI tick loop for VPS-driven generation over a held-open SSH session (survives Hostinger's ~10-min background-kill); $sync_mode guard on both tick handlers prevents double-drive; Run_Reaper UTC-vs-site-tz fix; one-shot self-heal migration restoring the maintenance crons that vanished after the 06-15/16 deploy (daily-generation excluded — VPS owns it).

QA: APPROVE @ 0689989 (qa-reviews/prautoblogger/2026-06-23-0689989.md). CEO greenlight 2026-06-22.

Agent-Session: prab-reliability-merge-20260622
This commit is contained in:
peptiderepo
2026-06-23 00:53:23 +07:00
committed by GitHub
parent a2af04f2c4
commit 98eeb12274
11 changed files with 611 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
includes/admin/class-wp-cli-commands.php
View File

@@ -8,6 +8,14 @@ declare(strict_types=1);
*/
class PRAutoBlogger_WP_CLI_Commands {
/**
* Max generate-tick iterations for the --sync loop (covers daily_article_target = 1
* with ample headroom; prevents infinite loops if the queue never drains).
*
* @var int
*/
private const SYNC_MAX_TICKS = 20;
/**
* Register WP-CLI commands.
*
@@ -18,12 +26,19 @@ class PRAutoBlogger_WP_CLI_Commands {
return;
}
// Command: wp prautoblogger opik:eval
\WP_CLI::add_command(
'prautoblogger generate',
array( self::class, 'generate_command' ),
array(
'shortdesc' => 'Queue a new article generation run on chained-cron checkpoints',
'shortdesc' => 'Queue (or synchronously run) a new article generation run',
'synopsis' => array(
array(
'type' => 'flag',
'name' => 'sync',
'description' => 'Run the full pipeline synchronously in this process (VPS orchestrator mode). Blocks until complete.',
'optional' => true,
),
),
)
);
@@ -51,6 +66,148 @@ class PRAutoBlogger_WP_CLI_Commands {
);
}
/**
* Queue or synchronously run a new article generation run.
*
* Without --sync: routes through kick_off() (same as the board "New Article"
* button). Returns immediately; all pipeline work happens in cron.
*
* With --sync: runs the pipeline synchronously in this SSH/CLI process.
* 1. Acquires the generation lock (skips if a live run is in progress).
* 2. Calls on_orchestrate_tick() to collect/score ideas in-process.
* 3. Loops calling on_generate_tick() until the queue is empty or the run
* reaches a terminal state, up to SYNC_MAX_TICKS iterations.
* 4. Emits a JSON summary line on stdout and exits 0 (success) or 1 (error).
*
* The --sync path suppresses wp-cron reschedule inside on_generate_tick() so
* the external loop cannot race with a background cron tick.
*
* ## OPTIONS
*
* [--sync]
* : Run synchronously (VPS orchestrator mode).
*
* ## EXAMPLES
*
* wp prautoblogger generate
* wp prautoblogger generate --sync
*
* @param array $args Positional args (unused).
* @param array $assoc_args Associative args: sync.
* @return void
*/
public static function generate_command( array $args, array $assoc_args ): void {
if ( isset( $assoc_args['sync'] ) ) {
self::run_sync();
return;
}
PRAutoBlogger_Generation_Checkpoint_Runner::kick_off();
\WP_CLI::success( 'Generation queued on chained-cron checkpoints. Check the board or Activity Log for progress.' );
}
/**
* Run the full pipeline synchronously in this process (--sync mode).
*
* Called only from generate_command(); never from wp-cron or AJAX paths.
*
* @return void
*/
private static function run_sync(): void {
// Honour ignore_user_abort so a dropped SSH session does not kill us.
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
@ignore_user_abort( true );
// Check for a live (non-expired) lock. Generation_Lock::acquire() already
// cleans expired locks on its DELETE pass, so if acquire() returns false
// there is a genuinely live concurrent run — skip cleanly.
if ( ! PRAutoBlogger_Generation_Lock::is_locked() ) {
// Lock is not held; proceed. acquire() is called inside on_orchestrate_tick().
} else {
$acquired_at = PRAutoBlogger_Generation_Lock::get_acquired_at();
$age = null !== $acquired_at ? ( time() - $acquired_at ) : HOUR_IN_SECONDS;
if ( $age < HOUR_IN_SECONDS ) {
\WP_CLI::log(
json_encode(
array(
'status' => 'skipped',
'reason' => 'run_in_progress',
'lock_age_s' => $age,
)
)
);
exit( 0 );
}
// Expired lock — on_orchestrate_tick()'s acquire() will clean it.
}
// Enable sync-mode: on_generate_tick() will skip the wp-cron reschedule.
PRAutoBlogger_Generation_Checkpoint_Runner::set_sync_mode( true );
\WP_CLI::log( 'PRAB-SYNC: starting orchestrate tick' );
PRAutoBlogger_Generation_Checkpoint_Runner::on_orchestrate_tick();
// If the orchestrate tick failed to acquire the lock or found no ideas,
// the RUN_ID option will be absent. Detect and exit cleanly.
$run_id = (string) get_option( 'prautoblogger_checkpoint_run_id', '' );
if ( '' === $run_id ) {
$queue = get_option( 'prautoblogger_article_queue' );
if ( ! is_array( $queue ) || empty( $queue['ideas'] ) ) {
\WP_CLI::log(
json_encode(
array(
'status' => 'done',
'generated' => 0,
'reason' => 'no_ideas_or_lock_failed',
)
)
);
exit( 0 );
}
}
// Tick loop: drive generate ticks synchronously.
$ticks = 0;
while ( $ticks < self::SYNC_MAX_TICKS ) {
$queue = get_option( 'prautoblogger_article_queue' );
if ( ! is_array( $queue ) || empty( $queue['ideas'] ) ) {
break; // Queue drained or finalized.
}
++$ticks;
\WP_CLI::log( sprintf( 'PRAB-SYNC: generate tick %d (ideas remaining: %d)', $ticks, count( $queue['ideas'] ) ) );
PRAutoBlogger_Generation_Checkpoint_Runner::on_generate_tick();
}
PRAutoBlogger_Generation_Checkpoint_Runner::set_sync_mode( false );
if ( $ticks >= self::SYNC_MAX_TICKS ) {
\WP_CLI::warning( 'PRAB-SYNC: hit max-tick guard (' . self::SYNC_MAX_TICKS . '). Queue may not be fully drained.' );
}
// Read final status transient for summary.
$status = get_transient( 'prautoblogger_generation_status' );
$result = is_array( $status ) ? $status : array();
$summary = array(
'status' => 'done',
'generated' => (int) ( $result['generated'] ?? 0 ),
'published' => (int) ( $result['published'] ?? 0 ),
'rejected' => (int) ( $result['rejected'] ?? 0 ),
'cost_usd' => round( (float) ( $result['cost'] ?? 0.0 ), 4 ),
'ticks' => $ticks,
);
\WP_CLI::log( json_encode( $summary ) );
if ( 'error' === ( $result['status'] ?? '' ) ) {
\WP_CLI::error( 'PRAB-SYNC: generation completed with error: ' . ( $result['message'] ?? 'unknown' ), false );
exit( 1 );
}
\WP_CLI::success( 'PRAB-SYNC: generation complete.' );
exit( 0 );
}
/**
* Run eval on the frozen dataset.
*
@@ -77,27 +234,4 @@ class PRAutoBlogger_WP_CLI_Commands {
exit( $result['items_run'] > 0 ? 0 : 1 );
}
/**
* Queue a new article generation run on chained-cron checkpoints.
*
* Routes through PRAutoBlogger_Generation_Checkpoint_Runner::kick_off()
* (same path as the board "New Article" button). Does NOT execute
* synchronously -- check the board or Activity Log for progress.
* This retires the `do_action("prautoblogger_manual_generation")` workaround.
*
* ## OPTIONS
*
* ## EXAMPLES
*
* wp prautoblogger generate
*
* @param array $args Positional args (unused).
* @param array $assoc_args Associative args (unused).
* @return void
*/
public static function generate_command( array $args, array $assoc_args ): void {
PRAutoBlogger_Generation_Checkpoint_Runner::kick_off();
\WP_CLI::success( 'Generation queued on chained-cron checkpoints. Check the board or Activity Log for progress.' );
}
}