Compare commits

..

8 Commits

Author SHA1 Message Date
gitea-actions 77e1017d09 chore: bump version to v0.4.16
Auto Tag Develop / tag (push) Successful in 9s
Build & Push Docker Image / build (push) Successful in 37s
2026-05-27 08:36:22 +00:00
Matthieu c528067c79 fix(mcp) : accepter les arguments scalaires stringifiés (coercition string->int/bool)
Auto Tag Develop / tag (push) Successful in 11s
Certains clients MCP sérialisent tous les arguments JSON-RPC en string
(ex: "22" au lieu de 22). Le SDK valide les arguments contre le schéma
JSON AVANT de les caster (CallToolHandler), donc un schéma integer strict
rejetait "22" en 422 alors que ReferenceHandler::castArgumentType sait
le coercer ensuite.

CoercingSchemaGenerator enveloppe le SchemaGenerator du SDK et ajoute
"string" aux types scalaires integer/number/boolean (et aux items de
tableaux), de sorte que opis accepte la valeur stringifiée ; le type PHP
réel du paramètre pilote toujours la coercition. Branché sur le builder
MCP via McpSchemaGeneratorPass (enregistrée dans Kernel::build).

Corrige le rejet 422 sur groupId/effortId/priorityId/statusId/etc. lors
de l'appel des tools depuis Claude.
2026-05-27 10:36:06 +02:00
gitea-actions 433032701e chore: bump version to v0.4.15
Auto Tag Develop / tag (push) Successful in 7s
Build & Push Docker Image / build (push) Successful in 28s
2026-05-27 08:11:38 +00:00
Matthieu 4334420625 fix(mcp) : typer les éléments des params tableaux d'IDs (items: integer)
Auto Tag Develop / tag (push) Successful in 11s
Les params tableaux (tagIds, collaboratorIds) des tools create-task,
update-task, list-tasks, create-time-entry et update-time-entry
généraient un schéma { type: [array, null] } sans clé items : aucune
contrainte sur le type des éléments, d'où des IDs pouvant transiter en
string. Ajout d'un docblock @param int[] sur chaque __invoke pour que le
SchemaGenerator du SDK MCP produise items: { type: integer }, ce qui
force la validation à n'accepter que des entiers.
2026-05-27 10:11:24 +02:00
gitea-actions 7e32e4c013 chore: bump version to v0.4.14
Auto Tag Develop / tag (push) Successful in 6s
Build & Push Docker Image / build (push) Successful in 52s
2026-05-26 09:36:14 +00:00
Matthieu 8fb5b80d8d fix(absences) : afficher le solde de CP avec décimales (8,75) sans arrondir
Auto Tag Develop / tag (push) Successful in 8s
Le solde était arrondi à la demi-journée (Math.round(n*2)/2), affichant
9 au lieu de 8,75 : un salarié pouvait croire à un droit supérieur au
réel. Formatage via Intl.NumberFormat fr-FR (virgule, max 2 décimales,
zéros superflus retirés) dans formatDays et les cartes de solde.
2026-05-26 11:36:04 +02:00
gitea-actions 96e25c2390 chore: bump version to v0.4.13
Auto Tag Develop / tag (push) Successful in 6s
Build & Push Docker Image / build (push) Successful in 48s
2026-05-26 09:33:27 +00:00
Matthieu 02ac151ac0 feat(users) : ajout prénom et nom sur l'utilisateur
Auto Tag Develop / tag (push) Successful in 7s
Deux colonnes nullable firstName/lastName sur User (groupes me:read,
user:list, user:write), éditables dans le drawer utilisateur (admin).
L'affichage reste basé sur le username pour l'instant. Migration +
valeurs de démo dans les fixtures.
2026-05-26 11:33:18 +02:00
17 changed files with 325 additions and 5 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
parameters:
app.version: '0.4.12'
app.version: '0.4.16'
@@ -102,7 +102,8 @@ const others = computed<AbsenceBalance[]>(() =>
)
function formatNumber(n: number): string {
return (Math.round(n * 2) / 2).toString()
// Valeur réelle avec décimales (ex. 8,75) : pas d'arrondi qui gonflerait le solde.
return new Intl.NumberFormat('fr-FR', { maximumFractionDigits: 2 }).format(n)
}
// Total entitlement = acquired (N-1) + in-progress (N); falls back to the
+18
View File
@@ -11,6 +11,16 @@
:error="touched.username && !form.username.trim() ? 'Le nom est requis' : ''"
@blur="touched.username = true"
/>
<MalioInputText
v-model="form.firstName"
label="Prénom"
input-class="w-full"
/>
<MalioInputText
v-model="form.lastName"
label="Nom"
input-class="w-full"
/>
<MalioInputPassword
v-model="form.password"
label="Mot de passe"
@@ -84,6 +94,8 @@ const isSubmitting = ref(false)
const form = reactive({
username: '',
firstName: '',
lastName: '',
password: '',
roles: [] as string[],
isEmployee: false,
@@ -98,11 +110,15 @@ watch(() => props.modelValue, (open) => {
if (open) {
if (props.item) {
form.username = props.item.username ?? ''
form.firstName = props.item.firstName ?? ''
form.lastName = props.item.lastName ?? ''
form.password = ''
form.roles = [...props.item.roles]
form.isEmployee = props.item.isEmployee ?? false
} else {
form.username = ''
form.firstName = ''
form.lastName = ''
form.password = ''
form.roles = ['ROLE_USER']
form.isEmployee = false
@@ -124,6 +140,8 @@ async function handleSubmit() {
try {
const payload: UserWrite = {
username: form.username.trim(),
firstName: form.firstName.trim() || null,
lastName: form.lastName.trim() || null,
roles: form.roles,
isEmployee: form.isEmployee,
}
+5 -3
View File
@@ -75,9 +75,11 @@ export function useAbsenceHelpers() {
}
function formatDays(days: number): string {
const rounded = Math.round(days * 2) / 2
const unit = rounded > 1 ? t('absences.daysPlural') : t('absences.daySingular')
return `${rounded} ${unit}`
// Affiche la valeur réelle avec décimales (ex. 8,75) : un solde de CP se
// gère en demi/quart de journée, arrondir masquerait des droits réels.
const value = new Intl.NumberFormat('fr-FR', { maximumFractionDigits: 2 }).format(days)
const unit = days >= 2 ? t('absences.daysPlural') : t('absences.daySingular')
return `${value} ${unit}`
}
return {
+4
View File
@@ -4,6 +4,8 @@ export type UserData = {
id: number
'@id'?: string
username: string
firstName?: string | null
lastName?: string | null
roles: string[]
avatarUrl?: string | null
apiToken?: string | null
@@ -20,6 +22,8 @@ export type UserData = {
export type UserWrite = {
username: string
firstName?: string | null
lastName?: string | null
plainPassword?: string
roles: string[]
// HR / absence management
+31
View File
@@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Add optional first name / last name to users.
*/
final class Version20260526120000 extends AbstractMigration
{
public function getDescription(): string
{
return 'Add user.first_name and user.last_name (nullable)';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE "user" ADD first_name VARCHAR(100) DEFAULT NULL');
$this->addSql('ALTER TABLE "user" ADD last_name VARCHAR(100) DEFAULT NULL');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE "user" DROP COLUMN IF EXISTS first_name');
$this->addSql('ALTER TABLE "user" DROP COLUMN IF EXISTS last_name');
}
}
+8
View File
@@ -43,6 +43,8 @@ class AppFixtures extends Fixture
// Users
$admin = new User();
$admin->setUsername('admin');
$admin->setFirstName('Alex');
$admin->setLastName('Martin');
$admin->setRoles(['ROLE_ADMIN']);
$admin->setPassword($this->passwordHasher->hashPassword($admin, 'admin'));
$admin->setApiToken('dev-mcp-token-for-testing-only-do-not-use-in-production');
@@ -50,18 +52,24 @@ class AppFixtures extends Fixture
$userAlice = new User();
$userAlice->setUsername('alice');
$userAlice->setFirstName('Alice');
$userAlice->setLastName('Dupont');
$userAlice->setRoles(['ROLE_USER']);
$userAlice->setPassword($this->passwordHasher->hashPassword($userAlice, 'alice'));
$manager->persist($userAlice);
$userBob = new User();
$userBob->setUsername('bob');
$userBob->setFirstName('Bob');
$userBob->setLastName('Leroy');
$userBob->setRoles(['ROLE_USER']);
$userBob->setPassword($this->passwordHasher->hashPassword($userBob, 'bob'));
$manager->persist($userBob);
$userCharlie = new User();
$userCharlie->setUsername('charlie');
$userCharlie->setFirstName('Charlie');
$userCharlie->setLastName('Moreau');
$userCharlie->setRoles(['ROLE_USER']);
$userCharlie->setPassword($this->passwordHasher->hashPassword($userCharlie, 'charlie'));
$manager->persist($userCharlie);
@@ -0,0 +1,28 @@
<?php
declare(strict_types=1);
namespace App\DependencyInjection\Compiler;
use App\Mcp\Schema\CoercingSchemaGenerator;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
/**
* Wires the CoercingSchemaGenerator into the MCP server builder so that
* generated tool input schemas accept stringified scalar arguments.
*/
final class McpSchemaGeneratorPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container): void
{
if (!$container->hasDefinition('mcp.server.builder')) {
return;
}
$container->getDefinition('mcp.server.builder')
->addMethodCall('setSchemaGenerator', [new Reference(CoercingSchemaGenerator::class)])
;
}
}
+32
View File
@@ -55,6 +55,14 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
#[Groups(['me:read', 'task:read', 'user:list', 'user:write', 'time_entry:read', 'absence_request:read', 'absence_balance:read'])]
private ?string $username = null;
#[ORM\Column(length: 100, nullable: true)]
#[Groups(['me:read', 'user:list', 'user:write'])]
private ?string $firstName = null;
#[ORM\Column(length: 100, nullable: true)]
#[Groups(['me:read', 'user:list', 'user:write'])]
private ?string $lastName = null;
/** @var list<string> */
#[ORM\Column]
#[ApiProperty(security: "is_granted('ROLE_ADMIN') or object == user")]
@@ -147,6 +155,30 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
return $this;
}
public function getFirstName(): ?string
{
return $this->firstName;
}
public function setFirstName(?string $firstName): static
{
$this->firstName = $firstName;
return $this;
}
public function getLastName(): ?string
{
return $this->lastName;
}
public function setLastName(?string $lastName): static
{
$this->lastName = $lastName;
return $this;
}
public function getUserIdentifier(): string
{
return (string) $this->username;
+7
View File
@@ -4,10 +4,17 @@ declare(strict_types=1);
namespace App;
use App\DependencyInjection\Compiler\McpSchemaGeneratorPass;
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
class Kernel extends BaseKernel
{
use MicroKernelTrait;
protected function build(ContainerBuilder $container): void
{
$container->addCompilerPass(new McpSchemaGeneratorPass());
}
}
@@ -0,0 +1,97 @@
<?php
declare(strict_types=1);
namespace App\Mcp\Schema;
use Mcp\Capability\Discovery\DocBlockParser;
use Mcp\Capability\Discovery\SchemaGenerator;
use Mcp\Capability\Discovery\SchemaGeneratorInterface;
use Reflector;
use function count;
use function in_array;
use function is_array;
/**
* Wraps the SDK SchemaGenerator and relaxes scalar parameter schemas so that
* numeric/boolean parameters also accept their string representation.
*
* Rationale: some MCP clients serialize every JSON-RPC argument as a string
* (e.g. `"22"` instead of `22`). The SDK validates arguments against the
* generated JSON Schema BEFORE casting them (see CallToolHandler), so a strict
* `integer` schema rejects `"22"` with a 422 even though the SDK's
* ReferenceHandler::castArgumentType would happily coerce it afterwards.
*
* By advertising `["integer", "string"]` (resp. number/boolean) we let opis
* accept the stringified value; the reflected PHP type hint (`int`, `bool`, ...)
* still drives the actual coercion in ReferenceHandler. Non-numeric strings are
* rejected later with a clear "cannot cast" error.
*/
final class CoercingSchemaGenerator implements SchemaGeneratorInterface
{
public function __construct(
private readonly SchemaGeneratorInterface $inner = new SchemaGenerator(new DocBlockParser()),
) {}
public function generate(Reflector $reflection): array
{
$schema = $this->inner->generate($reflection);
if (isset($schema['properties']) && is_array($schema['properties'])) {
foreach ($schema['properties'] as $name => $property) {
if (is_array($property)) {
$schema['properties'][$name] = $this->relaxNode($property);
}
}
}
return $schema;
}
public function generateOutputSchema(Reflector $reflection): ?array
{
return $this->inner->generateOutputSchema($reflection);
}
/**
* @param array<string, mixed> $node
*
* @return array<string, mixed>
*/
private function relaxNode(array $node): array
{
if (isset($node['type'])) {
$node['type'] = $this->relaxType($node['type']);
}
// Relax array element types too (stringified IDs inside tagIds, etc.).
if (isset($node['items']) && is_array($node['items'])) {
$node['items'] = $this->relaxNode($node['items']);
}
return $node;
}
/**
* Adds "string" to a type definition that allows integer/number/boolean.
*
* @param string|string[] $type
*
* @return string|string[]
*/
private function relaxType(array|string $type): array|string
{
$types = (array) $type;
$isNumericOrBool = in_array('integer', $types, true)
|| in_array('number', $types, true)
|| in_array('boolean', $types, true);
if ($isNumericOrBool && !in_array('string', $types, true)) {
$types[] = 'string';
}
return 1 === count($types) ? $types[0] : array_values($types);
}
}
+4
View File
@@ -41,6 +41,10 @@ class CreateTaskTool
private readonly CalDavService $calDavService,
) {}
/**
* @param int[] $tagIds IDs of the tags to attach
* @param int[] $collaboratorIds IDs of the collaborators to attach
*/
public function __invoke(
int $projectId,
string $title,
+3
View File
@@ -18,6 +18,9 @@ class ListTasksTool
private readonly Security $security,
) {}
/**
* @param int[] $tagIds IDs of the tags to filter by
*/
public function __invoke(
?int $projectId = null,
?int $statusId = null,
+4
View File
@@ -38,6 +38,10 @@ class UpdateTaskTool
private readonly CalDavService $calDavService,
) {}
/**
* @param int[] $tagIds IDs of the tags to attach
* @param int[] $collaboratorIds IDs of the collaborators to attach
*/
public function __invoke(
int $id,
?string $title = null,
@@ -33,6 +33,9 @@ class CreateTimeEntryTool
private readonly Security $security,
) {}
/**
* @param int[] $tagIds IDs of the tags to attach
*/
public function __invoke(
int $userId,
string $startedAt,
@@ -30,6 +30,9 @@ class UpdateTimeEntryTool
private readonly Security $security,
) {}
/**
* @param int[] $tagIds IDs of the tags to attach
*/
public function __invoke(
int $id,
?string $title = null,
@@ -0,0 +1,75 @@
<?php
declare(strict_types=1);
namespace App\Tests\Unit\Mcp;
use App\Mcp\Schema\CoercingSchemaGenerator;
use App\Mcp\Tool\Task\CreateTaskTool;
use App\Mcp\Tool\Task\ListTasksTool;
use PHPUnit\Framework\TestCase;
use ReflectionMethod;
/**
* @internal
*/
class CoercingSchemaGeneratorTest extends TestCase
{
private CoercingSchemaGenerator $generator;
protected function setUp(): void
{
$this->generator = new CoercingSchemaGenerator();
}
public function testNullableIntegerScalarAlsoAcceptsString(): void
{
$schema = $this->generator->generate(new ReflectionMethod(ListTasksTool::class, '__invoke'));
// ?int $projectId -> ["null","integer"] relaxed with "string".
self::assertSame(['null', 'integer', 'string'], $schema['properties']['projectId']['type']);
}
public function testRequiredIntegerScalarAlsoAcceptsString(): void
{
$schema = $this->generator->generate(new ReflectionMethod(ListTasksTool::class, '__invoke'));
// int $limit = 100 -> "integer" relaxed to ["integer","string"].
self::assertSame(['integer', 'string'], $schema['properties']['limit']['type']);
}
public function testBooleanScalarAlsoAcceptsString(): void
{
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
// ?bool $syncToCalendar -> ["boolean","null"] relaxed with "string".
$type = $schema['properties']['syncToCalendar']['type'];
self::assertContains('boolean', $type);
self::assertContains('string', $type);
self::assertContains('null', $type);
}
public function testArrayItemTypeAlsoAcceptsString(): void
{
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
// int[] $tagIds -> items {type: integer} relaxed to {type: [integer, string]}.
self::assertSame(['integer', 'string'], $schema['properties']['tagIds']['items']['type']);
}
public function testStringScalarIsLeftUntouched(): void
{
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
// string $title stays a plain string (no spurious relaxation).
self::assertSame('string', $schema['properties']['title']['type']);
}
public function testArrayContainerTypeIsNotRelaxed(): void
{
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
// The array container itself must not gain "string".
self::assertSame(['array', 'null'], $schema['properties']['tagIds']['type']);
}
}