From 283c31c9f3e4fe2f90f6750bfd84cfd2504b3f0b Mon Sep 17 00:00:00 2001 From: newbieQQ Date: Wed, 28 Oct 2026 20:19:26 +0800 Subject: [PATCH] docs: fork attribution, NOTICE and 1.1.0 metadata Adds the upstream credit section to both READMEs, a bilingual NOTICE.md open-source statement, and repoints repository/homepage/bugs at the fork while keeping the MIT (c) 2026 zcol notice untouched. --- NOTICE.md | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 44 ++++++++++++++++++++++++++-- README_ZH.md | 37 ++++++++++++++++++++++-- package.json | 9 ++++-- 4 files changed, 166 insertions(+), 6 deletions(-) create mode 100644 NOTICE.md diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 0000000..0795a7e --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,82 @@ +# NOTICE — 开源声明与署名 / Open-source statement and attribution + +## 中文 + +**本仓库** `newbieQQ/dsh-workspace-groups-local` +(DSH Web 客户端插件,npm 包名 `workspace-groups-local`)是下列作品的**衍生版本(fork)**: + +- **原始项目**:https://github.com/z-col/dsh-workspace-groups +- **原作者**:zcol(GitHub [@z-col](https://github.com/z-col),297114876@qq.com) +- **原始许可**:MIT License,`Copyright (c) 2026 zcol`(完整文本见仓库根目录 `LICENSE`) + +原始项目提供了本插件的核心能力:把 DSH GUI 侧边栏从「项目 → 会话」两层升级为 +「分类文件夹 → 项目文件夹 → 会话」三层树,以及拖拽归类、自由排序、sidecar YAML 规则 +自动归类、runtime overlay 与分组树搜索。**这些设计与实现均归功于原作者**。 + +### 本 fork 的修改 + +本仓库在原始项目 `release: workspace-groups-local 1.0.0` 之上新增/调整了: + +1. 分组外观弹窗新增「材料与实验」图标分区:28 个 16×16 手绘单色线条字形 + (实验操作 / 材料结构 / 表征测试 / 功能器件),中英双语悬停提示; +2. 外观弹窗改为在宿主 Modal 内容区内滚动、标题行固定,图标区变大不遮挡「完成」按钮, + 并规范默认图标输入框与「置顶分组」按钮的间距; +3. 所有行统一一个右对齐尾槽:成员数(会话行为相对时间)贴右边界,悬停/聚焦时让位给 + 「+」「⋯」按钮,零重排;按钮顺序统一为「+」在前、「⋯」在后; +4. 宿主「默认工作区」从分组树移出,固定在侧栏底部独立一栏,保留工作区行的全部能力, + 并从分组、顶层与搜索结果中去重(识别依据来自宿主工作区数据,不只依赖目录名); +5. `tools/verify-row-layout.mjs`:零依赖的样式表与行结构断言。 + +### 许可与合规 + +- 本仓库整体继续以 **MIT License** 发布,完整许可文本见 `LICENSE`, + `Copyright (c) 2026 zcol` 声明予以**保留不作修改**。 +- 本 fork 的修改部分:`Copyright (c) 2026 newbieQQ`,同样以 MIT 许可提供。 +- 本仓库不包含原项目的商标、图标或品牌资产;README 与 package.json 中对原项目的引用 + 仅用于署名与溯源。 +- 上游仓库仍是本项目的正源:仅存在于上游的问题请提交上游 issue tracker, + 本 fork 不主张上游的所有权。 + +--- + +## English + +**This repository**, `newbieQQ/dsh-workspace-groups-local` (a DeepSeek Harness web-client +plugin, npm package name `workspace-groups-local`), is a **fork** of: + +- **Original project**: https://github.com/z-col/dsh-workspace-groups +- **Original author**: zcol (GitHub [@z-col](https://github.com/z-col), 297114876@qq.com) +- **Original license**: MIT License, `Copyright (c) 2026 zcol` (full text in `LICENSE`) + +The original project contributed the core of this plugin: upgrading the DSH GUI sidebar from a +two-level "project → session" list to a three-level "category → project → session" tree, plus +drag-and-drop classification, free ordering, sidecar YAML rules, the runtime overlay and +tree search. **Those designs and implementations are the original author's work.** + +### Changes in this fork + +1. a "Materials & lab" icon section in the appearance picker — 28 hand-drawn 16×16 monochrome + line glyphs (lab operations, material structures, characterization, functional devices) + with bilingual tooltips; +2. the appearance dialog now scrolls inside the host modal with a sticky header, so a larger + icon grid never covers the "done" button, and the custom-icon input no longer touches the + "pin group" button; +3. every row kind shares one right-aligned trailing slot: the member count (or a session's + relative time) sits flush with the row's right edge and yields to the "+" / "⋯" buttons on + hover or keyboard focus without reflow; buttons always order "+" then "⋯"; +4. the host **default workspace** is pinned to its own bottom bar, keeping every + workspace-row capability and being deduplicated out of groups, the top level and search + results (identified from host workspace data, not from a directory name alone); +5. `tools/verify-row-layout.mjs`, a zero-dependency assertion script over the stylesheet and + the row markup. + +### License and compliance + +- This repository stays under the **MIT License**; the full text is in `LICENSE` and the + original `Copyright (c) 2026 zcol` notice is **kept unmodified**. +- Modifications in this fork: `Copyright (c) 2026 newbieQQ`, also provided under the MIT + License. +- No upstream trademarks, logos or brand assets are included; references to the upstream + project exist only for attribution and provenance. +- Upstream remains the canonical project. Issues that exist there should be reported to the + upstream issue tracker; this fork claims no ownership of upstream. diff --git a/README.md b/README.md index f7344fe..d85e15b 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,19 @@ English · 简体中文

-# dsh-workspace-groups +# dsh-workspace-groups-local ![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg) +![Fork of z-col/dsh-workspace-groups](https://img.shields.io/badge/fork-z--col%2Fdsh--workspace--groups-blueviolet.svg) ![DSH](https://img.shields.io/badge/DSH-0.1.1--rc.2-purple.svg) DeepSeek Harness plugin +> **Fork of [z-col/dsh-workspace-groups](https://github.com/z-col/dsh-workspace-groups).** +> The three-level tree, drag-and-drop grouping, sidecar rules and session tab strip are the +> original author's work (MIT); this fork keeps them and adds a research-glyph icon set, a +> pinned default-workspace bar and a unified trailing row slot — see +> [Credit & upstream](#credit--upstream). + > **A DeepSeek Harness (DSH) web client plugin: a complete workspace grouping manager.** > Turns the GUI sidebar's two-level workspace list (Projects → Sessions) into a > three-level **Category folder → Project folder → Session** tree, backed by full @@ -417,6 +424,39 @@ scripts/ - 66 unit tests green (vitest: `core` / `manual` / `tree` / `store`). - Reproducible automated verification: `node scripts/verify-groups.mjs` (host restarted). +## Credit & upstream + +This repository is a **fork** of [**z-col/dsh-workspace-groups**](https://github.com/z-col/dsh-workspace-groups), +created and maintained by [**zcol**](https://github.com/z-col) (297114876@qq.com), and released +under the MIT License. The three-level category → project → session tree, drag-and-drop grouping, +the sidecar YAML rules, the runtime overlay, the top-level ordering and the session tab strip are +the original author's design and implementation. This fork would not exist without that work — +thank you. + +Upstream stays the canonical project: please report bugs that also exist there to the upstream +issue tracker, and treat this repository's history (`upstream` remote) as its origin. + +Changes carried by this fork (on top of upstream `release: workspace-groups-local 1.0.0`): + +- **Materials & lab icon section** in the appearance picker: 28 hand-drawn 16×16 line glyphs + (lab operations, material structures, characterization, functional devices) beside the existing + 50 host icons and 16 emoji, with bilingual tooltips; old ids, custom short glyphs and the + "restore default" behaviour are untouched +- the **appearance dialog scrolls inside the host modal**, so the grown icon grid can never push + the "done" footer or the pin button out of reach, in either theme +- **one right-aligned trailing slot on every row kind**: the member count (or a session's relative + time) sits flush with the row's right edge and yields to the `+` / `⋯` buttons on hover or + keyboard focus without any reflow; every row orders them `+` then `⋯` +- the host **default workspace** is pinned to its own **bottom bar** (above it a rule, always + visible while the tree scrolls), keeps every workspace-row capability (expand, new session, + rename, delete, `⋯` menu, folder management, appearance), and is deduplicated out of groups, + the top level and search results — identified from host workspace data, never from a hardcoded + directory name alone +- `tools/verify-row-layout.mjs`: assertions over the stylesheet and the row markup, added because + vitest cannot start in the author's checkout (missing `@vitest/utils`, `std-env`) + ## License -MIT +MIT — original work © 2026 zcol ([z-col/dsh-workspace-groups](https://github.com/z-col/dsh-workspace-groups)); +modifications in this fork © 2026 newbieQQ. See [LICENSE](./LICENSE) and +[NOTICE.md](./NOTICE.md) for the full attribution and open-source statement. diff --git a/README_ZH.md b/README_ZH.md index 6687bbf..961397e 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -2,12 +2,18 @@ English · 简体中文

-# dsh-workspace-groups +# dsh-workspace-groups-local ![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg) +![Fork of z-col/dsh-workspace-groups](https://img.shields.io/badge/fork-z--col%2Fdsh--workspace--groups-blueviolet.svg) ![DSH](https://img.shields.io/badge/DSH-0.1.1--rc.2-purple.svg) DeepSeek Harness plugin +> **本仓库是 [z-col/dsh-workspace-groups](https://github.com/z-col/dsh-workspace-groups) 的 fork。** +> 三层树、拖拽归类、sidecar 规则与会话标签栏均为原作者设计实现(MIT);本 fork 在其之上 +> 增加了科研图标分区、固定在底部的默认工作区栏、以及统一的右侧尾槽——详见 +> [鸣谢与上游](#鸣谢与上游)。 + > **DeepSeek Harness(DSH)Web 客户端插件:完整的工作区分组管理工具。** > 把 GUI 侧边栏的工作区列表从两层「项目 → 会话」升级为三层 > **「分类文件夹 → 项目文件夹 → 会话」**,并围绕它提供完整的分组管理能力—— @@ -356,6 +362,33 @@ scripts/ - 单测 66 用例全绿(vitest:`core` / `manual` / `tree` / `store`)。 - 可复跑的自动化真机验证:`node scripts/verify-groups.mjs`(需 host 已重启)。 +## 鸣谢与上游 + +本仓库是 [**z-col/dsh-workspace-groups**](https://github.com/z-col/dsh-workspace-groups) 的 +**fork**,原作者为 [**zcol**](https://github.com/z-col)(297114876@qq.com),以 MIT 许可发布。 +三层「分类 → 项目 → 会话」树、拖拽归类、sidecar YAML 规则、runtime overlay、顶层排序与 +会话标签栏,均出自原作者的设计与实现——没有这些工作就没有本仓库,在此致谢。 + +上游仍是本项目的正源:若某个问题在上游同样存在,请提交到上游仓库的 issue tracker; +本仓库以 `upstream` remote 指向它作为来源。 + +本 fork 在上游 `release: workspace-groups-local 1.0.0` 之上新增/调整的内容: + +- 外观弹窗新增 **「材料与实验」图标分区**:28 个统一规格的 16×16 手绘线条字形 + (实验操作、材料结构、表征测试、功能器件),与原有 50 个宿主图标、16 个 Emoji 并列, + 带中英双语悬停提示;旧图标 ID、自定义短字形与「恢复默认」行为完全不变 +- **外观弹窗在宿主 Modal 内滚动**:图标区变大后既不会把「完成」按钮挤出视野,也不会让 + 默认图标输入框的聚焦边框贴住「置顶分组」按钮,浅/深主题一致 +- **所有行统一一个右对齐尾槽**:成员数(会话行则是相对时间)贴着行右边界,悬停或键盘 + 聚焦时让位给「+」「⋯」按钮,零重排;每行都按「+」在前、「⋯」在后排列 +- 宿主的**默认工作区被固定在侧栏底部独立一栏**(上方分隔线,树滚动时始终可见),保留 + 工作区行的全部能力(展开、新建会话、重命名、删除、`⋯` 菜单、文件夹管理、外观入口), + 并从分组、顶层与搜索结果中去除重复——识别依据来自宿主工作区数据,而不是只认目录名 +- `tools/verify-row-layout.mjs`:针对样式表与行结构的断言;因为作者本机的 vitest 缺 + `@vitest/utils`、`std-env` 无法启动,改用零依赖脚本做等价验证 + ## License -MIT +MIT——原始作品 © 2026 zcol([z-col/dsh-workspace-groups](https://github.com/z-col/dsh-workspace-groups)); +本 fork 的修改 © 2026 newbieQQ。完整的署名与开源声明见 [LICENSE](./LICENSE) 与 +[NOTICE.md](./NOTICE.md)。 diff --git a/package.json b/package.json index 575be8a..3c0eba8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "workspace-groups-local", - "version": "1.0.0", + "version": "1.1.0", "description": "Complete workspace grouping manager for the DSH web sidebar: category -> project -> session three-level tree with optional per-project folders (multi-root), manual group create/rename/delete, drag-and-drop grouping and ordering with insertion indicator, rule-based auto-classification, tree search, group colour/icon/pin, plus the session tab strip seated in the conversation column head. Sidecar YAML + runtime overlays, zero core-storage intrusion.", "keywords": [ "dsh", @@ -20,7 +20,11 @@ }, "repository": { "type": "git", - "url": "https://github.com/z-col/dsh-workspace-groups" + "url": "https://github.com/newbieQQ/dsh-workspace-groups-local" + }, + "homepage": "https://github.com/newbieQQ/dsh-workspace-groups-local", + "bugs": { + "url": "https://github.com/newbieQQ/dsh-workspace-groups-local/issues" }, "main": "lib/index.js", "types": "lib/types/index.d.ts", @@ -41,6 +45,7 @@ "cordis.patch.yml", "README.md", "README_ZH.md", + "NOTICE.md", "screenshot.png", "workspace-groups.example.yaml" ],