From e695e4d552e413dd5732859c73af7777fd106d71 Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 16:07:13 +0200
Subject: [PATCH 1/8] chore(agents): Make the review skill clean up after
 itself, on request

Changes:
- Add Stage 4, which detects the run's artifacts, branches and worktrees and proposes removing them
- Require AskUserQuestion before any deletion, with scratch output and triage docs asked separately
- Refuse to delete a branch with unpushed commits or an open PR, even when selected
- Note that a deleted reviews/ is not a broken state, since the runners recreate it

A cycle left scratch folders, triage docs and a fix branch behind with nothing in
the skill to clear them, so they accumulated across runs and muddied the resume
detection the skill reads on every invocation.

Notes:
Cleanup is opt-in per run rather than automatic. A triage doc is the only record
of the findings the user chose to skip, and a fix branch can hold the only copy
of unpushed commits, so nothing here is safe to sweep on the agent's initiative.
---
 .../skills/multi-tool-code-review/SKILL.md    | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/.claude/skills/multi-tool-code-review/SKILL.md b/.claude/skills/multi-tool-code-review/SKILL.md
index 63322b8f..a532f107 100644
--- a/.claude/skills/multi-tool-code-review/SKILL.md
+++ b/.claude/skills/multi-tool-code-review/SKILL.md
@@ -85,6 +85,32 @@ Follow `04-fix-protocol.md`. If the harness supports plan mode, enter it first a
 2. File GitHub issues (labeled) for every finding the user excluded, and for anything you deferred. Surface deferrals with a recommendation; never silently skip.
 3. Offer a recap and to watch CI settle.
 
+## Stage 4: Clean up after the cycle
+
+A run leaves debris in three places: scratch output and triage docs under `reviews/`, the fix branch locally and on the remote, and a worktree if the review used one. Clear it once the PR is merged, so the next run starts from a clean detection.
+
+**Never delete anything without asking first.** Everything here looks disposable and is not: a triage doc is the only record of the findings the user chose to skip, a fix branch may hold the only copy of unpushed commits, and disk state is what this skill's own resume detection reads. A user who has not finished reading the doc, or who wants to re-review next week, will not get any of it back. So propose, then wait.
+
+Offer cleanup once, when the cycle is genuinely over: the PR merged, or the user says they are done. Do not offer it while a PR is open, and do not fold it into another question as a default-on extra.
+
+Build the proposal by detecting what exists, then put it to the user with `AskUserQuestion`, one question per category, options built from what you actually found:
+
+```bash
+ls -d reviews/_review-run* reviews/_archive 2>/dev/null   # scratch, safe to drop
+ls reviews/REVIEW-*.md reviews/REVIEW-*.html 2>/dev/null  # triage docs, the user's record
+git worktree list                                          # which are this run's
+git branch --merged <base> | grep -E 'fix/.*review'        # merged fix branches
+git ls-remote --heads origin 'fix/*review*'                # their remote counterparts
+```
+
+Rules that hold regardless of the answer:
+
+- **Only ever propose what this cycle created.** Other branches and worktrees belong to unrelated in-flight work, and the host repo's `AGENTS.md` forbids touching it. List them in the question as explicitly excluded rather than leaving the user to wonder whether you swept them up.
+- **Scratch and reports are different questions.** `_review-run*` folders are pure working output and are the safe default to remove. `REVIEW-*.md` and `.html` are the deliverable; offer keeping them, archiving them, or deleting them, and default to keeping.
+- **Never delete a branch with unpushed commits, or one behind an open PR**, even if the user selects it. Check `git log <remote>..<branch>` and `gh pr list --head <branch>` first, and report back instead of deleting.
+- **Say what a report is still referenced by.** A PR body that cites a triage doc by path leaves a dangling reference once it is gone. Mention it, then let the user decide.
+- Report exactly what was removed and what was left standing.
+
 ## Conventions (apply throughout)
 
 - Ask if you are unsure of anything rather than assuming. Follow the host repo's `AGENTS.md` / `CLAUDE.md` closely.
@@ -96,4 +122,5 @@ Follow `04-fix-protocol.md`. If the harness supports plan mode, enter it first a
 - In a **worktree with symlinked `node_modules`**, do not use `pnpm exec` or `pnpm run`: both run a deps-status check, see the symlink as out of sync, and try to purge the main tree's real `node_modules` through it. Call the binary directly there instead. In a normal checkout `pnpm exec` is fine.
 - If `pnpm` is not on PATH, prepend it: `export PATH="$HOME/.local/share/pnpm/bin:$HOME/.local/share/nvm/*/bin:$PATH"`.
 - Never run the dev server or any deploy/Docker command. The production build is allowed, and Stage 3 expects it.
-- Runner outputs and the triage doc live under `reviews/` (gitignored). Keep them out of commits; `git add` explicit files, never `-A`.
+- Runner outputs and the triage doc live under `reviews/` (gitignored). Keep them out of commits; `git add` explicit files, never `-A`. The runners recreate the folder, so a deleted `reviews/` is not a broken state.
+- Deleting artifacts, branches or worktrees is always a question for the user, never a tidy-up you perform on your own initiative. See Stage 4.

From 47821afad3e3a6fcf0fa15ea6753a0b745bf1825 Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 18:31:38 +0200
Subject: [PATCH 2/8] fix(watchlist): Gate the save button on a parsed schema,
 not isValid

Changes:
- Derive isFormValid in use-watchlist-item-form by parsing the schema over the
  current values, and gate the submit button on it

formState.isValid only refreshes when RHF runs the resolver, and seeding the
prefill through reset does not run it, so the only pass was the mount one over
the empty defaults. A first-time watch opened with a valid prefilled threshold
but a dead Prati button, until switching watch mode triggered an unrelated
validation pass and woke it up.

Notes: this mirrors isEdited, which already compares values to baselines rather
than trusting RHF's dirty flags. The resolver stays in place and still owns the
messages under the field, so nothing is marked red before it is touched.
---
 .../components/forms/watchlist-item-modal.tsx       |  6 ++----
 .../app/products/hooks/use-watchlist-item-form.ts   | 13 +++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/products/components/forms/watchlist-item-modal.tsx b/frontend/src/app/products/components/forms/watchlist-item-modal.tsx
index 745a85fc..00daaf8f 100644
--- a/frontend/src/app/products/components/forms/watchlist-item-modal.tsx
+++ b/frontend/src/app/products/components/forms/watchlist-item-modal.tsx
@@ -70,6 +70,7 @@ export default function WatchlistItemModal({
     existingItems,
     existingItemForType,
     isCheckingWatchlist,
+    isFormValid,
     isEdited,
     isEditedInAnyMode,
     hasSavableChange,
@@ -121,10 +122,7 @@ export default function WatchlistItemModal({
       submitIcon={existingItemForType ? EyePen : Eye}
       submitLoading={isSaving}
       submitDisabled={
-        isCheckingWatchlist ||
-        !product ||
-        !form.formState.isValid ||
-        !hasSavableChange
+        isCheckingWatchlist || !product || !isFormValid || !hasSavableChange
       }
       cancelLabel="Odustani"
       resetLabel="Resetiraj"
diff --git a/frontend/src/app/products/hooks/use-watchlist-item-form.ts b/frontend/src/app/products/hooks/use-watchlist-item-form.ts
index 08936852..71efd9d0 100644
--- a/frontend/src/app/products/hooks/use-watchlist-item-form.ts
+++ b/frontend/src/app/products/hooks/use-watchlist-item-form.ts
@@ -160,12 +160,25 @@ export function useWatchlistItemForm(
   const activeValue =
     watchType === WatchType.absolute ? absoluteValue : percentageValue;
 
+  // Parsed here rather than read off formState.isValid, for the same reason isEdited
+  // does not read dirtyFields: the flag only refreshes when RHF runs the resolver,
+  // and seeding the prefill through reset does not. The one validation that had run
+  // was the mount pass over the empty defaults, so a prefilled first-time watch was
+  // held invalid until an unrelated change (switching mode) triggered a fresh pass.
+  // The resolver stays in place and still owns the messages under the field.
+  const isFormValid = watchlistFormSchema.safeParse({
+    watchType,
+    percentageValue,
+    absoluteValue,
+  }).success;
+
   return {
     form,
     draftKey,
     existingItems,
     existingItemForType,
     isCheckingWatchlist,
+    isFormValid,
     // Compared against the baselines rather than read off RHF's dirtyFields: the
     // seed keeps dirty flags so an in-progress edit survives a refetch, which means
     // a flag can outlive the edit itself (a saved value equals its new baseline but

From 9e2e7478129a6c7b15e4a433a4bb110240c8f8b3 Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 18:31:49 +0200
Subject: [PATCH 3/8] docs(state-persistence): Record that isValid is stale
 after seeding

Changes:
- Extend the prefill gotcha with the validity half: formState.isValid only
  refreshes when the resolver runs, a seeding reset does not run it, and a
  form gating an untouched prefill should parse the schema itself

The dirty half of this trap was already written down; the validity half is what
left a prefilled first-time watch unsavable until the mode was switched.
---
 docs/STATE-PERSISTENCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/STATE-PERSISTENCE.md b/docs/STATE-PERSISTENCE.md
index bbcf3b51..7fe80261 100644
--- a/docs/STATE-PERSISTENCE.md
+++ b/docs/STATE-PERSISTENCE.md
@@ -265,7 +265,7 @@ The URL and localStorage layers use only browser-native APIs; there is no extra
 
 - **Old drafts are type-guarded on restore.** If a field's type changed since a draft was written (for example a number where the field is now a string), the restore skips it so a stale draft cannot poison validation. Keys the form no longer has at all are skipped too, so renaming or splitting a field cannot strand a dead entry for the rest of the TTL.
 
-- **A prefill has to become the form's `defaultValue`, or the draft engine saves it as a change.** Drafts diff against the defaults, so seeding a server-loaded value with `setValue` writes a draft for a number the user never typed, and makes the reset button offer to clear a field the user never touched. Seed with `reset(values, { keepDirtyValues: true })`, which updates values and defaults together and leaves in-progress edits alone. `resetField` does the same thing for one field but only works on a field that is registered right now, so it silently does nothing while the modal is still loading or for a field the current branch does not render (the watchlist modal renders only the selected watch mode). Note that `keepDirtyValues` keeps the dirty flags as they were rather than recomputing them, so a flag can outlive the edit that set it: gate buttons on a value-vs-baseline comparison, not on `dirtyFields`.
+- **A prefill has to become the form's `defaultValue`, or the draft engine saves it as a change.** Drafts diff against the defaults, so seeding a server-loaded value with `setValue` writes a draft for a number the user never typed, and makes the reset button offer to clear a field the user never touched. Seed with `reset(values, { keepDirtyValues: true })`, which updates values and defaults together and leaves in-progress edits alone. `resetField` does the same thing for one field but only works on a field that is registered right now, so it silently does nothing while the modal is still loading or for a field the current branch does not render (the watchlist modal renders only the selected watch mode). Note that `keepDirtyValues` keeps the dirty flags as they were rather than recomputing them, so a flag can outlive the edit that set it: gate buttons on a value-vs-baseline comparison, not on `dirtyFields`. `formState.isValid` is stale after seeding for the same kind of reason, since it only refreshes when the resolver runs and a seeding `reset` does not run it, so a form that is prefilled with a valid value reads as invalid until an unrelated change triggers a pass. Where an untouched prefill has to be submittable straight away, parse the schema yourself (`schema.safeParse(values).success`) and gate on that; the resolver still owns the messages under the fields. Most modals hide this by gating on `!isDirty || !isValid`, where the dirty term disables the button anyway.
 
 - **Closing mid-debounce still saves, but a submit never re-persists.** The watch effect's cleanup flushes the last keystrokes on unmount unless the form is submitting or submitted. The `isSubmitting` guard matters for the optimistic-close pattern: the modal unmounts before the mutation resolves and `clearDraft` runs, so without it a late flush could rewrite a draft that was just cleared and a reopen would show stale data.
 

From 0cdf6fbdcc50cf8fb091fd7cbc5050cc3126181e Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 20:44:32 +0200
Subject: [PATCH 4/8] feat(shopping-lists): Name the copy before creating it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
- Extract the list name field into shopping-list-title-field.tsx, shared by the create, edit and copy modals
- Give the copy modal a react-hook-form title input, prefilled with "<naziv> (Kopija)" and submitted through the modal's form id
- Shorten the prefill by code point so the suffix fits the schema's ceiling, read off the schema rather than restated
- Trim the title inside shoppingListRequestSchema, so whitespace cannot pass min(3) and reach the backend blank
- Key CopyListModal by list id in the entity outlet, so the lingering instance cannot carry a typed name to the next list
- Grow the option row icon to size-6 and the checkbox to size-8 with a size-6 tick
- Relabel the option rows to "Kopiraj sve proizvode" and "Označeno i spremljene trgovine"

Copying always produced "<naziv> (Kopija)" and left renaming as a second trip through the edit modal. The name is now an input the user can change before the copy exists, and the field is the same one the create modal uses rather than a second copy of it.

Notes:
- The progress row's description still mentions prices while its new label does not. Deliberate, and the copy does carry the prices.
---
 .../components/forms/copy-list-modal.tsx      | 91 +++++++++++--------
 .../components/forms/copy-option-row.tsx      |  8 +-
 .../components/forms/shopping-list-modal.tsx  | 29 +-----
 .../forms/shopping-list-title-field.tsx       | 48 ++++++++++
 .../hooks/use-copy-list-modal.ts              | 48 +++++++++-
 .../modal-router/entity-modal-outlet.tsx      |  5 +-
 frontend/src/lib/api/schemas/shopping-list.ts |  8 ++
 7 files changed, 167 insertions(+), 70 deletions(-)
 create mode 100644 frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-title-field.tsx

diff --git a/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx b/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx
index cc49cbe3..fcbe7c1b 100644
--- a/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx
+++ b/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx
@@ -3,11 +3,13 @@
 import { Copy, ListChecks, Share2, ShoppingBasket } from "lucide-react";
 
 import { ModalShell } from "@/components/custom/modal/modal-shell";
+import { Form } from "@/components/ui/form";
 import { Skeleton } from "@/components/ui/skeleton";
 import { LOADING_LABELS } from "@/constants/loading-labels";
 import { closeModalUrl } from "@/lib/modal/modal-navigation";
 import { useCopyListModal } from "@/app/(user)/shopping-lists/hooks/use-copy-list-modal";
 import CopyOptionRow from "@/app/(user)/shopping-lists/components/forms/copy-option-row";
+import ShoppingListTitleField from "@/app/(user)/shopping-lists/components/forms/shopping-list-title-field";
 
 interface ICopyListModalProps {
   open: boolean;
@@ -20,6 +22,8 @@ export default function CopyListModal({ open, id }: ICopyListModalProps) {
     shoppingList,
     isLoading,
     isError,
+    form,
+    isValid,
     options,
     setOption,
     canCopySharing,
@@ -35,11 +39,11 @@ export default function CopyListModal({ open, id }: ICopyListModalProps) {
       description="Odaberi što se prenosi u kopiju."
       size="sm"
       preventClose={isCopying}
+      formId="copy-list-form"
       submitLabel={isCopying ? LOADING_LABELS.copying : "Kopiraj"}
       submitIcon={Copy}
       submitLoading={isCopying}
-      submitDisabled={isLoading || isError || !shoppingList}
-      onSubmit={() => void copyList()}
+      submitDisabled={isLoading || isError || !shoppingList || !isValid}
       cancelLabel="Odustani"
     >
       {isLoading ? (
@@ -53,45 +57,56 @@ export default function CopyListModal({ open, id }: ICopyListModalProps) {
           Popis nije pronađen. Možda je obrisan ili nemaš pristup.
         </p>
       ) : (
-        <div className="space-y-4">
-          <CopyOptionRow
-            icon={ShoppingBasket}
-            label="Proizvodi"
-            description="Prenesi sve proizvode s popisa."
-            checked={options.items}
-            onCheckedChange={(next) => setOption("items", next)}
-          />
+        <Form {...form}>
+          <form
+            id="copy-list-form"
+            onSubmit={form.handleSubmit((data) => void copyList(data))}
+            className="space-y-4"
+          >
+            {/* No autofocus: the field mounts only once the list query settles, so
+                focusing it would land mid-announcement and, on mobile, open the
+                keyboard over the options this modal is actually about. */}
+            <ShoppingListTitleField control={form.control} autoFocus={false} />
 
-          <CopyOptionRow
-            icon={ListChecks}
-            label="Označeno i spremljene cijene"
-            description="Zadrži što je kupljeno, u kojoj trgovini i po kojoj cijeni."
-            // Coerced, not just disabled: a box that stays ticked while inert states a
-            // choice the copy will not honour.
-            checked={options.progress && options.items}
-            disabled={!options.items}
-            onCheckedChange={(next) => setOption("progress", next)}
-          />
+            <CopyOptionRow
+              icon={ShoppingBasket}
+              label="Proizvodi"
+              description="Kopiraj sve proizvode"
+              checked={options.items}
+              onCheckedChange={(next) => setOption("items", next)}
+            />
 
-          <CopyOptionRow
-            icon={Share2}
-            label="Postavke dijeljenja"
-            description={
-              canCopySharing
-                ? "Kopija se dijeli jednako kao i original."
-                : "Samo vlasnik popisa može prenijeti dijeljenje."
-            }
-            checked={options.sharing && canCopySharing}
-            disabled={!canCopySharing}
-            onCheckedChange={(next) => setOption("sharing", next)}
-          />
+            <CopyOptionRow
+              icon={ListChecks}
+              label="Označeno i spremljene trgovine"
+              description="Zadrži što je kupljeno, u kojoj trgovini i po kojoj cijeni."
+              // Coerced, not just disabled: a box that stays ticked while inert states a
+              // choice the copy will not honour.
+              checked={options.progress && options.items}
+              disabled={!options.items}
+              onCheckedChange={(next) => setOption("progress", next)}
+            />
 
-          {!options.items && (
-            <p className="text-xs text-muted-foreground">
-              Kopirat će se samo naziv popisa.
-            </p>
-          )}
-        </div>
+            <CopyOptionRow
+              icon={Share2}
+              label="Postavke dijeljenja"
+              description={
+                canCopySharing
+                  ? "Kopija se dijeli jednako kao i original."
+                  : "Samo vlasnik popisa može prenijeti dijeljenje."
+              }
+              checked={options.sharing && canCopySharing}
+              disabled={!canCopySharing}
+              onCheckedChange={(next) => setOption("sharing", next)}
+            />
+
+            {!options.items && (
+              <p className="text-xs text-muted-foreground">
+                Kopirat će se samo naziv popisa.
+              </p>
+            )}
+          </form>
+        </Form>
       )}
     </ModalShell>
   );
diff --git a/frontend/src/app/(user)/shopping-lists/components/forms/copy-option-row.tsx b/frontend/src/app/(user)/shopping-lists/components/forms/copy-option-row.tsx
index 4a6662a7..85a391bb 100644
--- a/frontend/src/app/(user)/shopping-lists/components/forms/copy-option-row.tsx
+++ b/frontend/src/app/(user)/shopping-lists/components/forms/copy-option-row.tsx
@@ -41,7 +41,9 @@ export default function CopyOptionRow({
             : "bg-muted text-muted-foreground",
         )}
       >
-        <Icon aria-hidden="true" className="size-5" />
+        {/* size-6 matches the share modal's access row, the bottom nav glyph and the
+            list card's visibility indicator, so the same icons read at one size. */}
+        <Icon aria-hidden="true" className="size-6" />
       </span>
 
       {/* The description sits outside the label on purpose. Accessible-name computation
@@ -74,7 +76,9 @@ export default function CopyOptionRow({
           disabled ? undefined : (next) => onCheckedChange(next === true)
         }
         aria-describedby={descriptionId}
-        className="size-6 shrink-0 [&_svg]:size-4"
+        // A step below the default size-10 the list items use: these are settings on a
+        // form row, not the primary target of the screen.
+        className="size-8 shrink-0 [&_svg]:size-6"
       />
     </div>
   );
diff --git a/frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-modal.tsx b/frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-modal.tsx
index 28ffad50..7e5438a8 100644
--- a/frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-modal.tsx
+++ b/frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-modal.tsx
@@ -8,16 +8,9 @@ import { Save } from "lucide-react";
 
 import { ModalShell } from "@/components/custom/modal/modal-shell";
 import { resolveShoppingListAccess } from "@/app/(user)/shopping-lists/utils/shopping-list-access";
-import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
+import { Form } from "@/components/ui/form";
+import ShoppingListTitleField from "@/app/(user)/shopping-lists/components/forms/shopping-list-title-field";
 import type { ShoppingListDto, ShoppingListRequest } from "@/lib/api/types";
 import { shoppingListRequestSchema } from "@/lib/api/types";
 import { shoppingListService } from "@/lib/api";
@@ -177,23 +170,7 @@ export default function ShoppingListModal({
               </div>
             )}
 
-            <FormField
-              control={form.control}
-              name="title"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Naziv popisa</FormLabel>
-                  <FormControl>
-                    <Input
-                      {...field}
-                      placeholder="Roštilj 01.05.2026."
-                      autoFocus
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
+            <ShoppingListTitleField control={form.control} />
           </form>
         </Form>
       )}
diff --git a/frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-title-field.tsx b/frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-title-field.tsx
new file mode 100644
index 00000000..52e18786
--- /dev/null
+++ b/frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-title-field.tsx
@@ -0,0 +1,48 @@
+"use client";
+
+import type { Control } from "react-hook-form";
+
+import { Input } from "@/components/ui/input";
+import {
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import type { ShoppingListRequest } from "@/lib/api/types";
+
+interface IShoppingListTitleFieldProps {
+  control: Control<ShoppingListRequest>;
+  /** Off where the field is not the point of the modal, or where it mounts late. */
+  autoFocus?: boolean;
+}
+
+/**
+ * The list name, shared by the create, edit and copy modals so the label, the
+ * placeholder and the validation message read the same in all three.
+ */
+export default function ShoppingListTitleField({
+  control,
+  autoFocus = true,
+}: IShoppingListTitleFieldProps) {
+  return (
+    <FormField
+      control={control}
+      name="title"
+      render={({ field }) => (
+        <FormItem>
+          <FormLabel>Naziv popisa</FormLabel>
+          <FormControl>
+            <Input
+              {...field}
+              placeholder="Roštilj 01.05.2026."
+              autoFocus={autoFocus}
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts b/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
index 38b12a42..fcdea594 100644
--- a/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
+++ b/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
@@ -1,10 +1,14 @@
 "use client";
 
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useRouter } from "next/navigation";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
 import { toast } from "sonner";
 
 import { shoppingListService } from "@/lib/api";
+import type { ShoppingListRequest } from "@/lib/api/types";
+import { shoppingListRequestSchema } from "@/lib/api/types";
 import { shoppingListPath } from "@/utils/shopping-list-links";
 import { resolveShoppingListAccess } from "@/app/(user)/shopping-lists/utils/shopping-list-access";
 
@@ -25,6 +29,22 @@ const DEFAULT_OPTIONS: ICopyListOptions = {
   sharing: false,
 };
 
+const COPY_SUFFIX = " (Kopija)";
+// Read off the schema rather than restated, so raising the limit in one place cannot
+// leave the prefill producing titles the same schema then rejects.
+const TITLE_MAX_LENGTH = shoppingListRequestSchema.shape.title.maxLength ?? 100;
+
+/**
+ * The name the copy starts with. The original is shortened so the suffix always fits:
+ * a prefill that lands over the limit would open the modal on a validation error the
+ * user did not cause. Sliced by code point, so the cut cannot split an emoji in half.
+ */
+function suggestCopyTitle(title: string) {
+  const room = TITLE_MAX_LENGTH - COPY_SUFFIX.length;
+
+  return `${[...title].slice(0, room).join("")}${COPY_SUFFIX}`;
+}
+
 export function useCopyListModal(id: string) {
   const router = useRouter();
   const [options, setOptions] = useState<ICopyListOptions>(DEFAULT_OPTIONS);
@@ -38,18 +58,38 @@ export function useCopyListModal(id: string) {
     shoppingList?.myAccess,
   ).canManageShare;
 
+  // No draft persistence, unlike the create and edit modals: the default comes from
+  // server data the user has not asked to keep, so a stale draft would fight the prefill.
+  const form = useForm<ShoppingListRequest>({
+    resolver: zodResolver(shoppingListRequestSchema),
+    mode: "onChange",
+    defaultValues: { title: "" },
+  });
+
+  const { isDirty, isValid } = form.formState;
+
+  // Seeds the suggested name once the list lands, and never again after the first
+  // keystroke, so a late refetch cannot overwrite what the user typed.
+  useEffect(() => {
+    if (!shoppingList || isDirty) return;
+
+    form.reset({ title: suggestCopyTitle(shoppingList.title) });
+    // isDirty is read on purpose but must not retrigger the seed.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [shoppingList, form]);
+
   function setOption(key: keyof ICopyListOptions, value: boolean) {
     setOptions((previous) => ({ ...previous, [key]: value }));
   }
 
-  async function copyList() {
+  async function copyList(data: ShoppingListRequest) {
     if (!shoppingList || copyMutation.isPending) return;
 
     try {
       const copy = await copyMutation.mutateAsync({
         id,
         data: {
-          title: `${shoppingList.title} (Kopija)`,
+          title: data.title,
           includeItems: options.items,
           includeProgress: options.progress && options.items,
           includeSharing: options.sharing && canCopySharing,
@@ -68,6 +108,8 @@ export function useCopyListModal(id: string) {
     shoppingList,
     isLoading: listQuery.isLoading,
     isError: listQuery.isError,
+    form,
+    isValid,
     options,
     setOption,
     canCopySharing,
diff --git a/frontend/src/components/custom/modal-router/entity-modal-outlet.tsx b/frontend/src/components/custom/modal-router/entity-modal-outlet.tsx
index 12722fdc..8cc05039 100644
--- a/frontend/src/components/custom/modal-router/entity-modal-outlet.tsx
+++ b/frontend/src/components/custom/modal-router/entity-modal-outlet.tsx
@@ -69,7 +69,10 @@ export default function EntityModalOutlet({ target }: IEntityModalOutletProps) {
         return <ShareListModal open={open} id={rendered.id} />;
       }
       if (rendered.action === "copy") {
-        return <CopyListModal open={open} id={rendered.id} />;
+        // Keyed like the modals below: this outlet lingers 200ms after close, and the
+        // copy form now holds a typed name, which a reused instance would carry over to
+        // the next list instead of re-seeding from it.
+        return <CopyListModal key={rendered.id} open={open} id={rendered.id} />;
       }
       return (
         <ShoppingListModal
diff --git a/frontend/src/lib/api/schemas/shopping-list.ts b/frontend/src/lib/api/schemas/shopping-list.ts
index 745566be..133ac094 100644
--- a/frontend/src/lib/api/schemas/shopping-list.ts
+++ b/frontend/src/lib/api/schemas/shopping-list.ts
@@ -14,8 +14,12 @@ export const listAccessSchema = z.enum([
 
 // Shopping List schemas
 export const shoppingListRequestSchema = z.object({
+  // Trimmed before the length checks, so three spaces cannot pass min(3) and reach the
+  // backend as the blank title its @NotBlank rejects. zodResolver hands the trimmed
+  // value to the submit handler, so the form validates exactly what it sends.
   title: z
     .string()
+    .trim()
     .min(3, "Upiši naziv s najmanje 3 znaka")
     .max(100, "Upiši naziv s najviše 100 znakova"),
   linkAccess: linkAccessSchema.optional(),
@@ -42,8 +46,12 @@ export const shoppingListDtoSchema = z.object({
 
 /** Independent flags, so a copy can take the products without the shopping progress. */
 export const shoppingListCopyRequestSchema = z.object({
+  // Trimmed before the length checks, so three spaces cannot pass min(3) and reach the
+  // backend as the blank title its @NotBlank rejects. zodResolver hands the trimmed
+  // value to the submit handler, so the form validates exactly what it sends.
   title: z
     .string()
+    .trim()
     .min(3, "Upiši naziv s najmanje 3 znaka")
     .max(100, "Upiši naziv s najviše 100 znakova"),
   includeItems: z.boolean(),

From b40d1e7a066ffc7365b4ef91ae69320e4db17f7e Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 20:44:36 +0200
Subject: [PATCH 5/8] docs(shopping-lists): Record the editable copy name

Changes:
- Note in SHARING.md that the copy modal asks for a name, prefilled with the "(Kopija)" suggestion
- Add the copy hook and the shared title field to the file table

Keeps the sharing reference matching what the copy modal now does.
---
 docs/SHARING.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/SHARING.md b/docs/SHARING.md
index 4f8083b4..7932cd80 100644
--- a/docs/SHARING.md
+++ b/docs/SHARING.md
@@ -146,6 +146,8 @@ Worth knowing before changing any of this:
 | Level copy    | `frontend/src/app/(user)/shopping-lists/utils/link-access-copy.ts`                       |
 | Level icons   | `frontend/src/app/(user)/shopping-lists/utils/link-access-icons.ts`                      |
 | Copy modal    | `frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx`            |
+| Copy state    | `frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts`                    |
+| Title field   | `frontend/src/app/(user)/shopping-lists/components/forms/shopping-list-title-field.tsx`  |
 | Optimism      | `frontend/src/lib/api/shopping-lists/optimistic-list.ts`                                 |
 | Client access | `frontend/src/app/(user)/shopping-lists/utils/shopping-list-access.ts`                   |
 
@@ -159,7 +161,12 @@ Worth knowing before changing any of this:
   never directly.
 - **Copying a list asks what to carry**, through `POST /api/shopping-lists/{id}/copy`.
   Products default on; the ticks with their captured prices, and the sharing settings,
-  default off. One endpoint rather than a create followed by an add per item, because
+  default off. The name is an input rather than a fixed `<title> (Kopija)`, prefilled with
+  that suggestion so renaming and copying are one action. It shares
+  `shopping-list-title-field.tsx` with the create and edit modals, and the prefill shortens
+  the original by code point so the suffix always fits inside the schema's 100-character
+  ceiling, which it reads off the schema rather than restating. One endpoint rather than a
+  create followed by an add per item, because
   those were separate transactions: a failure partway left a half-populated copy behind
   that no retry could tidy up, and pressing the button again made another one.
 - **The sharing option on a copy is owner-only, enforced server side.** A recipient could

From 3af909032ba256e01357b88ba7189a72e9d01145 Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 21:12:17 +0200
Subject: [PATCH 6/8] style(shopping-lists): Drop the empty-copy hint from the
 copy modal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
- Remove the "Kopirat će se samo naziv popisa." paragraph that appeared when no option was ticked

The modal is vertically centred, so the hint appearing and disappearing shifted the whole dialog as options were toggled. The name field and the three rows already say what the copy will contain.
---
 .../shopping-lists/components/forms/copy-list-modal.tsx     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx b/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx
index fcbe7c1b..6ae929cf 100644
--- a/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx
+++ b/frontend/src/app/(user)/shopping-lists/components/forms/copy-list-modal.tsx
@@ -99,12 +99,6 @@ export default function CopyListModal({ open, id }: ICopyListModalProps) {
               disabled={!canCopySharing}
               onCheckedChange={(next) => setOption("sharing", next)}
             />
-
-            {!options.items && (
-              <p className="text-xs text-muted-foreground">
-                Kopirat će se samo naziv popisa.
-              </p>
-            )}
           </form>
         </Form>
       )}

From e704d9cdb49b1959b3b3957e538a29e802bf3cdb Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 21:26:53 +0200
Subject: [PATCH 7/8] fix(shopping-lists): Budget the copy name prefill in
 UTF-16 units

Changes:
- Build the shortened title a code point at a time, stopping on the UTF-16 length the schema measures
- Correct the matching note in SHARING.md

zod's max() counts UTF-16 code units, so slicing to 91 code points let an emoji title prefill at up to 182 units and open the modal on a validation error the user did not cause. Whole code points are still taken, so the cut cannot split an emoji.

Notes:
- Found by CodeRabbit on #161.
---
 docs/SHARING.md                                    |  6 ++++--
 .../shopping-lists/hooks/use-copy-list-modal.ts    | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/SHARING.md b/docs/SHARING.md
index 7932cd80..48907539 100644
--- a/docs/SHARING.md
+++ b/docs/SHARING.md
@@ -164,8 +164,10 @@ Worth knowing before changing any of this:
   default off. The name is an input rather than a fixed `<title> (Kopija)`, prefilled with
   that suggestion so renaming and copying are one action. It shares
   `shopping-list-title-field.tsx` with the create and edit modals, and the prefill shortens
-  the original by code point so the suffix always fits inside the schema's 100-character
-  ceiling, which it reads off the schema rather than restating. One endpoint rather than a
+  the original so the suffix always fits inside the schema's 100-character ceiling, which
+  it reads off the schema rather than restating. It takes whole code points so the cut
+  cannot split an emoji, but budgets in UTF-16 units, because that is what zod's `max()`
+  counts. One endpoint rather than a
   create followed by an add per item, because
   those were separate transactions: a failure partway left a half-populated copy behind
   that no retry could tidy up, and pressing the button again made another one.
diff --git a/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts b/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
index fcdea594..bf92f75b 100644
--- a/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
+++ b/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
@@ -37,12 +37,22 @@ const TITLE_MAX_LENGTH = shoppingListRequestSchema.shape.title.maxLength ?? 100;
 /**
  * The name the copy starts with. The original is shortened so the suffix always fits:
  * a prefill that lands over the limit would open the modal on a validation error the
- * user did not cause. Sliced by code point, so the cut cannot split an emoji in half.
+ * user did not cause.
+ *
+ * Taken a code point at a time so the cut cannot split an emoji in half, but budgeted in
+ * UTF-16 units, because that is what zod's max() counts: slicing to 91 code points would
+ * leave an emoji title twice that long by the schema's reckoning.
  */
 function suggestCopyTitle(title: string) {
   const room = TITLE_MAX_LENGTH - COPY_SUFFIX.length;
 
-  return `${[...title].slice(0, room).join("")}${COPY_SUFFIX}`;
+  let head = "";
+  for (const character of title) {
+    if (head.length + character.length > room) break;
+    head += character;
+  }
+
+  return `${head}${COPY_SUFFIX}`;
 }
 
 export function useCopyListModal(id: string) {

From b2824de1210a2b916d10572c089440fd277b2a3f Mon Sep 17 00:00:00 2001
From: CrazyFreak <44674613+OffCrazyFreak@users.noreply.github.com>
Date: Fri, 7 Aug 2026 21:30:18 +0200
Subject: [PATCH 8/8] fix(shopping-lists): Gate Kopiraj on a parsed schema, not
 a stale isValid

Changes:
- Parse shoppingListRequestSchema for the copy modal's validity, reading the title through useWatch
- Correct the watchlist form's reset comment, which claimed reset refreshes isValid
- Scope the review skill's cleanup proposal to a manifest of what the cycle created, and protect branches on either side of an open PR

formState.isValid only refreshes when the resolver runs, and a seeding reset does not run it, which docs/STATE-PERSISTENCE.md already records for the watchlist form. The copy modal gated its submit button on that flag, so an untouched valid prefill would have left Kopiraj dead until the user typed. useWatch rather than form.watch, since watch() opts the hook out of the React Compiler.

Notes:
- The skill changes are CodeRabbit findings on #161: branch discovery matched unrelated worktrees and branches by shape alone, and "behind an open PR" missed a branch that is the PR's head.
---
 .claude/skills/multi-tool-code-review/SKILL.md      |  4 +++-
 .../shopping-lists/hooks/use-copy-list-modal.ts     | 13 +++++++++++--
 .../app/products/hooks/use-watchlist-item-form.ts   |  6 +++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.claude/skills/multi-tool-code-review/SKILL.md b/.claude/skills/multi-tool-code-review/SKILL.md
index a532f107..fd1650ec 100644
--- a/.claude/skills/multi-tool-code-review/SKILL.md
+++ b/.claude/skills/multi-tool-code-review/SKILL.md
@@ -93,6 +93,8 @@ A run leaves debris in three places: scratch output and triage docs under `revie
 
 Offer cleanup once, when the cycle is genuinely over: the PR merged, or the user says they are done. Do not offer it while a PR is open, and do not fold it into another question as a default-on extra.
 
+Record what this cycle creates as it creates it: the exact review directory, report paths, branch names, their remote counterparts, and any worktree. That manifest, not the detection below, is what may be proposed for removal. The commands find everything matching a shape, including branches and worktrees from unrelated work that happen to be named the same way, so intersect their output with the manifest and keep anything whose owner you cannot establish, naming it in the question as retained.
+
 Build the proposal by detecting what exists, then put it to the user with `AskUserQuestion`, one question per category, options built from what you actually found:
 
 ```bash
@@ -107,7 +109,7 @@ Rules that hold regardless of the answer:
 
 - **Only ever propose what this cycle created.** Other branches and worktrees belong to unrelated in-flight work, and the host repo's `AGENTS.md` forbids touching it. List them in the question as explicitly excluded rather than leaving the user to wonder whether you swept them up.
 - **Scratch and reports are different questions.** `_review-run*` folders are pure working output and are the safe default to remove. `REVIEW-*.md` and `.html` are the deliverable; offer keeping them, archiving them, or deleting them, and default to keeping.
-- **Never delete a branch with unpushed commits, or one behind an open PR**, even if the user selects it. Check `git log <remote>..<branch>` and `gh pr list --head <branch>` first, and report back instead of deleting.
+- **Never delete a branch with unpushed commits, or one associated with an open PR**, even if the user selects it, whether the branch is that PR's head or its base. Check `git log <remote>..<branch>`, then `gh pr list --head <branch>` and `gh pr list --base <branch>` as separate calls, since the two filters combine as AND rather than OR. Report back instead of deleting. If either check cannot be run, keep the branch and say why.
 - **Say what a report is still referenced by.** A PR body that cites a triage doc by path leaves a dangling reference once it is gone. Mention it, then let the user decide.
 - Report exactly what was removed and what was left standing.
 
diff --git a/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts b/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
index bf92f75b..36545984 100644
--- a/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
+++ b/frontend/src/app/(user)/shopping-lists/hooks/use-copy-list-modal.ts
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react";
 import { useRouter } from "next/navigation";
-import { useForm } from "react-hook-form";
+import { useForm, useWatch } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { toast } from "sonner";
 
@@ -76,7 +76,16 @@ export function useCopyListModal(id: string) {
     defaultValues: { title: "" },
   });
 
-  const { isDirty, isValid } = form.formState;
+  const { isDirty } = form.formState;
+  // useWatch, not form.watch: watch() is a function the React Compiler cannot memoize,
+  // so reading it here would opt the whole hook out of compilation.
+  const title = useWatch({ control: form.control, name: "title" });
+
+  // Parsed rather than read off formState.isValid, the same way the watchlist form does
+  // it: the flag only refreshes when the resolver runs, and the seeding reset below does
+  // not run it, so an untouched valid prefill would read as invalid and leave Kopiraj
+  // dead until the user typed. The resolver still owns the message under the field.
+  const isValid = shoppingListRequestSchema.safeParse({ title }).success;
 
   // Seeds the suggested name once the list lands, and never again after the first
   // keystroke, so a late refetch cannot overwrite what the user typed.
diff --git a/frontend/src/app/products/hooks/use-watchlist-item-form.ts b/frontend/src/app/products/hooks/use-watchlist-item-form.ts
index 71efd9d0..9300104a 100644
--- a/frontend/src/app/products/hooks/use-watchlist-item-form.ts
+++ b/frontend/src/app/products/hooks/use-watchlist-item-form.ts
@@ -71,9 +71,9 @@ export function useWatchlistItemForm(
   // on screen. So the prefill landed on nothing. reset writes both values and both
   // defaults regardless, which is what makes an untouched prefill not a change, and
   // keepDirtyValues leaves a number the user (or a restored draft) has already
-  // edited alone. It also refreshes isValid without filling in errors, so the submit
-  // button is live for a valid prefill and nothing is marked red before it is
-  // touched.
+  // edited alone. What it does not do is re-run the resolver, so formState.isValid is
+  // still the mount pass over the empty defaults afterwards. That is why isFormValid
+  // below parses the schema itself rather than reading the flag.
   useEffect(() => {
     form.reset(
       {