dsh-tiddlywiki 0.27.2 → 0.28.0

package/src/host/routes.ts

@@ -193,14 +193,73 @@ export interface UiDefaultsPublic {
   showRightbarTab: boolean
 }
 
+/** One knowledge base as the GUI sees it (list/selector payload). */
+export interface WikiSummaryPublic {
+  id: string
+  label: string
+  /** Health of this wiki's TW child ('running' | 'starting' | 'stopped' | 'failed'). */
+  status: string
+  /** May the AGENT reach it at all (hidden ones are absent from every prompt). */
+  agentVisible: boolean
+  /** Comes up at boot (multi mode); others start on demand. */
+  autostart: boolean
+  /** A TW child is currently serving it. */
+  running: boolean
+  path: string
+}
+
+/** The whole farm as the GUI sees it. */
+export interface WikiFarmPublic {
+  /** 'single' = one wiki (legacy behaviour); 'multi' = the farm. */
+  mode: string
+  /** Id a session without an explicit scope falls back to. */
+  defaultId: string
+  items: WikiSummaryPublic[]
+}
+
+/**
+ * Everything the routes need from the plugin.
+ *
+ * v0.28.0: every PER-WIKI accessor takes the request, because the plugin no
+ * longer serves exactly one knowledge base. In single-wiki mode they all
+ * resolve to the same instance, so the call sites read exactly as before; in
+ * multi-wiki mode they resolve the wiki THIS request targets (`?wiki=<id>`, or
+ * the session's scope — see host/wiki-farm.ts).
+ *
+ * ⚠️ `server` returns `undefined` when the targeted wiki is not running. The
+ * routes then answer 503 — the same answer the previous
+ * `getClient() === undefined` guard already produced.
+ *
+ * The DSH *session* services below stay request-independent on purpose: they
+ * belong to the host, not to a wiki.
+ */
 export interface RouteDeps {
-  server: WikiServer
-  getClient: () => TiddlyWebClient | undefined
+  /** The whole farm's list/mode/default (the GUI's per-wiki selector). */
+  wikiSummaries: (req: IncomingMessage) => WikiFarmPublic
+  /** The TW child serving the wiki this request targets (undefined = not up). */
+  server: (req: IncomingMessage) => WikiServer | undefined
+  /** Lazily resolved REST client for the same wiki. */
+  getClient: (req: IncomingMessage) => TiddlyWebClient | undefined
+  /** The TW child of a NAMED wiki (the `/tw/<id>/…` proxy form). */
+  serverById: (id: string) => WikiServer | undefined
+  /** Every registered wiki id (lets the proxy tell an id from a TW path). */
+  wikiIds: () => readonly string[]
   git: GitFace
-  autoCommit: () => void
-  noteDefaults: () => { tag: string }
-  uiDefaults: () => UiDefaultsPublic
-  getWikiPath: () => string
+  /** Debounced auto-commit touch for the targeted wiki. */
+  autoCommit: (req: IncomingMessage) => void
+  /** Default note tag of the targeted wiki. */
+  noteDefaults: (req: IncomingMessage) => { tag: string }
+  /** Effective UI flags of the targeted wiki. */
+  uiDefaults: (req: IncomingMessage) => UiDefaultsPublic
+  /** Absolute folder of the targeted wiki. */
+  getWikiPath: (req: IncomingMessage) => string
+  /**
+   * After a pull moved HEAD: restart the running wikis whose content actually
+   * changed, and report their ids (v0.28.0). `changedFiles` are
+   * repository-relative paths, so a shared repository can restart exactly the
+   * affected knowledge bases. Absent in headless contexts (no restart).
+   */
+  restartAffected?: (req: IncomingMessage, dir: string, changedFiles: readonly string[]) => Promise<{ restarted: string[]; failed: Array<{ id: string; message: string }> }>
   /** Optional DSH sessionController service (agent-send routes only); resolved
    *  lazily per request because it may register after webServer appears. */
   getSessionController: () => SessionControllerFace | undefined
@@ -224,20 +283,33 @@ export interface RouteDeps {
    *  session's complete event log + descendant tree to decide which wiki notes
    *  belong to this conversation. Resolved lazily like the other services. */
   getSessionQuery: () => SessionQueryFace | undefined
-  /** Whether the one-click send-to-agent feature is enabled (config switch). */
-  sendToAgentEnabled: () => boolean
+  /** Whether the one-click send-to-agent feature is enabled for that wiki. */
+  sendToAgentEnabled: (req: IncomingMessage) => boolean
   /** Optional shared token that must match `x-send-to-agent-token` when set. */
-  sendToAgentToken: () => string
+  sendToAgentToken: (req: IncomingMessage) => string
   /**
-   * Effective `wechat.*` config (v0.23.3): the opt-in 公众号发布 feature's
-   * switch, CLI override, optional token and default adapter. Read per request
-   * so a settings-page save applies without a dsh web restart.
+   * Effective `wechat.*` config (v0.23.3) OF THE TARGETED WIKI: the opt-in
+   * 公众号发布 feature's switch, CLI override, optional token and default
+   * adapter. Read per request so a settings-page save applies without a dsh web
+   * restart.
    */
-  wechatConfig: () => WechatPublishConfig
-  /** The publish runner, or undefined when the host has not wired one. */
+  wechatConfig: (req: IncomingMessage) => WechatPublishConfig
+  /** The publish runner (plugin-wide: one opencli child at a time). */
   wechatRunner: () => WechatPublishFace | undefined
   /** Readiness report (opencli + adapter files) for the button's precheck. */
-  wechatReady: () => Promise<WechatReadyView>
+  wechatReady: (req: IncomingMessage) => Promise<WechatReadyView>
+  /**
+   * Per-session knowledge-base scope (v0.28.0): what this conversation works on.
+   * The composer's selector reads and writes it; the agent tools and the
+   * injected prompt are driven by the same value, so what the user picks is what
+   * the model gets.
+   */
+  sessionScope?: {
+    /** Current choice + what it resolves to (and why, when it cannot serve). */
+    get: (sessionId: string) => { scope?: string; resolved?: { id: string; label: string }; reason?: string }
+    /** Point the session at a wiki, or clear the choice with `undefined`. */
+    set: (sessionId: string, wikiId: string | undefined) => Promise<void>
+  }
 }
 
 /**
@@ -531,16 +603,19 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
    * invalidates it so a sync/upload is reflected immediately.
    */
   const GIT_STATUS_TTL_MS = 2_000
-  /** Cached git-status PROMISE (not value): a burst of concurrent /status polls
-   *  then shares ONE probe instead of each spawning up to five git processes
-   *  (v0.19.0 — value-caching still let every concurrent miss run its own). */
-  let gitStatusCache: { at: number; value: Promise<GitStatusViewPublic | null> } | undefined
+  /** Cached git-status PROMISE **per wiki** (not value): a burst of concurrent
+   *  /status polls then shares ONE probe instead of each spawning up to five git
+   *  processes (v0.19.0 — value-caching still let every concurrent miss run its
+   *  own). The key is the wiki folder: with several knowledge bases a
+   *  single-slot cache would hand wiki A the answer probed for wiki B (v0.28.0). */
+  let gitStatusCache: { key: string; at: number; value: Promise<GitStatusViewPublic | null> } | undefined
   const invalidateGitStatus = (): void => { gitStatusCache = undefined }
-  const cachedGitStatus = (): Promise<GitStatusViewPublic | null> => {
-    if (gitStatusCache !== undefined && Date.now() - gitStatusCache.at < GIT_STATUS_TTL_MS) return gitStatusCache.value
+  const cachedGitStatus = (req: IncomingMessage): Promise<GitStatusViewPublic | null> => {
+    const key = deps.getWikiPath(req)
+    if (gitStatusCache !== undefined && gitStatusCache.key === key && Date.now() - gitStatusCache.at < GIT_STATUS_TTL_MS) return gitStatusCache.value
     const pending = (async (): Promise<GitStatusViewPublic | null> => {
       try {
-        const view = await deps.git.status(deps.getWikiPath())
+        const view = await deps.git.status(key)
         // The remote URL can carry a PAT (`https://user:token@…`) and /status is
         // unauthenticated — never hand the credential to the browser.
         return { ...view, remote: redactRemoteUrl(typeof view.remote === 'string' ? view.remote : '') }
@@ -548,7 +623,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         return null
       }
     })()
-    gitStatusCache = { at: Date.now(), value: pending }
+    gitStatusCache = { key, at: Date.now(), value: pending }
     return pending
   }
 
@@ -639,8 +714,8 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
 
   const handleStatus = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
     if (rejectNonRead(req, res)) return
-    const view = deps.server.status()
-    const gitSummary = await cachedGitStatus()
+    const view = deps.server(req)?.status() ?? { status: 'stopped' as const, wikiPath: deps.getWikiPath(req), logs: [] }
+    const gitSummary = await cachedGitStatus(req)
     json(res, {
       ok: true,
       ...view,
@@ -653,8 +728,16 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
       // twProxyAbsoluteBase(). Absent when the Host header is unusable.
       twProxyAbsolute: twProxyAbsoluteBase(req),
       git: gitSummary,
-      note: { tag: deps.noteDefaults().tag },
-      ui: deps.uiDefaults(),
+      note: { tag: deps.noteDefaults(req).tag },
+      ui: deps.uiDefaults(req),
+      // The knowledge-base roster (v0.28.0): the GUI's per-wiki selector and the
+      // settings page read it from here. Deliberately WITHOUT per-wiki git
+      // status — that would spawn up to five git processes per wiki on every
+      // 30s poll; `/status?wiki=<id>` carries git for the one you are looking at.
+      ...(() => {
+        const farm = deps.wikiSummaries(req)
+        return { mode: farm.mode, defaultId: farm.defaultId, wikis: farm.items }
+      })(),
     })
   }
 
@@ -670,6 +753,80 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
   const SUMMARY_REUSE_MS = 3_000
   const summaryInFlight = new Map<string, { at: number; value: Promise<SessionSummaryResult> }>()
 
+  /**
+   * GET /dsh-tiddlywiki/session/wiki?session=<id> — which knowledge base this
+   * conversation works on, plus what it resolves to right now.
+   *
+   * The per-wiki selector in the composer reads this; the agent tools and the
+   * injected prompt are driven by the SAME value, so what the user picks is what
+   * the model gets.
+   */
+  const handleSessionWiki = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
+    try {
+      if (rejectNonRead(req, res)) return
+      if (deps.sessionScope === undefined) {
+        json(res, { ok: false, error: '会话作用域不可用（宿主未接线）' }, 503)
+        return
+      }
+      const url = new URL(req.url ?? '/', 'http://127.0.0.1')
+      const session = (url.searchParams.get('session') ?? '').trim()
+      if (session.length === 0) {
+        json(res, { ok: false, error: 'session is required' }, 400)
+        return
+      }
+      json(res, { ok: true, session, ...deps.sessionScope.get(session) })
+    } catch (err) {
+      json(res, { ok: false, error: err instanceof Error ? err.message : String(err) }, errorStatus(err))
+    }
+  }
+
+  /**
+   * POST /dsh-tiddlywiki/session/wiki { session, wiki } — point this conversation
+   * at a knowledge base (`wiki: null`/`''` clears the choice and falls back to
+   * the default).
+   *
+   * A HIDDEN wiki is refused (400): `agentVisible: false` means "the agent never
+   * reaches this one", and a selector that lets a session pick it would quietly
+   * contradict the setting the user just made.
+   */
+  const handleSessionWikiSet = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
+    try {
+      if (deps.sessionScope === undefined) {
+        json(res, { ok: false, error: '会话作用域不可用（宿主未接线）' }, 503)
+        return
+      }
+      let body: { session?: unknown; wiki?: unknown } = {}
+      try {
+        body = JSON.parse(await readBody(req)) as { session?: unknown; wiki?: unknown }
+      } catch {
+        json(res, { ok: false, error: '请求体必须是 JSON' }, 400)
+        return
+      }
+      const session = typeof body.session === 'string' ? body.session.trim() : ''
+      if (session.length === 0) {
+        json(res, { ok: false, error: 'session is required' }, 400)
+        return
+      }
+      const raw = typeof body.wiki === 'string' ? body.wiki.trim() : ''
+      const wikiId = raw.length === 0 ? undefined : raw
+      await deps.sessionScope.set(session, wikiId)
+      json(res, { ok: true, session, ...deps.sessionScope.get(session) })
+    } catch (err) {
+      // A refusal from the host (unknown / hidden wiki, bad session id) is the
+      // caller's problem: 400 + the reason, so the picker can say what happened.
+      json(res, { ok: false, error: err instanceof Error ? err.message : String(err) }, 400)
+    }
+  }
+
+  /** `/session/wiki` takes both methods on ONE registration (see /admin/wikis). */
+  const handleSessionWikiRoute = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
+    if ((req.method ?? 'GET').toUpperCase() === 'POST') {
+      if (rejectCrossSiteWrite(req, res, ['POST'])) return
+      return handleSessionWikiSet(req, res)
+    }
+    return handleSessionWiki(req, res)
+  }
+
   /**
    * POST /dsh-tiddlywiki/session/summary — 生成当前会话的 wiki 汇总页（「知识库」
    * Tab 的后端）。body `{ session: <会话ID> }`；后端用 sessionQuery 读本会话（含
@@ -698,7 +855,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         json(res, { ok: false, error: 'session id has an unsupported format' }, 400)
         return
       }
-      const client = deps.getClient()
+      const client = deps.getClient(req)
       if (client === undefined) {
         json(res, { ok: false, error: 'wiki service is not running' }, 503)
         return
@@ -783,11 +940,11 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
    * error response — the caller just does `if (!guard(...)) return`.
    */
   const guardSendToAgent = (req: IncomingMessage, res: ServerResponse): boolean => {
-    if (!deps.sendToAgentEnabled()) {
+    if (!deps.sendToAgentEnabled(req)) {
       json(res, { ok: false, error: 'send-to-agent is disabled' }, 403)
       return false
     }
-    const token = deps.sendToAgentToken().trim()
+    const token = deps.sendToAgentToken(req).trim()
     if (token.length === 0) return true
     const got = req.headers['x-send-to-agent-token']
     const value = typeof got === 'string' ? got : Array.isArray(got) ? got[0] ?? '' : ''
@@ -1023,7 +1180,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         json(res, { ok: false, error: 'text is required' }, 400)
         return
       }
-      const client = deps.getClient()
+      const client = deps.getClient(req)
       if (client === undefined) {
         json(res, { ok: false, error: 'wiki service is not running' }, 503)
         return
@@ -1046,11 +1203,11 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
       const { tiddler } = buildWriteTiddler(title, text, {
         existing,
         tags,
-        defaultTags: [deps.noteDefaults().tag],
+        defaultTags: [deps.noteDefaults(req).tag],
         agentTag: false,
       })
       await client.put(tiddler)
-      deps.autoCommit()
+      deps.autoCommit(req)
       invalidateGitStatus()
       const finalTags = tiddler.tags ?? []
       json(res, { ok: true, title, tag: finalTags.join(' '), tags: finalTags, text, type: typeof tiddler.type === 'string' ? tiddler.type : NOTE_TYPE })
@@ -1067,7 +1224,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
     try {
       if (rejectCrossSiteWrite(req, res, ['POST'])) return
       const body = JSON.parse(await readBody(req)) as { title?: unknown; tag?: unknown; tags?: unknown; text?: unknown; expectedModified?: unknown; expectedRevision?: unknown; force?: unknown }
-      const client = deps.getClient()
+      const client = deps.getClient(req)
       if (client === undefined) {
         json(res, { ok: false, error: 'wiki service is not running' }, 503)
         return
@@ -1079,10 +1236,10 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
       }
       const text = typeof body.text === 'string' ? body.text : ''
       const result = await openInTwEditor(client, title, text, resolveTags(body), {
-        defaultTags: [deps.noteDefaults().tag],
+        defaultTags: [deps.noteDefaults(req).tag],
         ...conflictTokens(body),
       })
-      deps.autoCommit()
+      deps.autoCommit(req)
       invalidateGitStatus()
       json(res, { ok: true, ...result, twUrl: TW_PROXY_PATH, twUrlAbsolute: twProxyAbsoluteBase(req) })
     } catch (err) {
@@ -1105,7 +1262,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
    *  order, plus `total`/`truncated` so a capped caller can say "N of M". */
   const handleTags = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
     if (rejectNonRead(req, res)) return
-    const client = deps.getClient()
+    const client = deps.getClient(req)
     if (client === undefined) {
       json(res, { ok: false, error: 'wiki service is not running' }, 503)
       return
@@ -1134,7 +1291,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
   /** Recent non-system tiddlers for the quick-note "最近" picker (newest first). */
   const handleRecent = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
     if (rejectNonRead(req, res)) return
-    const client = deps.getClient()
+    const client = deps.getClient(req)
     if (client === undefined) {
       json(res, { ok: false, error: 'wiki service is not running' }, 503)
       return
@@ -1167,7 +1324,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
   /** Full tiddler for the quick-note "最近" picker (load into the editor). */
   const handleGet = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
     if (rejectNonRead(req, res)) return
-    const client = deps.getClient()
+    const client = deps.getClient(req)
     if (client === undefined) {
       json(res, { ok: false, error: 'wiki service is not running' }, 503)
       return
@@ -1228,7 +1385,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
    */
   const handleSearch = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
     if (rejectNonRead(req, res)) return
-    const client = deps.getClient()
+    const client = deps.getClient(req)
     if (client === undefined) {
       json(res, { ok: false, error: 'wiki service is not running' }, 503)
       return
@@ -1302,15 +1459,15 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         // This route used to SIGKILL the child directly, so clicking「重启 TW」
         // within ~1s of any write silently lost that write.
         drained = await drainThenStop({
-          client: deps.getClient(),
-          tiddlersDir: join(deps.getWikiPath(), 'tiddlers'),
-          stop: () => deps.server.restart(),
+          client: deps.getClient(req),
+          tiddlersDir: join(deps.getWikiPath(req), 'tiddlers'),
+          stop: async () => { await deps.server(req)?.restart() },
           log: (message) => console.warn('[dsh-tiddlywiki]', message),
         })
       } finally {
         endMutation()
       }
-      json(res, { ok: true, status: deps.server.status().status, drained })
+      json(res, { ok: true, status: deps.server(req)?.status().status, drained })
     } catch (err) {
       json(res, { ok: false, error: err instanceof Error ? err.message : String(err) }, errorStatus(err))
     }
@@ -1329,7 +1486,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
       return
     }
     invalidateGitStatus()
-    const dir = deps.getWikiPath()
+    const dir = deps.getWikiPath(req)
     const status = async (): Promise<GitStatusViewPublic | null> => {
       try { return await deps.git.status(dir) } catch { return null }
     }
@@ -1346,24 +1503,19 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         return
       }
       let restarted = false
+      let restartedWikis: string[] | undefined
       let restartError: string | undefined
-      if (pulled.changed === true) {
+      if (pulled.changed === true && deps.restartAffected !== undefined) {
         try {
-          // DRAIN THE SYNCER FIRST (v0.19.1, data safety): a REST PUT answers 204
-          // while the filesystem syncer still holds the tiddler (~250ms timer).
-          // Restarting TW before the flush kills those writes — the restarted
-          // server boots from the pre-write snapshot and the note is gone, and
-          // the `git commit` right below cannot recover what never hit disk.
-          // v0.24.1: the drain lives inside `drainThenStop` (ironclad rule #1 is
-          // one primitive, not a per-route habit).
-          const drained = await drainThenStop({
-            client: deps.getClient(),
-            tiddlersDir: join(dir, 'tiddlers'),
-            stop: () => deps.server.restart(),
-            log: (message) => console.warn('[dsh-tiddlywiki]', message),
-          })
-          if (!drained) console.warn('[dsh-tiddlywiki] sync: syncer queue may not be drained before restart')
-          restarted = true
+          // v0.28.0: restart ONLY the wikis whose content changed, and let the
+          // runtime drain the syncer queue first (ironclad rule #1 lives inside
+          // `WikiInstance.restart()`). Restarting "the wiki this request came
+          // from" would miss the one that actually changed when several share a
+          // repository — and would interrupt a wiki nothing happened to.
+          const outcome = await deps.restartAffected(req, dir, pulled.changedFiles ?? [])
+          restarted = outcome.restarted.length > 0
+          if (outcome.restarted.length > 0) restartedWikis = outcome.restarted
+          if (outcome.failed.length > 0) restartError = outcome.failed.map((item) => `${item.id}: ${item.message}`).join('; ')
         } catch (err) {
           restartError = err instanceof Error ? err.message : String(err)
         }
@@ -1397,6 +1549,9 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         pull: 'ok',
         ...(pulled.changed === true ? { changed: true } : {}),
         restarted,
+        // Which knowledge bases were restarted (v0.28.0). `restarted` stays a
+        // BOOLEAN for the existing client, which only shows a sentence.
+        ...(restartedWikis !== undefined ? { restartedWikis } : {}),
         ...(restartError !== undefined ? { restartError } : {}),
         commit: committed.message,
         push: pushed.message,
@@ -1441,7 +1596,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         json(res, { ok: false, error: `不允许上传可执行/可脚本化的文件类型：${extension}` }, 400)
         return
       }
-      const filesDir = join(deps.getWikiPath(), 'files')
+      const filesDir = join(deps.getWikiPath(req), 'files')
       await mkdir(filesDir, { recursive: true })
       // Collision avoidance with an ATOMIC create (v0.19.3): the old code did
       // `access(candidate)` then `writeFile(candidate)`, so (a) any access error
@@ -1468,7 +1623,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         json(res, { ok: false, error: '同名文件过多，请换一个文件名' }, 409)
         return
       }
-      deps.autoCommit()
+      deps.autoCommit(req)
       invalidateGitStatus()
       json(res, {
         ok: true,
@@ -1507,7 +1662,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
   const handleRender = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
     try {
       if (rejectCrossSiteWrite(req, res, ['POST'])) return
-      const client = deps.getClient()
+      const client = deps.getClient(req)
       if (client === undefined) {
         json(res, { ok: false, error: 'wiki service is not running' }, 503)
         return
@@ -1586,8 +1741,10 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
     // forwarded to the TW child. The set is the TiddlyWeb API surface the TW
     // frontend uses.
     if (rejectCrossSiteWrite(req, res, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS'])) return
-    const client = deps.getClient()
-    if (client === undefined) {
+    // The upstream base comes straight from the child (v0.28.0: per request, so
+    // a named wiki can be proxied); the client is only a liveness proxy.
+    const server = deps.server(req)
+    if (server?.url === undefined) {
       json(res, { ok: false, error: 'wiki service is not running' }, 503)
       return
     }
@@ -1607,7 +1764,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
       if (method === 'PUT' || method === 'DELETE' || method === 'POST') headers['x-requested-with'] = 'TiddlyWiki'
       const init: RequestInit = { method, headers, signal: AbortSignal.timeout(15_000) }
       if (method === 'PUT' || method === 'POST') init.body = await readBody(req, MAX_PROXY_BODY_BYTES)
-      const upstream = await fetch(`${deps.server.url}${rest}${url.search}`, init)
+      const upstream = await fetch(`${server.url}${rest}${url.search}`, init)
       const data = await upstream.text()
       res.writeHead(upstream.status, {
         'content-type': upstream.headers.get('content-type') ?? 'application/json; charset=utf-8',
@@ -1633,17 +1790,31 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
     // pathname only, so without it TRACE or a typo'd verb was forwarded straight
     // to the TW child. Same set the sibling /api proxy declares.
     if (rejectCrossSiteWrite(req, res, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS'])) return
-    const client = deps.getClient()
-    if (client === undefined) {
-      json(res, { ok: false, error: 'wiki service is not running' }, 503)
-      return
-    }
     const url = new URL(req.url ?? '/', 'http://127.0.0.1')
-    const rest = url.pathname.replace(new RegExp(`^${TW_PROXY_PREFIX}(?=/|$)`), '') || '/'
-    if (isBlockedProxyPath(rest)) {
+    // PER-WIKI FORM (v0.28.0): `/tw/<id>/<tw-path>`. The first segment is only
+    // consumed when it names a REGISTERED wiki, so TW's own `/tw/status` and
+    // `/tw/files/…` keep meaning "the default wiki's TW path" — that is exactly
+    // what the reserved-id rule guarantees (a wiki id may never equal a TW root
+    // segment; see RESERVED_WIKI_IDS in host/wiki-registry.ts).
+    const afterPrefix = url.pathname.slice(TW_PROXY_PREFIX.length).replace(/^\//, '')
+    const [firstSegment = '', ...tail] = afterPrefix.split('/')
+    const named = deps.wikiIds().includes(firstSegment) ? firstSegment : undefined
+    const rest = named === undefined
+      ? (url.pathname.replace(new RegExp(`^${TW_PROXY_PREFIX}(?=/|$)`), '') || '/')
+      : `/${tail.join('/')}`
+    // The guard runs on BOTH forms: the raw path is what a crafted request
+    // controls, and the stripped `rest` is what actually reaches TW.
+    if (isBlockedProxyPath(url.pathname) || isBlockedProxyPath(rest)) {
       json(res, { ok: false, error: 'system tiddler not exposed' }, 403)
       return
     }
+    // Resolve the child LAST, so a named-but-stopped wiki answers 503 instead of
+    // being proxied to whoever happens to be the default.
+    const server = named === undefined ? deps.server(req) : deps.serverById(named)
+    if (server?.url === undefined) {
+      json(res, { ok: false, error: 'wiki service is not running' }, 503)
+      return
+    }
     try {
       const method = (req.method ?? 'GET').toUpperCase()
       const headers = forwardHeaders(req.headers)
@@ -1663,7 +1834,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
       // frontend does not send DELETE bodies, but the proxy is a generic
       // passthrough — drain whatever is there.
       else if (req.readableEnded === false && (req.headers['content-length'] !== undefined || req.headers['transfer-encoding'] !== undefined)) req.resume()
-      const upstream = await fetch(`${deps.server.url}${rest}${url.search}`, init)
+      const upstream = await fetch(`${server.url}${rest}${url.search}`, init)
       const responseHeaders: Record<string, string> = {
         'content-type': upstream.headers.get('content-type') ?? 'application/octet-stream',
         'cache-control': upstream.headers.get('cache-control') ?? 'no-store',
@@ -1717,7 +1888,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
    * deployment answers 403 instead of starting browser automation.
    */
   const guardWechat = (req: IncomingMessage, res: ServerResponse): boolean => {
-    const config = deps.wechatConfig()
+    const config = deps.wechatConfig(req)
     if (!config.enabled) {
       json(res, { ok: false, error: 'wechat publishing is disabled' }, 403)
       return false
@@ -1741,7 +1912,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
     try {
       if (rejectNonRead(req, res)) return
       if (!guardWechat(req, res)) return
-      const ready = await deps.wechatReady()
+      const ready = await deps.wechatReady(req)
       json(res, {
         ok: true,
         enabled: ready.enabled,
@@ -1761,7 +1932,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
    * overrides it for exotic setups.
    */
   const wechatDsn = (req: IncomingMessage): string => {
-    const configured = deps.wechatConfig().dsn
+    const configured = deps.wechatConfig(req).dsn
     if (configured.length > 0) return configured
     const port = req.socket.localPort
     return port === undefined ? '' : `http://127.0.0.1:${port}${ROUTE_PREFIX}`
@@ -1812,7 +1983,7 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
       }
       // Fail fast on a title that does not exist: the adapter would otherwise
       // spend ~10s booting the browser only to 404 in /render.
-      const client = deps.getClient()
+      const client = deps.getClient(req)
       if (client !== undefined) {
         const tiddler = await client.get(title)
         if (tiddler === undefined) {
@@ -1820,8 +1991,8 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
           return
         }
       }
-      const adapter = (requested ?? deps.wechatConfig().adapter) as WechatAdapter
-      const ready = await deps.wechatReady()
+      const adapter = (requested ?? deps.wechatConfig(req).adapter) as WechatAdapter
+      const ready = await deps.wechatReady(req)
       const adapterReady = adapter === 'publish-note-imgs' ? ready.adapters.publishNoteImgs : ready.adapters.publishNote
       if (!ready.opencli.ok || !adapterReady) {
         // `stale` (v0.23.4) = installed but outdated adapter files: the common
@@ -1903,6 +2074,8 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/upload`, handler: guardHandler(handleUpload) }),
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/restart`, handler: guardHandler(handleRestart) }),
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/session/summary`, handler: guardHandler(handleSessionSummary) }),
+    // One path, both methods (the host webserver dispatches by pathname only).
+    ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/session/wiki`, handler: guardHandler(handleSessionWikiRoute) }),
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/agent/sessions`, handler: guardHandler(handleAgentSessions) }),
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/agent/modes`, handler: guardHandler(handleAgentModes) }),
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/agent/send`, handler: guardHandler(handleAgentSend) }),