diff --git a/ui/src/components/HandInput.tsx b/ui/src/components/HandInput.tsx index 83dba5b36..0ca42d5c7 100644 --- a/ui/src/components/HandInput.tsx +++ b/ui/src/components/HandInput.tsx @@ -86,6 +86,7 @@ export function HandTextarea({ label, className = '', style, id, ...props }: Han export interface SelectOption { value: string; label: string; + description?: string; } interface HandSelectProps { @@ -203,13 +204,14 @@ export function HandSelect({ label, value, onChange, options, className = '' }: diff --git a/ui/src/pages/TargetsPage.tsx b/ui/src/pages/TargetsPage.tsx index 539e38769..48a98459c 100644 --- a/ui/src/pages/TargetsPage.tsx +++ b/ui/src/pages/TargetsPage.tsx @@ -18,9 +18,9 @@ import { wobbly, shadows } from '../design'; import { shortenHome } from '../lib/paths'; const SYNC_MODE_OPTIONS = [ - { value: 'merge', label: 'Merge' }, - { value: 'symlink', label: 'Symlink' }, - { value: 'copy', label: 'Copy' }, + { value: 'merge', label: 'Merge (default)', description: 'Per-skill symlinks, preserves local skills' }, + { value: 'symlink', label: 'Symlink', description: 'Entire directory symlinked to source' }, + { value: 'copy', label: 'Copy', description: 'Physical file copies instead of symlinks' }, ]; export default function TargetsPage() { @@ -397,7 +397,7 @@ export default function TargetsPage() { > {shortenHome(target.path)}

-
+
Sync mode: @@ -413,7 +413,7 @@ export default function TargetsPage() { } }} options={SYNC_MODE_OPTIONS} - className="w-32" + className="w-44" />
diff --git a/ui/src/pages/UpdatePage.tsx b/ui/src/pages/UpdatePage.tsx index 8affd954d..e4f299cff 100644 --- a/ui/src/pages/UpdatePage.tsx +++ b/ui/src/pages/UpdatePage.tsx @@ -1,23 +1,59 @@ import { useState } from 'react'; import { useQuery, useQueryClient } from '@tanstack/react-query'; -import { RefreshCw, Check, ArrowUpCircle, Loader2 } from 'lucide-react'; +import { + RefreshCw, Check, ArrowUpCircle, Loader2, + Circle, CheckCircle, XCircle, MinusCircle, ShieldAlert, +} from 'lucide-react'; import Card from '../components/Card'; import HandButton from '../components/HandButton'; import { HandCheckbox } from '../components/HandInput'; import Badge from '../components/Badge'; -import EmptyState from '../components/EmptyState'; import { PageSkeleton } from '../components/Skeleton'; -import { useToast } from '../components/Toast'; import { queryKeys, staleTimes } from '../lib/queryKeys'; import { api } from '../api/client'; +import type { UpdateResultItem } from '../api/client'; import { wobbly } from '../design'; +type UpdatePhase = 'idle' | 'updating' | 'done'; + +interface ItemUpdateStatus { + name: string; + isRepo: boolean; + status: 'pending' | 'in-progress' | 'success' | 'error' | 'blocked' | 'skipped'; + message?: string; + auditRiskLabel?: string; +} + +function formatRelativeTime(dateStr: string): string { + const now = Date.now(); + const then = new Date(dateStr).getTime(); + if (isNaN(then)) return dateStr; + const diff = Math.floor((now - then) / 1000); + if (diff < 60) return 'just now'; + if (diff < 3600) return `${Math.floor(diff / 60)}m ago`; + if (diff < 86400) return `${Math.floor(diff / 3600)}h ago`; + if (diff < 2592000) return `${Math.floor(diff / 86400)}d ago`; + if (diff < 31536000) return `${Math.floor(diff / 2592000)}mo ago`; + return `${Math.floor(diff / 31536000)}y ago`; +} + +function actionToStatus(action: string): ItemUpdateStatus['status'] { + switch (action) { + case 'updated': return 'success'; + case 'error': return 'error'; + case 'blocked': return 'blocked'; + case 'skipped': + case 'up-to-date': return 'skipped'; + default: return 'success'; + } +} + export default function UpdatePage() { - const { toast } = useToast(); const queryClient = useQueryClient(); const [selectedRepos, setSelectedRepos] = useState>(new Set()); const [selectedSkills, setSelectedSkills] = useState>(new Set()); - const [updating, setUpdating] = useState(false); + const [phase, setPhase] = useState('idle'); + const [itemStatuses, setItemStatuses] = useState([]); const checkQuery = useQuery({ queryKey: queryKeys.check, @@ -67,28 +103,75 @@ export default function UpdatePage() { const handleUpdate = async () => { if (totalSelected === 0) return; - setUpdating(true); - try { - const names = [...selectedRepos, ...selectedSkills]; - for (const name of names) { - await api.update({ name }); + + // Build items list with repo/skill distinction + const items: { name: string; isRepo: boolean }[] = [ + ...[...selectedRepos].map((name) => ({ name, isRepo: true })), + ...[...selectedSkills].map((name) => ({ name, isRepo: false })), + ]; + + // Initialize statuses + const initial: ItemUpdateStatus[] = items.map((it) => ({ + name: it.name, + isRepo: it.isRepo, + status: 'pending', + })); + setItemStatuses(initial); + setPhase('updating'); + + for (let i = 0; i < items.length; i++) { + // Mark current as in-progress + setItemStatuses((prev) => + prev.map((s, idx) => idx === i ? { ...s, status: 'in-progress' } : s) + ); + + try { + const resp = await api.update({ name: items[i].name }); + const result: UpdateResultItem | undefined = resp.results?.[0]; + const status = result ? actionToStatus(result.action) : 'success'; + setItemStatuses((prev) => + prev.map((s, idx) => + idx === i + ? { + ...s, + status, + message: result?.message, + auditRiskLabel: result?.auditRiskLabel, + } + : s + ) + ); + } catch (e) { + setItemStatuses((prev) => + prev.map((s, idx) => + idx === i ? { ...s, status: 'error', message: (e as Error).message } : s + ) + ); } - toast(`Updated ${names.length} item(s)`, 'success'); - setSelectedRepos(new Set()); - setSelectedSkills(new Set()); - queryClient.invalidateQueries({ queryKey: queryKeys.check }); - queryClient.invalidateQueries({ queryKey: queryKeys.overview }); - queryClient.invalidateQueries({ queryKey: queryKeys.skills.all }); - } catch (e) { - toast((e as Error).message, 'error'); - } finally { - setUpdating(false); } + + setPhase('done'); + queryClient.invalidateQueries({ queryKey: queryKeys.check }); + queryClient.invalidateQueries({ queryKey: queryKeys.overview }); + queryClient.invalidateQueries({ queryKey: queryKeys.skills.all }); + }; + + const handleDone = () => { + setPhase('idle'); + setItemStatuses([]); + setSelectedRepos(new Set()); + setSelectedSkills(new Set()); }; const upToDateRepos = data.tracked_repos.filter((r) => r.status === 'up_to_date').length; const upToDateSkills = data.skills.filter((s) => s.status === 'up_to_date').length; + // Summary counts for results + const successCount = itemStatuses.filter((s) => s.status === 'success').length; + const skippedCount = itemStatuses.filter((s) => s.status === 'skipped').length; + const blockedCount = itemStatuses.filter((s) => s.status === 'blocked').length; + const errorCount = itemStatuses.filter((s) => s.status === 'error').length; + return (
@@ -101,102 +184,238 @@ export default function UpdatePage() {

- queryClient.invalidateQueries({ queryKey: queryKeys.check })} - disabled={checkQuery.isFetching} - > - - Check Now - - {totalSelected > 0 && ( - - {updating ? : } + {phase === 'idle' && ( + queryClient.invalidateQueries({ queryKey: queryKeys.check })} + disabled={checkQuery.isFetching} + > + + Check Now + + )} + {phase === 'idle' && totalSelected > 0 && ( + + Update Selected ({totalSelected}) )}
- {!hasUpdates ? ( - - ) : ( - <> - {updatableRepos.length > 0 && ( - -
-

- Tracked Repositories ({updatableRepos.length}) -

- - {selectedRepos.size === updatableRepos.length ? 'Deselect All' : 'Select All'} - + {/* Update results panel */} + {phase !== 'idle' && ( +
+ {/* Summary bar */} + +
+
+ {phase === 'updating' && ( + + + Updating... + + )} + {phase === 'done' && ( + <> + {successCount > 0 && {successCount} updated} + {skippedCount > 0 && {skippedCount} skipped} + {blockedCount > 0 && {blockedCount} blocked} + {errorCount > 0 && {errorCount} failed} + + )}
-
- {updatableRepos.map((repo) => ( -
+ Done + + )} +
+ + + {/* Per-item status cards */} +
+ {itemStatuses.map((item, i) => ( +
+ +
+ + {item.name} + + {item.message && ( + {item.message} + )} +
+
+ {item.auditRiskLabel && item.auditRiskLabel !== 'clean' && ( + + + {item.auditRiskLabel} + + )} + +
+
+ ))} +
+
+ )} + + {/* Idle state content */} + {phase === 'idle' && ( + <> + {!hasUpdates ? ( + +
+
+ +
+

+ Everything is up to date +

+

+ All tracked repositories and skills are at their latest versions. +

+
+ queryClient.invalidateQueries({ queryKey: queryKeys.check })} + disabled={checkQuery.isFetching} > - toggleRepo(repo.name)} /> - - {repo.name} - - {repo.behind} commit(s) behind -
- ))} + + Check Again + +
+ ) : ( + <> + {updatableRepos.length > 0 && ( + +
+

+ Tracked Repositories ({updatableRepos.length}) +

+ + {selectedRepos.size === updatableRepos.length ? 'Deselect All' : 'Select All'} + +
+
+ {updatableRepos.map((repo) => ( +
+ toggleRepo(repo.name)} /> +
+ + {repo.name} + + {repo.message && ( + {repo.message} + )} +
+ {repo.behind} commit(s) behind +
+ ))} +
+
+ )} + + {updatableSkills.length > 0 && ( + +
+

+ Skills with Updates ({updatableSkills.length}) +

+ + {selectedSkills.size === updatableSkills.length ? 'Deselect All' : 'Select All'} + +
+
+ {updatableSkills.map((skill) => ( +
+ toggleSkill(skill.name)} /> +
+ + {skill.name} + + + {[skill.source, skill.installed_at && formatRelativeTime(skill.installed_at)] + .filter(Boolean) + .join(' ยท ')} + +
+ Update available +
+ ))} +
+
+ )} + )} - {updatableSkills.length > 0 && ( - -
-

- Skills with Updates ({updatableSkills.length}) -

- - {selectedSkills.size === updatableSkills.length ? 'Deselect All' : 'Select All'} - -
-
- {updatableSkills.map((skill) => ( -
- toggleSkill(skill.name)} /> -
- - {skill.name} - - {skill.source && ( - {skill.source} - )} -
- Update available -
- ))} -
+ {(upToDateRepos + upToDateSkills > 0) && ( + +

+ {upToDateRepos} repo(s) and {upToDateSkills} skill(s) already up to date. +

)} )} - - {(upToDateRepos + upToDateSkills > 0) && ( - -

- {upToDateRepos} repo(s) and {upToDateSkills} skill(s) already up to date. -

-
- )}
); } + +function StatusIcon({ status }: { status: ItemUpdateStatus['status'] }) { + switch (status) { + case 'pending': + return ; + case 'in-progress': + return ; + case 'success': + return ; + case 'error': + return ; + case 'blocked': + return ; + case 'skipped': + return ; + } +} + +function StatusBadge({ status }: { status: ItemUpdateStatus['status'] }) { + switch (status) { + case 'pending': + return Pending; + case 'in-progress': + return Updating; + case 'success': + return Updated; + case 'error': + return Failed; + case 'blocked': + return Blocked; + case 'skipped': + return Skipped; + } +}