Merge branch 'dev'

lkeme · lkeme · commit 757e9efd6d5f · 2026-05-24T11:23:00.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,10 @@ worktrees/
 
 .phpunit.*
 captcha/data.json
+
+# Local AI/Trellis tooling
+.ace-tool/
+.agents/
+.codex/
+.trellis/
+AGENTS.md
diff --git a/plugins/DynamicLottery/src/DynamicLotteryReservationExecutor.php b/plugins/DynamicLottery/src/DynamicLotteryReservationExecutor.php
@@ -58,6 +58,8 @@ protected function postJson(string $url, array $payload, array $headers): array
     {
         try {
             $raw = $this->request->postText('pc', $url, $payload, $headers);
+        } catch (NoLoginException $exception) {
+            throw $exception;
         } catch (Throwable $throwable) {
             return [
                 'code' => -500,
diff --git a/plugins/Judge/src/JudgePlugin.php b/plugins/Judge/src/JudgePlugin.php
@@ -11,6 +11,10 @@
 
 class JudgePlugin extends BasePlugin implements PluginTaskInterface
 {
+    private const VOTE_RESULT_SUCCESS = 'success';
+    private const VOTE_RESULT_RETRY = 'retry';
+    private const VOTE_RESULT_SKIP = 'skip';
+
     private AuthFailureClassifier $authFailureClassifier;
     private ?ApiJury $juryApi = null;
 
@@ -74,7 +78,8 @@ protected function judgementTask(): void
             return;
         }
 
-        if (!$this->vote($case['id'], $case['vote'])) {
+        $voteResult = $this->vote($case['id'], $case['vote']);
+        if ($voteResult === self::VOTE_RESULT_RETRY) {
             $this->scheduleAfter(60.0);
 
             return;
@@ -106,10 +111,19 @@ protected function caseCheck(string $caseId): bool
 
         $vote = $voteInfo['vote'];
         $voteText = $voteInfo['vote_text'];
-        $this->wait_case[] = ['id' => $caseId, 'vote' => $vote];
         $this->info("風機委員: 案件{$caseId}的預測投票結果 {$vote}({$voteText})");
-        $this->vote($caseId, 0);
-        $this->scheduleAfter(65);
+
+        $voteResult = $this->vote($caseId, 0, 0);
+        if ($voteResult === self::VOTE_RESULT_SUCCESS) {
+            $this->wait_case[] = ['id' => $caseId, 'vote' => $vote];
+            $this->scheduleAfter(65);
+
+            return false;
+        }
+
+        if ($voteResult === self::VOTE_RESULT_RETRY) {
+            $this->scheduleAfter(60.0);
+        }
 
         return false;
     }
@@ -118,20 +132,37 @@ protected function caseCheck(string $caseId): bool
      * 处理vote
      * @param string $caseId
      * @param int $vote
-     * @return bool
+     * @return self::VOTE_RESULT_*
      */
-    private function vote(string $caseId, int $vote): bool
+    private function vote(string $caseId, int $vote, ?int $insiders = null): string
     {
-        $response = $this->juryApi()->vote($caseId, $vote, '', 0, array_rand([0, 1]));
+        $response = $this->juryApi()->vote($caseId, $vote, '', 0, $insiders ?? array_rand([0, 1]));
         $this->authFailureClassifier->assertNotAuthFailure($response, "風機委員: 案件{$caseId}投票时账号未登录");
 
-        if ($response['code']) {
-            $this->warning("風機委員: 案件{$caseId}投票失败 {$response['code']} -> {$response['message']}");
-            return false;
-        } else {
+        $code = (int)($response['code'] ?? -500);
+        $message = trim((string)($response['message'] ?? ''));
+
+        if ($code === 0) {
             $this->notice("風機委員: 案件{$caseId}投票成功");
-            return true;
+
+            return self::VOTE_RESULT_SUCCESS;
+        }
+
+        $logMessage = "風機委員: 案件{$caseId}投票失败 {$code} -> {$message}";
+        if ($this->isTerminalVoteFailure($code, $message)) {
+            $this->warning($logMessage . '，跳过该案件');
+
+            return self::VOTE_RESULT_SKIP;
         }
+
+        $this->warning($logMessage);
+
+        return self::VOTE_RESULT_RETRY;
+    }
+
+    private function isTerminalVoteFailure(int $code, string $message): bool
+    {
+        return in_array($code, [25009, 25018], true) || str_contains($message, '不能进行此操作');
     }
 
     /**
diff --git a/src/App/AppKernel.php b/src/App/AppKernel.php
@@ -6,6 +6,7 @@
 use Bhp\Bootstrap\StartupSelfCheck;
 use Bhp\Cache\Cache;
 use Bhp\Config\Config;
+use Bhp\Console\Cli\RuntimeException as CliRuntimeException;
 use Bhp\Console\Console;
 use Bhp\Console\Command\AppCommand;
 use Bhp\Console\Command\DebugCommand;
@@ -36,6 +37,7 @@
 use Bhp\Profile\ProfileCacheResetService;
 use Bhp\Profile\ProfileContext;
 use Bhp\Profile\ProfileInspector;
+use Bhp\Profile\ProfileRuntimeLock;
 use Bhp\Request\Request;
 use Bhp\Request\RequestRetryPolicy;
 use Bhp\Runtime\AppContext;
@@ -44,6 +46,7 @@
 use Bhp\Scheduler\Scheduler;
 use Bhp\Scheduler\SchedulerStateStore;
 use Bhp\WbiSign\WbiSign;
+use RuntimeException;
 
 final class AppKernel
 {
@@ -72,10 +75,20 @@ public function boot(): BootstrapResult
         $profileName = Console::parse($this->argv);
         $runtimeMode = Console::resolveMode($this->argv);
         $profileContext = ProfileContext::fromAppRoot($this->appRoot, $profileName);
+        $runtimeLock = new ProfileRuntimeLock($profileContext);
+        if (!$readOnlyRequest) {
+            try {
+                $runtimeLock->acquire('mode:' . $runtimeMode);
+            } catch (RuntimeException $exception) {
+                throw new CliRuntimeException($exception->getMessage(), 0, $exception);
+            }
+        }
+
         $container = new ServiceContainer();
 
         $container->setInstance(ServiceContainer::class, $container);
         $container->setInstance(ProfileContext::class, $profileContext);
+        $container->setInstance(ProfileRuntimeLock::class, $runtimeLock);
         $container->set(Core::class, static fn (ServiceContainer $services): Core => new Core($profileContext));
         $container->set(Config::class, static fn (ServiceContainer $services): Config => new Config($profileContext));
         $container->set(Cache::class, static fn (ServiceContainer $services): Cache => new Cache($profileContext));
@@ -190,7 +203,7 @@ public function boot(): BootstrapResult
             $this->argv,
             $profileContext->appRoot(),
             static fn (): Plugin => $services->get(Plugin::class),
-            static fn (): ProfileCacheResetService => $services->get(ProfileCacheResetService::class)
+            static fn (): ProfileCacheResetService => $services->get(ProfileCacheResetService::class),
         ));
         $container->set(Console::class, fn (ServiceContainer $services): Console => new Console(
             $this->argv,
diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
@@ -91,6 +91,14 @@ public function flush(): void
         $this->store()->clear();
     }
 
+    /**
+     * @return string[]
+     */
+    public function scopes(): array
+    {
+        return $this->store()->scopes();
+    }
+
     /**
      * 处理ensureScopeInitialized
      * @param string $classname
diff --git a/src/Cache/CacheStoreInterface.php b/src/Cache/CacheStoreInterface.php
@@ -10,6 +10,11 @@ interface CacheStoreInterface
      */
     public function databasePath(): string;
 
+    /**
+     * @return string[]
+     */
+    public function scopes(): array;
+
     /**
      * 处理get
      * @param string $scope
diff --git a/src/Cache/SqliteCacheStore.php b/src/Cache/SqliteCacheStore.php
@@ -25,6 +25,52 @@ public function databasePath(): string
         return $this->databasePath;
     }
 
+    /**
+     * @return string[]
+     */
+    public function scopes(): array
+    {
+        if (!is_file($this->databasePath) && !$this->connection instanceof \SQLite3) {
+            return [];
+        }
+
+        $connection = null;
+        $result = null;
+
+        try {
+            $connection = $this->connection instanceof \SQLite3
+                ? $this->connection
+                : $this->openExistingConnection();
+            if (!$connection instanceof \SQLite3 || !$this->hasCacheEntriesTable($connection)) {
+                return [];
+            }
+
+            $result = $connection->query('SELECT DISTINCT scope FROM cache_entries ORDER BY scope');
+            if (!$result instanceof \SQLite3Result) {
+                return [];
+            }
+
+            $scopes = [];
+            while (($row = $result->fetchArray(SQLITE3_ASSOC)) !== false) {
+                $scope = trim((string)($row['scope'] ?? ''));
+                if ($scope !== '') {
+                    $scopes[] = $scope;
+                }
+            }
+
+            return $scopes;
+        } catch (\Throwable) {
+            return [];
+        } finally {
+            if ($result instanceof \SQLite3Result) {
+                $result->finalize();
+            }
+            if ($connection instanceof \SQLite3 && $connection !== $this->connection) {
+                $connection->close();
+            }
+        }
+    }
+
     /**
      * 处理get
      * @param string $scope
@@ -155,6 +201,39 @@ private function connection(): \SQLite3
         return $this->connection = $connection;
     }
 
+    private function openExistingConnection(): ?\SQLite3
+    {
+        if (!is_file($this->databasePath)) {
+            return null;
+        }
+
+        $connection = new \SQLite3($this->databasePath, SQLITE3_OPEN_READONLY);
+        $connection->busyTimeout(5000);
+        $connection->enableExceptions(true);
+
+        return $connection;
+    }
+
+    private function hasCacheEntriesTable(\SQLite3 $connection): bool
+    {
+        $statement = $connection->prepare(
+            "SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'cache_entries' LIMIT 1"
+        );
+        if (!$statement instanceof \SQLite3Stmt) {
+            return false;
+        }
+
+        $result = $statement->execute();
+        if (!$result instanceof \SQLite3Result) {
+            return false;
+        }
+
+        $row = $result->fetchArray(SQLITE3_ASSOC);
+        $result->finalize();
+
+        return is_array($row) && ($row['name'] ?? '') === 'cache_entries';
+    }
+
     /**
      * 处理purgeEntries
      * @param \SQLite3 $connection
diff --git a/src/Config/ConfigTemplateSynchronizer.php b/src/Config/ConfigTemplateSynchronizer.php
@@ -24,7 +24,7 @@ public function synchronize(string $templatePath, string $targetPath): ConfigTem
 
         $backupPath = null;
         if ($targetExists) {
-            $backupPath = $targetPath . '.bak';
+            $backupPath = $this->nextBackupPath($targetPath);
             file_put_contents($backupPath, $targetContent);
         }
 
@@ -128,6 +128,24 @@ private function detectNewline(string $content): string
         return "\n";
     }
 
+    private function nextBackupPath(string $targetPath): string
+    {
+        $timestamp = date('YmdHis');
+        $basePath = $targetPath . '.' . $timestamp . '.bak';
+        if (!is_file($basePath)) {
+            return $basePath;
+        }
+
+        for ($index = 1; $index < 1000; $index++) {
+            $candidate = $targetPath . '.' . $timestamp . '.' . $index . '.bak';
+            if (!is_file($candidate)) {
+                return $candidate;
+            }
+        }
+
+        return $targetPath . '.' . $timestamp . '.' . bin2hex(random_bytes(4)) . '.bak';
+    }
+
     /**
      * @return string[]
      */
diff --git a/src/Profile/ProfileCacheResetService.php b/src/Profile/ProfileCacheResetService.php
@@ -40,19 +40,45 @@ private function clearCacheFiles(array $authSnapshot): void
             return;
         }
 
-        $this->cache->flush();
-        $this->removeFiles([
+        $files = [
             $cacheDir . DIRECTORY_SEPARATOR . 'cache.sqlite3',
             $cacheDir . DIRECTORY_SEPARATOR . 'cache.sqlite3-shm',
             $cacheDir . DIRECTORY_SEPARATOR . 'cache.sqlite3-wal',
-        ]);
+        ];
+        $this->logResetPlan($files, $this->cache->scopes(), $authSnapshot !== []);
+
+        $this->cache->flush();
+        $this->removeFiles($files);
 
         if ($authSnapshot !== []) {
             $this->context->restoreAuthSnapshot($authSnapshot);
             $this->context->log()->recordInfo('已保留当前登录态');
         }
     }
 
+    /**
+     * @param string[] $files
+     * @param string[] $scopes
+     */
+    private function logResetPlan(array $files, array $scopes, bool $keepAuth): void
+    {
+        $existingFiles = array_values(array_filter($files, 'is_file'));
+        $this->context->log()->recordInfo(sprintf(
+            '缓存重置: 登录态%s，持久 scope %d 个，缓存文件 %d 个',
+            $keepAuth ? '保留' : '清理',
+            count($scopes),
+            count($existingFiles),
+        ));
+
+        if ($scopes !== []) {
+            $this->context->log()->recordInfo('缓存重置 scope: ' . implode(', ', $scopes));
+        }
+
+        foreach ($existingFiles as $file) {
+            $this->context->log()->recordInfo('缓存重置文件: ' . basename($file));
+        }
+    }
+
     /**
      * @param string[] $files
      */
diff --git a/src/Profile/ProfileRuntimeLock.php b/src/Profile/ProfileRuntimeLock.php
diff --git a/src/Scheduler/Scheduler.php b/src/Scheduler/Scheduler.php

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ protected function postJson(string $url, array $payload, array $headers): array`
`58`	`58`	`{`
`59`	`59`	`try {`
`60`	`60`	`$raw = $this->request->postText('pc', $url, $payload, $headers);`
	`61`	`+ } catch (NoLoginException $exception) {`
	`62`	`+ throw $exception;`
`61`	`63`	`} catch (Throwable $throwable) {`
`62`	`64`	`return [`
`63`	`65`	`'code' => -500,`