@musnows/scriverse 0.6.5 → 0.6.6

package/dist/public/timeline-view.js

@@ -0,0 +1,119 @@
+/** 时间轴轨道色板（与 CSS `--timeline-track-palette-*` 索引对应） */
+export const TIMELINE_TRACK_PALETTE_SIZE = 8;
+
+/** 未分组轨道使用的色板索引 */
+export const TIMELINE_UNGROUPED_COLOR_INDEX = TIMELINE_TRACK_PALETTE_SIZE - 1;
+
+function timelineEventTrackKey(event) {
+  return String(event?.trackId ?? "");
+}
+
+function compareNullableTimeSort(left, right, direction = "asc") {
+  const leftSort = left?.timeSort;
+  const rightSort = right?.timeSort;
+  const leftMissing = leftSort === null || leftSort === undefined || Number.isNaN(Number(leftSort));
+  const rightMissing = rightSort === null || rightSort === undefined || Number.isNaN(Number(rightSort));
+  if (leftMissing && rightMissing) return 0;
+  if (leftMissing) return 1;
+  if (rightMissing) return -1;
+  const delta = Number(leftSort) - Number(rightSort);
+  if (delta === 0) return 0;
+  return direction === "desc" ? -delta : delta;
+}
+
+function compareStableTieBreak(left, right, direction = "asc") {
+  const leftUpdated = String(left?.updatedAt ?? "");
+  const rightUpdated = String(right?.updatedAt ?? "");
+  if (leftUpdated !== rightUpdated) {
+    const delta = leftUpdated < rightUpdated ? -1 : 1;
+    return direction === "desc" ? -delta : delta;
+  }
+  const leftId = String(left?.id ?? "");
+  const rightId = String(right?.id ?? "");
+  if (leftId === rightId) return 0;
+  const delta = leftId < rightId ? -1 : 1;
+  return direction === "desc" ? -delta : delta;
+}
+
+export function normalizeTimelineSortDirection(direction) {
+  return direction === "desc" ? "desc" : "asc";
+}
+
+/**
+ * 按 timeSort 排序；缺失或无效的排序值始终置底；同值按 updatedAt、id 稳定排序。
+ */
+export function sortTimelineEvents(events = [], { direction = "asc" } = {}) {
+  const sortDirection = normalizeTimelineSortDirection(direction);
+  return [...events].sort((left, right) => {
+    const bySort = compareNullableTimeSort(left, right, sortDirection);
+    if (bySort !== 0) return bySort;
+    return compareStableTieBreak(left, right, sortDirection);
+  });
+}
+
+/**
+ * 按轨道筛选。trackIds 为空表示不过滤；未分组轨道用空字符串 ""。
+ */
+export function filterTimelineEvents(events = [], { trackIds = [] } = {}) {
+  const selected = new Set(trackIds.map((id) => String(id)));
+  if (selected.size === 0) return events;
+  return events.filter((event) => selected.has(timelineEventTrackKey(event)));
+}
+
+/**
+ * 将轨道映射到固定色板索引。按 sortOrder、id 排序后取模；未分组固定为末位索引。
+ */
+export function timelineTrackColorIndex(trackId, tracks = []) {
+  const key = String(trackId ?? "");
+  if (!key) return TIMELINE_UNGROUPED_COLOR_INDEX;
+  const ordered = [...tracks]
+    .filter((track) => String(track?.id ?? ""))
+    .sort((left, right) => {
+      const orderDelta = Number(left?.sortOrder ?? 0) - Number(right?.sortOrder ?? 0);
+      if (orderDelta !== 0) return orderDelta;
+      const leftId = String(left?.id ?? "");
+      const rightId = String(right?.id ?? "");
+      if (leftId === rightId) return 0;
+      return leftId < rightId ? -1 : 1;
+    });
+  const index = ordered.findIndex((track) => String(track.id) === key);
+  if (index < 0) return TIMELINE_UNGROUPED_COLOR_INDEX;
+  return index % (TIMELINE_TRACK_PALETTE_SIZE - 1);
+}
+
+/**
+ * 先筛选再按时间排序，供列表渲染使用。
+ */
+export function prepareTimelineEvents(events = [], filters = {}, { direction = "asc" } = {}) {
+  return sortTimelineEvents(filterTimelineEvents(events, filters), { direction });
+}
+
+/**
+ * 解析当前激活的轨道 Tab。优先保留已选轨道；失效时回退到第一条真实轨道，再回退未分组。
+ * null/undefined 表示尚未选择，回退到第一条真实轨道。
+ */
+export function resolveTimelineActiveTrackId(activeTrackId, tracks = []) {
+  const orderedIds = [...tracks]
+    .filter((track) => String(track?.id ?? ""))
+    .sort((left, right) => {
+      const orderDelta = Number(left?.sortOrder ?? 0) - Number(right?.sortOrder ?? 0);
+      if (orderDelta !== 0) return orderDelta;
+      const leftId = String(left?.id ?? "");
+      const rightId = String(right?.id ?? "");
+      if (leftId === rightId) return 0;
+      return leftId < rightId ? -1 : 1;
+    })
+    .map((track) => String(track.id));
+  const fallback = orderedIds[0] ?? "";
+  if (activeTrackId === null || activeTrackId === undefined) return fallback;
+  const key = String(activeTrackId);
+  if (orderedIds.includes(key) || key === "") return key;
+  return fallback;
+}
+
+export function timelineTrackDisplayName(trackId, tracks = []) {
+  const key = String(trackId ?? "");
+  if (!key) return "未分组";
+  const track = tracks.find((item) => String(item?.id ?? "") === key);
+  return track?.name || "未知轨道";
+}

package/dist/store.js

@@ -374,6 +374,7 @@ export class Store {
         if (type === "race")
             return {
                 name: entity.name,
+                isExtinct: entity.isExtinct,
                 parentRaceId: entity.parentRaceId,
                 description: entity.description,
                 settings: entity.settings,
@@ -383,6 +384,7 @@ export class Store {
         if (type === "organization")
             return {
                 name: entity.name,
+                isDissolved: entity.isDissolved,
                 description: entity.description,
                 settings: entity.settings,
                 settingsSections: entity.settingsSections,
@@ -552,9 +554,9 @@ export class Store {
         else if (type === "setting")
             restored = this.updateSetting(entityId, snapshot, "restore", sourceRef, changeNote, expectedVersionNo);
         else if (type === "race")
-            restored = this.updateRace(entityId, snapshot, "restore", sourceRef, changeNote, expectedVersionNo);
+            restored = this.updateRace(entityId, { isExtinct: false, ...snapshot }, "restore", sourceRef, changeNote, expectedVersionNo);
         else if (type === "organization")
-            restored = this.updateOrganization(entityId, snapshot, "restore", sourceRef, changeNote, expectedVersionNo);
+            restored = this.updateOrganization(entityId, { isDissolved: false, ...snapshot }, "restore", sourceRef, changeNote, expectedVersionNo);
         else if (type === "timeline-track")
             restored = this.updateTimelineTrack(entityId, snapshot, "restore", sourceRef, changeNote, expectedVersionNo);
         else if (type === "timeline-event")
@@ -595,10 +597,10 @@ export class Store {
             return this.insertSettingWithId(workId, entityId, snapshot, "restore", sourceRef, changeNote);
         }
         if (type === "race") {
-            return this.insertRaceWithId(workId, entityId, snapshot, "restore", sourceRef, changeNote);
+            return this.insertRaceWithId(workId, entityId, { isExtinct: false, ...snapshot }, "restore", sourceRef, changeNote);
         }
         if (type === "organization") {
-            return this.insertOrganizationWithId(workId, entityId, snapshot, "restore", sourceRef, changeNote);
+            return this.insertOrganizationWithId(workId, entityId, { isDissolved: false, ...snapshot }, "restore", sourceRef, changeNote);
         }
         if (type === "timeline-track") {
             return this.insertTimelineTrackWithId(workId, entityId, snapshot, "restore", sourceRef, changeNote);
@@ -2606,8 +2608,8 @@ export class Store {
         const settings = settingsFromKnowledgeSections(settingsSections);
         const timestamp = now();
         this.db.transaction(() => {
-            this.db.run(`INSERT INTO races (id, work_id, parent_race_id, name, normalized_name, description, settings_json, settings_sections_json, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, raceId, workId, parentRaceId, name, normalizedName, input.description ?? "", JSON.stringify(settings), JSON.stringify(settingsSections), timestamp, timestamp);
+            this.db.run(`INSERT INTO races (id, work_id, parent_race_id, name, normalized_name, description, is_extinct, settings_json, settings_sections_json, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, raceId, workId, parentRaceId, name, normalizedName, input.description ?? "", input.isExtinct ? 1 : 0, JSON.stringify(settings), JSON.stringify(settingsSections), timestamp, timestamp);
             this.syncMarkdownAttachmentReferences(workId, "race", raceId, settingsMarkdownFromList(settings));
             this.replaceRaceMembers(raceId, name, memberIds);
             this.recordMembershipVersions(memberSnapshots, "race", raceId, `设为种族“${name}”`);
@@ -2672,7 +2674,7 @@ export class Store {
         const settings = settingsFromKnowledgeSections(settingsSections);
         this.db.transaction(() => {
             this.assertExpectedVersion("race", raceId, expectedVersionNo, "种族");
-            this.db.run(`UPDATE races SET parent_race_id = ?, name = ?, normalized_name = ?, description = ?, settings_json = ?, settings_sections_json = ?, updated_at = ? WHERE id = ?`, parentRaceId, name, normalizedName, input.description ?? String(current.description), JSON.stringify(settings), JSON.stringify(settingsSections), now(), raceId);
+            this.db.run(`UPDATE races SET parent_race_id = ?, name = ?, normalized_name = ?, description = ?, is_extinct = ?, settings_json = ?, settings_sections_json = ?, updated_at = ? WHERE id = ?`, parentRaceId, name, normalizedName, input.description ?? String(current.description), input.isExtinct === undefined ? (current.isExtinct ? 1 : 0) : (input.isExtinct ? 1 : 0), JSON.stringify(settings), JSON.stringify(settingsSections), now(), raceId);
             this.syncMarkdownAttachmentReferences(workId, "race", raceId, settingsMarkdownFromList(settings));
             if (nameChanged)
                 this.db.run("UPDATE characters SET species = ?, updated_at = ? WHERE race_id = ?", name, now(), raceId);
@@ -2764,6 +2766,7 @@ export class Store {
             parentRaceId: optionalString(row, "parent_race_id"),
             name: requiredString(row, "name"),
             description: requiredString(row, "description"),
+            isExtinct: booleanValue(row, "is_extinct"),
             ...(row.child_count === undefined ? {} : { childCount: numberValue(row, "child_count") }),
             ...(includeMarkdown
                 ? { settings, settingsMarkdown: settingsMarkdownFromList(settings), settingsSections }
@@ -2879,8 +2882,8 @@ export class Store {
         const settings = settingsFromKnowledgeSections(settingsSections);
         const timestamp = now();
         this.db.transaction(() => {
-            this.db.run(`INSERT INTO organizations (id, work_id, name, normalized_name, description, settings_json, settings_sections_json, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, organizationId, workId, name, normalizedName, input.description ?? "", JSON.stringify(settings), JSON.stringify(settingsSections), timestamp, timestamp);
+            this.db.run(`INSERT INTO organizations (id, work_id, name, normalized_name, description, is_dissolved, settings_json, settings_sections_json, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, organizationId, workId, name, normalizedName, input.description ?? "", input.isDissolved ? 1 : 0, JSON.stringify(settings), JSON.stringify(settingsSections), timestamp, timestamp);
             this.syncMarkdownAttachmentReferences(workId, "organization", organizationId, settingsMarkdownFromList(settings));
             this.replaceOrganizationMembers(organizationId, memberIds);
             this.recordMembershipVersions(memberSnapshots, "organization", organizationId, `加入组织“${name}”`);
@@ -2925,7 +2928,7 @@ export class Store {
         const settings = settingsFromKnowledgeSections(settingsSections);
         this.db.transaction(() => {
             this.assertExpectedVersion("organization", organizationId, expectedVersionNo, "组织");
-            this.db.run(`UPDATE organizations SET name = ?, normalized_name = ?, description = ?, settings_json = ?, settings_sections_json = ?, updated_at = ? WHERE id = ?`, name, normalizedName, input.description ?? String(current.description), JSON.stringify(settings), JSON.stringify(settingsSections), now(), organizationId);
+            this.db.run(`UPDATE organizations SET name = ?, normalized_name = ?, description = ?, is_dissolved = ?, settings_json = ?, settings_sections_json = ?, updated_at = ? WHERE id = ?`, name, normalizedName, input.description ?? String(current.description), input.isDissolved === undefined ? (current.isDissolved ? 1 : 0) : (input.isDissolved ? 1 : 0), JSON.stringify(settings), JSON.stringify(settingsSections), now(), organizationId);
             this.syncMarkdownAttachmentReferences(workId, "organization", organizationId, settingsMarkdownFromList(settings));
             if (memberIds) {
                 this.replaceOrganizationMembers(organizationId, memberIds);
@@ -3001,6 +3004,7 @@ export class Store {
             workId: requiredString(row, "work_id"),
             name: requiredString(row, "name"),
             description: requiredString(row, "description"),
+            isDissolved: booleanValue(row, "is_dissolved"),
             ...(includeMarkdown
                 ? { settings, settingsMarkdown: settingsMarkdownFromList(settings), settingsSections }
                 : { settings: [], settingsCount: settingsSections.length }),
@@ -3053,6 +3057,7 @@ export class Store {
         delete profile.sections;
         return {
             name: String(character.name),
+            isDead: Boolean(character.isDead),
             code: String(character.code),
             aliases: [...character.aliases],
             raceId: character.raceId,
@@ -3106,8 +3111,8 @@ export class Store {
         this.assertOrganizationsInWork(workId, organizationIds);
         this.db.transaction(() => {
             this.db.run(`INSERT INTO characters (id, work_id, name, code, aliases_json, species, race_id, attributes_json, profile_json, current_state_json,
-         locked_fields_json, first_chapter_id, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, characterId, workId, names.name, input.code?.trim() ?? "", JSON.stringify(names.aliases), species, raceId, JSON.stringify(input.attributes ?? {}), JSON.stringify(input.profile ?? {}), JSON.stringify(input.currentState ?? {}), JSON.stringify(input.lockedFields ?? []), input.firstChapterId ?? null, timestamp, timestamp);
+         is_dead, locked_fields_json, first_chapter_id, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, characterId, workId, names.name, input.code?.trim() ?? "", JSON.stringify(names.aliases), species, raceId, JSON.stringify(input.attributes ?? {}), JSON.stringify(input.profile ?? {}), JSON.stringify(input.currentState ?? {}), input.isDead ? 1 : 0, JSON.stringify(input.lockedFields ?? []), input.firstChapterId ?? null, timestamp, timestamp);
             this.insertCharacterNames(workId, characterId, names.entries);
             this.replaceCharacterOrganizations(characterId, organizationIds);
             this.insertCharacterVersion(characterId, 1, "create", null, "建立人物档案", timestamp);
@@ -3547,7 +3552,7 @@ export class Store {
             const lockedCurrent = this.getCharacter(characterId);
             this.assertExpectedRevision("character", characterId, expectedVersionNo, "人物", Number(lockedCurrent.versionNo));
             this.db.run(`UPDATE characters SET name = ?, code = ?, aliases_json = ?, species = ?, race_id = ?, attributes_json = ?, profile_json = ?, current_state_json = ?,
-         locked_fields_json = ?, first_chapter_id = ?, updated_at = ? WHERE id = ?`, names.name, input.code === undefined ? String(current.code) : input.code.trim(), JSON.stringify(names.aliases), species, raceId, JSON.stringify(attributes), JSON.stringify(input.profile ?? current.profile), JSON.stringify(input.currentState ?? current.currentState), JSON.stringify(input.lockedFields ?? current.lockedFields), input.firstChapterId === undefined ? current.firstChapterId : input.firstChapterId, now(), characterId);
+         is_dead = ?, locked_fields_json = ?, first_chapter_id = ?, updated_at = ? WHERE id = ?`, names.name, input.code === undefined ? String(current.code) : input.code.trim(), JSON.stringify(names.aliases), species, raceId, JSON.stringify(attributes), JSON.stringify(input.profile ?? current.profile), JSON.stringify(input.currentState ?? current.currentState), input.isDead === undefined ? (current.isDead ? 1 : 0) : (input.isDead ? 1 : 0), JSON.stringify(input.lockedFields ?? current.lockedFields), input.firstChapterId === undefined ? current.firstChapterId : input.firstChapterId, now(), characterId);
             this.db.run("DELETE FROM character_names WHERE character_id = ?", characterId);
             this.insertCharacterNames(workId, characterId, names.entries);
             if (organizationIds)
@@ -3616,7 +3621,7 @@ export class Store {
             this.assertExpectedRevision("character", characterId, expectedVersionNo, "人物", this.currentCharacterVersionNo(characterId));
             return this.recreateCharacterFromVersion(characterId, version, snapshot, versionNo);
         }
-        return this.updateCharacter(characterId, { ...snapshot, code: snapshot.code ?? "" }, "restore", requiredString(version, "id"), `恢复至 v${versionNo}`, expectedVersionNo);
+        return this.updateCharacter(characterId, { ...snapshot, isDead: snapshot.isDead ?? false, code: snapshot.code ?? "" }, "restore", requiredString(version, "id"), `恢复至 v${versionNo}`, expectedVersionNo);
     }
     recreateCharacterFromVersion(characterId, version, snapshot, versionNo) {
         const workId = requiredString(version, "work_id");
@@ -3634,8 +3639,8 @@ export class Store {
         const nextVersionNo = numberValue(this.db.get("SELECT COALESCE(MAX(version_no), 0) AS version_no FROM character_versions WHERE character_id = ?", characterId) ?? {}, "version_no") + 1;
         this.db.transaction(() => {
             this.db.run(`INSERT INTO characters (id, work_id, name, code, aliases_json, species, race_id, attributes_json, profile_json, current_state_json,
-         locked_fields_json, first_chapter_id, version_no, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, characterId, workId, names.name, snapshot.code ?? "", JSON.stringify(names.aliases), species, raceId, JSON.stringify(snapshot.attributes ?? {}), JSON.stringify(snapshot.profile ?? {}), JSON.stringify(snapshot.currentState ?? {}), JSON.stringify(snapshot.lockedFields ?? []), snapshot.firstChapterId ?? null, nextVersionNo, timestamp, timestamp);
+         is_dead, locked_fields_json, first_chapter_id, version_no, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, characterId, workId, names.name, snapshot.code ?? "", JSON.stringify(names.aliases), species, raceId, JSON.stringify(snapshot.attributes ?? {}), JSON.stringify(snapshot.profile ?? {}), JSON.stringify(snapshot.currentState ?? {}), snapshot.isDead ? 1 : 0, JSON.stringify(snapshot.lockedFields ?? []), snapshot.firstChapterId ?? null, nextVersionNo, timestamp, timestamp);
             this.insertCharacterNames(workId, characterId, names.entries);
             this.replaceCharacterOrganizations(characterId, organizationIds);
             this.insertCharacterVersion(characterId, nextVersionNo, "restore", requiredString(version, "id"), `恢复至 v${versionNo}`, timestamp, workId);
@@ -3674,12 +3679,13 @@ export class Store {
     }
     mapCharacter(row, includeProfileSections = true, includeRaceMarkdown = true) {
         const indexedAliases = this.db.all("SELECT display_name FROM character_names WHERE character_id = ? AND kind = 'alias' ORDER BY sort_order", requiredString(row, "id")).map((item) => requiredString(item, "display_name"));
-        const organizations = this.db.all(`SELECT o.id, o.name, m.role, m.note
+        const organizations = this.db.all(`SELECT o.id, o.name, o.is_dissolved, m.role, m.note
        FROM character_organization_memberships m
        JOIN organizations o ON o.id = m.organization_id
        WHERE m.character_id = ? ORDER BY o.name`, requiredString(row, "id")).map((item) => ({
             organizationId: requiredString(item, "id"),
             name: requiredString(item, "name"),
+            isDissolved: booleanValue(item, "is_dissolved"),
             role: requiredString(item, "role"),
             note: requiredString(item, "note")
         }));
@@ -3716,6 +3722,7 @@ export class Store {
             race: race ? {
                 id: String(race.id),
                 name: species,
+                isExtinct: race.isExtinct,
                 lineage: race.lineage,
                 effectiveSettings: race.effectiveSettings
             } : null,
@@ -3726,6 +3733,7 @@ export class Store {
             profile,
             profileSectionCount,
             currentState: json(requiredString(row, "current_state_json"), {}),
+            isDead: booleanValue(row, "is_dead"),
             lockedFields: json(requiredString(row, "locked_fields_json"), []),
             firstChapterId: optionalString(row, "first_chapter_id"),
             mergedIntoCharacterId: optionalString(row, "merged_into_character_id"),
@@ -6048,14 +6056,14 @@ export class Store {
        ), character_race_paths AS (
          SELECT character_id, path FROM character_race_lineage WHERE parent_race_id IS NULL
        )
-       SELECT character.id, character.name, character.aliases_json, character.species,
+       SELECT character.id, character.name, character.aliases_json, character.species, character.is_dead,
               COALESCE(path.path, character.species) AS race_path
        FROM characters character LEFT JOIN character_race_paths path ON path.character_id = character.id
        WHERE character.work_id = ? AND (
          character.name LIKE ? ESCAPE '\\' OR character.aliases_json LIKE ? ESCAPE '\\' OR character.species LIKE ? ESCAPE '\\'
          OR EXISTS (SELECT 1 FROM character_race_lineage lineage WHERE lineage.character_id = character.id AND lineage.name LIKE ? ESCAPE '\\')
        ) LIMIT 50`, workId, workId, pattern, pattern, pattern, pattern);
-        const organizations = this.db.all("SELECT id, name, description, settings_json FROM organizations WHERE work_id = ? AND (name LIKE ? ESCAPE '\\' OR description LIKE ? ESCAPE '\\' OR settings_json LIKE ? ESCAPE '\\') LIMIT 50", workId, pattern, pattern, pattern);
+        const organizations = this.db.all("SELECT id, name, description, is_dissolved, settings_json FROM organizations WHERE work_id = ? AND (name LIKE ? ESCAPE '\\' OR description LIKE ? ESCAPE '\\' OR settings_json LIKE ? ESCAPE '\\') LIMIT 50", workId, pattern, pattern, pattern);
         const characterSections = this.searchCharacterProfileSections(workId, query, 30);
         const snippet = (content) => {
             const index = content.toLocaleLowerCase().indexOf(query.toLocaleLowerCase());
@@ -6068,7 +6076,8 @@ export class Store {
                 id: requiredString(row, "id"),
                 title: requiredString(row, "name"),
                 snippet: [requiredString(row, "race_path"), ...json(requiredString(row, "aliases_json"), [])].filter(Boolean).join("、"),
-                racePath: requiredString(row, "race_path")
+                racePath: requiredString(row, "race_path"),
+                isDead: booleanValue(row, "is_dead")
             })),
             ...characterSections.map((section) => ({
                 type: "character",
@@ -6076,7 +6085,8 @@ export class Store {
                 sectionId: String(section.id),
                 title: `${String(section.characterName)} / ${String(section.title)}`,
                 snippet: snippet(String(section.contentMarkdown)),
-                sectionType: String(section.sectionType)
+                sectionType: String(section.sectionType),
+                isDead: Boolean(this.getCharacter(String(section.characterId)).isDead)
             })),
             ...settings.map((row) => ({ type: "setting", id: requiredString(row, "id"), title: requiredString(row, "title"), snippet: snippet(requiredString(row, "content")), category: requiredString(row, "category") })),
             ...races.map((race) => {
@@ -6087,11 +6097,12 @@ export class Store {
                     id: String(race.id),
                     title: String(race.name),
                     snippet: snippet(`${lineage.map((item) => item.name).join(" / ")}\n${String(race.description)}\n${effectiveSettings.map((item) => `${item.sourceRaceName}：${item.value}`).join("\n")}`),
+                    isExtinct: Boolean(race.isExtinct),
                     lineage,
                     effectiveSettings
                 };
             }),
-            ...organizations.map((row) => ({ type: "organization", id: requiredString(row, "id"), title: requiredString(row, "name"), snippet: snippet(`${requiredString(row, "description")}\n${json(requiredString(row, "settings_json"), []).join("\n")}`) })),
+            ...organizations.map((row) => ({ type: "organization", id: requiredString(row, "id"), title: requiredString(row, "name"), snippet: snippet(`${requiredString(row, "description")}\n${json(requiredString(row, "settings_json"), []).join("\n")}`), isDissolved: booleanValue(row, "is_dissolved") })),
             ...chapters.map((row) => ({ type: "chapter", id: requiredString(row, "id"), title: requiredString(row, "title"), snippet: snippet(requiredString(row, "content")), volumeId: requiredString(row, "volume_id") }))
         ];
     }