@cerbur/clutch-dsh-worktree 0.1.5 → 0.1.6

package/README.md

@@ -12,10 +12,18 @@ The plugin stores only external Worktree/Session relationship metadata.
 The English screenshot shows Worktree mode in the Sidebar, a Workspace tree with Main and
 Worktree rows, and the read-only blank-session Hero context.
 
+![English Worktree Create/Import dialog](assets/screenshots/screenshots-import.png)
+
+The Import screenshot shows the existing Workspace `+` dialog with Create selected by default,
+the adjacent Import tab, and a standard dropdown containing safe example branch/path values.
+
 ## Capabilities
 
 - Enter Worktree mode from the DSH Sidebar footer and browse Workspace → Worktree → Session.
 - Search Workspaces and create a Git Worktree and branch from an existing local branch.
+- Choose Import in the same dialog to discover unmanaged, branch-attached Git Worktrees linked to the Workspace repository. The first version omits the repository root and detached HEAD entries.
+- Register an existing Worktree in place without moving, copying, or editing its directory; the imported record uses `source: external` and then follows the same Session, binding, health, ordering, cwd, projection, refresh, and recovery flow as a plugin-created record.
+- Remove plugin-created and imported Worktrees through real `git worktree remove`; removing an imported Worktree can delete its linked directory and is called out in the confirmation dialog.
 - Create a normal Session from Main or a Session whose runtime cwd is an active Worktree, then
   open it directly.
 - See ready, repair, active, and detached Worktree states, including retryable operation errors.
@@ -24,6 +32,8 @@ Worktree rows, and the read-only blank-session Hero context.
 - Continue using DSH-native Workspace rename/delete/reorder and Session menus. Worktree rows can
   be reordered within their owning Workspace; order is stored in the plugin sidecar and Main is
   fixed first.
+- Persist Workspace, Main, and Worktree expansion choices in browser-local storage; the five-row Session overflow state remains transient and resets after refresh or parent collapse.
+- Highlight the DSH current Session in Worktree view; entering Worktree mode or switching the current Session temporarily reveals its Workspace/Main/Worktree path, expands Session overflow, clears a hiding search, and scrolls the row into view; this browser-local behavior does not change persisted expansion choices.
 - Keep the current local branch or Worktree branch visible as read-only context in the existing
   Conversation title row and in the blank-session Hero.
 - Keep Conversation and Hero context stable across same-Session snapshot updates and Session
@@ -36,7 +46,11 @@ Worktree rows, and the read-only blank-session Hero context.
 
 ### Compatibility and prerequisites
 
-- The DSH CLI and the target Web profile must use `dsh-v0.1.0-rc.8`.
+- For development and source validation, use a clean checkout of the official [DeepSeek Harness
+  repository](https://github.com/deepseek-ai/deepseek-harness) on its current default branch. The
+  repository currently uses `master` rather than `main`; it is developer-preview software, so its
+  package and API contracts may change. Run the upstream install/build steps before installing
+  this plugin into that profile.
 - The target profile, such as `web` or `demo`, must already start successfully, and the plugin
   must be installed into the same profile that launches the Web UI.
 - DSH Client must provide the native `@deepseek-ai/dsh-client-ui-conversation` package and its
@@ -79,6 +93,20 @@ To inspect the currently published version on the official registry:
 npm view @cerbur/clutch-dsh-worktree version --registry=https://registry.npmjs.org/
 ```
 
+### Prepare the current upstream DSH checkout
+
+For source-based development or validation, prepare the upstream checkout first. The current
+upstream default branch is `master`; follow the repository's default branch if it changes later.
+
+```bash
+git clone https://github.com/deepseek-ai/deepseek-harness.git
+cd deepseek-harness
+git fetch origin
+git pull --ff-only origin master
+pnpm install
+pnpm run build
+```
+
 ### Install from a repository checkout
 
 Build the package from the `clutch-dsh` checkout, then install its absolute path into the DSH
@@ -176,14 +204,30 @@ blank-session Hero. The displayed language follows DSH's current language settin
    Project root. Relative paths, a different Project, or the Project root are rejected.
 3. Git must be installed and available on `PATH`. A missing Git executable shows install guidance
    and no command block; install Git, restart DSH, and retry. If the repository, initial commit,
-   or local branch is missing, follow the copyable setup commands in the dialog. The plugin only
-   renders this guidance; it does not run setup or installation commands or edit business files.
+  or local branch is missing, follow the copyable setup commands in the dialog. The plugin only
+  renders this guidance; it does not run setup or installation commands or edit business files.
+
+### Import an existing Worktree
+
+1. Select a Workspace, press its `+`, and choose the `Import` tab. The dialog loads Git-linked
+   Worktrees for that repository through the existing DSH `/api` Connection.
+2. The first version lists only branch-attached, non-root Worktrees that are not already present
+   in the plugin sidecar. Detached HEAD entries are intentionally omitted. Candidates are presented
+   in a standard dropdown; each option shows its branch first and absolute path as secondary
+   diagnostic text.
+3. Choose an option and select `Import Worktree`. Registration writes only the plugin sidecar;
+   the existing Worktree directory and Git working state remain in place. Import then creates or
+   reuses a Session at that Worktree cwd and runs the same bind → membership projection → open →
+   refresh flow as Create.
+4. An active external import for the same Workspace and physical path is idempotent. A path already
+   managed by the plugin returns `WORKTREE_ALREADY_MANAGED`; invalid or stale candidates return
+   `WORKTREE_IMPORT_INVALID` and can be retried after the repository state is fixed.
 
 ### Create Main and Worktree Sessions
 
 - Use Main's `+` to create a normal DSH Session in the Project-root view.
-- Use a Worktree's `+` to create or reuse a Session with that Worktree as its runtime cwd. On
-  rc.8, the native call is `session.create({ cwd: worktreePath })`; the plugin then saves the
+- Use a Worktree's `+` to create or reuse a Session with that Worktree as its runtime cwd. The
+  plugin calls the upstream runtime with `session.create({ cwd: worktreePath })`, then saves the
   external binding, applies a browser-local `{ workspaceId, sessionId }` membership projection,
   and opens the Session.
 - The connector reuses an unarchived blank Session with the exact target cwd when possible. An
@@ -203,14 +247,19 @@ blank-session Hero. The displayed language follows DSH's current language settin
   the plugin sidecar; Main is a fixed first row and Worktrees cannot move across Workspaces.
 - Use the active Worktree options menu and confirmation dialog to remove a Worktree. Main and
   detached Worktrees do not show this menu.
+- Imported Worktrees expose the same active options menu as plugin-created Worktrees. Removing
+  either source runs real `git worktree remove`; for an imported Worktree, the confirmation warns
+  that the linked Worktree directory may be deleted. Sessions are retained as detached bindings.
 - Removing a Worktree does not delete its Sessions. The relationship remains detached until it
   is explicitly unbound. Deleting a Workspace removes only DSH's Workspace registration; its
   directory, Sessions, Git Worktrees, and plugin sidecar remain.
 - DSH-native Workspace rename/delete/reorder and Session menus remain available. Session drag
   ordering is limited to the current visual Main or Worktree group.
 - The Main group shows the current local branch as `Local (branch)` and falls back to `Local` if
-  DSH reports no current branch. Branch names, paths, Workspace names, Session titles, and raw
-  DSH/Git errors keep their original values.
+  DSH reports no current branch. When a Workspace is imported from a Git subdirectory, the Git
+  root is resolved first and the same branch/worktree information is used as for the root.
+  Branch names, paths, Workspace names, Session titles, and raw DSH/Git errors keep their
+  original values.
 - Existing Sessions show read-only context in the form `Session title` → `Agent mode` →
   `current branch / Worktree branch`. Long values remain ellipsized in the compact chip and show
   their complete value in a hover card. The blank Hero shows `Workspace (branch)` after the native
@@ -254,6 +303,7 @@ an independent sidecar store and may contain only relationship facts such as:
 
 - `projectId`, `worktreeId`, and `sessionId`;
 - an absolute Worktree path, branch, and lifecycle state;
+- the Worktree source (`plugin` or `external`);
 - binding status and schema version.
 
 The index is not written into a Project working tree or DSH's raw data directory. It does not
@@ -273,15 +323,16 @@ does not change the sidecar state, so the relationship remains retryable. Sessio
 the native DSH API before binding; a binding failure never deletes or modifies the already-created
 Session.
 
-The rc.8 `session.create` API cannot receive `workspaceId` and an independent cwd together. The
-Worktree flow therefore uses a browser-local membership projection rather than a persistent DSH
-attach, and it does not modify DSH source, Session metadata, or native Workspace storage. The
-projection is replayed after native list refreshes and removed when the binding disappears or the
-Client is disposed.
+The Worktree session flow sends the independent Worktree cwd through the upstream DSH runtime and
+keeps `{ workspaceId, sessionId }` as a browser-local membership projection rather than a
+persistent DSH attach. It does not modify DSH source, Session metadata, or native Workspace
+storage. The projection is replayed after native list refreshes and removed when the binding
+disappears or the Client is disposed.
 
-The blank Hero context is visual only. Because rc.8 has no additive Hero headline slot, its
-placement depends on the native `[data-phase="hero"]` and title anchors; it disappears when those
-anchors are unavailable and should move to a formal DSH slot when one exists.
+The blank Hero context is visual only. Because the current upstream DSH source checkout has no
+additive Hero headline slot, its placement depends on the native `[data-phase="hero"]` and title
+anchors; it disappears when those anchors are unavailable and should move to a formal DSH slot
+when one exists.
 
 ## Development and verification
 

package/README.zh.md

@@ -12,15 +12,25 @@ Session 元数据、原生列表和会话历史的唯一事实来源。插件只
 中文截图展示了侧边栏中的 Worktree 模式、包含 Main 和 Worktree 行的 Workspace 树，以及
 新会话空白 Hero 中的只读上下文。
 
+![英文 Worktree 创建/导入弹窗](assets/screenshots/screenshots-import.png)
+
+导入截图展示了现有 Workspace `+` 弹窗：默认选中创建，旁边是导入 Tab，并在普通下拉框中
+使用安全的示例 branch 和路径值。
+
 ## 能力
 
 - 从 DSH Sidebar footer 进入 Worktree 模式，按 Workspace → Worktree → Session 浏览会话。
 - 搜索 Workspace，并从已有 local branch 创建 Git Worktree 和 branch。
+- 在同一个弹窗中选择导入，发现与当前 Workspace repository 关联、尚未由 sidecar 管理且绑定 branch 的 Git Worktree。第一版不展示 repository root 和 detached HEAD 条目。
+- 导入只登记已有 Worktree，不移动、复制或编辑其目录；记录使用 `source: external`，之后与 plugin 创建的记录共享 Session、binding、health、排序、cwd、projection、刷新和恢复流程。
+- plugin 创建和导入的 Worktree 都通过真实的 `git worktree remove` 移除；移除导入的 Worktree 可能删除其关联目录，确认弹窗会明确提示。
 - 在 Main 或 active Worktree 下创建普通 Session 或 Worktree Session，并直接打开新会话。
 - 查看 ready、repair、active 和 detached Worktree 状态，包括可重试的操作错误。
 - 通过 active Worktree 的选项菜单和确认弹窗移除 Worktree；Main 和 detached 行不显示该菜单。
 - 继续使用 DSH 原生的 Workspace rename/delete/reorder 和 Session 菜单。Worktree 可以在所属
   Workspace 内排序；顺序保存在插件 sidecar 中，Main 固定在第一位。
+- 将 Workspace、Main 和 Worktree 的展开选择保存到浏览器本地存储；Session 五行溢出展开保持临时状态，并在刷新或父级折叠后重置。
+- 在 Worktree view 高亮 DSH 当前 Session；进入 Worktree 模式或切换当前会话时，临时展开其 Workspace/Main/Worktree 路径和 Session 五行溢出，清空隐藏它的搜索并滚动定位；这一浏览器本地行为不改变已保存的展开选择。
 - 在已有 Conversation 的标题行以及新会话空白 Hero 中，以只读方式显示当前 local branch 或
   Worktree branch 上下文。
 - 在同一个 Session 的 snapshot 更新以及 Session 切换期间保持 Conversation 和 Hero 上下文
@@ -32,7 +42,10 @@ Session 元数据、原生列表和会话历史的唯一事实来源。插件只
 
 ### 兼容性与前置条件
 
-- DSH CLI 和目标 Web profile 必须使用 `dsh-v0.1.0-rc.8`。
+- 开发和源码验证应使用官方 [DeepSeek Harness 仓库](https://github.com/deepseek-ai/deepseek-harness)
+  的干净 checkout，并跟随仓库当前默认分支。该仓库当前使用 `master` 而不是 `main`，且仍是
+  developer preview，package 和 API contract 可能变化；在向 profile 安装本 plugin 前，先完成
+  upstream 的安装和构建步骤。
 - 目标 profile（例如 `web` 或 `demo`）必须已经可以正常启动，且 plugin 必须安装到实际
   启动 Web UI 的同一个 profile。
 - DSH Client 必须提供原生 `@deepseek-ai/dsh-client-ui-conversation` package 及其
@@ -73,6 +86,20 @@ pnpm dsh web
 npm view @cerbur/clutch-dsh-worktree version --registry=https://registry.npmjs.org/
 ```
 
+### 准备当前 upstream DSH checkout
+
+进行源码开发或验证时，先准备 upstream checkout。当前 upstream 默认分支是 `master`；如果仓库
+未来切换默认分支，应跟随仓库的当前默认分支。
+
+```bash
+git clone https://github.com/deepseek-ai/deepseek-harness.git
+cd deepseek-harness
+git fetch origin
+git pull --ff-only origin master
+pnpm install
+pnpm run build
+```
+
 ### 从仓库 checkout 安装
 
 先从 `clutch-dsh` checkout 构建 package，再把绝对路径安装到 DSH profile：
@@ -170,12 +197,26 @@ pnpm dsh plugin --profile web remove @cerbur/clutch-dsh-worktree
    的可复制 setup 命令修复后重试。插件只展示这些提示，不会执行 setup 或安装命令或编辑
    业务文件。
 
+### 导入已有 Worktree
+
+1. 选择 Workspace，点击旁边的 `+`，再选择 `导入` Tab。弹窗通过现有 DSH `/api` Connection
+   加载该 repository 的 Git Worktree 候选项。
+2. 第一版只列出绑定 branch、不是 repository root、且未出现在 plugin sidecar 中的 Worktree。
+   detached HEAD 会被省略；候选项通过普通下拉框选择，每个选项先显示 branch，再显示绝对路径
+   作为诊断信息。
+3. 在下拉框中选择一个选项并点击 `导入 Worktree`。登记只写入 plugin sidecar，已有 Worktree 目录和 Git
+   工作状态保持不变。随后会在该 Worktree cwd 创建或复用 Session，并执行与创建相同的
+   `bind → membership projection → open → refresh` 流程。
+4. 同一 Workspace、同一物理路径的 active external 导入是幂等的。已经由 plugin 管理的路径
+   返回 `WORKTREE_ALREADY_MANAGED`；无效或过期候选项返回 `WORKTREE_IMPORT_INVALID`，修复
+   repository 状态后可以重试。
+
 ### 创建 Main 和 Worktree Session
 
 - 使用 Main 的 `+`，在 Project 根目录视角中创建普通 DSH Session。
-- 使用 Worktree 的 `+`，创建或复用 runtime cwd 指向该 Worktree 的 Session。在 rc.8 中，
-  原生调用为 `session.create({ cwd: worktreePath })`；插件随后保存外部 binding，在当前
-  浏览器内应用 `{ workspaceId, sessionId }` membership projection，并打开该 Session。
+- 使用 Worktree 的 `+`，创建或复用 runtime cwd 指向该 Worktree 的 Session。插件通过 upstream
+  runtime 调用 `session.create({ cwd: worktreePath })`，随后保存外部 binding，在当前浏览器内
+  应用 `{ workspaceId, sessionId }` membership projection，并打开该 Session。
 - 如果存在目标 cwd 完全匹配的未归档 blank Session，连接器会优先复用它。已绑定的 Session
   会直接打开；未绑定的候选会先 binding，再 projection 和打开。否则执行
   `create → bind → project → open`，同一个 Worktree 的并发点击会合并。
@@ -191,14 +232,18 @@ pnpm dsh plugin --profile web remove @cerbur/clutch-dsh-worktree
   Main 是固定的第一行，Worktree 不能跨 Workspace 移动。
 - 使用 active Worktree 的选项菜单和确认弹窗移除 Worktree。Main 和 detached Worktree 不显示
   该菜单。
+- 导入的 Worktree 与 plugin 创建的 Worktree 显示相同的 active 选项菜单。两种来源都执行真实
+  `git worktree remove`；导入项的确认文案会警告关联 Worktree 目录可能被删除。Session 会
+  保留为 detached binding。
 - 移除 Worktree 不会删除其 Session。关系会保留为 detached，直到显式解绑。删除 Workspace
   只会删除 DSH 的 Workspace registration；其目录、Session、Git Worktree 和 plugin
   sidecar 会保留。
 - DSH 原生的 Workspace rename/delete/reorder 和 Session 菜单继续可用。Session 拖动排序
   限定在当前视觉 Main 或 Worktree 分组中。
 - Main 分组显示当前 local branch：有分支时为 `本地（branch）`，DSH 没有返回当前分支时
-  回退为 `本地`。branch 名称、路径、Workspace 名称、Session 标题以及原始 DSH/Git 错误
-  信息保持原值。
+  回退为 `本地`。如果导入的 Workspace 是 Git 仓库中的子目录，会先解析 Git 根目录，再
+  复用与 Git 根目录相同的 branch/worktree 信息。branch 名称、路径、Workspace 名称、Session
+  标题以及原始 DSH/Git 错误信息保持原值。
 - 已有 Session 会在标题行显示只读上下文，格式为 `Session title` → `Agent mode` →
   `current branch / Worktree branch`。过长值在紧凑 chip 中折叠，并通过 hover card 显示完整
   内容。原生标题存在且有锚点时，新会话空白 Hero 会在标题后显示 `Workspace (branch)`，并
@@ -237,6 +282,7 @@ DSH 管理原始 Project/Workspace 身份和根目录、Session 身份和元数
 
 - `projectId`、`worktreeId` 和 `sessionId`；
 - 绝对 Worktree 路径、branch 和生命周期状态；
+- Worktree 来源（`plugin` 或 `external`）；
 - binding 状态和 schema version。
 
 索引不会写入 Project 工作树或 DSH 原始数据目录，也不会保存 `projectRoot` 副本或任何
@@ -252,14 +298,14 @@ Worktree binding 使用对应的 Worktree 路径。cwd 在每次执行时派生
 创建的 Git Worktree。删除 Worktree 失败时不会改变 sidecar 状态，因此关系仍可重试。创建
 Session 时先调用 DSH 原生 API，再写入 binding；binding 失败不会删除或修改已创建的 Session。
 
-rc.8 的 `session.create` API 不能同时接收 `workspaceId` 和独立 cwd。因此 Worktree 流程
-使用浏览器本地 membership projection，而不是持久化的 DSH attach，并且不会修改 DSH 源码、
-Session metadata 或原生 Workspace 存储。native list 刷新后会重放 projection；binding 消失
-或 Client dispose 时会移除 projection。
+Worktree Session 流程将独立的 Worktree cwd 交给 upstream DSH runtime，并将
+`{ workspaceId, sessionId }` 保持为浏览器本地 membership projection，而不是持久化的 DSH
+attach。它不会修改 DSH 源码、Session metadata 或原生 Workspace 存储。native list 刷新后会
+重放 projection；binding 消失或 Client dispose 时会移除 projection。
 
-空白 Hero 上下文只用于展示。由于 rc.8 没有 additive Hero headline slot，它的位置依赖原生
-`[data-phase="hero"]` 和标题锚点；锚点不可用时浮层会消失，未来有正式 DSH slot 时应迁移到
-该 slot。
+空白 Hero 上下文只用于展示。由于当前 upstream DSH source checkout 没有 additive Hero
+headline slot，它的位置依赖原生 `[data-phase="hero"]` 和标题锚点；锚点不可用时浮层会消失，
+未来有正式 DSH slot 时应迁移到该 slot。
 
 ## 开发与验证
 

package/lib/client/WorktreeHeroContext.d.ts

@@ -4,7 +4,7 @@ import { WORKTREE_NS } from './locales.js';
 export type WorktreeHeroContextProps = PropsRuntime<'shell.overlay'> & PropsLocale<typeof WORKTREE_NS> & InjectFace<WorktreeContextInjected>;
 /**
  * Browser-local Hero suffix. It intentionally uses the frame overlay because
- * rc.8 exposes no additive slot beside the native Hero headline.
+ * The current upstream DSH exposes no additive slot beside the native Hero headline.
  */
 export declare function WorktreeHeroContext({ useWorktreeContext, t, }: WorktreeHeroContextProps): import("react").JSX.Element | null;
 //# sourceMappingURL=WorktreeHeroContext.d.ts.map

package/lib/client/WorktreeHeroContext.js

@@ -71,7 +71,7 @@ function contextAriaLabel(state, t) {
 }
 /**
  * Browser-local Hero suffix. It intentionally uses the frame overlay because
- * rc.8 exposes no additive slot beside the native Hero headline.
+ * The current upstream DSH exposes no additive slot beside the native Hero headline.
  */
 export function WorktreeHeroContext({ useWorktreeContext, t, }) {
     const state = useWorktreeContext((snapshot) => snapshot);

package/lib/client/WorktreeSurface.d.ts

@@ -4,5 +4,5 @@ export type { WorktreeSurfaceInjected, WorktreeSurfaceProps, } from './worktree-
  * Peer Worktree navigation surface. It keeps the original DSH Workspace mode
  * intact and renders a browser-local Workspace → Worktree → Session projection.
  */
-export declare function WorktreeSurface({ useStore, actions, useSessions, useWorkspaces, t, available, manager, invalidateWorktreeContext, createWorkspace, createSessionForWorktree: createSessionCallback, createMainSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, insertSessionBefore, insertWorktreeBefore, renameSession, forkSession, archiveSession, ensureSessionWorkspace, syncSessionWorkspaces, openSession, }: WorktreeSurfaceProps): import("react").JSX.Element | null;
+export declare function WorktreeSurface({ useStore, actions, useSessions, useWorkspaces, t, available, expandState, manager, invalidateWorktreeContext, createWorkspace, createSessionForWorktree: createSessionCallback, createMainSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, insertSessionBefore, insertWorktreeBefore, renameSession, forkSession, archiveSession, ensureSessionWorkspace, syncSessionWorkspaces, openSession, }: WorktreeSurfaceProps): import("react").JSX.Element | null;
 //# sourceMappingURL=WorktreeSurface.d.ts.map

package/lib/client/WorktreeSurface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorktreeSurface.d.ts","sourceRoot":"","sources":["../../src/client/WorktreeSurface.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAOV,oBAAoB,EAOrB,MAAM,6BAA6B,CAAC;AAmBrC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AAkBrC;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,OAAO,EACP,WAAW,EACX,aAAa,EACb,CAAC,EACD,SAAS,EACT,OAAO,EACP,yBAAyB,EACzB,eAAe,EACf,wBAAwB,EAAE,qBAAqB,EAC/C,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,qBAAqB,EACrB,WAAW,GACZ,EAAE,oBAAoB,sCAgmCtB"}
+{"version":3,"file":"WorktreeSurface.d.ts","sourceRoot":"","sources":["../../src/client/WorktreeSurface.tsx"],"names":[],"mappings":"AAqDA,OAAO,KAAK,EAQV,oBAAoB,EAQrB,MAAM,6BAA6B,CAAC;AAsBrC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AAwBrC;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,OAAO,EACP,WAAW,EACX,aAAa,EACb,CAAC,EACD,SAAS,EACT,WAAW,EACX,OAAO,EACP,yBAAyB,EACzB,eAAe,EACf,wBAAwB,EAAE,qBAAqB,EAC/C,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,qBAAqB,EACrB,WAAW,GACZ,EAAE,oBAAoB,sCAu5CtB"}