@steerable/agent-shell-web 0.6.65 → 0.6.66

package/src/layouts/right-panel-tabs.ts

@@ -1,51 +1,149 @@
 /**
  * 右侧栏位的多标签状态。
  *
- * 同一会话可以同时打开终端和若干包槽位。`active` 是当前看见的那一个。
+ * 同一会话可以同时打开终端和若干包槽位。`activeTabId` 是当前看见的那一个。
  * `collapsed` 表示整栏收起：标签还留着，右侧不显示，再打开时恢复。
- * 持久化兼容以前每个会话只存一个字符串的格式。
+ * 标签实例 id、内容身份和显示标题分开保存；持久化兼容旧字符串格式。
  */
 
+export type RightPanelTabRecord = {
+  id: string;
+  kind: string;
+  contentId: string;
+  title: string;
+};
+
 export type RightPanelTabs = {
-  tabs: string[];
-  active: string;
+  tabs: RightPanelTabRecord[];
+  activeTabId: string;
   collapsed?: boolean;
 };
 
 /** 每个会话各自的标签：chatId → 打开的标签（没有标签时不落盘）。 */
 export type RightPanelMap = Record<string, RightPanelTabs>;
 
+export type RightPanelTabTarget = Omit<RightPanelTabRecord, 'id'>;
+
+export const RIGHT_PANEL_PERSISTENCE_VERSION = 2;
+
+let fallbackTabSequence = 0;
+
+/** 新建一次标签实例。内容相同的标签是否复用由打开策略决定。 */
+export function createRightPanelTab(
+  target: RightPanelTabTarget,
+  id?: string,
+): RightPanelTabRecord {
+  const generated = globalThis.crypto?.randomUUID?.()
+    ?? `tab-${Date.now().toString(36)}-${(++fallbackTabSequence).toString(36)}`;
+  return { id: id ?? generated, ...target };
+}
+
+function contentKey(tab: Pick<RightPanelTabRecord, 'kind' | 'contentId'>): string {
+  return `${tab.kind}\0${tab.contentId}`;
+}
+
+/** 查找已打开的同一内容。 */
+export function findRightPanelContentTab(
+  current: RightPanelTabs | null,
+  target: Pick<RightPanelTabRecord, 'kind' | 'contentId'>,
+): RightPanelTabRecord | null {
+  return current?.tabs.find((tab) =>
+    tab.kind === target.kind && tab.contentId === target.contentId) ?? null;
+}
+
+/** 非当前标签只在类型声明需要保活时继续挂载。 */
+export function shouldMountRightPanelTab(
+  tabId: string,
+  activeTabId: string,
+  keepMounted: boolean,
+): boolean {
+  return tabId === activeTabId || keepMounted;
+}
+
+function normalizeTabRecord(
+  value: unknown,
+  isValidKind: (kind: string) => boolean,
+): RightPanelTabRecord | null {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  const record = value as Partial<Record<keyof RightPanelTabRecord, unknown>>;
+  if (
+    typeof record.id !== 'string'
+    || !record.id
+    || typeof record.kind !== 'string'
+    || !isValidKind(record.kind)
+    || typeof record.contentId !== 'string'
+    || !record.contentId
+    || typeof record.title !== 'string'
+    || !record.title
+  ) {
+    return null;
+  }
+  return {
+    id: record.id,
+    kind: record.kind,
+    contentId: record.contentId,
+    title: record.title,
+  };
+}
+
 export function normalizeRightPanelEntry(
   value: unknown,
-  isValidValue: (value: string) => boolean,
+  isValidKind: (kind: string) => boolean,
+  resolveLegacyTab: (value: string) => RightPanelTabTarget | null,
 ): RightPanelTabs | null {
   if (typeof value === 'string') {
-    return isValidValue(value) ? { tabs: [value], active: value } : null;
+    const target = resolveLegacyTab(value);
+    if (!target || !isValidKind(target.kind)) return null;
+    const tab = createRightPanelTab(target, `legacy:${encodeURIComponent(value)}`);
+    return { tabs: [tab], activeTabId: tab.id };
   }
   if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
-  const record = value as { tabs?: unknown; active?: unknown; collapsed?: unknown };
-  const seen = new Set<string>();
-  const tabs: string[] = [];
+  const record = value as {
+    tabs?: unknown;
+    active?: unknown;
+    activeTabId?: unknown;
+    collapsed?: unknown;
+  };
+  const seenIds = new Set<string>();
+  const seenContent = new Set<string>();
+  const tabs: RightPanelTabRecord[] = [];
   if (Array.isArray(record.tabs)) {
     for (const item of record.tabs) {
-      if (typeof item !== 'string' || !isValidValue(item) || seen.has(item)) continue;
-      seen.add(item);
-      tabs.push(item);
+      const tab = typeof item === 'string'
+        ? (() => {
+          const target = resolveLegacyTab(item);
+          return target && isValidKind(target.kind)
+            ? createRightPanelTab(target, `legacy:${encodeURIComponent(item)}`)
+            : null;
+        })()
+        : normalizeTabRecord(item, isValidKind);
+      if (!tab || seenIds.has(tab.id) || seenContent.has(contentKey(tab))) continue;
+      seenIds.add(tab.id);
+      seenContent.add(contentKey(tab));
+      tabs.push(tab);
     }
   }
   if (tabs.length === 0) return null;
-  const active =
-    typeof record.active === 'string' && tabs.includes(record.active)
+  const requestedActive = typeof record.activeTabId === 'string'
+    ? record.activeTabId
+    : typeof record.active === 'string'
       ? record.active
-      : tabs[0]!;
-  return record.collapsed === true ? { tabs, active, collapsed: true } : { tabs, active };
+      : '';
+  const activeTabId = tabs.some((tab) => tab.id === requestedActive)
+    ? requestedActive
+    : tabs.find((tab) => tab.id === `legacy:${encodeURIComponent(requestedActive)}`)?.id
+      ?? tabs[0]!.id;
+  return record.collapsed === true
+    ? { tabs, activeTabId, collapsed: true }
+    : { tabs, activeTabId };
 }
 
 /**
  * 解析持久化的「会话 → 右侧标签」映射。
  *
  * 兼容这些历史格式：
- *   - 多标签：{"<chatId>": { "tabs": ["ppt", "terminal"], "active": "ppt" }}；
+ *   - v2：{"version":2,"sessions":{"<chatId>":{"tabs":[...],"activeTabId":"..."}}}；
+ *   - 旧多标签：{"<chatId>": { "tabs": ["ppt", "terminal"], "active": "ppt" }}；
  *   - 单值映射：{"<chatId>": "terminal" | "<slotId>"} → 一个标签；
  *   - 整个值就是单个字符串 → 迁到当前会话；
  *   - 更老：只记录终端是否打开过的布尔 key。
@@ -55,70 +153,94 @@ export function parseRightPanelMap(options: {
   raw: string | null;
   legacyTerminalOpen: string | null;
   chatId: string | null;
-  isValidValue: (value: string) => boolean;
+  isValidKind: (kind: string) => boolean;
+  resolveLegacyTab: (value: string) => RightPanelTabTarget | null;
 }): RightPanelMap {
-  const { raw, legacyTerminalOpen, chatId, isValidValue } = options;
+  const { raw, legacyTerminalOpen, chatId, isValidKind, resolveLegacyTab } = options;
   if (raw !== null) {
     if (raw === '') return {};
     try {
       const parsed = JSON.parse(raw) as unknown;
       if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        const root = parsed as { version?: unknown; sessions?: unknown };
+        const source = root.version === RIGHT_PANEL_PERSISTENCE_VERSION
+          && root.sessions
+          && typeof root.sessions === 'object'
+          && !Array.isArray(root.sessions)
+          ? root.sessions as Record<string, unknown>
+          : parsed as Record<string, unknown>;
         const map: RightPanelMap = {};
-        for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
-          const entry = normalizeRightPanelEntry(value, isValidValue);
+        for (const [key, value] of Object.entries(source)) {
+          const entry = normalizeRightPanelEntry(value, isValidKind, resolveLegacyTab);
           if (entry) map[key] = entry;
         }
         return map;
       }
     } catch {
-      const entry = normalizeRightPanelEntry(raw, isValidValue);
+      const entry = normalizeRightPanelEntry(raw, isValidKind, resolveLegacyTab);
       if (entry && chatId) return { [chatId]: entry };
     }
     return {};
   }
-  if (legacyTerminalOpen === '1' && chatId && isValidValue('terminal')) {
-    return { [chatId]: { tabs: ['terminal'], active: 'terminal' } };
+  if (legacyTerminalOpen === '1' && chatId && isValidKind('terminal')) {
+    const tab = createRightPanelTab(
+      { kind: 'terminal', contentId: 'terminal', title: 'Terminal' },
+      'legacy:terminal',
+    );
+    return { [chatId]: { tabs: [tab], activeTabId: tab.id } };
   }
   return {};
 }
 
+/** 把运行时状态写成带版本的持久化载荷。 */
+export function serializeRightPanelMap(map: RightPanelMap): string {
+  return JSON.stringify({ version: RIGHT_PANEL_PERSISTENCE_VERSION, sessions: map });
+}
+
 /** 快捷键：整栏收着时打开并显示这一项；没开就追加并显示；已开但不是当前就切过去；当前这个就关掉。 */
 export function toggleRightPanelEntry(
   current: RightPanelTabs | null,
-  kind: string,
+  requested: RightPanelTabRecord,
 ): RightPanelTabs | null {
+  const existing = findRightPanelContentTab(current, requested);
+  const tab = existing ?? requested;
   if (current?.collapsed) {
-    const tabs = current.tabs.includes(kind) ? current.tabs : [...current.tabs, kind];
-    return { tabs, active: kind };
+    const tabs = existing ? current.tabs : [...current.tabs, tab];
+    return { tabs, activeTabId: tab.id };
+  }
+  if (!current || !existing) {
+    return {
+      tabs: current ? [...current.tabs, tab] : [tab],
+      activeTabId: tab.id,
+    };
   }
-  if (!current || !current.tabs.includes(kind)) {
-    return { tabs: current ? [...current.tabs, kind] : [kind], active: kind };
+  if (current.activeTabId !== tab.id) {
+    return { tabs: current.tabs, activeTabId: tab.id };
   }
-  if (current.active !== kind) return { tabs: current.tabs, active: kind };
-  return closeRightPanelTab(current, kind);
+  return closeRightPanelTab(current, tab.id);
 }
 
 /** 收起整栏。标签保留，下次展开还是这些。 */
 export function collapseRightPanel(current: RightPanelTabs): RightPanelTabs {
-  return { tabs: current.tabs, active: current.active, collapsed: true };
+  return { tabs: current.tabs, activeTabId: current.activeTabId, collapsed: true };
 }
 
 /** 展开整栏，回到收起前正在看的标签。 */
 export function expandRightPanel(current: RightPanelTabs): RightPanelTabs {
-  return { tabs: current.tabs, active: current.active };
+  return { tabs: current.tabs, activeTabId: current.activeTabId };
 }
 
 /** 关掉一个标签。关掉的是当前标签时，改看相邻的那一个。 */
 export function closeRightPanelTab(
   current: RightPanelTabs,
-  kind: string,
+  tabId: string,
 ): RightPanelTabs | null {
-  const tabs = current.tabs.filter((id) => id !== kind);
+  const tabs = current.tabs.filter((tab) => tab.id !== tabId);
   if (tabs.length === 0) return null;
-  if (current.active !== kind) return { tabs, active: current.active };
-  const index = current.tabs.indexOf(kind);
+  if (current.activeTabId !== tabId) return { tabs, activeTabId: current.activeTabId };
+  const index = current.tabs.findIndex((tab) => tab.id === tabId);
   const active = tabs[Math.min(index, tabs.length - 1)] ?? tabs[0]!;
-  return { tabs, active };
+  return { tabs, activeTabId: active.id };
 }
 
 /**
@@ -127,23 +249,61 @@ export function closeRightPanelTab(
  */
 export function revealRightPanelTab(
   current: RightPanelTabs | null,
-  kind: string,
+  requested: RightPanelTabRecord,
 ): RightPanelTabs {
-  if (!current) return { tabs: [kind], active: kind };
+  if (!current) return { tabs: [requested], activeTabId: requested.id };
+  const existing = findRightPanelContentTab(current, requested);
+  const tab = existing ?? requested;
   if (current.collapsed) {
-    const tabs = current.tabs.includes(kind) ? current.tabs : [...current.tabs, kind];
-    return { tabs, active: kind };
+    const tabs = existing ? current.tabs : [...current.tabs, tab];
+    return { tabs, activeTabId: tab.id };
+  }
+  if (existing) return current;
+  return { tabs: [...current.tabs, tab], activeTabId: current.activeTabId };
+}
+
+function sameRightPanelTabs(
+  tabs: readonly RightPanelTabRecord[],
+  next: readonly RightPanelTabRecord[],
+): boolean {
+  return tabs.length === next.length && tabs.every((tab, index) => tab.id === next[index]?.id);
+}
+
+/**
+ * 对话里的预览跟着当前回合换文件。
+ * 栏位关着时不重新打开。正在看终端时只把文档标签留在后面，不抢走终端。
+ * 已经开着文档时，切到这一轮对应的标签。
+ */
+export function followRightPanelTab(
+  current: RightPanelTabs | null,
+  requested: RightPanelTabRecord,
+): RightPanelTabs | null {
+  if (!current) return null;
+  const existing = findRightPanelContentTab(current, requested);
+  const tab = existing ?? requested;
+  const tabs = existing ? current.tabs : [...current.tabs, tab];
+  const activeTab = current.tabs.find((item) => item.id === current.activeTabId);
+  const activeTabId = activeTab?.kind === 'terminal' ? activeTab.id : tab.id;
+  const next: RightPanelTabs = current.collapsed
+    ? { tabs, activeTabId, collapsed: true }
+    : { tabs, activeTabId };
+  if (
+    current.activeTabId === next.activeTabId
+    && current.collapsed === next.collapsed
+    && sameRightPanelTabs(current.tabs, next.tabs)
+  ) {
+    return current;
   }
-  if (current.tabs.includes(kind)) return current;
-  return { tabs: [...current.tabs, kind], active: current.active };
+  return next;
 }
 
 /** 打开并显示。已经开着时只切换当前标签。 */
 export function openRightPanelTab(
   current: RightPanelTabs | null,
-  kind: string,
+  requested: RightPanelTabRecord,
 ): RightPanelTabs {
-  if (!current) return { tabs: [kind], active: kind };
-  if (current.tabs.includes(kind)) return { tabs: current.tabs, active: kind };
-  return { tabs: [...current.tabs, kind], active: kind };
+  if (!current) return { tabs: [requested], activeTabId: requested.id };
+  const existing = findRightPanelContentTab(current, requested);
+  if (existing) return { tabs: current.tabs, activeTabId: existing.id };
+  return { tabs: [...current.tabs, requested], activeTabId: requested.id };
 }

package/src/lib/local-api.ts

@@ -445,6 +445,8 @@ export interface LocalProject {
   sourceFolders?: string[];
   /** W6-5: 信任后该项目目录里的规则文件才会注入模型上下文。缺省 false。 */
   trusted?: boolean;
+  /** 侧边栏顺序，越小越靠前。缺省时列表顺序由服务端决定。 */
+  sortOrder?: number;
   createdAt: string;
   updatedAt: string;
 }
@@ -570,6 +572,15 @@ export async function updateProject(
   });
 }
 
+/** 按 id 顺序保存侧栏项目排序。服务端忽略未知 id，没提到的项目接在后面。 */
+export async function reorderProjects(orderedIds: string[]) {
+  return bridge().localBackend.request<{ success: boolean; projects: LocalProject[] }>({
+    method: 'PUT',
+    path: '/api/v2/projects/order',
+    body: { orderedIds },
+  });
+}
+
 export async function deleteProject(projectId: string) {
   return bridge().localBackend.request<{ success: boolean; detachedChats: number }>({
     method: 'DELETE',

package/src/lib/project-order.ts

@@ -0,0 +1,48 @@
+/**
+ * 侧栏项目拖拽排序。显示顺序以列表下标为准；服务端再把同样的 id
+ * 顺序写成 sortOrder。
+ */
+
+export type ProjectDropPlace = 'before' | 'after';
+
+/**
+ * 把 fromId 插到 targetId 前面或后面。顺序没有变化时返回 null，
+ * 调用方就不必再请求保存。
+ */
+export function nextProjectOrder(
+  ids: readonly string[],
+  fromId: string,
+  targetId: string,
+  place: ProjectDropPlace,
+): string[] | null {
+  if (!fromId || fromId === targetId) return null;
+  const without = ids.filter((id) => id !== fromId);
+  const targetIndex = without.indexOf(targetId);
+  if (targetIndex < 0) return null;
+  const insertAt = place === 'before' ? targetIndex : targetIndex + 1;
+  const next = without.slice();
+  next.splice(insertAt, 0, fromId);
+  if (next.length === ids.length && next.every((id, index) => id === ids[index])) return null;
+  return next;
+}
+
+/** 按 orderedIds 重排。名单里没有的项目保持原先的相对顺序，接在后面。 */
+export function applyProjectIdOrder<T extends { id: string }>(
+  projects: readonly T[],
+  orderedIds: readonly string[],
+): Array<T & { sortOrder: number }> {
+  const byId = new Map(projects.map((project) => [project.id, project]));
+  const next: Array<T & { sortOrder: number }> = [];
+  const seen = new Set<string>();
+  for (const id of orderedIds) {
+    const project = byId.get(id);
+    if (!project || seen.has(id)) continue;
+    seen.add(id);
+    next.push({ ...project, sortOrder: next.length });
+  }
+  for (const project of projects) {
+    if (seen.has(project.id)) continue;
+    next.push({ ...project, sortOrder: next.length });
+  }
+  return next;
+}

package/src/packs/registry.ts

@@ -13,6 +13,7 @@ import type {
   PackChatSlotAutoRevealApi,
   PackChatSlotContribution,
   PackChatSlotProps,
+  PackChatSlotTarget,
   PackRendererContributions,
   PackRouteContribution,
   PackSettingsPanelContribution,
@@ -23,6 +24,7 @@ export type {
   PackChatSlotAutoRevealApi,
   PackChatSlotContribution,
   PackChatSlotProps,
+  PackChatSlotTarget,
   PackRendererContributions,
   PackRouteContribution,
   PackSettingsPanelContribution,