Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
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
# Version épinglée : l'API des mods (early access) change sans préavis d'une version à l'autre.
- name: Installer Claude Code
run: npm install -g @anthropic-ai/claude-code@2.1.280
- 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'
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ Dans une session Claude Code, à l'invite du terminal :
/plugin install diff-replie --marketplace Aliquanto3/claude-code-mods
```

Répondre `y` pour ajouter le marketplace, puis choisir la portée (utilisateur par défaut). Le mod est actif aussitôt, sans redémarrage.
Répondre `y` pour ajouter le marketplace, puis choisir la portée (utilisateur par défaut). Le mod est actif aussitôt, sans redémarrage, si les mods de code sont activés.

**Prérequis** : les mods de code de Claude Code sont en accès anticipé. Sans la variable `CLAUDE_CODE_ENABLE_FUNCTION_HOOKS=1`, le mod s'installe mais ne se charge pas, sans message. Ajoutez-la au bloc `env` de `~/.claude/settings.json` (`"env": { "CLAUDE_CODE_ENABLE_FUNCTION_HOOKS": "1" }`), puis redémarrez Claude Code. Testé avec Claude Code 2.1.280 et 2.1.306.

Depuis un shell :

Expand Down
5 changes: 2 additions & 3 deletions plugins/diff-replie/.claude-plugin/plugin.json
Original file line number Diff line number Diff line change
@@ -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"
}
18 changes: 18 additions & 0 deletions plugins/diff-replie/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 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, remises à zéro à chaque début et fin de session (`/clear`, `/resume`), et les
changements déclenchés hors du rendu courant (commande `/details`, appel lancé ou terminé, 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.
24 changes: 24 additions & 0 deletions plugins/diff-replie/hooks/register.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,27 @@ for (const surface of ['terminal', 'desktop'] as const) {
expect(await promoted.find({ text: 'Lister · Dater' })).toBeDefined()
})
}

test('une nouvelle session repart repliée et sans groupes (/clear, /resume)', async ($, on) => {
on('ui.render', ($, e) => $.ui.resolve(e).Text({ children: 'ligne du moteur' }))
on('tool.call', () => ({ result: { stdout: 'ok', stderr: '', interrupted: false }, isError: false }))
on('session.end', ($, e) => ({ sessionId: e.sessionId }))
for (const id of ['toolu_s1', 'toolu_s2']) await $.tool.call({ tool: 'Bash', tool_use_id: id, command: `echo ${id}` })
await $.command.run({ command: 'details', args: '' })
await $.session.end({ reason: 'clear', sessionId: 'ancienne', resume: false })
const result = await $.ui.mount({
plugin: 'diff-replie',
surface: 'desktop',
component: 'ToolResult',
props: { tool_use_id: 'toolu_9', tool: 'Edit', output: editOutput, isErrored: false },
})
expect(await result.find({ key: 'voir' })).toBeDefined()
const use = await $.ui.mount({
plugin: 'diff-replie',
surface: 'desktop',
component: 'ToolUse',
props: { tool_use_id: 'toolu_s1', tool: 'Bash', input: { command: 'echo toolu_s1' }, isRunning: false, isErrored: false, isInterrupted: false },
})
expect(await use.find({ text: '2 commandes shell' })).toBeUndefined()
expect(await use.find({ text: 'ligne du moteur' })).toBeDefined()
})
161 changes: 96 additions & 65 deletions plugins/diff-replie/hooks/register.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
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 du process et remis à zéro par `resetState` à chaque début et fin de
// session (/clear, /resume), 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é (bouton, /details,
// fin d'un appel) passe par `$.ui.invalidate('ui.render')`, qui redessine les rendus du mod.
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

function resetState() {
expanded = []
runs = {}
leaderOf = {}
summaries = {}
showAll = false
}

const COMMAND = 'details'
const HINT = ' · /details pour déplier'
Expand Down Expand Up @@ -63,55 +74,60 @@ 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)
// Coût borné par la taille des groupes touchés, pas par l'historique de la session.
function detach(gone: string[]): Record<string, string | null> {
const moved: Record<string, string | null> = {}
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 goneIds = new Set(gone)
for (const leader of new Set(gone.map(id => leaderOf[id]).filter(Boolean))) {
const members = (runs[leader] ?? []).filter(x => !goneIds.has(x))
delete runs[leader]
const newLeader = members[0] ?? null
moved[leader] = newLeader
if (newLeader) {
runs[newLeader] = members
for (const id of members) leaderOf[id] = newLeader
}
return kept
})
}
for (const id of gone) delete leaderOf[id]
return moved
}

export const register: Register = on => {
// Suivi des appels consécutifs : même type, sans texte du modèle entre eux.
let current: { leader: string; kind: Kind } | null = null
let textSinceLastCall = false
// Appels déjà rangés par Claude Code dans ses propres lignes (voir ui.render ToolGroup).
const engineFolded = new Set<string>()
const resetSession = () => {
resetState()
current = null
textSinceLastCall = false
engineFolded.clear()
}

on('session.start', async ($, e, next) => {
resetSession()
await $.command.register({ name: COMMAND, description: 'Déplie ou replie les diffs et les sorties de commandes' })
return next(e)
})

on('command.run', { command: COMMAND }, async $ => {
const isShown = !(await read($, showAll))
await update($, showAll, () => isShown)
on('session.end', ($, e, next) => {
resetSession()
return next(e)
})

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.' }
})

Expand Down Expand Up @@ -143,52 +159,55 @@ 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[id] = leader
;(runs[leader] ??= []).push(id)
summaries[id] = { label: `${pending} (en cours)`, isError: false }
// La ligne de tête du groupe affiche ce nouvel appel : la redessiner.
$.ui.invalidate('ui.render')

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[id] = { label: isError ? `${label} (échec)` : label, isError }
$.ui.invalidate('ui.render')
return answer
})

// Claude Code range déjà certains appels dans ses propres lignes repliées (lectures, `wc`,
// éditions du dossier temporaire) : on les retire des groupes du mod, sinon un groupe
// pourrait dépendre d'une ligne invisible. L'écriture part hors du dessin (refusée pendant).
const engineFolded = new Set<string>()

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)
})

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) : <Box />
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 (
Expand All @@ -198,9 +217,8 @@ export const register: Register = on => {
</Box>
)
}
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 (
<Box marginTop={1}>
<Text>
Expand All @@ -216,28 +234,34 @@ 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 } } })
})

on('ui.render', { component: 'ToolResult' }, async ($, e, next) => {
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) : <Box />
const { leader, isGrouped } = groupOf(id)
if (isGrouped && leader) return expanded.includes(leader) ? next(e) : <Box />

const noun = kind === 'edit' ? 'le diff' : 'la sortie'
if (open.includes(id)) {
if (expanded.includes(id)) {
const engineTree = await next(e)
return (
<Box flexDirection="column">
{engineTree ?? null}
<Button key="masquer" label={`Masquer ${noun}`} onPress={() => update($, expanded, ids => (ids ?? []).filter(x => x !== id))} />
<Button
key="masquer"
label={`Masquer ${noun}`}
onPress={() => {
expanded = expanded.filter(x => x !== id)
$.ui.invalidate('ui.render')
}}
/>
</Box>
)
}
Expand All @@ -251,7 +275,14 @@ export const register: Register = on => {
{canPress(e) ? ' ' : HINT}
</Text>
{canPress(e) ? (
<Button key="voir" label={`Voir ${noun}`} onPress={() => update($, expanded, ids => [...(ids ?? []), id])} />
<Button
key="voir"
label={`Voir ${noun}`}
onPress={() => {
expanded = [...expanded, id]
$.ui.invalidate('ui.render')
}}
/>
) : null}
</Box>
)
Expand Down
6 changes: 0 additions & 6 deletions plugins/diff-replie/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ export type Runs = Record<string, string[]>
export type LeaderOf = Record<string, string>
/** Appel → sa ligne de synthèse (« epics.md (+2 −1) », description de la commande). */
export type Summaries = Record<string, { label: string; isError: boolean }>

declare module 'claude-code' {
interface PluginState {
'diff-replie': { expanded: Expanded; runs: Runs; leaderOf: LeaderOf; summaries: Summaries; showAll: boolean }
}
}
Loading