From 3f600a3d6bee59a7296c2ca744e76dcbf863212b Mon Sep 17 00:00:00 2001
From: Danyang Chen <birfychen@gmail.com>
Date: Mon, 19 Oct 2026 22:47:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Tree=20reorg=20MOVEs=20bots;=20never=20rena?=
 =?UTF-8?q?me=20to=20=E5=BD=92=E6=A1=A3-=20and=20recreate=20(#452)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #452

Owner decision 2026-10-19 22:23 Asia/Shanghai: grouping reparents existing
Bots; never renames old ones to 归档- / Archive- and creates replacements.
Archived Bots leave the default Bot list; leftover 归档-* names are repaired.

- organize.js: archive sets bot.hidden; undo clears it; repairArchiveNames
  strips 归档-/Archive- when the bare name is free, else archives+hides the
  prefixed duplicate; reorg never renames for grouping
- flybot.bot.update({ name, hidden }) for plugin rename/hide
- sidebar structure.include hides archived and 归档-* from the default list
- tests for move-only reorg, hide-on-archive, repair, and include()

Risk tier: T2 (plugins/tree + core host/client; no create_child_bot topic)
---
 .../452-tree-reorg-move-not-rename.fixed.md   |  1 +
 core/client.js                                |  5 +-
 core/src/client/flybot-slots.js               |  3 +-
 core/src/client/sidebar.js                    |  6 +-
 core/src/host/hooks.js                        | 14 ++++
 core/test/new-chat.test.js                    |  5 +-
 core/types/flybot.d.ts                        |  4 ++
 docs/subsystems/tree.md                       |  3 +-
 patches/ds-bot/0003-flybot-api-client.patch   |  8 ++-
 patches/ds-bot/0008-client-bundle.patch       |  7 +-
 .../ds-bot/files/src/client/flybot-slots.js   |  3 +-
 patches/ds-bot/files/src/host/hooks.js        | 14 ++++
 patches/ds-bot/files/test/new-chat.test.js    |  5 +-
 patches/ds-bot/files/types/flybot.d.ts        |  4 ++
 plugins/tree/client.js                        | 21 ++++--
 plugins/tree/src/adapter.js                   |  5 ++
 plugins/tree/src/organize.js                  | 66 ++++++++++++++++++-
 plugins/tree/src/tree.js                      |  6 +-
 plugins/tree/test/mock-flybot.js              | 18 ++++-
 plugins/tree/test/tree.test.js                | 61 +++++++++++++++++
 20 files changed, 232 insertions(+), 27 deletions(-)
 create mode 100644 changelog.d/452-tree-reorg-move-not-rename.fixed.md

diff --git a/changelog.d/452-tree-reorg-move-not-rename.fixed.md b/changelog.d/452-tree-reorg-move-not-rename.fixed.md
new file mode 100644
index 000000000..a33da6775
--- /dev/null
+++ b/changelog.d/452-tree-reorg-move-not-rename.fixed.md
@@ -0,0 +1 @@
+Tree reorganization moves / reparents existing Bots; it never renames them to `归档-` and recreates. Archived Bots are hidden from the default Bot list. A one-shot repair restores leftover `归档-*` / `Archive-*` names.
diff --git a/core/client.js b/core/client.js
index de58fe6d0..ef823a0f5 100644
--- a/core/client.js
+++ b/core/client.js
@@ -6765,7 +6765,8 @@ function TeamSidebar(props) {
   const [collapsed, setCollapsed] = (0, import_react10.useState)({});
   const toggle = (id) => setCollapsed((value) => ({ ...value, [id]: !value[id] }));
   const inTree = (entry) => entry.kind === "bot" && !entry.item.remote;
-  const tree = structure && wide && main ? botTree([main, ...order.filter(inTree).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null;
+  const listed = (entry) => inTree(entry) && structure?.include?.(entry.item.id) !== false;
+  const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null;
   useListGlide(listRef, wide, order.map((entry) => entry.item.id).join(","));
   useLandOnMainBot(roster, useSessions, actions);
   const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide };
@@ -6796,7 +6797,7 @@ function TeamSidebar(props) {
       "div",
       { ref: listRef, className: "bt-list", role: "region", "aria-label": t("Bot list") },
       tree ? (0, import_react10.createElement)("div", { className: "bt-tree", role: "group", "aria-label": t("Bot tree") }, tree.map((node) => (0, import_react10.createElement)(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) : main ? (0, import_react10.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react10.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")),
-      order.filter((entry) => !(tree && inTree(entry))).map((entry) => entry.kind === "bot" ? (0, import_react10.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react10.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react10.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })),
+      order.filter((entry) => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).map((entry) => entry.kind === "bot" ? (0, import_react10.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react10.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react10.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })),
       wide ? (0, import_react10.createElement)(FlyBotSections, { roster, actions, renderBot: (bot) => (0, import_react10.createElement)(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null
     )
   );
diff --git a/core/src/client/flybot-slots.js b/core/src/client/flybot-slots.js
index 1a0de2607..330bef6dd 100644
--- a/core/src/client/flybot-slots.js
+++ b/core/src/client/flybot-slots.js
@@ -4,7 +4,8 @@
 // ds-bot's own components render whatever is registered:
 //
 //   flybot.sidebar.section  { id, order, component({ roster, actions, call }) }   below the Bot list
-//   flybot.sidebar.structure { id, order, parentOf(botId), menuItems?, nodeActions? }   the Bot list becomes one tree under the Main Bot;
+//   flybot.sidebar.structure { id, order, parentOf(botId), include?(botId), menuItems?, nodeActions? }   the Bot list becomes one tree under the Main Bot;
+//     include(botId) === false hides that Bot from the default list (e.g. tree-archived);
 //                            menuItems({ bot }) → [{ id, label, visible, run({ bot }) }] adds items to a Bot's right-click
 //                            menu (visible false hides one; a string from run shows as a toast; a throw as the error toast);
 //                            nodeActions({ bot }) is drawn after each tree row
diff --git a/core/src/client/sidebar.js b/core/src/client/sidebar.js
index a0bfc284c..0f7182b2c 100644
--- a/core/src/client/sidebar.js
+++ b/core/src/client/sidebar.js
@@ -358,8 +358,10 @@ export function TeamSidebar(props) {
   const [collapsed, setCollapsed] = useState({})
   const toggle = id => setCollapsed(value => ({ ...value, [id]: !value[id] }))
   // Only own Bots belong to the tree; a friend's Bot stays in the ordered list below it.
+  // structure.include(id) === false hides a Bot from the default list (e.g. tree-archived, #452).
   const inTree = entry => entry.kind === 'bot' && !entry.item.remote
-  const tree = structure && wide && main ? botTree([main, ...order.filter(inTree).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null
+  const listed = entry => inTree(entry) && structure?.include?.(entry.item.id) !== false
+  const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null
   useListGlide(listRef, wide, order.map(entry => entry.item.id).join(','))
   useLandOnMainBot(roster, useSessions, actions)
   const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide }
@@ -383,7 +385,7 @@ export function TeamSidebar(props) {
     h('div', { ref: listRef, className: 'bt-list', role: 'region', 'aria-label': t('Bot list') },
       tree ? h('div', { className: 'bt-tree', role: 'group', 'aria-label': t('Bot tree') }, tree.map(node => h(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions })))
         : main ? h(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : h('div', { className: 'bt-hint' }, t('Setting up your Main Bot…')),
-      order.filter(entry => !(tree && inTree(entry))).map(entry => (entry.kind === 'bot'
+      order.filter(entry => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).map(entry => (entry.kind === 'bot'
         ? h(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true })
         : entry.kind === 'room'
           ? h(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true })
diff --git a/core/src/host/hooks.js b/core/src/host/hooks.js
index a9d4d83d1..db76f2731 100644
--- a/core/src/host/hooks.js
+++ b/core/src/host/hooks.js
@@ -139,6 +139,7 @@ export function install(rt) {
     systemPrompt: bot.systemPrompt ?? '', fields: clone(bot.fields ?? {}),
     ...(typeof bot.color === 'string' ? { color: bot.color } : {}),
     ...(bot.avatar && typeof bot.avatar === 'object' ? { avatar: clone(bot.avatar) } : {}),
+    ...(bot.hidden === true ? { hidden: true } : {}),
   })
   const persist = () => rt.save().catch(error => warn('flybot: save failed: %s', error))
 
@@ -605,6 +606,18 @@ export function install(rt) {
     })
   }
 
+  /** Rename and/or hide a Bot in the sidebar. Used by plugins (e.g. tree archive, #452). */
+  async function updateBotFields(id, patch = {}) {
+    const bot = rt.botOf(id)
+    if (bot === undefined) throw new Error(`flybot: unknown Bot ${id}`)
+    const name = patch.name !== undefined ? String(patch.name).trim() : undefined
+    const wantName = name !== undefined && name !== bot.name
+    const wantHidden = typeof patch.hidden === 'boolean' && Boolean(patch.hidden) !== Boolean(bot.hidden)
+    if (wantName) await rt.updateBot(id, { name })
+    if (wantHidden) await rt.setFlags(id, { hidden: Boolean(patch.hidden) })
+    return view(rt.botOf(id))
+  }
+
   async function send({ from, to, text, role = 'request', hop = 0, via = SHARED, meta, attachments } = {}) {
     await rt.load()
     if (typeof text !== 'string' || text.trim() === '') throw new Error('flybot: send needs text')
@@ -938,6 +951,7 @@ export function install(rt) {
       hasAnyGrant: id => rt.hasAnyGrant?.(id) === true,
       of: sessionId => view(rt.botOf(rt.selfOf(sessionId))),
       create: spec => create({ plugin, ...spec }),
+      update: (id, patch) => updateBotFields(id, patch),
       setSystemPrompt,
       // Same object as flybot.fields.
       fields,
diff --git a/core/test/new-chat.test.js b/core/test/new-chat.test.js
index 4332cabeb..a5d2cc120 100644
--- a/core/test/new-chat.test.js
+++ b/core/test/new-chat.test.js
@@ -61,8 +61,9 @@ test('the sidebar + menu wires plugin actions in after New group chat', () => {
   assert.match(sidebar, /Number\(foreign\(a\)\) - Number\(foreign\(b\)\)/)
   // With @flybot/tree on, a friend's Bot is not a tree node under Main; it stays in the flat list.
   assert.match(sidebar, /const inTree = entry => entry\.kind === 'bot' && !entry\.item\.remote/)
-  assert.match(sidebar, /botTree\(\[main, \.\.\.order\.filter\(inTree\)/)
-  assert.match(sidebar, /order\.filter\(entry => !\(tree && inTree\(entry\)\)\)/)
+  assert.match(sidebar, /structure\?\.include\?\.\(entry\.item\.id\) !== false/)
+  assert.match(sidebar, /botTree\(\[main, \.\.\.order\.filter\(listed\)/)
+  assert.match(sidebar, /order\.filter\(entry => !\(tree && inTree\(entry\)\) && !\(inTree\(entry\) && structure\?\.include/)
   assert.equal(DICTIONARY.zh['Copy my handle'], '复制我的 handle')
   assert.equal(DICTIONARY.zh['Face-to-face'], '面对面')
   assert.equal(DICTIONARY.zh['Face-to-face room'], '面对面房间')
diff --git a/core/types/flybot.d.ts b/core/types/flybot.d.ts
index 1ce76346c..aec7f3e16 100644
--- a/core/types/flybot.d.ts
+++ b/core/types/flybot.d.ts
@@ -42,6 +42,8 @@ export interface BotView {
   color?: string
   /** Owner-chosen avatar ({ shape }, { image }, or { emoji }). Omitted when unset. */
   avatar?: { shape?: string; image?: string; emoji?: string }
+  /** True when hidden from the default Bot list (Search still finds it). */
+  hidden?: boolean
 }
 
 /** 'change' payload. Delivered for the listener's own plugin unless it subscribed with { all: true }. */
@@ -334,6 +336,8 @@ export interface FlyBot {
     of(sessionId: string): BotView | undefined
     /** Returns the new Bot's id. */
     create(spec: CreateBotSpec): Promise<BotId>
+    /** Rename and/or set sidebar flags. Plugins use this to hide archived Bots (#452). */
+    update(id: BotId, patch: { name?: string; hidden?: boolean }): Promise<BotView>
     setSystemPrompt(id: BotId, text: string): void
     /** Same object as FlyBot.fields. */
     fields: BotFields
diff --git a/docs/subsystems/tree.md b/docs/subsystems/tree.md
index 92cbb7c76..4b2eac541 100644
--- a/docs/subsystems/tree.md
+++ b/docs/subsystems/tree.md
@@ -52,7 +52,8 @@ The tree organizes itself by role instead of leaving Bots outside it or a parent
 - **Leads.** A suitable existing lead is a member already marked as that group's lead, already coordinating that group (it has children and the key, project and domain only), or named for it ("Life", "FlyBot Lead") or as a lead ("Kitchen Manager", 负责人). It gets `lead { key, label }`. Only when none fits a new lead is created with a clear role (`<Label> Lead`, role "Lead of the <Label> group: coordinates …"); its members move under it before it joins the level. A lead's own group key, and broad areas below any lead, are ignored inside it, so there is no second "Dev Lead" under "Dev Lead".
 - **Repair**: a parent over `maxChildren` (after a deletion re-attached a deleted Bot's children) is regrouped the same way, at once when the lead exists, else in the queue.
 - **Daily tidy** (checked hourly, runs once a day; the first check after install only records the time; `dailyTidy: false` turns it off): (1) leaf Bots with no activity for `tidy.idleDays` (14) get `idle` (any turn or tool call clears it) and are **archived** after `tidy.archiveIdleDays` (30) more days; Bots with children, granted Bots and the root are never idle; (2) duplicates: two Bots with essentially the same role (same name once generic words are dropped and no conflicting description, or near-identical descriptions in one domain), both at least `tidy.mergeGraceDays` (1) in the tree, are **merged**: the newer one's children move to the kept Bot, which lists it in `mergedFrom` and is told in its prompt; the old one is archived; (3) project and domain groups of three or more (or two with an existing lead) on every level, never a group of a whole level without a lead.
-- **Archive, never delete**: an archived Bot leaves the tree (`archived { at, reason, parent, treeRole, into? }`, tree fields and block removed) but keeps its chat, memory and grants; the sidebar tags it "archived". Deleting it stays the owner's own click. Moving conversation / memory references into the kept Bot on a merge needs a core API and is a follow-up.
+- **Archive, never delete**: an archived Bot leaves the tree (`archived { at, reason, parent, treeRole, into? }`, tree fields and block removed) but keeps its chat, memory and grants. It is **hidden from the default Bot list** (`bot.hidden` / structure `include`; Search still finds it) (#452). Deleting it stays the owner's own click. Moving conversation / memory references into the kept Bot on a merge needs a core API and is a follow-up (#450).
+- **Move, never rename-to-归档 + recreate** (#452): grouping always reparents (`parent`); it never renames a Bot to `归档-…` / `Archive-…` and never creates a replacement with the old name. A one-shot repair strips those prefixes when the bare name is free, or archives+hides the prefixed Bot when a live Bot already has that name.
 - **Journal and undo**: every move, new lead, lead mark, merge, archive and idle mark of a run is an action in the root's `reorg { runs (last 5), dismissed, dailyAt }` and a `flybot-tree: reorganized (<trigger>): …` log line. The tree view's notice (sidebar section `flybot-tree-reorg`, `reorgNotice: false` hides it) shows the last run with **Undo** and **Dismiss** (`tree/reorg`, `tree/undo`, `tree/dismiss`). Undo reverses the newest run: moves go back where the old parent has room and the Bot was not moved again, archived Bots come back, a lead the run created is archived once empty; what it cannot restore is listed as kept. Restored Bots are pinned for `tidy.pinDays` (14) so the daily tidy leaves them alone.
 - **The owner is told afterwards**, no plan card first: the notice in the tree view, and the Main Bot's prompt names the last run (within 7 days, not undone) so Chief can say what moved.
 - **No silent pull-up**: freeing a slot moves nobody up; the next new Bot takes it. Activity is metadata only (when, which tool names), never message text.
diff --git a/patches/ds-bot/0003-flybot-api-client.patch b/patches/ds-bot/0003-flybot-api-client.patch
index d3e9a87f4..6d719d2d5 100644
--- a/patches/ds-bot/0003-flybot-api-client.patch
+++ b/patches/ds-bot/0003-flybot-api-client.patch
@@ -1799,7 +1799,7 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js
  export function TeamSidebar(props) {
    const { wide, useRoster, useUi, useSessions, actions } = props
    const listRef = useRef(null)
-@@ -249,14 +249,24 @@ export function TeamSidebar(props) {
+@@ -249,14 +249,26 @@ export function TeamSidebar(props) {
    const order = useMemo(() => {
      const stamps = JSON.parse(updated)
      const entries = [
@@ -1822,8 +1822,10 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js
 +  const [collapsed, setCollapsed] = useState({})
 +  const toggle = id => setCollapsed(value => ({ ...value, [id]: !value[id] }))
 +  // Only own Bots belong to the tree; a friend's Bot stays in the ordered list below it.
++  // structure.include(id) === false hides a Bot from the default list (e.g. tree-archived, #452).
 +  const inTree = entry => entry.kind === 'bot' && !entry.item.remote
-+  const tree = structure && wide && main ? botTree([main, ...order.filter(inTree).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null
++  const listed = entry => inTree(entry) && structure?.include?.(entry.item.id) !== false
++  const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null
    useListGlide(listRef, wide, order.map(entry => entry.item.id).join(','))
    useLandOnMainBot(roster, useSessions, actions)
    const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide }
@@ -1835,7 +1837,7 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js
 -      order.map(entry => (entry.kind === 'bot'
 +      tree ? h('div', { className: 'bt-tree', role: 'group', 'aria-label': t('Bot tree') }, tree.map(node => h(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions })))
 +        : main ? h(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : h('div', { className: 'bt-hint' }, t('Setting up your Main Bot…')),
-+      order.filter(entry => !(tree && inTree(entry))).map(entry => (entry.kind === 'bot'
++      order.filter(entry => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).map(entry => (entry.kind === 'bot'
          ? h(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true })
          : entry.kind === 'room'
            ? h(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true })
diff --git a/patches/ds-bot/0008-client-bundle.patch b/patches/ds-bot/0008-client-bundle.patch
index 3814d3f10..91577e548 100644
--- a/patches/ds-bot/0008-client-bundle.patch
+++ b/patches/ds-bot/0008-client-bundle.patch
@@ -4981,7 +4981,7 @@ diff --git a/client.js b/client.js
    const roster = useRoster((value) => value);
    const markedUnread = useUi((value) => value.unread);
    props.useRegistry((value) => value);
-@@ -5025,17 +5025,25 @@ function TeamSidebar(props) {
+@@ -5025,17 +5025,26 @@ function TeamSidebar(props) {
      for (const id of list.ids) stamps[id] = list.byId[id]?.updatedAt ?? 0;
      return JSON.stringify(stamps);
    });
@@ -5007,7 +5007,8 @@ diff --git a/client.js b/client.js
 +  const [collapsed, setCollapsed] = (0, import_react10.useState)({});
 +  const toggle = (id) => setCollapsed((value) => ({ ...value, [id]: !value[id] }));
 +  const inTree = (entry) => entry.kind === "bot" && !entry.item.remote;
-+  const tree = structure && wide && main ? botTree([main, ...order.filter(inTree).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null;
++  const listed = (entry) => inTree(entry) && structure?.include?.(entry.item.id) !== false;
++  const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null;
    useListGlide(listRef, wide, order.map((entry) => entry.item.id).join(","));
    useLandOnMainBot(roster, useSessions, actions);
    const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide };
@@ -5050,7 +5051,7 @@ diff --git a/client.js b/client.js
 -      main ? (0, import_react8.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react8.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")),
 -      order.map((entry) => entry.kind === "bot" ? (0, import_react8.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react8.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react8.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))
 +      tree ? (0, import_react10.createElement)("div", { className: "bt-tree", role: "group", "aria-label": t("Bot tree") }, tree.map((node) => (0, import_react10.createElement)(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) : main ? (0, import_react10.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react10.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")),
-+      order.filter((entry) => !(tree && inTree(entry))).map((entry) => entry.kind === "bot" ? (0, import_react10.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react10.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react10.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })),
++      order.filter((entry) => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).map((entry) => entry.kind === "bot" ? (0, import_react10.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react10.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react10.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })),
 +      wide ? (0, import_react10.createElement)(FlyBotSections, { roster, actions, renderBot: (bot) => (0, import_react10.createElement)(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null
      )
    );
diff --git a/patches/ds-bot/files/src/client/flybot-slots.js b/patches/ds-bot/files/src/client/flybot-slots.js
index 1a0de2607..330bef6dd 100644
--- a/patches/ds-bot/files/src/client/flybot-slots.js
+++ b/patches/ds-bot/files/src/client/flybot-slots.js
@@ -4,7 +4,8 @@
 // ds-bot's own components render whatever is registered:
 //
 //   flybot.sidebar.section  { id, order, component({ roster, actions, call }) }   below the Bot list
-//   flybot.sidebar.structure { id, order, parentOf(botId), menuItems?, nodeActions? }   the Bot list becomes one tree under the Main Bot;
+//   flybot.sidebar.structure { id, order, parentOf(botId), include?(botId), menuItems?, nodeActions? }   the Bot list becomes one tree under the Main Bot;
+//     include(botId) === false hides that Bot from the default list (e.g. tree-archived);
 //                            menuItems({ bot }) → [{ id, label, visible, run({ bot }) }] adds items to a Bot's right-click
 //                            menu (visible false hides one; a string from run shows as a toast; a throw as the error toast);
 //                            nodeActions({ bot }) is drawn after each tree row
diff --git a/patches/ds-bot/files/src/host/hooks.js b/patches/ds-bot/files/src/host/hooks.js
index a9d4d83d1..db76f2731 100644
--- a/patches/ds-bot/files/src/host/hooks.js
+++ b/patches/ds-bot/files/src/host/hooks.js
@@ -139,6 +139,7 @@ export function install(rt) {
     systemPrompt: bot.systemPrompt ?? '', fields: clone(bot.fields ?? {}),
     ...(typeof bot.color === 'string' ? { color: bot.color } : {}),
     ...(bot.avatar && typeof bot.avatar === 'object' ? { avatar: clone(bot.avatar) } : {}),
+    ...(bot.hidden === true ? { hidden: true } : {}),
   })
   const persist = () => rt.save().catch(error => warn('flybot: save failed: %s', error))
 
@@ -605,6 +606,18 @@ export function install(rt) {
     })
   }
 
+  /** Rename and/or hide a Bot in the sidebar. Used by plugins (e.g. tree archive, #452). */
+  async function updateBotFields(id, patch = {}) {
+    const bot = rt.botOf(id)
+    if (bot === undefined) throw new Error(`flybot: unknown Bot ${id}`)
+    const name = patch.name !== undefined ? String(patch.name).trim() : undefined
+    const wantName = name !== undefined && name !== bot.name
+    const wantHidden = typeof patch.hidden === 'boolean' && Boolean(patch.hidden) !== Boolean(bot.hidden)
+    if (wantName) await rt.updateBot(id, { name })
+    if (wantHidden) await rt.setFlags(id, { hidden: Boolean(patch.hidden) })
+    return view(rt.botOf(id))
+  }
+
   async function send({ from, to, text, role = 'request', hop = 0, via = SHARED, meta, attachments } = {}) {
     await rt.load()
     if (typeof text !== 'string' || text.trim() === '') throw new Error('flybot: send needs text')
@@ -938,6 +951,7 @@ export function install(rt) {
       hasAnyGrant: id => rt.hasAnyGrant?.(id) === true,
       of: sessionId => view(rt.botOf(rt.selfOf(sessionId))),
       create: spec => create({ plugin, ...spec }),
+      update: (id, patch) => updateBotFields(id, patch),
       setSystemPrompt,
       // Same object as flybot.fields.
       fields,
diff --git a/patches/ds-bot/files/test/new-chat.test.js b/patches/ds-bot/files/test/new-chat.test.js
index 4332cabeb..a5d2cc120 100644
--- a/patches/ds-bot/files/test/new-chat.test.js
+++ b/patches/ds-bot/files/test/new-chat.test.js
@@ -61,8 +61,9 @@ test('the sidebar + menu wires plugin actions in after New group chat', () => {
   assert.match(sidebar, /Number\(foreign\(a\)\) - Number\(foreign\(b\)\)/)
   // With @flybot/tree on, a friend's Bot is not a tree node under Main; it stays in the flat list.
   assert.match(sidebar, /const inTree = entry => entry\.kind === 'bot' && !entry\.item\.remote/)
-  assert.match(sidebar, /botTree\(\[main, \.\.\.order\.filter\(inTree\)/)
-  assert.match(sidebar, /order\.filter\(entry => !\(tree && inTree\(entry\)\)\)/)
+  assert.match(sidebar, /structure\?\.include\?\.\(entry\.item\.id\) !== false/)
+  assert.match(sidebar, /botTree\(\[main, \.\.\.order\.filter\(listed\)/)
+  assert.match(sidebar, /order\.filter\(entry => !\(tree && inTree\(entry\)\) && !\(inTree\(entry\) && structure\?\.include/)
   assert.equal(DICTIONARY.zh['Copy my handle'], '复制我的 handle')
   assert.equal(DICTIONARY.zh['Face-to-face'], '面对面')
   assert.equal(DICTIONARY.zh['Face-to-face room'], '面对面房间')
diff --git a/patches/ds-bot/files/types/flybot.d.ts b/patches/ds-bot/files/types/flybot.d.ts
index 1ce76346c..aec7f3e16 100644
--- a/patches/ds-bot/files/types/flybot.d.ts
+++ b/patches/ds-bot/files/types/flybot.d.ts
@@ -42,6 +42,8 @@ export interface BotView {
   color?: string
   /** Owner-chosen avatar ({ shape }, { image }, or { emoji }). Omitted when unset. */
   avatar?: { shape?: string; image?: string; emoji?: string }
+  /** True when hidden from the default Bot list (Search still finds it). */
+  hidden?: boolean
 }
 
 /** 'change' payload. Delivered for the listener's own plugin unless it subscribed with { all: true }. */
@@ -334,6 +336,8 @@ export interface FlyBot {
     of(sessionId: string): BotView | undefined
     /** Returns the new Bot's id. */
     create(spec: CreateBotSpec): Promise<BotId>
+    /** Rename and/or set sidebar flags. Plugins use this to hide archived Bots (#452). */
+    update(id: BotId, patch: { name?: string; hidden?: boolean }): Promise<BotView>
     setSystemPrompt(id: BotId, text: string): void
     /** Same object as FlyBot.fields. */
     fields: BotFields
diff --git a/plugins/tree/client.js b/plugins/tree/client.js
index 8c0dcf785..2a794b3f9 100644
--- a/plugins/tree/client.js
+++ b/plugins/tree/client.js
@@ -275,6 +275,8 @@ window.__ModuleLoader__.load({
     }
 
     const REFRESH_MS = 10000
+    // Same as organize.js ARCHIVE_NAME_RE (#452): mis-renamed archived Bots stay out of the list.
+    const ARCHIVE_NAME_RE = /^(?:归档|Archive)[-—–＿_\s]+/u
     // 'flybot.sidebar.section' is a FlyBot registry slot (ds-bot renders it), not a DSH
     // shell slot, so the section goes in through the browser flybot service.
     // ---- forest-of:start (identical copy of src/forest.js forestOf; a test keeps them in sync)
@@ -307,17 +309,19 @@ window.__ModuleLoader__.load({
 
     // ds-bot draws its own Bot list as one tree from the registry slot 'flybot.sidebar.structure'
     // ({ parentOf(botId) }): parents come from forestOf over the browser bots (fields included), so
-    // retired and non-tree Bots have no parent and ds-bot shows them directly under Chief. The entry is
+    // retired and non-tree Bots have no parent and ds-bot shows them under Chief; archived / 归档-*
+    // Bots are omitted via include() (#452). The entry is
     // re-registered whenever the structure changes (field changes and a 10 s poll), which re-renders.
     function registerStructure(flybot) {
       let parents = new Map()
       let statuses = new Map()
-      let key = '[[],[]]'
+      let key = '[[],[],[]]'  // parents, tags, hidden (#452)
       let stopped = false
       // menuItems: entries ds-bot adds to a Bot's right-click menu ({ bot } → [{ id, label, visible, run }]).
       const menuItems = makeMenuItems(flybot)
       const nodeActions = makeStatusTag(() => statuses)
-      const entry = () => ({ id: 'flybot-tree', order: 90, parentOf: id => parents.get(id), menuItems, nodeActions })
+      let hidden = new Set()
+      const entry = () => ({ id: 'flybot-tree', order: 90, parentOf: id => parents.get(id), include: id => !hidden.has(id), menuItems, nodeActions })
       let off = flybot.slots.register('flybot.sidebar.structure', entry())
       const refresh = async () => {
         let bots
@@ -327,12 +331,19 @@ window.__ModuleLoader__.load({
         const walk = (node, parent) => { if (parent) next.set(node.id, parent); for (const c of node.children) walk(c, node.id) }
         for (const top of forestOf(bots)) walk(top, null)
         const tags = new Map()
-        for (const b of bots ?? []) { const s = statusOf(b); if (s) tags.set(b.id, s) }
-        const nextKey = JSON.stringify([[...next], [...tags]])
+        const hide = new Set()
+        for (const b of bots ?? []) {
+          const st = statusOf(b); if (st) tags.set(b.id, st)
+          const own = b?.fields?.['flybot-tree'] ?? {}
+          // Archived (field) or leftover 归档-* / Archive-* names: not in the default Bot list (#452).
+          if (own.archived || ARCHIVE_NAME_RE.test(String(b?.name ?? ''))) hide.add(b.id)
+        }
+        const nextKey = JSON.stringify([[...next], [...tags], [...hide]])
         if (nextKey === key) return
         key = nextKey
         parents = next
         statuses = tags
+        hidden = hide
         off()
         off = flybot.slots.register('flybot.sidebar.structure', entry())
       }
diff --git a/plugins/tree/src/adapter.js b/plugins/tree/src/adapter.js
index aa591445d..66164b143 100644
--- a/plugins/tree/src/adapter.js
+++ b/plugins/tree/src/adapter.js
@@ -35,6 +35,11 @@ export function createAdapter(flybot) {
   return {
     listBots: () => bot.list() ?? [],
     createBot: async spec => await bot.create(spec),
+    // #452: rename / hide (optional on older cores without bot.update).
+    updateBot: async (id, patch) => {
+      if (typeof bot.update !== 'function') throw new Error('flybot: bot.update is unavailable')
+      return bot.update(id, patch)
+    },
     getBot: id => bot.get?.(id) ?? (bot.list() ?? []).find(b => b.id === id),
     getSystemPrompt: id => (bot.get?.(id) ?? (bot.list() ?? []).find(b => b.id === id))?.systemPrompt ?? '',
     setSystemPrompt: (id, text) => bot.setSystemPrompt(id, text),
diff --git a/plugins/tree/src/organize.js b/plugins/tree/src/organize.js
index 694151dc4..9bc5ee335 100644
--- a/plugins/tree/src/organize.js
+++ b/plugins/tree/src/organize.js
@@ -11,12 +11,17 @@
 //   archived, never deleted), long-idle leaf Bots marked idle and archived after 30 days.
 // - Every change is a journal action on the root ('reorg' field): the tree view shows the last run
 //   and undoes it in one click. Nothing is ever deleted; an archived Bot keeps its chat and memory.
+// - Grouping always MOVES (reparents) existing Bots. It never renames a Bot to 归档- / Archive- and
+//   never recreates a same-role Bot to achieve a group (#452). Archive hides from the default sidebar.
 import { profileOf, keysOf, kindOf, KIND_RANK, labelOf, leadNameOf, canLead, sameRole, norm, DOMAINS } from './roles.js'
 import { systemPrompt, withTreeBlock, BLOCK_START } from './prompt.js'
 
 const DAY = 24 * 60 * 60 * 1000
 const DOMAIN_AREA = new Map(DOMAINS.map(d => [d.id, d.area]))
 export const DEFAULT_TIDY = Object.freeze({ idleDays: 14, archiveIdleDays: 30, mergeGraceDays: 1, pinDays: 14, keepRuns: 5 })
+/** Mis-archive rename prefix (Chief update_bot / manual): 归档-Name or Archive-Name. Reorg never writes this. */
+export const ARCHIVE_NAME_RE = /^(?:归档|Archive)[-—–＿_\s]+/u
+export const stripArchivePrefix = name => { const n = String(name ?? ''); return ARCHIVE_NAME_RE.test(n) ? n.replace(ARCHIVE_NAME_RE, '').trim() : n.trim() }
 const ACTIVITY_WRITE_MS = 60 * 60 * 1000
 const MAX_TOOLS = 8
 
@@ -27,6 +32,18 @@ export function createOrganizer({ fb, limits, snapshot, childrenOf, depthOf, war
   const cfg = { ...DEFAULT_TIDY, ...Object.fromEntries(Object.entries(tidyConfig).filter(([, v]) => Number.isFinite(v) && v >= 0)) }
   const get = (id, key) => fb.getField(id, key)
   const set = (id, key, value) => fb.setField(id, key, value)
+  // Hide / unhide in the core sidebar (bot.hidden). Optional on older hosts without bot.update.
+  const hideBot = (id, hidden) => {
+    if (typeof fb.updateBot !== 'function') return
+    try {
+      const out = fb.updateBot(id, { hidden: Boolean(hidden) })
+      if (out && typeof out.then === 'function') out.catch(error => warn('flybot-tree: could not set hidden:', error?.message ?? error))
+    } catch (error) { warn('flybot-tree: could not set hidden:', error?.message ?? error) }
+  }
+  const renameBot = (id, name) => {
+    if (typeof fb.updateBot !== 'function') return Promise.reject(new Error('bot.update is unavailable'))
+    return Promise.resolve(fb.updateBot(id, { name }))
+  }
 
   // ------------------------------------------------------------ profiles
   const infoOf = (nodes, id, extra = {}) => {
@@ -97,6 +114,7 @@ export function createOrganizer({ fb, limits, snapshot, childrenOf, depthOf, war
       case 'archive': return a.reason === 'merged' ? `archived ${a.name} (merged into ${a.intoName})` : `archived ${a.name} (${a.reason})`
       case 'idle': return `marked ${a.name} idle`
       case 'mark-lead': return `made ${a.name} the lead of the ${a.label} group`
+      case 'repair-name': return a.toName ? `restored name ${a.toName} (was ${a.name})` : `hid mis-archived ${a.name}`
       default: return a.op
     }
   }
@@ -125,6 +143,7 @@ export function createOrganizer({ fb, limits, snapshot, childrenOf, depthOf, war
     set(id, 'archived', record)
     set(id, 'parent', null); set(id, 'treeRole', null); set(id, 'idle', null)
     writeBlock(id, '')
+    hideBot(id, true) // out of the default Bot list (#452); search still finds it when un-hidden
     run.actions.push({ op: 'archive', bot: id, name: n.name, reason, parent: n.parent, treeRole: n.role, ...(extra.into ? { into: extra.into, intoName: extra.intoName } : {}) })
     return true
   }
@@ -452,6 +471,50 @@ export function createOrganizer({ fb, limits, snapshot, childrenOf, depthOf, war
     set(botId, 'activity', { at: t, tools })
   }
 
+
+  // ------------------------------------------------------------ repair mis-named 归档-* / Archive-* (#452)
+  /**
+   * One-shot / idempotent: Bots renamed to 归档-X or Archive-X (never written by this plugin) are
+   * restored. If X is free, rename back to X and unhide. If X already exists, keep X, set archived
+   * on the prefixed Bot when it is a leaf, and hide it from the default sidebar. Grouping never
+   * uses this path; it only MOVEs.
+   */
+  async function repairArchiveNames() {
+    const run = begin('repair-names')
+    const bots = fb.listBots().filter(b => b && b.isMain !== true && !fb.isRemote?.(b.id))
+    for (const b of bots) {
+      if (!ARCHIVE_NAME_RE.test(b.name)) continue
+      const bare = stripArchivePrefix(b.name)
+      if (!bare) continue
+      const clash = bots.find(o => o.id !== b.id && norm(o.name) === norm(bare))
+      if (!clash) {
+        try {
+          await renameBot(b.id, bare)
+          hideBot(b.id, false)
+          run.actions.push({ op: 'repair-name', bot: b.id, name: b.name, toName: bare })
+        } catch (error) { warn(`flybot-tree: could not restore name of ${b.name}:`, error?.message ?? error) }
+        continue
+      }
+      // Duplicate of a live Bot with the bare name: archive (if leaf) and hide the prefixed one.
+      if (get(b.id, 'archived') === undefined) {
+        const nodes = snapshot()
+        if (nodes[b.id] && !childrenOf(nodes, b.id).length && !nodes[b.id].root) archive(run, b.id, 'prefix-duplicate')
+        else {
+          set(b.id, 'archived', { at: now(), reason: 'prefix-duplicate', parent: nodes[b.id]?.parent ?? null, treeRole: nodes[b.id]?.role ?? '', run: run.id })
+          if (nodes[b.id]) { set(b.id, 'parent', null); set(b.id, 'treeRole', null); writeBlock(b.id, '') }
+          hideBot(b.id, true)
+          run.actions.push({ op: 'repair-name', bot: b.id, name: b.name, into: clash.id, intoName: clash.name })
+        }
+      } else hideBot(b.id, true)
+    }
+    // Hide every Bot that already has archived set (older installs before hide-on-archive).
+    for (const b of fb.listBots()) {
+      if (b.isMain === true || fb.isRemote?.(b.id)) continue
+      if (get(b.id, 'archived') !== undefined) hideBot(b.id, true)
+    }
+    return commit(run)
+  }
+
   // ------------------------------------------------------------ undo
   /** Undoes the last reorganization (only the newest run that is not undone yet). */
   function undo(runId) {
@@ -476,6 +539,7 @@ export function createOrganizer({ fb, limits, snapshot, childrenOf, depthOf, war
         const home = nodes[rec.parent] && fits(nodes, rec.parent, { id: a.bot, name, height: 1 }) ? rec.parent : undefined
         if (!home) { kept.push(`${name}: stays archived (${nodes[rec.parent]?.name ?? 'its old parent'} is full or gone)`); continue }
         set(a.bot, 'archived', null); set(a.bot, 'treeRole', rec.treeRole ?? ''); set(a.bot, 'parent', home); pin(a.bot)
+        hideBot(a.bot, false)
         if (rec.into) set(rec.into, 'mergedFrom', (get(rec.into, 'mergedFrom') ?? []).filter(m => m.id !== a.bot))
         restored.push(`${name} back in the tree under ${nodes[home].name}`)
       } else if (a.op === 'idle') {
@@ -509,5 +573,5 @@ export function createOrganizer({ fb, limits, snapshot, childrenOf, depthOf, war
   const idle = () => pending === 0 ? Promise.resolve() : queue.then(() => idle())
 
   const busy = () => pending > 0
-  return { busy, place, repair, tidy, maybeTidy, undo, dismiss, overview, noteActivity, idle, planLevel, describeAction }
+  return { busy, place, repair, tidy, maybeTidy, undo, dismiss, overview, noteActivity, idle, planLevel, describeAction, repairArchiveNames }
 }
diff --git a/plugins/tree/src/tree.js b/plugins/tree/src/tree.js
index d642631ed..0d34fb21c 100644
--- a/plugins/tree/src/tree.js
+++ b/plugins/tree/src/tree.js
@@ -102,6 +102,8 @@ export function createTree(fb, { limits, rootName = 'Root', rootBotId, adoptExis
     if (fb.getField(chief.id, 'treeRole') !== ROOT_ROLE) fb.setField(chief.id, 'treeRole', ROOT_ROLE)
     migrateLegacyRoots(chief.id)
     if (adoptExisting) adoptUnattached(chief.id)
+    // #452: restore 归档-* / Archive-* mis-renames; hide archived from the default sidebar.
+    try { const r = organizer.repairArchiveNames(); if (r && typeof r.then === 'function') r.catch(error => warn('flybot-tree: archive-name repair failed:', error?.message ?? error)) } catch (error) { warn('flybot-tree: archive-name repair failed:', error?.message ?? error) }
     organizer.repair()
     refreshAll()
     return chief.id
@@ -233,6 +235,6 @@ export function createTree(fb, { limits, rootName = 'Root', rootBotId, adoptExis
   }
   const subscribe = fn => { listeners.add(fn); return () => listeners.delete(fn) }
 
-  const { tidy: tidyNow, maybeTidy, undo, dismiss, overview, noteActivity, idle: settled } = organizer
-  return { tidy: tidyNow, maybeTidy, undo, dismiss, overview, noteActivity, settled, limits, forest, adoptUnattached, snapshot, childrenOf, depthOf, traceOf, ensureRoot, adoptChief, findChief, migrateLegacyRoots, promptFor, createChild, isMember, isRoot, rootOf, isTreeEdge, onFieldChange, onBotRemoved, subscribe }
+  const { tidy: tidyNow, maybeTidy, undo, dismiss, overview, noteActivity, idle: settled, repairArchiveNames } = organizer
+  return { tidy: tidyNow, maybeTidy, undo, dismiss, overview, noteActivity, settled, repairArchiveNames, limits, forest, adoptUnattached, snapshot, childrenOf, depthOf, traceOf, ensureRoot, adoptChief, findChief, migrateLegacyRoots, promptFor, createChild, isMember, isRoot, rootOf, isTreeEdge, onFieldChange, onBotRemoved, subscribe }
 }
diff --git a/plugins/tree/test/mock-flybot.js b/plugins/tree/test/mock-flybot.js
index 92544179e..86292b94d 100644
--- a/plugins/tree/test/mock-flybot.js
+++ b/plugins/tree/test/mock-flybot.js
@@ -29,7 +29,7 @@ export function createMockFlybot() {
   const grants = new Map()
   let seq = 0
   const granted = b => (grants.get(b?.id) ?? []).some(g => !g.roomId)
-  const view = b => b && { id: b.id, name: b.name, isMain: b.isMain === true, granted: granted(b), createdAt: b.createdAt, createdBy: null, systemPrompt: b.systemPrompt ?? '', fields: clone(b.fields) }
+  const view = b => b && { id: b.id, name: b.name, isMain: b.isMain === true, granted: granted(b), createdAt: b.createdAt, createdBy: null, systemPrompt: b.systemPrompt ?? '', fields: clone(b.fields), ...(b.hidden === true ? { hidden: true } : {}) }
   const fire = (ev, payload) => { for (const fn of [...listeners[ev]]) fn({ ...payload }) }
   const onFor = plugin => (ev, fn, { all = false } = {}) => {
     if (!listeners[ev]) throw new Error(`flybot: unknown event ${ev}`)
@@ -94,7 +94,21 @@ export function createMockFlybot() {
           fire('bot.created', view(bots.get(id)))
           return id
         },
-        setSystemPrompt: (id, text) => { const b = bots.get(id); if (!b) throw new Error('flybot: unknown Bot ' + id); b.systemPrompt = String(text ?? '').trim() },
+setSystemPrompt: (id, text) => { const b = bots.get(id); if (!b) throw new Error('flybot: unknown Bot ' + id); b.systemPrompt = String(text ?? '').trim() },
+        update: async (id, patch = {}) => {
+          const b = bots.get(id); if (!b) throw new Error('flybot: unknown Bot ' + id)
+          if (patch.name !== undefined) {
+            const next = String(patch.name).trim()
+            const clash = [...bots.values()].find(o => o.id !== id && o.name === next)
+            if (!next || clash) throw new Error(`Name ${next} is not available`)
+            b.name = next
+          }
+          if (typeof patch.hidden === 'boolean') {
+            if (patch.hidden) b.hidden = true
+            else delete b.hidden
+          }
+          return view(b)
+        },
         fields,
         send: Object.assign((req, opts) => send({ via: plugin, ...req }, opts), {
           use: m => { if (middlewares.some(x => x.name === m.name)) throw new Error('exists'); middlewares.push(m); return () => { const i = middlewares.indexOf(m); if (i >= 0) middlewares.splice(i, 1) } },
diff --git a/plugins/tree/test/tree.test.js b/plugins/tree/test/tree.test.js
index 85350326d..a7b1a4ea7 100644
--- a/plugins/tree/test/tree.test.js
+++ b/plugins/tree/test/tree.test.js
@@ -1207,3 +1207,64 @@ test('#446 client: reorganization notice (what moved, Undo, Dismiss), idle / arc
   assert.match(renderToString(reactStub.createElement(Tag, { bot: { id: 'x' } })), /class="flybot-tree-tag"[^>]*>idle</)
   assert.equal(renderToString(reactStub.createElement(Tag, { bot: { id: 'y' } })), '')
 })
+
+// #452 (owner decision 2026-10-19 22:23): reorg MOVEs / reparents; never renames to 归档- + recreate;
+// archived Bots (and leftover 归档-* names) stay out of the default Bot list; repair restores names.
+test('#452: reorganization MOVEs bots and never renames any Bot to 归档- / Archive-', async () => {
+  const { m, tree, kids } = await fullChief(4, ['Cooking', 'Shopping', 'Garden', 'Travel'])
+  const before = new Map([...m.bots.entries()].map(([id, b]) => [id, b.name]))
+  for (const name of ['FlyBot Dev', 'FlyBot Test', 'FlyBot Maint', 'FlyBot Repo']) await m.flybot.bot.create({ name })
+  await tree.settled()
+  for (const [id, name] of before) assert.equal(m.bots.get(id).name, name, `reorg must not rename ${name}`)
+  for (const b of m.bots.values()) assert.doesNotMatch(b.name, /^(?:归档|Archive)[-—–]/)
+  // Existing life Bots moved under Life Lead; names unchanged.
+  for (const id of Object.values(kids)) assert.equal(m.bots.get(id).name, before.get(id))
+})
+
+test('#452: archive sets hidden; undo clears it', async () => {
+  const DAY = 24 * 60 * 60 * 1000
+  let clock = Date.UTC(2026, 9, 19, 12)
+  const { m, tree, kids } = await fullChief(8, ['Editor', 'Travel'], { now: () => clock })
+  const dup = await m.flybot.bot.create({ name: 'Editor Bot' })
+  await tree.tidy(); clock += 2 * DAY; await tree.tidy()
+  assert.equal(f(m, dup, 'archived').into, kids.Editor)
+  assert.equal(m.bots.get(dup).hidden, true, 'archived Bot is hidden from the default list')
+  const { runs } = tree.overview()
+  assert.deepEqual(tree.undo(runs[0].id).kept, [])
+  assert.equal(f(m, dup, 'archived'), undefined)
+  assert.notEqual(m.bots.get(dup).hidden, true, 'undo clears hidden')
+})
+
+test('#452: repairArchiveNames restores 归档- when bare name is free; archives+hides when taken', async () => {
+  const { m, tree, chief } = await fullChief(8, ['Budget'])
+  const alone = m.addBot({ name: '归档-SoloDev', fields: { 'flybot-tree': { parent: chief, treeRole: 'dev' } } })
+  const live = m.addBot({ name: 'FlyBot 测试', fields: { 'flybot-tree': { parent: chief, treeRole: 'test' } } })
+  const dup = m.addBot({ name: '归档-FlyBot 测试', fields: { 'flybot-tree': { parent: chief, treeRole: 'test' } } })
+  await tree.repairArchiveNames()
+  assert.equal(m.bots.get(alone).name, 'SoloDev')
+  assert.notEqual(m.bots.get(alone).hidden, true)
+  assert.equal(m.bots.get(live).name, 'FlyBot 测试')
+  assert.equal(f(m, dup, 'archived').reason, 'prefix-duplicate')
+  assert.equal(m.bots.get(dup).hidden, true)
+  assert.equal(m.bots.get(dup).name, '归档-FlyBot 测试', 'name kept when bare name is taken; Bot is archived+hidden')
+})
+
+test('#452 client: structure.include is false for archived and 归档-* names', async () => {
+  const mod = loadClient()
+  const bots = [
+    { id: 'c', name: 'Chief', createdAt: 1, isMain: true, fields: { 'flybot-tree': { parent: null, treeRole: 'root' } } },
+    { id: 'live', name: 'FlyBot 开发', createdAt: 2, fields: { 'flybot-tree': { parent: 'c', treeRole: 'dev' } } },
+    { id: 'arch', name: 'Old', createdAt: 3, fields: { 'flybot-tree': { archived: { reason: 'idle' } } } },
+    { id: 'pref', name: '归档-FlyBot 维护', createdAt: 4, fields: { 'flybot-tree': { parent: 'c', treeRole: 'maint' } } },
+  ]
+  const entries = []
+  const dispose = mod.registerStructure({ slots: { register: (n, e) => { entries.push(e); return () => {} } }, bots: async () => bots })
+  await new Promise(r => setTimeout(r, 10))
+  const entry = entries.at(-1)
+  assert.equal(typeof entry.include, 'function')
+  assert.equal(entry.include('live'), true)
+  assert.equal(entry.include('arch'), false)
+  assert.equal(entry.include('pref'), false)
+  assert.equal(entry.include('c'), true)
+  dispose()
+})

From ff2ad5f56ee53125590d65db9c27f8fd9bb4f24c Mon Sep 17 00:00:00 2001
From: Danyang Chen <birfychen@gmail.com>
Date: Mon, 19 Oct 2026 22:49:31 +0800
Subject: [PATCH 2/2] Docs: core-client and plugin-runtime for
 structure.include and bot.update

Arch-docs gate: owned core files need matching subsystem docs (#452).
---
 docs/subsystems/core-client.md    | 4 ++--
 docs/subsystems/plugin-runtime.md | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/subsystems/core-client.md b/docs/subsystems/core-client.md
index edb8e49ee..27e1a021d 100644
--- a/docs/subsystems/core-client.md
+++ b/docs/subsystems/core-client.md
@@ -92,7 +92,7 @@ The overlay (`flybot-slots.js` `FlyBotApprovals`) is the fallback, not a second
 
 ### One sidebar list
 
-- `TeamSidebar` lists local Bots, listed remote chats (`isListedRemoteChat`), live face-to-face rooms, and shared rooms in one `bt-list`. Own chats sort before foreign ones (a remote Bot, a face room, or `sharedFrom`); pinned and recency still win. A friend's Bot keeps the globe `RemoteMark`; a live face room gets a small people `FaceMark` (`bt-row-remote bt-row-face`). No row wraps its title (#384): a friend's Bot row shows the Bot's name (`bt-row-title`), then its owner (`bt-row-owner`, muted, shrinks first) and the globe (at `--bt-ink-2`, readable) on one line; its second line is the preview like an own row, or *Friend's Bot* before the first message, and the full `remoteBotTitle` ("Helper (Bob)") is its hover text and label. The row wrap's gear is absolutely positioned so the hover/selected band stays full width (#384). A friend's Bot fallback look (`lookAvoidingLocals`) steps its seeded shape (then color) when it would match one of your own Bots exactly; a named ink and its published hex count as one color. `indexRoster` registers the own Bots (`setLocalBots`) and `BotMark` applies the avoidance to every remote Bot, so the sidebar, header, palette, details drawer and transcript agree; a published image/emoji/shape is left alone. A face-room row stays on one line with an ellipsis, and every room row has its full title as hover text (#304). Past/ended face rooms stay out of this list (`isPastFaceRoom`) so the social section can fold them under **Past rooms**. With `@flybot/tree` on, only own Bots are tree nodes under Main; a friend's Bot stays in the flat ordered list (not hidden when Main is collapsed).
+- `TeamSidebar` lists local Bots, listed remote chats (`isListedRemoteChat`), live face-to-face rooms, and shared rooms in one `bt-list`. Own chats sort before foreign ones (a remote Bot, a face room, or `sharedFrom`); pinned and recency still win. A friend's Bot keeps the globe `RemoteMark`; a live face room gets a small people `FaceMark` (`bt-row-remote bt-row-face`). No row wraps its title (#384): a friend's Bot row shows the Bot's name (`bt-row-title`), then its owner (`bt-row-owner`, muted, shrinks first) and the globe (at `--bt-ink-2`, readable) on one line; its second line is the preview like an own row, or *Friend's Bot* before the first message, and the full `remoteBotTitle` ("Helper (Bob)") is its hover text and label. The row wrap's gear is absolutely positioned so the hover/selected band stays full width (#384). A friend's Bot fallback look (`lookAvoidingLocals`) steps its seeded shape (then color) when it would match one of your own Bots exactly; a named ink and its published hex count as one color. `indexRoster` registers the own Bots (`setLocalBots`) and `BotMark` applies the avoidance to every remote Bot, so the sidebar, header, palette, details drawer and transcript agree; a published image/emoji/shape is left alone. A face-room row stays on one line with an ellipsis, and every room row has its full title as hover text (#304). Past/ended face rooms stay out of this list (`isPastFaceRoom`) so the social section can fold them under **Past rooms**. With `@flybot/tree` on, only own Bots are tree nodes under Main; a friend's Bot stays in the flat ordered list (not hidden when Main is collapsed). The structure entry may set `include(botId) === false` to omit a Bot from the default list (tree-archived and leftover `归档-*` / `Archive-*` names, #452); those Bots stay findable in Search when not also `bot.hidden`.
 
 ### Approval wait badge on chat rows
 
@@ -100,7 +100,7 @@ The overlay (`flybot-slots.js` `FlyBotApprovals`) is the fallback, not a second
 
 ### Bot tree chevron
 
-- The sidebar Bot-list tree (`sidebar.js` `TreeNode`, from slot `flybot.sidebar.structure`) draws collapse/expand as `.bt-tree-toggle`: a 28×28 hit target with a 16px `.bt-tree-chev` glyph, hover background, and a `:focus-visible` accent ring. The glyph rotates when `aria-expanded` is false; the button stays upright so hover and focus stay square. Expand/Collapse `{name}` labels and `aria-expanded` are unchanged. Leaf rows use the same 28px width as a spacer (`.bt-tree-leaf`) so names stay aligned; indent is still `depth * 16px` and the Bot row keeps its height.
+- The sidebar Bot-list tree (`sidebar.js` `TreeNode`, from slot `flybot.sidebar.structure`; optional `include(botId)` filters the default list, #452) draws collapse/expand as `.bt-tree-toggle`: a 28×28 hit target with a 16px `.bt-tree-chev` glyph, hover background, and a `:focus-visible` accent ring. The glyph rotates when `aria-expanded` is false; the button stays upright so hover and focus stay square. Expand/Collapse `{name}` labels and `aria-expanded` are unchanged. Leaf rows use the same 28px width as a spacer (`.bt-tree-leaf`) so names stay aligned; indent is still `depth * 16px` and the Bot row keeps its height.
 
 ### New-chat menu
 
diff --git a/docs/subsystems/plugin-runtime.md b/docs/subsystems/plugin-runtime.md
index a753b1086..bf5837834 100644
--- a/docs/subsystems/plugin-runtime.md
+++ b/docs/subsystems/plugin-runtime.md
@@ -33,11 +33,11 @@ FlyBot's plugin API surface on top of the patched core: host hooks, client slots
 
 | File | Role |
 | --- | --- |
-| `core/src/host/hooks.js` | Host hook points: send middleware, transports, grants, the owner-bound held-send approvals (#52), and task hold/decide/delete seams (#54). |
+| `core/src/host/hooks.js` | Host hook points: send middleware, transports, grants, the owner-bound held-send approvals (#52), task hold/decide/delete seams (#54), and `bot.update({ name?, hidden? })` for plugin rename/hide (#452). |
 | `core/src/host/flybot-feed.js` | Activity feed: folds a Bot Session's `session/event`s into `flybot.on('turn.start' \| 'turn.end' \| 'tool.start' \| 'tool.end' \| 'exchange.delivered')` (#241). |
-| `core/src/client/flybot-slots.js` | Client slots, including the approval card queue (`flybot.approvals`, `flybot/decide`). |
+| `core/src/client/flybot-slots.js` | Client slots, including the approval card queue (`flybot.approvals`, `flybot/decide`) and `flybot.sidebar.structure` (`parentOf`, optional `include`, `menuItems`, `nodeActions`). |
 | `core/src/client/flybot-registry.js` | Registry. |
-| `core/types/flybot.d.ts` | Types. |
+| `core/types/flybot.d.ts` | Types (`BotView.hidden`, `bot.update`, …). |
 
 ## Entry points