Merge remote-tracking branch 'origin/dev' into naver-list-import

server/src/services/adminService.ts

@@ -40,8 +40,8 @@ export const isDocker = (() => {
 
 export function listUsers() {
   const users = db.prepare(
-    'SELECT id, username, email, role, created_at, updated_at, last_login FROM users ORDER BY created_at DESC'
-  ).all() as Pick<User, 'id' | 'username' | 'email' | 'role' | 'created_at' | 'updated_at' | 'last_login'>[];
+    'SELECT id, username, email, role, avatar, created_at, updated_at, last_login FROM users ORDER BY created_at DESC'
+  ).all() as (Pick<User, 'id' | 'username' | 'email' | 'role' | 'created_at' | 'updated_at' | 'last_login'> & { avatar?: string | null })[];
   let onlineUserIds = new Set<number>();
   try {
     const { getOnlineUserIds } = require('../websocket');
@@ -49,6 +49,7 @@ export function listUsers() {
   } catch { /* */ }
   return users.map(u => ({
     ...u,
+    avatar_url: u.avatar ? `/uploads/avatars/${u.avatar}` : null,
     created_at: utcSuffix(u.created_at),
     updated_at: utcSuffix(u.updated_at as string),
     last_login: utcSuffix(u.last_login),

server/src/services/budgetService.ts

@@ -14,12 +14,13 @@ export function verifyTripAccess(tripId: string | number, userId: number) {
 }
 
 function loadItemMembers(itemId: number | string) {
-  return db.prepare(`
+  const rows = db.prepare(`
     SELECT bm.user_id, bm.paid, u.username, u.avatar
     FROM budget_item_members bm
     JOIN users u ON bm.user_id = u.id
     WHERE bm.budget_item_id = ?
   `).all(itemId) as BudgetItemMember[];
+  return rows.map(m => ({ ...m, avatar_url: avatarUrl(m) }));
 }
 
 // ---------------------------------------------------------------------------
@@ -27,9 +28,12 @@ function loadItemMembers(itemId: number | string) {
 // ---------------------------------------------------------------------------
 
 export function listBudgetItems(tripId: string | number) {
-  const items = db.prepare(
-    'SELECT * FROM budget_items WHERE trip_id = ? ORDER BY category ASC, created_at ASC'
-  ).all(tripId) as BudgetItem[];
+  const items = db.prepare(`
+    SELECT bi.* FROM budget_items bi
+    LEFT JOIN budget_category_order bco ON bco.trip_id = bi.trip_id AND bco.category = bi.category
+    WHERE bi.trip_id = ?
+    ORDER BY COALESCE(bco.sort_order, 999999) ASC, bi.sort_order ASC
+  `).all(tripId) as BudgetItem[];
 
   const itemIds = items.map(i => i.id);
   const membersByItem: Record<number, (BudgetItemMember & { avatar_url: string | null })[]> = {};
@@ -63,11 +67,21 @@ export function createBudgetItem(
   ).get(tripId) as { max: number | null };
   const sortOrder = (maxOrder.max !== null ? maxOrder.max : -1) + 1;
 
+  const cat = data.category || 'Other';
+
+  // Ensure category has a sort_order entry
+  const catExists = db.prepare('SELECT 1 FROM budget_category_order WHERE trip_id = ? AND category = ?').get(tripId, cat);
+  if (!catExists) {
+    const maxCatOrder = db.prepare('SELECT MAX(sort_order) as max FROM budget_category_order WHERE trip_id = ?').get(tripId) as { max: number | null };
+    const catOrder = (maxCatOrder?.max !== null && maxCatOrder?.max !== undefined ? maxCatOrder.max : -1) + 1;
+    db.prepare('INSERT OR IGNORE INTO budget_category_order (trip_id, category, sort_order) VALUES (?, ?, ?)').run(tripId, cat, catOrder);
+  }
+
   const result = db.prepare(
     'INSERT INTO budget_items (trip_id, category, name, total_price, persons, days, note, sort_order, expense_date) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)'
   ).run(
     tripId,
-    data.category || 'Other',
+    cat,
     data.name,
     data.total_price || 0,
     data.persons != null ? data.persons : null,
@@ -113,6 +127,16 @@ export function updateBudgetItem(
     id,
   );
 
+  // If category changed, update category order table
+  if (data.category) {
+    const catExists = db.prepare('SELECT 1 FROM budget_category_order WHERE trip_id = ? AND category = ?').get(tripId, data.category);
+    if (!catExists) {
+      const maxCatOrder = db.prepare('SELECT MAX(sort_order) as max FROM budget_category_order WHERE trip_id = ?').get(tripId) as { max: number | null };
+      const catOrder = (maxCatOrder?.max !== null && maxCatOrder?.max !== undefined ? maxCatOrder.max : -1) + 1;
+      db.prepare('INSERT OR IGNORE INTO budget_category_order (trip_id, category, sort_order) VALUES (?, ?, ?)').run(tripId, data.category, catOrder);
+    }
+  }
+
   const updated = db.prepare('SELECT * FROM budget_items WHERE id = ?').get(id) as BudgetItem & { members?: BudgetItemMember[] };
   updated.members = loadItemMembers(id);
   return updated;
@@ -254,3 +278,23 @@ export function calculateSettlement(tripId: string | number) {
     flows,
   };
 }
+
+// ---------------------------------------------------------------------------
+// Reorder
+// ---------------------------------------------------------------------------
+
+export function reorderBudgetItems(tripId: string | number, orderedIds: number[]) {
+  const update = db.prepare('UPDATE budget_items SET sort_order = ? WHERE id = ? AND trip_id = ?');
+  db.transaction(() => {
+    orderedIds.forEach((id, index) => update.run(index, id, tripId));
+  })();
+}
+
+export function reorderBudgetCategories(tripId: string | number, orderedCategories: string[]) {
+  const upsert = db.prepare(
+    'INSERT INTO budget_category_order (trip_id, category, sort_order) VALUES (?, ?, ?) ON CONFLICT(trip_id, category) DO UPDATE SET sort_order = excluded.sort_order'
+  );
+  db.transaction(() => {
+    orderedCategories.forEach((cat, index) => upsert.run(tripId, cat, index));
+  })();
+}

server/src/services/collabService.ts

@@ -117,11 +117,12 @@ export function listNotes(tripId: string | number) {
   return notes.map(formatNote);
 }
 
-export function createNote(tripId: string | number, userId: number, data: { title: string; content?: string; category?: string; color?: string; website?: string }) {
+export function createNote(tripId: string | number, userId: number, data: { title: string; content?: string; category?: string; color?: string; website?: string; pinned?: boolean }) {
+  const pinned = data.pinned ? 1 : 0;
   const result = db.prepare(`
-    INSERT INTO collab_notes (trip_id, user_id, title, content, category, color, website)
-    VALUES (?, ?, ?, ?, ?, ?, ?)
-  `).run(tripId, userId, data.title, data.content || null, data.category || 'General', data.color || '#6366f1', data.website || null);
+    INSERT INTO collab_notes (trip_id, user_id, title, content, category, color, website, pinned)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(tripId, userId, data.title, data.content || null, data.category || 'General', data.color || '#6366f1', data.website || null, pinned);
 
   const note = db.prepare(`
     SELECT n.*, u.username, u.avatar FROM collab_notes n JOIN users u ON n.user_id = u.id WHERE n.id = ?
@@ -317,6 +318,11 @@ export function formatMessage(msg: CollabMessage, reactions?: GroupedReaction[])
   return { ...msg, user_avatar: avatarUrl(msg), avatar_url: avatarUrl(msg), reactions: reactions || [] };
 }
 
+export function countMessages(tripId: string | number): number {
+  const row = db.prepare('SELECT COUNT(*) as cnt FROM collab_messages WHERE trip_id = ?').get(tripId) as { cnt: number };
+  return row.cnt;
+}
+
 export function listMessages(tripId: string | number, before?: string | number) {
   const query = `
     SELECT m.*, u.username, u.avatar,

server/src/services/inAppNotifications.ts

@@ -159,7 +159,7 @@ function createNotification(input: NotificationInput): number[] {
       notification: {
         ...row,
         sender_username: sender?.username ?? null,
-        sender_avatar: sender?.avatar ?? null,
+        sender_avatar: sender?.avatar ? `/uploads/avatars/${sender.avatar}` : null,
       },
     });
   }
@@ -219,7 +219,7 @@ export function createNotificationForRecipient(
     notification: {
       ...row,
       sender_username: sender?.username ?? null,
-      sender_avatar: sender?.avatar ?? null,
+      sender_avatar: sender?.avatar ? `/uploads/avatars/${sender.avatar}` : null,
     },
   });
 
@@ -249,7 +249,12 @@ function getNotifications(
   const { total } = db.prepare(`SELECT COUNT(*) as total FROM notifications ${wherePlain}`).get(userId) as { total: number };
   const { unread_count } = db.prepare('SELECT COUNT(*) as unread_count FROM notifications WHERE recipient_id = ? AND is_read = 0').get(userId) as { unread_count: number };
 
-  return { notifications: rows, total, unread_count };
+  const mapped = rows.map(r => ({
+    ...r,
+    sender_avatar: r.sender_avatar ? `/uploads/avatars/${r.sender_avatar}` : null,
+  }));
+
+  return { notifications: mapped, total, unread_count };
 }
 
 function getUnreadCount(userId: number): number {
@@ -326,9 +331,14 @@ async function respondToBoolean(
     WHERE n.id = ?
   `).get(notificationId) as NotificationRow;
 
-  broadcastToUser(userId, { type: 'notification:updated', notification: updated });
+  const mappedUpdated = {
+    ...updated,
+    sender_avatar: updated.sender_avatar ? `/uploads/avatars/${updated.sender_avatar}` : null,
+  };
 
-  return { success: true, notification: updated };
+  broadcastToUser(userId, { type: 'notification:updated', notification: mappedUpdated });
+
+  return { success: true, notification: mappedUpdated };
 }
 
 export {

server/src/services/placeService.ts

@@ -20,7 +20,7 @@ interface UnsplashSearchResponse {
 
 export function listPlaces(
   tripId: string,
-  filters: { search?: string; category?: string; tag?: string },
+  filters: { search?: string; category?: string; tag?: string; assignment?: 'all' | 'unassigned' | 'assigned' },
 ) {
   let query = `
     SELECT DISTINCT p.*, c.name as category_name, c.color as category_color, c.icon as category_icon
@@ -46,6 +46,14 @@ export function listPlaces(
     params.push(filters.tag);
   }
 
+  if (filters.assignment === 'unassigned') {
+    query += ` AND p.id NOT IN (SELECT da.place_id FROM day_assignments da JOIN days d ON da.day_id = d.id WHERE d.trip_id = ?)`;
+    params.push(tripId);
+  } else if (filters.assignment === 'assigned') {
+    query += ` AND p.id IN (SELECT da.place_id FROM day_assignments da JOIN days d ON da.day_id = d.id WHERE d.trip_id = ?)`;
+    params.push(tripId);
+  }
+
   query += ' ORDER BY p.created_at DESC';
 
   const places = db.prepare(query).all(...params) as PlaceWithCategory[];
@@ -133,7 +141,7 @@ export function updatePlace(
     category_id?: number; price?: number; currency?: string;
     place_time?: string; end_time?: string;
     duration_minutes?: number; notes?: string; image_url?: string;
-    google_place_id?: string; website?: string; phone?: string;
+    google_place_id?: string; osm_id?: string; website?: string; phone?: string;
     transport_mode?: string; tags?: number[];
   },
 ) {
@@ -143,7 +151,7 @@ export function updatePlace(
   const {
     name, description, lat, lng, address, category_id, price, currency,
     place_time, end_time,
-    duration_minutes, notes, image_url, google_place_id, website, phone,
+    duration_minutes, notes, image_url, google_place_id, osm_id, website, phone,
     transport_mode, tags,
   } = body;
 
@@ -163,6 +171,7 @@ export function updatePlace(
       notes = ?,
       image_url = ?,
       google_place_id = ?,
+      osm_id = ?,
       website = ?,
       phone = ?,
       transport_mode = COALESCE(?, transport_mode),
@@ -183,6 +192,7 @@ export function updatePlace(
     notes !== undefined ? notes : existingPlace.notes,
     image_url !== undefined ? image_url : existingPlace.image_url,
     google_place_id !== undefined ? google_place_id : existingPlace.google_place_id,
+    osm_id !== undefined ? osm_id : existingPlace.osm_id,
     website !== undefined ? website : existingPlace.website,
     phone !== undefined ? phone : existingPlace.phone,
     transport_mode || null,

server/src/services/reservationService.ts

@@ -200,6 +200,10 @@ export function updateReservation(id: string | number, tripId: string | number,
 
   // Update or create accommodation for hotel reservations
   let resolvedAccId: number | null = accommodation_id !== undefined ? (accommodation_id || null) : (current.accommodation_id ?? null);
+  if (resolvedAccId) {
+    const accExists = db.prepare('SELECT id FROM day_accommodations WHERE id = ?').get(resolvedAccId);
+    if (!accExists) resolvedAccId = null;
+  }
   if (type === 'hotel' && create_accommodation) {
     const { place_id: accPlaceId, start_day_id, end_day_id, check_in, check_out, confirmation: accConf } = create_accommodation;
     if (accPlaceId && start_day_id && end_day_id) {

server/src/services/tripService.ts

@@ -394,6 +394,76 @@ export function exportICS(tripId: string | number): { ics: string; filename: str
     ics += `END:VEVENT\r\n`;
   }
 
+  // Days with assignments and notes
+  const days = db.prepare('SELECT * FROM days WHERE trip_id = ? ORDER BY day_number ASC').all(tripId) as any[];
+  for (const day of days) {
+    if (!day.date) continue;
+
+    const assignments = db.prepare(`
+      SELECT da.*, p.name as place_name, p.address as place_address,
+        COALESCE(da.assignment_time, p.place_time) as effective_time,
+        COALESCE(da.assignment_end_time, p.end_time) as effective_end_time
+      FROM day_assignments da
+      JOIN places p ON da.place_id = p.id
+      WHERE da.day_id = ?
+      ORDER BY da.order_index ASC, da.created_at ASC
+    `).all(day.id) as any[];
+
+    const notes = db.prepare(
+      'SELECT * FROM day_notes WHERE day_id = ? ORDER BY sort_order ASC, created_at ASC'
+    ).all(day.id) as any[];
+
+    const timed = assignments.filter(a => a.effective_time);
+    const untimed = assignments.filter(a => !a.effective_time);
+
+    // Timed assignments → individual events
+    for (const a of timed) {
+      ics += `BEGIN:VEVENT\r\nUID:${uid(a.id, 'assign')}\r\nDTSTAMP:${now}\r\n`;
+      ics += `DTSTART:${fmtDateTime(a.effective_time, day.date + 'T00:00')}\r\n`;
+      if (a.effective_end_time) {
+        ics += `DTEND:${fmtDateTime(a.effective_end_time, day.date + 'T00:00')}\r\n`;
+      }
+      ics += `SUMMARY:${esc(a.place_name)}\r\n`;
+      let desc = '';
+      if (a.notes) desc += a.notes;
+      if (a.place_address) desc += (desc ? '\n' : '') + a.place_address;
+      if (desc) ics += `DESCRIPTION:${esc(desc)}\r\n`;
+      if (a.place_address) ics += `LOCATION:${esc(a.place_address)}\r\n`;
+      ics += `END:VEVENT\r\n`;
+    }
+
+    // Build all-day summary event if there are untimed activities or notes
+    if (untimed.length > 0 || notes.length > 0) {
+      const dayTitle = day.title || `Day ${day.day_number}`;
+      const endNext = new Date(day.date + 'T00:00:00');
+      endNext.setDate(endNext.getDate() + 1);
+      const endStr = endNext.toISOString().split('T')[0].replace(/-/g, '');
+
+      ics += `BEGIN:VEVENT\r\nUID:${uid(day.id, 'day')}\r\nDTSTAMP:${now}\r\n`;
+      ics += `DTSTART;VALUE=DATE:${fmtDate(day.date)}\r\nDTEND;VALUE=DATE:${endStr}\r\n`;
+      ics += `SUMMARY:${esc(dayTitle)}\r\n`;
+
+      let desc = '';
+      if (untimed.length > 0) {
+        desc += untimed.map(a => {
+          let line = `• ${a.place_name}`;
+          if (a.place_address) line += ` (${a.place_address})`;
+          if (a.notes) line += ` — ${a.notes}`;
+          return line;
+        }).join('\n');
+      }
+      if (notes.length > 0) {
+        if (desc) desc += '\n\n';
+        desc += 'Notes:\n' + notes.map(n => {
+          let line = n.time ? `${n.time} — ${n.text}` : `• ${n.text}`;
+          return line;
+        }).join('\n');
+      }
+      if (desc) ics += `DESCRIPTION:${esc(desc)}\r\n`;
+      ics += `END:VEVENT\r\n`;
+    }
+  }
+
   // Reservations as events
   for (const r of reservations) {
     if (!r.reservation_time) continue;
@@ -431,6 +501,158 @@ export function exportICS(tripId: string | number): { ics: string; filename: str
   return { ics, filename: `${safeFilename}.ics` };
 }
 
+// ── Copy / duplicate ─────────────────────────────────────────────────────
+
+/**
+ * Duplicates a trip (all days, places, assignments, accommodations, reservations,
+ * budget, packing bags/items, day notes) into a new trip owned by `newOwnerId`.
+ * Packing items are reset to unchecked. Budget paid status is cleared.
+ * Returns the new trip's ID.
+ */
+export function copyTripById(sourceTripId: string | number, newOwnerId: number, title?: string): number {
+  const src = db.prepare('SELECT * FROM trips WHERE id = ?').get(sourceTripId) as any;
+  if (!src) throw new NotFoundError('Trip not found');
+
+  const newTitle = title || src.title;
+
+  const fn = db.transaction(() => {
+    const tripResult = db.prepare(`
+      INSERT INTO trips (user_id, title, description, start_date, end_date, currency, cover_image, is_archived, reminder_days)
+      VALUES (?, ?, ?, ?, ?, ?, ?, 0, ?)
+    `).run(newOwnerId, newTitle, src.description, src.start_date, src.end_date, src.currency, src.cover_image, src.reminder_days ?? 3);
+    const newTripId = tripResult.lastInsertRowid;
+
+    const oldDays = db.prepare('SELECT * FROM days WHERE trip_id = ? ORDER BY day_number').all(sourceTripId) as any[];
+    const dayMap = new Map<number, number | bigint>();
+    const insertDay = db.prepare('INSERT INTO days (trip_id, day_number, date, notes, title) VALUES (?, ?, ?, ?, ?)');
+    for (const d of oldDays) {
+      const r = insertDay.run(newTripId, d.day_number, d.date, d.notes, d.title);
+      dayMap.set(d.id, r.lastInsertRowid);
+    }
+
+    const oldPlaces = db.prepare('SELECT * FROM places WHERE trip_id = ?').all(sourceTripId) as any[];
+    const placeMap = new Map<number, number | bigint>();
+    const insertPlace = db.prepare(`
+      INSERT INTO places (trip_id, name, description, lat, lng, address, category_id, price, currency,
+        reservation_status, reservation_notes, reservation_datetime, place_time, end_time,
+        duration_minutes, notes, image_url, google_place_id, website, phone, transport_mode, osm_id)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    for (const p of oldPlaces) {
+      const r = insertPlace.run(newTripId, p.name, p.description, p.lat, p.lng, p.address, p.category_id,
+        p.price, p.currency, p.reservation_status, p.reservation_notes, p.reservation_datetime,
+        p.place_time, p.end_time, p.duration_minutes, p.notes, p.image_url, p.google_place_id,
+        p.website, p.phone, p.transport_mode, p.osm_id);
+      placeMap.set(p.id, r.lastInsertRowid);
+    }
+
+    const oldTags = db.prepare(`
+      SELECT pt.* FROM place_tags pt JOIN places p ON p.id = pt.place_id WHERE p.trip_id = ?
+    `).all(sourceTripId) as any[];
+    const insertTag = db.prepare('INSERT OR IGNORE INTO place_tags (place_id, tag_id) VALUES (?, ?)');
+    for (const t of oldTags) {
+      const newPlaceId = placeMap.get(t.place_id);
+      if (newPlaceId) insertTag.run(newPlaceId, t.tag_id);
+    }
+
+    const oldAssignments = db.prepare(`
+      SELECT da.* FROM day_assignments da JOIN days d ON d.id = da.day_id WHERE d.trip_id = ?
+    `).all(sourceTripId) as any[];
+    const assignmentMap = new Map<number, number | bigint>();
+    const insertAssignment = db.prepare(`
+      INSERT INTO day_assignments (day_id, place_id, order_index, notes, reservation_status, reservation_notes, reservation_datetime, assignment_time, assignment_end_time)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    for (const a of oldAssignments) {
+      const newDayId = dayMap.get(a.day_id);
+      const newPlaceId = placeMap.get(a.place_id);
+      if (newDayId && newPlaceId) {
+        const r = insertAssignment.run(newDayId, newPlaceId, a.order_index, a.notes,
+          a.reservation_status, a.reservation_notes, a.reservation_datetime,
+          a.assignment_time, a.assignment_end_time);
+        assignmentMap.set(a.id, r.lastInsertRowid);
+      }
+    }
+
+    const oldAccom = db.prepare('SELECT * FROM day_accommodations WHERE trip_id = ?').all(sourceTripId) as any[];
+    const accomMap = new Map<number, number | bigint>();
+    const insertAccom = db.prepare(`
+      INSERT INTO day_accommodations (trip_id, place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    for (const a of oldAccom) {
+      const newPlaceId = placeMap.get(a.place_id);
+      const newStartDay = dayMap.get(a.start_day_id);
+      const newEndDay = dayMap.get(a.end_day_id);
+      if (newPlaceId && newStartDay && newEndDay) {
+        const r = insertAccom.run(newTripId, newPlaceId, newStartDay, newEndDay, a.check_in, a.check_out, a.confirmation, a.notes);
+        accomMap.set(a.id, r.lastInsertRowid);
+      }
+    }
+
+    const oldReservations = db.prepare('SELECT * FROM reservations WHERE trip_id = ?').all(sourceTripId) as any[];
+    const insertReservation = db.prepare(`
+      INSERT INTO reservations (trip_id, day_id, place_id, assignment_id, accommodation_id, title, reservation_time, reservation_end_time,
+        location, confirmation_number, notes, status, type, metadata, day_plan_position)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    for (const r of oldReservations) {
+      insertReservation.run(newTripId,
+        r.day_id ? (dayMap.get(r.day_id) ?? null) : null,
+        r.place_id ? (placeMap.get(r.place_id) ?? null) : null,
+        r.assignment_id ? (assignmentMap.get(r.assignment_id) ?? null) : null,
+        r.accommodation_id ? (accomMap.get(r.accommodation_id) ?? null) : null,
+        r.title, r.reservation_time, r.reservation_end_time,
+        r.location, r.confirmation_number, r.notes, r.status, r.type,
+        r.metadata, r.day_plan_position);
+    }
+
+    const oldBudget = db.prepare('SELECT * FROM budget_items WHERE trip_id = ?').all(sourceTripId) as any[];
+    const insertBudget = db.prepare(`
+      INSERT INTO budget_items (trip_id, category, name, total_price, persons, days, note, sort_order)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    for (const b of oldBudget) {
+      insertBudget.run(newTripId, b.category, b.name, b.total_price, b.persons, b.days, b.note, b.sort_order);
+    }
+
+    const oldBags = db.prepare('SELECT * FROM packing_bags WHERE trip_id = ?').all(sourceTripId) as any[];
+    const bagMap = new Map<number, number | bigint>();
+    const insertBag = db.prepare(`
+      INSERT INTO packing_bags (trip_id, name, color, weight_limit_grams, sort_order)
+      VALUES (?, ?, ?, ?, ?)
+    `);
+    for (const bag of oldBags) {
+      const r = insertBag.run(newTripId, bag.name, bag.color, bag.weight_limit_grams, bag.sort_order);
+      bagMap.set(bag.id, r.lastInsertRowid);
+    }
+
+    const oldPacking = db.prepare('SELECT * FROM packing_items WHERE trip_id = ?').all(sourceTripId) as any[];
+    const insertPacking = db.prepare(`
+      INSERT INTO packing_items (trip_id, name, checked, category, sort_order, weight_grams, bag_id)
+      VALUES (?, ?, 0, ?, ?, ?, ?)
+    `);
+    for (const p of oldPacking) {
+      insertPacking.run(newTripId, p.name, p.category, p.sort_order, p.weight_grams,
+        p.bag_id ? (bagMap.get(p.bag_id) ?? null) : null);
+    }
+
+    const oldNotes = db.prepare('SELECT * FROM day_notes WHERE trip_id = ?').all(sourceTripId) as any[];
+    const insertNote = db.prepare(`
+      INSERT INTO day_notes (day_id, trip_id, text, time, icon, sort_order)
+      VALUES (?, ?, ?, ?, ?, ?)
+    `);
+    for (const n of oldNotes) {
+      const newDayId = dayMap.get(n.day_id);
+      if (newDayId) insertNote.run(newDayId, newTripId, n.text, n.time, n.icon, n.sort_order);
+    }
+
+    return Number(newTripId);
+  });
+
+  return fn();
+}
+
 // ── Trip summary (used by MCP get_trip_summary tool) ──────────────────────
 
 export function getTripSummary(tripId: number) {
@@ -448,6 +670,7 @@ export function getTripSummary(tripId: number) {
 
   const budgetItems = listBudgetItems(tripId);
   const budget = {
+    items: budgetItems,
     item_count: budgetItems.length,
     total: budgetItems.reduce((sum, i) => sum + (i.total_price || 0), 0),
     currency: trip.currency,
@@ -455,6 +678,7 @@ export function getTripSummary(tripId: number) {
 
   const packingItems = listPackingItems(tripId);
   const packing = {
+    items: packingItems,
     total: packingItems.length,
     checked: (packingItems as { checked: number }[]).filter(i => i.checked).length,
   };