@morlay/dsh-session-mode 0.0.14 → 0.0.16

package/src/client/api.ts

@@ -3,6 +3,7 @@
 
 import {
   SESSION_MODE_PATH,
+  type SessionModeActiveState,
   type SessionModeRoster,
   type SessionModeSelectResult,
 } from "../shared.ts";
@@ -13,7 +14,7 @@ export async function fetchRoster(): Promise<SessionModeRoster> {
     method: "GET",
     headers: { accept: "application/json" },
   });
-  if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
+  if (!response.ok) throw await failure(response);
   return (await response.json()) as SessionModeRoster;
 }
 
@@ -33,3 +34,126 @@ export async function selectMode(sessionId: string, mode: string): Promise<strin
   }
   return value?.mode ?? mode;
 }
+
+// 读某个会话**当下生效**的那一份（工具是运行期可见集，MCP 组加载后会变），侧边栏面板用。
+
+// 错误响应体里的 `error` 是 host 给的可读原因：原样抛出来，别让页面只剩一个 HTTP 状态码。
+async function failure(response: Response): Promise<Error> {
+  const value = (await response.json().catch(() => undefined)) as { error?: unknown } | undefined;
+  return new Error(
+    typeof value?.error === "string" ? value.error : `HTTP ${String(response.status)}`,
+  );
+}
+
+export async function fetchActive(sessionId: string): Promise<SessionModeActiveState> {
+  const response = await fetch(`${SESSION_MODE_PATH}?sessionId=${encodeURIComponent(sessionId)}`, {
+    method: "GET",
+    headers: { accept: "application/json" },
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}
+
+// 面板的写面：改这个会话的三个注入开关；返回新的生效态。
+export async function updateSwitches(
+  sessionId: string,
+  switches: Partial<Record<"instructions" | "skills" | "runtimeContext", boolean | null>>,
+): Promise<SessionModeActiveState> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, switches }),
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}
+
+// 把当前会话的开关覆盖写回这个模式的配置（对之后的新会话生效）。
+export async function saveSwitchesAsDefault(sessionId: string): Promise<SessionModeActiveState> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, saveAsDefault: true }),
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}
+
+// 会话级的字段覆盖（`null` = 回到模式默认）。
+export async function updateModePatch(
+  sessionId: string,
+  patch: Record<string, unknown>,
+): Promise<SessionModeActiveState> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, modePatch: patch }),
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}
+
+// 以当前会话的生效配置另存为一个新模式。
+export async function saveAsNewMode(sessionId: string, code: string, name: string): Promise<void> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, saveAsNewMode: { code, name } }),
+  });
+  if (!response.ok) throw await failure(response);
+}
+
+// 删除一个"另存为"出来的模式（内置模式由 host 拒绝）。
+export async function deleteMode(sessionId: string): Promise<SessionModeActiveState> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, deleteMode: true }),
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}
+
+// 会话级逐条目三态（`null` = 回到模式默认）。
+export async function updateItemState(
+  sessionId: string,
+  kind: "tools" | "skills" | "policies",
+  id: string,
+  value: "allow" | "deny" | null,
+): Promise<SessionModeActiveState> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, itemState: { kind, id, value } }),
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}
+
+// 一次性应用整份会话覆盖（面板的"应用到会话"）。
+export async function applySessionConfig(
+  sessionId: string,
+  config: import("../mode-config.ts").ModeConfig,
+): Promise<SessionModeActiveState> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, applyConfig: { config } }),
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}
+
+// 把草稿写回配置（"保存为默认"）：传的是完整 `ModeConfig`。
+export async function saveConfigDraft(
+  sessionId: string,
+  config: import("../mode-config.ts").ModeConfig,
+): Promise<SessionModeActiveState> {
+  const response = await fetch(SESSION_MODE_PATH, {
+    method: "POST",
+    headers: { accept: "application/json", "content-type": "application/json" },
+    body: JSON.stringify({ sessionId, saveConfig: { config } }),
+  });
+  if (!response.ok) throw await failure(response);
+  return (await response.json()) as SessionModeActiveState;
+}

package/src/client/hints.ts

@@ -0,0 +1,41 @@
+// 行配置页与提示面共用的命名空间/解包：从 `bundle-config.ts` 抽出来，配置页移除后仍要给提示面用。
+
+export const SESSION_MODE_NS = "session-mode";
+
+// cordis 会把服务值包成追踪代理（`Symbol.for("cordis.original")` 指回原始实例）。代理上的方法调用以代理为
+// `this`，而服务实现用的是 JS 私有字段——先解包成原实例再调。
+export function unwrapService<T>(value: T | undefined): T | undefined {
+  if (value === undefined) return undefined;
+  const original = (value as { [key: symbol]: unknown })[Symbol.for("cordis.original")];
+  return (original ?? value) as T;
+}
+
+export interface HintsLike {
+  textFor(ns: string, path: readonly string[]): { label?: string; hint?: string };
+  selectFor(ns: string, path: readonly string[]): unknown;
+  sourceFor(name: string): unknown;
+  subscribe(listener: () => void): () => void;
+}
+
+export interface HintsService extends HintsLike {
+  describe(
+    ns: string,
+    path: readonly string[],
+    read: () => { label?: string; hint?: string },
+  ): () => void;
+  select(
+    ns: string,
+    path: readonly string[],
+    spec: { options: () => readonly unknown[] },
+  ): () => void;
+  source(
+    name: string,
+    read: {
+      options: (
+        read: (path: readonly string[]) => unknown,
+      ) => readonly { value: string; label?: string }[];
+      dependsOn?: readonly (readonly string[])[];
+    },
+  ): () => void;
+  refresh(): void;
+}

package/src/client/index.ts

@@ -1,6 +1,5 @@
-// client 半：会话里那一个面（模式 chip，槽位 `conversation.input.left`，list + session scope）+ 配置面两处——
-// 本行自己那页（由 `@morlay/dsh-client-ui-primitives` 按 schema 自动生成，key = `<bundle 包名>#<行 id>`）与
-// 装本行的 bundle 那一页（`plugins.bundle.config`，key = bundle 包名，见 `./BundleConfigPage.tsx`）。
+// client 半：会话里那一个面（模式 chip，槽位 `conversation.input.left`，list + session scope）。bundle 配置页
+// 不再注册——模式与它的生效面（工具 / 技能 / policy / 系统提示词）改在侧边栏面板里按会话展示。
 
 import type { Context } from "@deepseek-ai/cordis";
 // Type-only：`ctx.remote` 的合并面（选模型的候选来自 LLM 目录）。
@@ -11,38 +10,35 @@ import type {} from "@deepseek-ai/dsh-client-ui-slots";
 import type {} from "@deepseek-ai/dsh-client-ui-conversation/client";
 // Type-only：`plugins.bundle.config` 的槽位声明（bundle 详情页的配置座位）。
 import type {} from "@deepseek-ai/dsh-client-ui-plugin-manager/client";
+// Type-only：右栏 tab 的类型注册面（`ctx.sidebarRightTabs`）与座位声明。
+import type {} from "@deepseek-ai/dsh-client-ui-sidebar-right/client";
 import {
   CATALOG_NS,
   SESSION_MODE_CATALOG_REMOTE,
   type SessionModeCatalogRemote,
 } from "../catalog-remote.ts";
 import { POLICY_NAMES } from "../shared.ts";
-import {
-  BUNDLE_CONFIG_KEY,
-  createBundleConfigFace,
-  SESSION_MODE_NS,
-  unwrapService,
-  type HintsLike,
-  type HintsService,
-} from "./bundle-config.ts";
-import { BundleConfigPage } from "./BundleConfigPage.tsx";
-import { BUNDLE_NS, bundleEn, bundleZh, type BundleLocaleKey } from "./bundle-locales.ts";
+import { SESSION_MODE_NS, unwrapService, type HintsService } from "./hints.ts";
 import { loadLlmProviders, remoteNamespace, type ProviderModels } from "./llm-directory.ts";
+import { SessionModePanel } from "./SessionModePanel.tsx";
 import { SessionModeSeat } from "./SessionModeSeat.tsx";
 import { en, zh, type SessionModeLocaleKey } from "./locales.ts";
 
 declare module "@deepseek-ai/dsh-client-ui-slots" {
   interface LocaleNamespaceMap {
-    // 会话里两个面的文案（本行配置页的文案在通用 schema 表单的字典里）。
+    // 会话里那个面（模式 chip）的文案。
     "session-mode": SessionModeLocaleKey;
-    // bundle 配置页（`plugins.bundle.config`）的文案。
-    "session-mode-bundle": BundleLocaleKey;
+    // bundle 配置页的字典：页面已不再注册，类型面留着给保留的文件。
+    "session-mode-bundle": import("./bundle-locales.ts").BundleLocaleKey;
   }
 }
 
 // 浏览器半插件的字典命名空间。
 const NS = "session-mode";
 
+// 右栏 tab 类型的 id（也是正文座位的 key）：包名是天然的唯一值。
+const PANEL_ID = "@morlay/dsh-session-mode";
+
 // 这一行里需要中文文案的字段（都在 `modes.<模式>.defaultModel` 里，所以按模板路径注册一次）。
 const FIELDS = ["provider", "model", "reasoningEffort"] as const;
 
@@ -63,7 +59,6 @@ interface PresetRosterReader {
 
 export type { SessionModeSeatProps } from "./SessionModeSeat.tsx";
 export type { SessionModeLocaleKey } from "./locales.ts";
-export type { BundleConfigPageProps } from "./BundleConfigPage.tsx";
 
 // 需要的服务：槽位与字典（会话列表经槽位的标准 props 到达组件，不必自己 inject）；bundle 那页另要配置表单与
 // schema 服务，见下面那段注册自己的 `ctx.inject`。
@@ -253,51 +248,72 @@ export function apply(ctx: Context): void {
     }, "session-mode: composer chip");
   });
 
-  // 装本行的 bundle 那一页（`plugins.bundle.config`，key = bundle 包名）：本行是那份配置的 owner，页面摆的就是
-  // `modes` 与 `default` 这几项——按模式折叠分组而不是按 schema 平铺，所以它自带表单，不用自动生成那页。
-  // 提示面的候选（选服务商 / 选模型的两个具名源）可能比本页晚到，所以这一页自己重投影的入口留在外面：
-  // 提示面一到（或它的候选变了）就刷一次，模型那两个字段不会静默退回手输。
-  let refreshPage: (() => void) | undefined;
-  // 提示面按**属性访问**取（`ctx.get(name)` 给的是追踪代理，调带 JS 私有字段的方法会抛），存下来给下面那一页用。
-  let hints: HintsLike | undefined;
-  ctx.inject(["schemaFormHints"], (scope) =>
+  // 右栏面板（`sidebar.right.pane.tab`）：只展示这个会话**选中的模式**与它当下生效的那一份。注册是两段式——
+  // 类型进 `sidebarRightTabs`，正文进 keyed 座位（key = 类型 id）——与上游各 tab 类型走同一条路。
+  ctx.inject(["sidebarRightTabs", "slots", "locale"], (scope) =>
     scope.effect(() => {
-      // 订阅也要用解包后的实例（服务实现用 JS 私有字段，代理上的调用会抛）。
-      const service = unwrapHintService(scope);
-      hints = service;
-      const off = service.subscribe(() => {
-        refreshPage?.();
+      const panelT = scope.locale.bind(NS);
+      const offType = scope.sidebarRightTabs.register({
+        id: PANEL_ID,
+        kind: PANEL_ID,
+        priority: "extension",
+        title: () => panelT("panel"),
+        // 右栏 guide 页上的一条入口：没有它，用户只能等自动打开才看得到这一页。
+        guide: [
+          {
+            id: PANEL_ID,
+            order: 20,
+            title: () => panelT("panel"),
+            description: () => panelT("panelDescription"),
+          },
+        ],
       });
+      const body = scope.slots.inject("sidebar.right.pane.tab", () =>
+        scope.slots.register(
+          { name: "sidebar.right.pane.tab", key: PANEL_ID, locale: NS },
+          SessionModePanel,
+        ),
+      );
       return () => {
-        off();
-        hints = undefined;
+        body();
+        offType();
       };
-    }, "session-mode: bundle page candidates"),
+    }, "session-mode: sidebar panel"),
   );
 
-  ctx.inject(["slots", "locale", "configForms", "settingsSchema"], (scope) => {
+  // 和新建对话联动：当前会话一变（新建或切换）就把面板带到右栏。右栏没挂载（窄屏/未装那一行）时不动；
+  // 同一 pane 内按 kind 单页，重复调用只是把已有那一页选中。
+  ctx.inject(["sidebarRight", "uiSession"], (scope) =>
     scope.effect(() => {
-      const bundleT = scope.locale.bind(BUNDLE_NS);
-      const { face, refresh, dispose } = createBundleConfigFace(scope, bundleT, () => hints);
-      refreshPage = refresh;
-      const bundleDictionary = scope.locale.register(BUNDLE_NS, { zh: bundleZh, en: bundleEn });
-      const off = scope.slots.inject("plugins.bundle.config", () =>
-        scope.slots.register(
-          {
-            name: "plugins.bundle.config",
-            key: BUNDLE_CONFIG_KEY,
-            locale: BUNDLE_NS,
-            inject: () => face,
-          },
-          BundleConfigPage,
-        ),
-      );
+      const current = scope.uiSession.adapter.current;
+      // `mounted` 是右栏当前显示的会话：首帧与切换过程中它还没指向新会话，这时 `openTab` 会以
+      // "no session surface is mounted" 抛错。所以两路都订阅——会话换了自己不写，等右栏挂到这个会话
+      // 再打开（同一 pane 内按 kind 单页，重复调用只是选中）。
+      const mounted = scope.sidebarRight.mounted;
+      let queued = false;
+      const sync = (): void => {
+        if (queued) return;
+        queued = true;
+        // 推迟到本轮订阅回调结束之后：`publishMain` 期间 surface 还在切换，同步写会抛。
+        queueMicrotask(() => {
+          queued = false;
+          const key = current.getSnapshot().key;
+          if (typeof key !== "string" || key.length === 0) return;
+          if (mounted.getSnapshot() !== key) return;
+          try {
+            scope.sidebarRight.openTab(PANEL_ID);
+          } catch {
+            // 挂载与卸载之间仍可能撞上：下一次订阅回调会再试，这里不当作错误。
+          }
+        });
+      };
+      const offCurrent = current.subscribe(sync);
+      const offMounted = mounted.subscribe(sync);
+      sync();
       return () => {
-        off();
-        bundleDictionary();
-        refreshPage = undefined;
-        dispose();
+        offCurrent();
+        offMounted();
       };
-    }, "session-mode: bundle configuration page");
-  });
+    }, "session-mode: panel follows the session"),
+  );
 }

package/src/client/locales.ts

@@ -12,6 +12,45 @@ export const zh = {
   modelHint: "模型 id。",
   reasoningEffort: "思考档位",
   reasoningEffortHint: "默认就跟服务商自己的默认。",
+  panel: "会话模式",
+  panelDescription: "当前会话的模式与生效面：工具、技能、政策与注入开关。",
+  panelNoSession: "当前没有会话",
+  persona: "系统提示词",
+  tools: "工具",
+  skills: "技能",
+  policies: "政策规则",
+  switches: "注入面",
+  instructions: "工作区指令",
+  skillsCatalog: "技能目录",
+  runtimeContext: "动态快照",
+  empty: "（无）",
+  loading: "读取中…",
+  saveDefault: "保存为默认",
+  reset: "重置",
+  apply: "应用到会话",
+  applied: "已应用到会话",
+  fromSession: "会话覆盖",
+  fromMode: "模式默认",
+  saveAs: "另存为",
+  delete: "删除",
+  deleteConfirm: "删除这个模式？它会从配置里移除，使用它的会话回到默认模式。",
+  cancel: "取消",
+  confirm: "确定",
+  nameLabel: "显示名（可选）",
+  codeLabel: "模式 code（必填）",
+  codePlaceholder: "例如 my-mode",
+  namePlaceholder: "新模式名",
+  addValue: "添加一项",
+  general: "通用配置",
+  stateDefault: "默认",
+  stateMixed: "混合",
+  stateOn: "开",
+  stateOff: "关",
+  stateAllow: "允许",
+  stateDeny: "禁止",
+  savedNewMode: "已另存为新模式，对新会话生效",
+  saved: "已保存，对新会话生效",
+  saveFailed: "保存失败",
 };
 
 export const en: Record<keyof typeof zh, string> = {
@@ -25,6 +64,47 @@ export const en: Record<keyof typeof zh, string> = {
   modelHint: "Model id.",
   reasoningEffort: "Reasoning effort",
   reasoningEffortHint: "Default keeps the provider's own default.",
+  panel: "Session mode",
+  panelDescription:
+    "The mode this session runs and what it currently exposes: tools, skills, policies and injections.",
+  panelNoSession: "No session",
+  persona: "System prompt",
+  tools: "Tools",
+  skills: "Skills",
+  policies: "Policies",
+  switches: "Injections",
+  instructions: "Workspace instructions",
+  skillsCatalog: "Skill catalog",
+  runtimeContext: "Runtime context",
+  empty: "(none)",
+  loading: "Loading…",
+  saveDefault: "Save as default",
+  reset: "Reset",
+  apply: "Apply to session",
+  applied: "Applied to session",
+  fromSession: "session override",
+  fromMode: "mode default",
+  saveAs: "Save as",
+  delete: "Delete",
+  deleteConfirm:
+    "Delete this mode? It is removed from the configuration and sessions using it fall back to the default.",
+  cancel: "Cancel",
+  confirm: "Confirm",
+  nameLabel: "Display name (optional)",
+  codeLabel: "Mode code (required)",
+  codePlaceholder: "e.g. my-mode",
+  namePlaceholder: "New mode name",
+  addValue: "Add an entry",
+  general: "General",
+  stateDefault: "Default",
+  stateMixed: "Mixed",
+  stateOn: "On",
+  stateOff: "Off",
+  stateAllow: "Allow",
+  stateDeny: "Deny",
+  savedNewMode: "Saved as a new mode; applies to new sessions",
+  saved: "Saved; applies to new sessions",
+  saveFailed: "Save failed",
 };
 
 export type SessionModeLocaleKey = keyof typeof zh;