Add prompt finder

src/Bootstrap.php

@@ -4,21 +4,21 @@
 
 namespace LLM\Assistant;
 
-use LLM\Assistant\Module\Finder\Finder;
-use LLM\Assistant\Module\Finder\Internal\FinderImpl;
+use LLM\Assistant\Module\Finder\FilesystemFinder;
+use LLM\Assistant\Module\Finder\Internal\FilesystemFinderImpl;
+use LLM\Assistant\Module\Finder\Internal\PromptFinderImpl;
+use LLM\Assistant\Module\Finder\PromptFinder;
 use LLM\Assistant\Service\Cache;
 use LLM\Assistant\Service\Container;
 use LLM\Assistant\Service\Internal\Cache\PsrCache;
 use LLM\Assistant\Service\Internal\Container\ContainerImpl;
 use LLM\Assistant\Service\Internal\Container\Injection\ConfigLoader;
 use LLM\Assistant\Service\Internal\Logger\LoggerImpl;
 use LLM\Assistant\Service\Logger;
-use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\StyleInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Yiisoft\Cache\File\FileCache;
 
 /**
  * Build the container based on the configuration.
@@ -48,7 +48,8 @@ public function finish(): Container
         $c = $this->container;
         unset($this->container);
 
-        $c->bind(Finder::class, FinderImpl::class);
+        $c->bind(FilesystemFinder::class, FilesystemFinderImpl::class);
+        $c->bind(PromptFinder::class, PromptFinderImpl::class);
         $c->bind(Cache::class, PsrCache::class);
 
         return $c;

src/Command/Run.php

@@ -4,7 +4,7 @@
 
 namespace LLM\Assistant\Command;
 
-use LLM\Assistant\Module\Finder\Finder;
+use LLM\Assistant\Module\Finder\PromptFinder;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -32,11 +32,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->logger->alert('Assistant is running');
 
-        $finder = $this->container->get(Finder::class);
+        $finder = $this->container->get(PromptFinder::class);
 
-        foreach ($finder->files() as $name => $file) {
-            $this->logger->info($name);
-        }
+        #AI test
+        tr($finder->getNext());
+
+        // foreach ($finder->files() as $name => $file) {
+        //     $this->logger->info($name);
+        // }
 
         return Command::SUCCESS;
     }

src/Module/Finder/Dto/File.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Assistant\Module\Finder\Dto;
+
+final readonly class File
+{
+    /**
+     * @param list<Prompt> $prompts
+     */
+    public function __construct(
+        public readonly \SplFileInfo $file,
+        public readonly string $content,
+        public readonly array $prompts,
+    ) {}
+}

src/Module/Finder/Dto/Prompt.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Assistant\Module\Finder\Dto;
+
+final readonly class Prompt
+{
+    /**
+     * @param int<0, max> $start
+     * @param positive-int $length
+     * @param non-empty-string $prompt
+     */
+    public function __construct(
+        public readonly int $start,
+        public readonly int $length,
+        public readonly string $prompt,
+    ) {}
+}

src/Module/Finder/Finder.php → src/Module/Finder/FilesystemFinder.php

@@ -9,7 +9,7 @@
  *
  * @extends \IteratorAggregate<string, \SplFileInfo>
  */
-interface Finder extends \IteratorAggregate
+interface FilesystemFinder extends \IteratorAggregate
 {
     /**
      * @return \Traversable<string, \SplFileInfo>
@@ -18,6 +18,11 @@ public function getIterator(): \Traversable;
 
     public function after(\DateTimeInterface $date): static;
 
+    /**
+     * Sort by modify time, oldest first
+     */
+    public function oldest(): static;
+
     /**
      * @return \Traversable<string, \SplFileInfo>
      */

src/Module/Finder/Internal/FinderImpl.php → src/Module/Finder/Internal/FilesystemFinderImpl.php

@@ -5,13 +5,17 @@
 namespace LLM\Assistant\Module\Finder\Internal;
 
 use LLM\Assistant\Config\Source;
-use LLM\Assistant\Module\Finder\Finder;
+use LLM\Assistant\Module\Finder\FilesystemFinder;
 
-final class FinderImpl implements Finder
+final class FilesystemFinderImpl implements FilesystemFinder
 {
+    /**
+     * @param bool|null $sort If true, sort by newest first
+     */
     public function __construct(
         private readonly Source $config,
         private ?\DateTimeInterface $after = null,
+        private ?bool $sort = null,
     ) {}
 
     public function getIterator(): \Traversable
@@ -21,7 +25,12 @@ public function getIterator(): \Traversable
 
     public function after(\DateTimeInterface $date): static
     {
-        return new self($this->config, $date);
+        return new self($this->config, $date, $this->sort);
+    }
+
+    public function oldest(): static
+    {
+        return new self($this->config, $this->after, false);
     }
 
     public function files(): \Traversable
@@ -51,9 +60,9 @@ private function finder(): \Symfony\Component\Finder\Finder
         $finder->exclude(\array_map($this->directoryToPattern(...), $this->config->excludeDir));
         // $finder->exclude($this->config->cacheDir);
 
-        if ($this->after !== null) {
-            $finder->date('> ' . $this->after->format('Y-m-d H:i:s'));
-        }
+        $this->after === null or $finder->date('>= ' . $this->after->format('Y-m-d H:i:s'));
+        // todo direction
+        $this->sort === null or $finder->sortByModifiedTime();
 
         return $finder;
     }

src/Module/Finder/Internal/PromptCache.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Assistant\Module\Finder\Internal;
+
+final class PromptCache
+{
+    public ?\DateTimeInterface $lastScan = null;
+}

src/Module/Finder/Internal/PromptFinderImpl.php

@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Assistant\Module\Finder\Internal;
+
+use LLM\Assistant\Module\Finder\Dto\File;
+use LLM\Assistant\Module\Finder\Dto\Prompt;
+use LLM\Assistant\Module\Finder\FilesystemFinder;
+use LLM\Assistant\Module\Finder\PromptFinder;
+use LLM\Assistant\Service\Cache;
+use LLM\Assistant\Service\Logger;
+
+final class PromptFinderImpl implements PromptFinder
+{
+    private const CACHE_KEY = 'prompt_finder';
+
+    private ?PromptCache $lastCache = null;
+
+    public function __construct(
+        private readonly FilesystemFinder $files,
+        private readonly Cache $cache,
+        private readonly Logger $logger,
+    ) {}
+
+    public function getNext(): ?File
+    {
+        $cache = $this->getOrUpdateCache();
+
+        // Get last modified files
+        $files = $cache->lastScan === null
+            ? $this->files->oldest()->files()
+            : $this->files->after($cache->lastScan)->oldest()->files();
+
+        foreach ($files as $file) {
+            $result = $this->scanFile($file);
+            if ($result !== null) {
+                // Update modified time in cache DTO to be saved later
+                $mtime = $file->getMTime();
+                $mtime === false or $cache->lastScan = new \DateTimeImmutable('@' . $mtime);
+
+                $this->lastCache = $cache;
+                return $result;
+            }
+        }
+
+        return null;
+    }
+
+    private function getOrUpdateCache(): PromptCache
+    {
+        try {
+            if ($this->lastCache !== null) {
+                $this->cache->set(self::CACHE_KEY, $this->lastCache);
+                return $this->lastCache;
+            }
+
+            return $this->cache->get(self::CACHE_KEY) ?? new PromptCache();
+        } catch (\Throwable) {
+            return new PromptCache();
+        }
+    }
+
+    private function scanFile(\SplFileInfo $file): ?File
+    {
+        $content = \file_get_contents($file->getPathname());
+        $this->logger->debug(
+            \sprintf(
+                'Scanning MT: %s Path: %s',
+                (new \DateTimeImmutable('@' . (int) $file->getMTime()))->format('Y-m-d H:i:s'),
+                $file->getPathname(),
+            ),
+        );
+
+        // Find all inline prompts started with "#AI" from a new line
+        $matches = [];
+        $result = \preg_match_all(
+            '/^[ \\t]*#AI[ \\t]+(.+)$/m',
+            $content,
+            $matches,
+            \PREG_OFFSET_CAPTURE,
+        );
+
+        if ($result === 0) {
+            return null;
+        }
+
+        $prompts = [];
+        /**
+         * @var array{
+         *     list<array{non-empty-string, int<0, max>}>,
+         *     list<array{non-empty-string, positive-int}>
+         * } $matches
+         */
+        foreach ($matches[0] as $key => $match) {
+            $prompts[] = new Prompt($match[1], \strlen($match[0]), $matches[1][$key][0]);
+        }
+
+        return new File($file, $content, $prompts);
+    }
+}

src/Module/Finder/PromptFinder.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Assistant\Module\Finder;
+
+use LLM\Assistant\Module\Finder\Dto\File;
+
+/**
+ * Finds new prompts
+ */
+interface PromptFinder
+{
+    public function getNext(): ?File;
+}