feat: rework EOL, repairs, and hosts for real workflow

Four domain-model changes driven by exercising the deployed 2.0 build:

- EOL moves from manufacturer to MPN via new PartModel catalog table,
  so alerts fire on the thing that actually ages.
- Repairs re-home to Host (required hostId + problem text) with an
  optional RepairJobPart join for affected parts; drop Part.replacementPartId.
- New /repairs/:id detail page with editable problem, part list, and
  a RepairComment thread (REPAIR_COMMENTED events fan out to each
  problem part's timeline).
- Host.assetId (required, unique) surfaces prominently on the repair
  page so techs can confirm they're touching the right box.

Single destructive migration reshapes existing dev data. All 7 packages
typecheck clean; 30 API tests pass (9 new covering host membership,
upsertByMpn idempotency + race, assetId 409, comment userId stamping).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

apps/web/src/components/hosts/HostFormDialog.tsx

@@ -28,6 +28,7 @@ import { queryKeys } from '../../lib/queryKeys.js';
 import type { Host } from '../../lib/api/types.js';
 
 const Schema = z.object({
+  assetId: z.string().trim().min(1, 'Required').max(64),
   name: z.string().min(1, 'Required').max(128),
   location: z.string().max(256).optional(),
   notes: z.string().max(4096).optional(),
@@ -46,12 +47,13 @@ export function HostFormDialog({ open, onOpenChange, host }: HostFormDialogProps
 
   const form = useForm<Values>({
     resolver: zodResolver(Schema),
-    defaultValues: { name: '', location: '', notes: '' },
+    defaultValues: { assetId: '', name: '', location: '', notes: '' },
   });
 
   useEffect(() => {
     if (!open) return;
     form.reset({
+      assetId: host?.assetId ?? '',
       name: host?.name ?? '',
       location: host?.location ?? '',
       notes: host?.notes ?? '',
@@ -60,12 +62,20 @@ export function HostFormDialog({ open, onOpenChange, host }: HostFormDialogProps
 
   const mutation = useMutation({
     mutationFn: async (values: Values) => {
-      const payload = {
+      if (editing && host) {
+        return updateHost(host.id, {
+          assetId: values.assetId,
+          name: values.name,
+          location: values.location ? values.location : null,
+          notes: values.notes ? values.notes : null,
+        });
+      }
+      return createHost({
+        assetId: values.assetId,
         name: values.name,
         location: values.location ? values.location : null,
         notes: values.notes ? values.notes : null,
-      };
-      return editing && host ? updateHost(host.id, payload) : createHost(payload);
+      });
     },
     onSuccess: () => {
       toast.success(editing ? 'Host updated' : 'Host created');
@@ -88,6 +98,19 @@ export function HostFormDialog({ open, onOpenChange, host }: HostFormDialogProps
 
         <Form {...form}>
           <form onSubmit={form.handleSubmit((v) => mutation.mutate(v))} className="space-y-3">
+            <FormField
+              control={form.control}
+              name="assetId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Asset ID</FormLabel>
+                  <FormControl>
+                    <Input autoFocus placeholder="e.g. ASSET-001" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
             <FormField
               control={form.control}
               name="name"
@@ -95,7 +118,7 @@ export function HostFormDialog({ open, onOpenChange, host }: HostFormDialogProps
                 <FormItem>
                   <FormLabel>Name</FormLabel>
                   <FormControl>
-                    <Input autoFocus {...field} />
+                    <Input {...field} />
                   </FormControl>
                   <FormMessage />
                 </FormItem>

apps/web/src/components/layout/Sidebar.tsx

@@ -4,6 +4,7 @@ import {
   ChevronsLeft,
   ChevronsRight,
   LayoutDashboard,
+  Layers,
   type LucideIcon,
   MapPinned,
   Package,
@@ -25,6 +26,7 @@ interface NavItem {
 const NAV_ITEMS: NavItem[] = [
   { to: '/', label: 'Dashboard', icon: LayoutDashboard },
   { to: '/parts', label: 'Parts', icon: Package },
+  { to: '/part-models', label: 'Part models', icon: Layers },
   { to: '/locations', label: 'Locations', icon: MapPinned },
   { to: '/manufacturers', label: 'Manufacturers', icon: Boxes },
   { to: '/repairs', label: 'Repairs', icon: Wrench },

apps/web/src/components/manufacturers/ManufacturerFormDialog.tsx

@@ -15,7 +15,6 @@ import {
   DialogTitle,
   Form,
   FormControl,
-  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -32,11 +31,6 @@ import type { Manufacturer } from '../../lib/api/types.js';
 
 const Schema = z.object({
   name: z.string().min(1, 'Required').max(128),
-  eolDate: z
-    .string()
-    .regex(/^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD')
-    .or(z.literal(''))
-    .optional(),
 });
 type Values = z.infer<typeof Schema>;
 
@@ -46,11 +40,6 @@ interface ManufacturerFormDialogProps {
   manufacturer?: Manufacturer | null;
 }
 
-function isoToDateInput(iso: string | null): string {
-  if (!iso) return '';
-  return new Date(iso).toISOString().slice(0, 10);
-}
-
 export function ManufacturerFormDialog({
   open,
   onOpenChange,
@@ -61,23 +50,17 @@ export function ManufacturerFormDialog({
 
   const form = useForm<Values>({
     resolver: zodResolver(Schema),
-    defaultValues: { name: '', eolDate: '' },
+    defaultValues: { name: '' },
   });
 
   useEffect(() => {
     if (!open) return;
-    form.reset({
-      name: manufacturer?.name ?? '',
-      eolDate: isoToDateInput(manufacturer?.eolDate ?? null),
-    });
+    form.reset({ name: manufacturer?.name ?? '' });
   }, [open, manufacturer, form]);
 
   const mutation = useMutation({
     mutationFn: async (values: Values) => {
-      const payload = {
-        name: values.name,
-        eolDate: values.eolDate ? values.eolDate : null,
-      };
+      const payload = { name: values.name };
       return editing && manufacturer
         ? updateManufacturer(manufacturer.id, payload)
         : createManufacturer(payload);
@@ -98,8 +81,8 @@ export function ManufacturerFormDialog({
           <DialogTitle>{editing ? 'Edit manufacturer' : 'New manufacturer'}</DialogTitle>
           <DialogDescription>
             {editing
-              ? 'Update this manufacturer. EOL drives replacement alerts on parts.'
-              : 'Add a manufacturer. Names must be unique.'}
+              ? 'Update the manufacturer record.'
+              : 'Add a manufacturer. Names must be unique. EOL is tracked per part model.'}
           </DialogDescription>
         </DialogHeader>
 
@@ -118,23 +101,6 @@ export function ManufacturerFormDialog({
                 </FormItem>
               )}
             />
-            <FormField
-              control={form.control}
-              name="eolDate"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>End-of-life date</FormLabel>
-                  <FormControl>
-                    <Input type="date" {...field} />
-                  </FormControl>
-                  <FormDescription>
-                    Optional. Parts from this manufacturer will show a replacement alert past this
-                    date.
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
             <DialogFooter>
               <Button
                 type="button"

apps/web/src/components/part-models/PartModelFormDialog.tsx

@@ -0,0 +1,207 @@
+import { useEffect } from 'react';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { z } from 'zod';
+import { Loader2 } from 'lucide-react';
+import { toast } from 'sonner';
+import {
+  Button,
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  Input,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+  Textarea,
+} from '@vector/ui';
+import { createPartModel, updatePartModel } from '../../lib/api/part-models.js';
+import { listManufacturers } from '../../lib/api/manufacturers.js';
+import { ApiRequestError } from '../../lib/api/client.js';
+import { queryKeys } from '../../lib/queryKeys.js';
+import type { PartModel } from '../../lib/api/types.js';
+
+const Schema = z.object({
+  manufacturerId: z.string().uuid('Pick a manufacturer'),
+  mpn: z.string().min(1, 'Required').max(128),
+  eolDate: z
+    .string()
+    .regex(/^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD')
+    .or(z.literal(''))
+    .optional(),
+  notes: z.string().max(4096).optional(),
+});
+type Values = z.infer<typeof Schema>;
+
+function isoToDateInput(iso: string | null): string {
+  if (!iso) return '';
+  return new Date(iso).toISOString().slice(0, 10);
+}
+
+interface PartModelFormDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  partModel?: PartModel | null;
+}
+
+export function PartModelFormDialog({
+  open,
+  onOpenChange,
+  partModel,
+}: PartModelFormDialogProps) {
+  const editing = Boolean(partModel);
+  const queryClient = useQueryClient();
+
+  const form = useForm<Values>({
+    resolver: zodResolver(Schema),
+    defaultValues: { manufacturerId: '', mpn: '', eolDate: '', notes: '' },
+  });
+
+  useEffect(() => {
+    if (!open) return;
+    form.reset({
+      manufacturerId: partModel?.manufacturerId ?? '',
+      mpn: partModel?.mpn ?? '',
+      eolDate: isoToDateInput(partModel?.eolDate ?? null),
+      notes: partModel?.notes ?? '',
+    });
+  }, [open, partModel, form]);
+
+  const manufacturers = useQuery({
+    queryKey: queryKeys.manufacturers.list({ pageSize: 100 }),
+    queryFn: () => listManufacturers({ pageSize: 100 }),
+    enabled: open,
+  });
+
+  const mutation = useMutation({
+    mutationFn: async (values: Values) => {
+      const payload = {
+        manufacturerId: values.manufacturerId,
+        mpn: values.mpn,
+        eolDate: values.eolDate ? values.eolDate : null,
+        notes: values.notes ? values.notes : null,
+      };
+      return editing && partModel
+        ? updatePartModel(partModel.id, payload)
+        : createPartModel(payload);
+    },
+    onSuccess: () => {
+      toast.success(editing ? 'Part model updated' : 'Part model created');
+      queryClient.invalidateQueries({ queryKey: queryKeys.partModels.all });
+      onOpenChange(false);
+    },
+    onError: (err) =>
+      toast.error(err instanceof ApiRequestError ? err.body.message : 'Save failed'),
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="max-w-md">
+        <DialogHeader>
+          <DialogTitle>{editing ? 'Edit part model' : 'New part model'}</DialogTitle>
+          <DialogDescription>
+            A part model (MPN) is the catalog entry that carries an end-of-life date.
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit((v) => mutation.mutate(v))} className="space-y-3">
+            <FormField
+              control={form.control}
+              name="manufacturerId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Manufacturer</FormLabel>
+                  <Select value={field.value} onValueChange={field.onChange}>
+                    <FormControl>
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select manufacturer" />
+                      </SelectTrigger>
+                    </FormControl>
+                    <SelectContent>
+                      {manufacturers.data?.data.map((m) => (
+                        <SelectItem key={m.id} value={m.id}>
+                          {m.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="mpn"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>MPN</FormLabel>
+                  <FormControl>
+                    <Input autoFocus {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="eolDate"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>EOL date</FormLabel>
+                  <FormControl>
+                    <Input type="date" {...field} />
+                  </FormControl>
+                  <FormDescription>
+                    Deployed parts past this date surface on the dashboard.
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="notes"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Notes</FormLabel>
+                  <FormControl>
+                    <Textarea rows={3} {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <DialogFooter>
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => onOpenChange(false)}
+                disabled={mutation.isPending}
+              >
+                Cancel
+              </Button>
+              <Button type="submit" disabled={mutation.isPending}>
+                {mutation.isPending && <Loader2 className="h-4 w-4 animate-spin" />}
+                {editing ? 'Save changes' : 'Create'}
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+}

apps/web/src/components/parts/PartEventTimeline.tsx

@@ -4,10 +4,12 @@ import {
   ArrowRight,
   CheckCircle2,
   MapPin,
+  MessageSquare,
   Package,
   Pencil,
   Tag,
   Wrench,
+  XCircle,
   type LucideIcon,
 } from 'lucide-react';
 import type { PartEventType } from '@vector/shared';
@@ -22,6 +24,8 @@ const EVENT_ICON: Record<PartEventType, LucideIcon> = {
   FIELD_UPDATED: Pencil,
   REPAIR_STARTED: Wrench,
   REPAIR_COMPLETED: Wrench,
+  REPAIR_CANCELLED: XCircle,
+  REPAIR_COMMENTED: MessageSquare,
   TAG_ADDED: Tag,
   TAG_REMOVED: Tag,
 };
@@ -33,6 +37,8 @@ const EVENT_TITLE: Record<PartEventType, string> = {
   FIELD_UPDATED: 'Field updated',
   REPAIR_STARTED: 'Repair started',
   REPAIR_COMPLETED: 'Repair completed',
+  REPAIR_CANCELLED: 'Repair cancelled',
+  REPAIR_COMMENTED: 'Repair comment',
   TAG_ADDED: 'Tag added',
   TAG_REMOVED: 'Tag removed',
 };

apps/web/src/components/parts/PartFormDialog.tsx

@@ -80,7 +80,7 @@ export function PartFormDialog({ open, onOpenChange, part }: PartFormDialogProps
       part
         ? {
             serialNumber: part.serialNumber,
-            mpn: part.mpn,
+            mpn: part.partModel.mpn,
             manufacturerId: part.manufacturerId,
             state: part.state,
             binId: part.binId ?? '',

apps/web/src/components/parts/PartRepairSection.tsx

@@ -1,74 +1,53 @@
-import { useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { Plus } from 'lucide-react';
-import { Button, Skeleton } from '@vector/ui';
-import { listRepairsForPart } from '../../lib/api/repairs.js';
+import { Link } from 'react-router-dom';
+import { Skeleton } from '@vector/ui';
+import { listRepairs } from '../../lib/api/repairs.js';
 import { queryKeys } from '../../lib/queryKeys.js';
 import { RepairStatusBadge } from '../repairs/RepairStatusBadge.js';
-import { RepairFormDialog } from '../repairs/RepairFormDialog.js';
-import type { RepairJob } from '../../lib/api/types.js';
 
 interface PartRepairSectionProps {
   partId: string;
 }
 
 export function PartRepairSection({ partId }: PartRepairSectionProps) {
-  const [createOpen, setCreateOpen] = useState(false);
-  const [editing, setEditing] = useState<RepairJob | null>(null);
   const query = useQuery({
-    queryKey: [...queryKeys.parts.detail(partId), 'repairs'],
-    queryFn: () => listRepairsForPart(partId),
+    queryKey: queryKeys.repairs.list({ problemPartId: partId, pageSize: 50 }),
+    queryFn: () => listRepairs({ problemPartId: partId, pageSize: 50 }),
   });
 
   return (
     <div className="space-y-2">
-      <div className="flex items-center justify-between">
-        <p className="text-sm font-medium">Repair history</p>
-        <Button variant="outline" size="sm" onClick={() => setCreateOpen(true)}>
-          <Plus className="h-3.5 w-3.5" />
-          Open repair
-        </Button>
-      </div>
+      <p className="text-sm font-medium">Repairs touching this part</p>
       {query.isPending ? (
         <Skeleton className="h-16 w-full" />
-      ) : !query.data || query.data.length === 0 ? (
-        <p className="text-xs text-muted-foreground">No repair jobs yet.</p>
+      ) : !query.data || query.data.data.length === 0 ? (
+        <p className="text-xs text-muted-foreground">No repairs reference this part yet.</p>
       ) : (
         <ul className="divide-y divide-border rounded-md border border-border text-sm">
-          {query.data.map((repair) => (
+          {query.data.data.map((repair) => (
             <li
               key={repair.id}
               className="flex items-center justify-between gap-3 px-3 py-2"
             >
-              <div className="flex items-center gap-2">
+              <div className="flex min-w-0 items-center gap-2">
                 <RepairStatusBadge status={repair.status} />
-                <span className="text-xs text-muted-foreground">
-                  Opened {new Date(repair.openedAt).toLocaleDateString()}
-                  {repair.host ? ` · ${repair.host.name}` : ''}
+                <Link
+                  to={`/repairs/${repair.id}`}
+                  className="truncate text-xs text-foreground hover:underline"
+                >
+                  {repair.problem}
+                </Link>
+                <span className="shrink-0 text-xs text-muted-foreground">
+                  · {repair.host.name}
                 </span>
               </div>
-              <Button
-                variant="ghost"
-                size="sm"
-                className="h-7 px-2 text-xs"
-                onClick={() => setEditing(repair)}
-              >
-                Edit
-              </Button>
+              <span className="text-xs text-muted-foreground">
+                {new Date(repair.openedAt).toLocaleDateString()}
+              </span>
             </li>
           ))}
         </ul>
       )}
-      <RepairFormDialog
-        open={createOpen}
-        onOpenChange={setCreateOpen}
-        defaultPartId={partId}
-      />
-      <RepairFormDialog
-        open={Boolean(editing)}
-        onOpenChange={(o) => !o && setEditing(null)}
-        repair={editing}
-      />
     </div>
   );
 }

apps/web/src/components/repairs/RepairCommentThread.tsx

@@ -0,0 +1,118 @@
+import { useState } from 'react';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { Loader2, Send } from 'lucide-react';
+import { toast } from 'sonner';
+import { Button, Skeleton, Textarea } from '@vector/ui';
+import { addRepairComment, listRepairComments } from '../../lib/api/repairs.js';
+import { ApiRequestError } from '../../lib/api/client.js';
+import { queryKeys } from '../../lib/queryKeys.js';
+
+function formatWhen(iso: string) {
+  return new Date(iso).toLocaleString(undefined, {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit',
+  });
+}
+
+function initialsOf(username: string | undefined | null): string {
+  if (!username) return '?';
+  return username.slice(0, 2).toUpperCase();
+}
+
+export function RepairCommentThread({ repairId }: { repairId: string }) {
+  const queryClient = useQueryClient();
+  const [content, setContent] = useState('');
+
+  const query = useQuery({
+    queryKey: queryKeys.repairs.comments(repairId),
+    queryFn: () => listRepairComments(repairId, { pageSize: 100 }),
+  });
+
+  const mutation = useMutation({
+    mutationFn: (body: string) => addRepairComment(repairId, { content: body }),
+    onSuccess: () => {
+      setContent('');
+      queryClient.invalidateQueries({ queryKey: queryKeys.repairs.comments(repairId) });
+    },
+    onError: (err) =>
+      toast.error(err instanceof ApiRequestError ? err.body.message : 'Post failed'),
+  });
+
+  const submit = () => {
+    const trimmed = content.trim();
+    if (!trimmed) return;
+    mutation.mutate(trimmed);
+  };
+
+  return (
+    <div className="space-y-4">
+      {query.isPending ? (
+        <div className="space-y-2">
+          {Array.from({ length: 3 }).map((_, i) => (
+            <Skeleton key={i} className="h-14 w-full" />
+          ))}
+        </div>
+      ) : query.isError ? (
+        <p className="text-sm text-destructive">Could not load comments.</p>
+      ) : query.data && query.data.data.length > 0 ? (
+        <ol className="space-y-3">
+          {query.data.data.map((c) => (
+            <li key={c.id} className="flex gap-3">
+              <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-accent text-[10px] font-semibold text-accent-foreground">
+                {initialsOf(c.user?.username)}
+              </div>
+              <div className="flex-1 space-y-0.5">
+                <div className="flex flex-wrap items-center gap-x-2 text-xs text-muted-foreground">
+                  <span className="font-medium text-foreground">
+                    {c.user?.username ?? 'Unknown user'}
+                  </span>
+                  <span>·</span>
+                  <span>{formatWhen(c.createdAt)}</span>
+                </div>
+                <p className="whitespace-pre-wrap text-sm text-foreground">{c.content}</p>
+              </div>
+            </li>
+          ))}
+        </ol>
+      ) : (
+        <p className="text-sm text-muted-foreground">No comments yet. Start the thread below.</p>
+      )}
+
+      <div className="space-y-2">
+        <Textarea
+          rows={3}
+          placeholder="Leave a comment..."
+          value={content}
+          onChange={(e) => setContent(e.target.value)}
+          disabled={mutation.isPending}
+          onKeyDown={(e) => {
+            if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
+              e.preventDefault();
+              submit();
+            }
+          }}
+        />
+        <div className="flex items-center justify-between gap-2">
+          <span className="text-xs text-muted-foreground">
+            {content.length}/4000 · Ctrl/⌘+Enter to post
+          </span>
+          <Button
+            size="sm"
+            onClick={submit}
+            disabled={mutation.isPending || content.trim().length === 0}
+          >
+            {mutation.isPending ? (
+              <Loader2 className="h-3.5 w-3.5 animate-spin" />
+            ) : (
+              <Send className="h-3.5 w-3.5" />
+            )}
+            Post
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+}

apps/web/src/components/repairs/RepairFormDialog.tsx

@@ -7,6 +7,7 @@ import { Loader2 } from 'lucide-react';
 import { toast } from 'sonner';
 import {
   Button,
+  Checkbox,
   Dialog,
   DialogContent,
   DialogDescription,
@@ -25,44 +26,38 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
+  Skeleton,
   Textarea,
 } from '@vector/ui';
-import { createRepair, updateRepair } from '../../lib/api/repairs.js';
-import { listHosts } from '../../lib/api/hosts.js';
+import { createRepair } from '../../lib/api/repairs.js';
+import { listHosts, listHostDeployedParts } from '../../lib/api/hosts.js';
 import { ApiRequestError } from '../../lib/api/client.js';
 import { queryKeys } from '../../lib/queryKeys.js';
 import type { RepairJob } from '../../lib/api/types.js';
-import { repairStatusOptions } from './RepairStatusBadge.js';
-
-const NONE = '__none__';
 
 const CreateSchema = z.object({
-  partId: z.string().uuid('Pick a valid part id'),
-  hostId: z.string().optional(),
-  notes: z.string().max(4096).optional(),
-});
-const EditSchema = z.object({
-  status: z.enum(['PENDING', 'IN_PROGRESS', 'COMPLETED', 'CANCELLED']),
-  hostId: z.string().optional(),
+  hostId: z.string().uuid('Pick a host'),
+  problem: z.string().trim().min(1, 'Describe the problem').max(2000),
+  problemPartIds: z.array(z.string().uuid()).max(100),
   notes: z.string().max(4096).optional(),
 });
 type CreateValues = z.infer<typeof CreateSchema>;
-type EditValues = z.infer<typeof EditSchema>;
 
 interface RepairFormDialogProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
-  repair?: RepairJob | null;
-  defaultPartId?: string;
+  defaultHostId?: string;
+  defaultProblemPartIds?: string[];
+  onCreated?: (repair: RepairJob) => void;
 }
 
 export function RepairFormDialog({
   open,
   onOpenChange,
-  repair,
-  defaultPartId,
+  defaultHostId,
+  defaultProblemPartIds,
+  onCreated,
 }: RepairFormDialogProps) {
-  const editing = Boolean(repair);
   const queryClient = useQueryClient();
 
   const hostsQuery = useQuery({
@@ -71,242 +66,213 @@ export function RepairFormDialog({
     enabled: open,
   });
 
-  const createForm = useForm<CreateValues>({
+  const form = useForm<CreateValues>({
     resolver: zodResolver(CreateSchema),
-    defaultValues: { partId: '', hostId: NONE, notes: '' },
-  });
-  const editForm = useForm<EditValues>({
-    resolver: zodResolver(EditSchema),
-    defaultValues: { status: 'PENDING', hostId: NONE, notes: '' },
+    defaultValues: {
+      hostId: '',
+      problem: '',
+      problemPartIds: [],
+      notes: '',
+    },
   });
 
   useEffect(() => {
     if (!open) return;
-    if (editing && repair) {
-      editForm.reset({
-        status: repair.status,
-        hostId: repair.hostId ?? NONE,
-        notes: repair.notes ?? '',
-      });
-    } else {
-      createForm.reset({ partId: defaultPartId ?? '', hostId: NONE, notes: '' });
-    }
-  }, [open, editing, repair, defaultPartId, createForm, editForm]);
+    form.reset({
+      hostId: defaultHostId ?? '',
+      problem: '',
+      problemPartIds: defaultProblemPartIds ?? [],
+      notes: '',
+    });
+  }, [open, defaultHostId, defaultProblemPartIds, form]);
+
+  const hostId = form.watch('hostId');
+  const selectedPartIds = form.watch('problemPartIds');
+  const deployedQuery = useQuery({
+    queryKey: queryKeys.hosts.deployedParts(hostId),
+    queryFn: () => listHostDeployedParts(hostId),
+    enabled: open && Boolean(hostId),
+  });
 
   const createMutation = useMutation({
     mutationFn: async (values: CreateValues) =>
       createRepair({
-        partId: values.partId,
-        hostId: values.hostId && values.hostId !== NONE ? values.hostId : null,
+        hostId: values.hostId,
+        problem: values.problem,
+        problemPartIds:
+          values.problemPartIds.length > 0 ? values.problemPartIds : undefined,
         notes: values.notes ? values.notes : null,
       }),
-    onSuccess: () => {
+    onSuccess: (repair) => {
       toast.success('Repair opened');
       queryClient.invalidateQueries({ queryKey: queryKeys.repairs.all });
       queryClient.invalidateQueries({ queryKey: queryKeys.parts.all });
       onOpenChange(false);
+      onCreated?.(repair);
     },
     onError: (err) =>
       toast.error(err instanceof ApiRequestError ? err.body.message : 'Save failed'),
   });
 
-  const editMutation = useMutation({
-    mutationFn: async (values: EditValues) =>
-      updateRepair(repair!.id, {
-        status: values.status,
-        hostId: values.hostId && values.hostId !== NONE ? values.hostId : null,
-        notes: values.notes ? values.notes : null,
-      }),
-    onSuccess: () => {
-      toast.success('Repair updated');
-      queryClient.invalidateQueries({ queryKey: queryKeys.repairs.all });
-      queryClient.invalidateQueries({ queryKey: queryKeys.parts.all });
-      onOpenChange(false);
-    },
-    onError: (err) =>
-      toast.error(err instanceof ApiRequestError ? err.body.message : 'Save failed'),
-  });
+  const pending = createMutation.isPending;
 
-  const pending = createMutation.isPending || editMutation.isPending;
+  function togglePart(partId: string, checked: boolean) {
+    const next = checked
+      ? [...new Set([...selectedPartIds, partId])]
+      : selectedPartIds.filter((id) => id !== partId);
+    form.setValue('problemPartIds', next, { shouldValidate: true, shouldDirty: true });
+  }
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-md">
+      <DialogContent className="max-w-lg">
         <DialogHeader>
-          <DialogTitle>{editing ? 'Edit repair' : 'Open repair'}</DialogTitle>
+          <DialogTitle>Open repair</DialogTitle>
           <DialogDescription>
-            {editing
-              ? 'Advance status, re-assign the host, or update notes.'
-              : 'Open a repair job for a part. Status starts as PENDING.'}
+            Create a repair against a host. Select the deployed parts involved (optional).
           </DialogDescription>
         </DialogHeader>
 
-        {editing ? (
-          <Form {...editForm}>
-            <form
-              onSubmit={editForm.handleSubmit((v) => editMutation.mutate(v))}
-              className="space-y-3"
-            >
-              <FormField
-                control={editForm.control}
-                name="status"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Status</FormLabel>
-                    <Select onValueChange={field.onChange} value={field.value}>
-                      <FormControl>
-                        <SelectTrigger>
-                          <SelectValue />
-                        </SelectTrigger>
-                      </FormControl>
-                      <SelectContent>
-                        {repairStatusOptions.map((o) => (
-                          <SelectItem key={o.value} value={o.value}>
-                            {o.label}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <FormField
-                control={editForm.control}
-                name="hostId"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Host</FormLabel>
-                    <Select onValueChange={field.onChange} value={field.value ?? NONE}>
-                      <FormControl>
-                        <SelectTrigger>
-                          <SelectValue placeholder="None" />
-                        </SelectTrigger>
-                      </FormControl>
-                      <SelectContent>
-                        <SelectItem value={NONE}>None</SelectItem>
-                        {hostsQuery.data?.data.map((h) => (
-                          <SelectItem key={h.id} value={h.id}>
-                            {h.name}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <FormField
-                control={editForm.control}
-                name="notes"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Notes</FormLabel>
+        <Form {...form}>
+          <form
+            onSubmit={form.handleSubmit((v) => createMutation.mutate(v))}
+            className="space-y-3"
+          >
+            <FormField
+              control={form.control}
+              name="hostId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Host</FormLabel>
+                  <Select
+                    onValueChange={(v) => {
+                      field.onChange(v);
+                      form.setValue('problemPartIds', [], {
+                        shouldValidate: false,
+                      });
+                    }}
+                    value={field.value}
+                  >
                     <FormControl>
-                      <Textarea rows={3} {...field} />
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select host" />
+                      </SelectTrigger>
                     </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <DialogFooter>
-                <Button
-                  type="button"
-                  variant="outline"
-                  onClick={() => onOpenChange(false)}
-                  disabled={pending}
-                >
-                  Cancel
-                </Button>
-                <Button type="submit" disabled={pending}>
-                  {pending && <Loader2 className="h-4 w-4 animate-spin" />}
-                  Save changes
-                </Button>
-              </DialogFooter>
-            </form>
-          </Form>
-        ) : (
-          <Form {...createForm}>
-            <form
-              onSubmit={createForm.handleSubmit((v) => createMutation.mutate(v))}
-              className="space-y-3"
-            >
+                    <SelectContent>
+                      {hostsQuery.data?.data.map((h) => (
+                        <SelectItem key={h.id} value={h.id}>
+                          {h.assetId} — {h.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="problem"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Problem</FormLabel>
+                  <FormControl>
+                    <Textarea
+                      rows={3}
+                      placeholder="Short description of what's wrong."
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            {hostId && (
               <FormField
-                control={createForm.control}
-                name="partId"
-                render={({ field }) => (
+                control={form.control}
+                name="problemPartIds"
+                render={() => (
                   <FormItem>
-                    <FormLabel>Part ID</FormLabel>
-                    <FormControl>
-                      <input
-                        className="flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm"
-                        placeholder="Part UUID"
-                        autoFocus
-                        {...field}
-                      />
-                    </FormControl>
+                    <FormLabel>Affected parts (optional)</FormLabel>
                     <FormDescription>
-                      Paste the part UUID to open a repair against it.
+                      Select deployed parts involved in this problem.
                     </FormDescription>
+                    <div className="max-h-40 overflow-y-auto rounded-md border border-border">
+                      {deployedQuery.isPending ? (
+                        <Skeleton className="m-2 h-12" />
+                      ) : !deployedQuery.data || deployedQuery.data.length === 0 ? (
+                        <p className="p-3 text-xs text-muted-foreground">
+                          No deployed parts on this host.
+                        </p>
+                      ) : (
+                        <ul className="divide-y divide-border">
+                          {deployedQuery.data.map((part) => {
+                            const checked = selectedPartIds.includes(part.id);
+                            return (
+                              <li
+                                key={part.id}
+                                className="flex items-center gap-2 px-3 py-2 text-sm"
+                              >
+                                <Checkbox
+                                  id={`pp-${part.id}`}
+                                  checked={checked}
+                                  onCheckedChange={(v) => togglePart(part.id, v === true)}
+                                />
+                                <label
+                                  htmlFor={`pp-${part.id}`}
+                                  className="flex-1 cursor-pointer select-none"
+                                >
+                                  <span className="font-mono text-xs">
+                                    {part.serialNumber}
+                                  </span>{' '}
+                                  <span className="text-xs text-muted-foreground">
+                                    {part.partModel.mpn}
+                                  </span>
+                                </label>
+                              </li>
+                            );
+                          })}
+                        </ul>
+                      )}
+                    </div>
                     <FormMessage />
                   </FormItem>
                 )}
               />
-              <FormField
-                control={createForm.control}
-                name="hostId"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Host (optional)</FormLabel>
-                    <Select onValueChange={field.onChange} value={field.value ?? NONE}>
-                      <FormControl>
-                        <SelectTrigger>
-                          <SelectValue placeholder="None" />
-                        </SelectTrigger>
-                      </FormControl>
-                      <SelectContent>
-                        <SelectItem value={NONE}>None</SelectItem>
-                        {hostsQuery.data?.data.map((h) => (
-                          <SelectItem key={h.id} value={h.id}>
-                            {h.name}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <FormField
-                control={createForm.control}
-                name="notes"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Notes</FormLabel>
-                    <FormControl>
-                      <Textarea rows={3} {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <DialogFooter>
-                <Button
-                  type="button"
-                  variant="outline"
-                  onClick={() => onOpenChange(false)}
-                  disabled={pending}
-                >
-                  Cancel
-                </Button>
-                <Button type="submit" disabled={pending}>
-                  {pending && <Loader2 className="h-4 w-4 animate-spin" />}
-                  Open repair
-                </Button>
-              </DialogFooter>
-            </form>
-          </Form>
-        )}
+            )}
+
+            <FormField
+              control={form.control}
+              name="notes"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Notes (optional)</FormLabel>
+                  <FormControl>
+                    <Textarea rows={2} {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <DialogFooter>
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => onOpenChange(false)}
+                disabled={pending}
+              >
+                Cancel
+              </Button>
+              <Button type="submit" disabled={pending}>
+                {pending && <Loader2 className="h-4 w-4 animate-spin" />}
+                Open repair
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
       </DialogContent>
     </Dialog>
   );