From a8c7602651303e06d7c95fd2736f07a043f98a07 Mon Sep 17 00:00:00 2001 From: Aliquanto3 Date: Wed, 21 Oct 2026 07:08:02 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20diff-replie=201.0.1,=20API=20atom/re?= =?UTF-8?q?ad/update=20retir=C3=A9e=20de=20claude-code=202.1.280?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit claude plugin validate échouait : $ est désormais refusé en argument d'une fonction importée (atom/read/update de claude-code, qui n'existent d'ailleurs plus à l'exécution — claude plugin test confirmait "Export named 'atom' not found"). L'état du mod (groupes, lignes dépliées, résumés) passe par de simples variables de module, et les changements déclenchés hors du rendu courant (/details, retrait d'un appel replié par Claude Code, boutons) appellent $.ui.invalidate('ui.render') pour forcer le redessin. Retrait aussi du champ `types` du manifeste (le mod n'ajoute rien à $ dans engine.create, ce champ ne le concernait pas) et ajout de `claude plugin validate`/`test` en CI pour éviter la régression. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/validate.yml | 26 ++++ .../diff-replie/.claude-plugin/plugin.json | 5 +- plugins/diff-replie/CHANGELOG.md | 17 +++ plugins/diff-replie/hooks/register.tsx | 140 ++++++++++-------- plugins/diff-replie/types/index.d.ts | 6 - 5 files changed, 121 insertions(+), 73 deletions(-) create mode 100644 .github/workflows/validate.yml create mode 100644 plugins/diff-replie/CHANGELOG.md diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml new file mode 100644 index 0000000..1fa0f07 --- /dev/null +++ b/.github/workflows/validate.yml @@ -0,0 +1,26 @@ +name: Valider les mods + +on: + push: + branches: [main] + pull_request: + +jobs: + validate: + runs-on: ubuntu-latest + strategy: + matrix: + plugin: [diff-replie] + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 22 + - name: Installer Claude Code + run: npm install -g @anthropic-ai/claude-code + - name: claude plugin validate + run: claude plugin validate plugins/${{ matrix.plugin }} --strict + - name: claude plugin test + run: claude plugin test plugins/${{ matrix.plugin }} + env: + CLAUDE_CODE_ENABLE_FUNCTION_HOOKS: '1' diff --git a/plugins/diff-replie/.claude-plugin/plugin.json b/plugins/diff-replie/.claude-plugin/plugin.json index 7abc889..c13ad53 100644 --- a/plugins/diff-replie/.claude-plugin/plugin.json +++ b/plugins/diff-replie/.claude-plugin/plugin.json @@ -1,9 +1,8 @@ { "name": "diff-replie", - "version": "1.0.0", + "version": "1.0.1", "description": "Replie les diffs d'Edit et Write et la sortie des commandes shell en une ligne, regroupe les appels consécutifs du même type, et /details déplie tout", "author": { "name": "Aliquanto3", "url": "https://github.com/Aliquanto3" }, "homepage": "https://github.com/Aliquanto3/claude-code-mods", - "license": "Apache-2.0", - "types": "./types/index.d.ts" + "license": "Apache-2.0" } diff --git a/plugins/diff-replie/CHANGELOG.md b/plugins/diff-replie/CHANGELOG.md new file mode 100644 index 0000000..c8f2e5b --- /dev/null +++ b/plugins/diff-replie/CHANGELOG.md @@ -0,0 +1,17 @@ +# Changelog — diff-replie + +## 1.0.1 + +- Correction : le mod ne se chargeait plus sous Claude Code 2.1.280 (`atom`, `read`, `update`, + retirés de `claude-code`, et l'analyseur interdit de toute façon de passer `$` à une fonction + importée). L'état du mod (groupes, lignes dépliées, résumés) passe par de simples variables au + niveau du fichier, et les changements déclenchés hors du rendu courant (commande `/details`, + retrait d'un appel replié par Claude Code, boutons) appellent désormais `$.ui.invalidate('ui.render')`. +- Retrait du champ `types` du manifeste : le mod n'ajoute rien à `$` dans `engine.create`, ce champ + ne le concernait pas et produisait un avertissement de validation inutile. +- Comportement inchangé : repli des diffs et des sorties, regroupement des appels consécutifs, + `/details`. + +## 1.0.0 + +- Version initiale. diff --git a/plugins/diff-replie/hooks/register.tsx b/plugins/diff-replie/hooks/register.tsx index 8117b6f..5c47fe1 100644 --- a/plugins/diff-replie/hooks/register.tsx +++ b/plugins/diff-replie/hooks/register.tsx @@ -1,15 +1,17 @@ -import { atom, read, update } from 'claude-code' -import type { EngineInterface, Register } from 'claude-code' +import type { Register } from 'claude-code' import type { Expanded, LeaderOf, Runs, Summaries } from '../types' -const expanded = atom({ plugin: 'diff-replie', key: 'expanded' } as const, [] as Expanded) -const runs = atom({ plugin: 'diff-replie', key: 'runs' } as const, {} as Runs) -const leaderOf = atom({ plugin: 'diff-replie', key: 'leaderOf' } as const, {} as LeaderOf) -const summaries = atom({ plugin: 'diff-replie', key: 'summaries' } as const, {} as Summaries) +// État du mod, en mémoire pour le process (repart à zéro à chaque session, comme l'affichage +// replié/déplié lui-même). `claude-code` n'exporte plus d'atome réactif : un changement qui doit +// se voir hors du rendu qui l'a causé (le bouton pressé) passe par `$.ui.invalidate('ui.render')`. +let expanded: Expanded = [] +let runs: Runs = {} +let leaderOf: LeaderOf = {} +let summaries: Summaries = {} // Tout déplier d'un coup (commande /details) : le seul geste possible hors du plein écran, // où le terminal ne transmet pas les clics. -const showAll = atom({ plugin: 'diff-replie', key: 'showAll' } as const, false) +let showAll = false const COMMAND = 'details' const HINT = ' · /details pour déplier' @@ -63,39 +65,35 @@ export const summarizeShell = (output: ShellOutput) => { export const groupTitle = (kind: Kind, count: number) => kind === 'shell' ? `${count} commandes shell` : `${count} modifications de fichiers` -const groupOf = async ($: EngineInterface, id: string) => { - const leader = (await read($, leaderOf))[id] - const ids = leader ? ((await read($, runs))[leader] ?? []) : [] +const groupOf = (id: string) => { + const leader = leaderOf[id] + const ids = leader ? (runs[leader] ?? []) : [] return { leader, ids, isGrouped: ids.length > 1 } } // Retire des groupes du mod les appels que Claude Code a rangés dans ses propres lignes ; // rend, pour chaque groupe touché, le nouvel appel de tête (null si le groupe est vide). -async function detach($: EngineInterface, gone: string[]) { - const owners = await read($, leaderOf) +function detach(gone: string[]): Record { + const owners = leaderOf const moved: Record = {} - await update($, runs, r => { - const kept = { ...(r ?? {}) } - for (const leader of new Set(gone.map(id => owners[id]).filter(Boolean))) { - const members = (kept[leader] ?? []).filter(x => !gone.includes(x)) - delete kept[leader] - moved[leader] = members[0] ?? null - if (members.length > 0) kept[members[0]] = members - } - return kept - }) - await update($, leaderOf, m => { - const kept = { ...(m ?? {}) } - for (const id of gone) delete kept[id] - for (const [id, leader] of Object.entries(kept)) { - if (leader in moved) { - const newLeader = moved[leader] - if (newLeader) kept[id] = newLeader - else delete kept[id] - } + const keptRuns = { ...runs } + for (const leader of new Set(gone.map(id => owners[id]).filter(Boolean))) { + const members = (keptRuns[leader] ?? []).filter(x => !gone.includes(x)) + delete keptRuns[leader] + moved[leader] = members[0] ?? null + if (members.length > 0) keptRuns[members[0]] = members + } + runs = keptRuns + const keptLeaderOf = { ...leaderOf } + for (const id of gone) delete keptLeaderOf[id] + for (const [id, leader] of Object.entries(keptLeaderOf)) { + if (leader in moved) { + const newLeader = moved[leader] + if (newLeader) keptLeaderOf[id] = newLeader + else delete keptLeaderOf[id] } - return kept - }) + } + leaderOf = keptLeaderOf return moved } @@ -109,9 +107,10 @@ export const register: Register = on => { return next(e) }) - on('command.run', { command: COMMAND }, async $ => { - const isShown = !(await read($, showAll)) - await update($, showAll, () => isShown) + on('command.run', { command: COMMAND }, $ => { + const isShown = !showAll + showAll = isShown + $.ui.invalidate('ui.render') return { text: isShown ? 'Diffs et sorties dépliés.' : 'Diffs et sorties repliés.' } }) @@ -143,15 +142,15 @@ export const register: Register = on => { const input = e as unknown as ShellInput & { file_path?: string } const pending = kind === 'shell' ? (input.description ?? input.command ?? 'commande') : baseName(input.file_path ?? 'fichier') - await update($, leaderOf, m => ({ ...(m ?? {}), [id]: leader })) - await update($, runs, r => ({ ...(r ?? {}), [leader]: [...((r ?? {})[leader] ?? []), id] })) - await update($, summaries, s => ({ ...(s ?? {}), [id]: { label: `${pending} (en cours)`, isError: false } })) + leaderOf = { ...leaderOf, [id]: leader } + runs = { ...runs, [leader]: [...(runs[leader] ?? []), id] } + summaries = { ...summaries, [id]: { label: `${pending} (en cours)`, isError: false } } const answer = await next(e) const isError = Boolean((answer as { isError?: boolean }).isError) const output = (answer as { result?: unknown }).result as EditOutput | undefined const label = kind === 'edit' && output && !isError ? editStats(e.tool, output) : pending - await update($, summaries, s => ({ ...(s ?? {}), [id]: { label: isError ? `${label} (échec)` : label, isError } })) + summaries = { ...summaries, [id]: { label: isError ? `${label} (échec)` : label, isError } } return answer }) @@ -160,17 +159,17 @@ export const register: Register = on => { // pourrait dépendre d'une ligne invisible. L'écriture part hors du dessin (refusée pendant). const engineFolded = new Set() - on('ui.render', { component: 'ToolGroup' }, async ($, e, next) => { + on('ui.render', { component: 'ToolGroup' }, ($, e, next) => { const fresh = e.props.calls.map(c => c.tool_use_id).filter((id): id is string => Boolean(id) && !engineFolded.has(id!)) if (fresh.length > 0) { fresh.forEach(id => engineFolded.add(id)) $.clock.after(0, () => { - void detach($, fresh).then(moved => { - if (current && current.leader in moved) { - const newLeader = moved[current.leader] - current = newLeader ? { ...current, leader: newLeader } : null - } - }) + const moved = detach(fresh) + if (current && current.leader in moved) { + const newLeader = moved[current.leader] + current = newLeader ? { ...current, leader: newLeader } : null + } + $.ui.invalidate('ui.render') }) } return next(e) @@ -178,17 +177,18 @@ export const register: Register = on => { on('ui.render', { component: 'ToolUse' }, async ($, e, next) => { const kind = kindOf(e.props.tool) - if (!kind || (await read($, showAll))) return next(e) + if (!kind || showAll) return next(e) const id = e.props.tool_use_id - const open = await read($, expanded) - const { leader, ids, isGrouped } = await groupOf($, id) + const { leader, ids, isGrouped } = groupOf(id) const { Box, Button, Text } = $.ui.resolve(e) if (isGrouped && leader) { - const isOpen = open.includes(leader) + const isOpen = expanded.includes(leader) if (id !== leader) return isOpen ? next(e) : - const toggle = () => - update($, expanded, list => (isOpen ? (list ?? []).filter(x => x !== leader) : [...(list ?? []), leader])) + const toggle = () => { + expanded = isOpen ? expanded.filter(x => x !== leader) : [...expanded, leader] + $.ui.invalidate('ui.render') + } if (isOpen) { const engineTree = await next(e) return ( @@ -198,9 +198,8 @@ export const register: Register = on => { ) } - const notes = await read($, summaries) - const labels = ids.map(x => notes[x]?.label ?? '…') - const errors = ids.filter(x => notes[x]?.isError).length + const labels = ids.map(x => summaries[x]?.label ?? '…') + const errors = ids.filter(x => summaries[x]?.isError).length return ( @@ -216,7 +215,7 @@ export const register: Register = on => { // Appel seul : la description de la commande à la place de son texte. const input = e.props.input as ShellInput | undefined - if (kind !== 'shell' || !input?.description || !input.command || open.includes(id)) return next(e) + if (kind !== 'shell' || !input?.description || !input.command || expanded.includes(id)) return next(e) return next({ ...e, props: { ...e.props, input: { ...input, command: input.description } } }) }) @@ -224,20 +223,26 @@ export const register: Register = on => { const { tool, tool_use_id: id, isErrored } = e.props const kind = kindOf(tool) const output = e.props.output as (EditOutput & ShellOutput) | undefined - if (!kind || isErrored || !output || output.staged || (await read($, showAll))) return next(e) + if (!kind || isErrored || !output || output.staged || showAll) return next(e) - const open = await read($, expanded) const { Box, Button, Text } = $.ui.resolve(e) - const { leader, isGrouped } = await groupOf($, id) - if (isGrouped && leader) return open.includes(leader) ? next(e) : + const { leader, isGrouped } = groupOf(id) + if (isGrouped && leader) return expanded.includes(leader) ? next(e) : const noun = kind === 'edit' ? 'le diff' : 'la sortie' - if (open.includes(id)) { + if (expanded.includes(id)) { const engineTree = await next(e) return ( {engineTree ?? null} -