Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/packages-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
description: Independent npm package
type: choice
required: true
options: [dsh-external-agents, dsh-decision, dsh-annotation, dsh-side-chat, dsh-desktop-pet, dsh-literature, dsh-oidc, dsh-memory, dsh-mail, dsh-artifact-services, dsh-knowledge-studio, dsh-remote-access]
options: [dsh-external-agents, dsh-decision, dsh-annotation, dsh-side-chat, dsh-message-edit, dsh-desktop-pet, dsh-literature, dsh-oidc, dsh-memory, dsh-mail, dsh-artifact-services, dsh-knowledge-studio, dsh-remote-access]
publish:
description: Publish inspected tarball (requires reviewed source commit and npm trusted publisher)
type: boolean
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
run: python -m pip install -r packages/dsh-knowledge-studio/packages/artifact-services/python/requirements.txt
- run: node scripts/packages/manage.mjs install ${{ inputs.package }}
- name: Install locked DSH Runtime for native plugin checks
if: inputs.package == 'dsh-side-chat' || inputs.package == 'dsh-decision'
if: inputs.package == 'dsh-side-chat' || inputs.package == 'dsh-message-edit' || inputs.package == 'dsh-decision'
working-directory: third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime
run: npm ci --ignore-scripts --no-audit --no-fund
- run: node scripts/packages/manage.mjs check ${{ inputs.package }}
Expand All @@ -59,6 +59,7 @@ jobs:
PYTHONUTF8: '1'
EDUWORK_SIDE_CHAT_RUNTIME: ${{ inputs.package == 'dsh-side-chat' && format('{0}/third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime', github.workspace) || '' }}
EDUWORK_DECISION_RUNTIME: ${{ inputs.package == 'dsh-decision' && format('{0}/third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime', github.workspace) || '' }}
EDUWORK_MESSAGE_EDIT_RUNTIME: ${{ inputs.package == 'dsh-message-edit' && format('{0}/third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime', github.workspace) || '' }}
- run: node scripts/packages/manage.mjs pack ${{ inputs.package }} dist/npm-release
- uses: actions/upload-artifact@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: python -m pip install -r packages/dsh-knowledge-studio/packages/artifact-services/python/requirements.txt
- run: node scripts/packages/manage.mjs install ${{ matrix.package }}
- name: Install locked DSH Runtime for native plugin checks
if: matrix.package == 'dsh-side-chat' || matrix.package == 'dsh-decision'
if: matrix.package == 'dsh-side-chat' || matrix.package == 'dsh-message-edit' || matrix.package == 'dsh-decision'
working-directory: third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime
run: npm ci --ignore-scripts --no-audit --no-fund
- run: node scripts/packages/manage.mjs check ${{ matrix.package }}
Expand All @@ -59,6 +59,7 @@ jobs:
PYTHONUTF8: '1'
EDUWORK_SIDE_CHAT_RUNTIME: ${{ matrix.package == 'dsh-side-chat' && format('{0}/third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime', github.workspace) || '' }}
EDUWORK_DECISION_RUNTIME: ${{ matrix.package == 'dsh-decision' && format('{0}/third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime', github.workspace) || '' }}
EDUWORK_MESSAGE_EDIT_RUNTIME: ${{ matrix.package == 'dsh-message-edit' && format('{0}/third_party/dsh/candidate-v0.2.2-rc.1/npm-runtime', github.workspace) || '' }}
- run: node scripts/packages/manage.mjs pack ${{ matrix.package }}
- if: matrix.package == 'dsh-knowledge-studio'
run: node scripts/packages/manage.mjs pack dsh-artifact-services
Expand Down
3 changes: 3 additions & 0 deletions docs/PACKAGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ EduWork 在一个仓库维护公共插件,npm 包仍分别安装、版本管
| `@eduwork/dsh-decision` | [SystemOne 决策工具与技能](../packages/dsh-decision/README.md) | `packages/dsh-decision` |
| `@eduwork/dsh-annotation` | [选段引用与批注](../packages/dsh-annotation/README.md) | `packages/dsh-annotation` |
| `@eduwork/dsh-side-chat` | [侧边聊天与选区提问](../packages/dsh-side-chat/README.md) | `packages/dsh-side-chat` |
| `@eduwork/dsh-message-edit` | [编辑消息](../packages/dsh-message-edit/README.md) | `packages/dsh-message-edit` |
| `@eduwork/dsh-desktop-pet` | [桌面宠物与宿主要求](../packages/dsh-desktop-pet/README.md) | `packages/dsh-desktop-pet` |
| `@eduwork/dsh-literature` | [文献检索、引用与全文](../packages/dsh-literature/README.md) | `packages/dsh-literature` |
| `@eduwork/dsh-oidc` | [身份、凭据与模型接入](../packages/dsh-oidc/README.md) | `packages/dsh-oidc` |
Expand All @@ -29,6 +30,8 @@ EduWork 在一个仓库维护公共插件,npm 包仍分别安装、版本管

决策插件使用 DSH 原生 bundle、工具和技能,从已发布的 npm 原包预装。决策服务默认关闭;支持显式 API Key、可选 OIDC 和免鉴权服务配置,配置完成后启用。包检查使用锁定的 rc.5 Runtime(`EDUWORK_DECISION_RUNTIME`),测试不请求真实模型。

编辑消息插件用 DSH 原生分叉重发改过的消息,尚未加入桌面装配。构建和包检查使用锁定的 DSH `0.2.2-rc.1` Runtime(`EDUWORK_MESSAGE_EDIT_RUNTIME`),测试不请求真实模型;浏览器验收脚本在本地运行,不进普通 CI。

`peerDependencies` 表示插件支持的宿主 API 范围;开发依赖、`package-lock.json` 和产品组件锁记录一次构建的确切输入,两者分别维护。对已验证兼容的同一 API 系列,peer 应使用有上下界的版本范围,避免逐个追加 rc 版本。范围需要检查预发布版本的匹配语义,并在支持范围内验证实际插件加载与工具调用;不能仅因版本号相邻就假定兼容,也不使用 `*` 跳过边界。

内核升级时先核对 API 与行为:兼容声明已覆盖且验证通过的包直接复用现有 npm 产物,不因宿主升级重发。若已发布包的声明过窄,修正元数据仍需新的 npm 版本,不能覆盖旧包,但这不应成为每次 rc 升级的固定步骤。文献包从 `0.1.2` 起声明 `>=0.2.0-rc.1 <0.3.0-0`,检索实现不变。
Expand Down
3 changes: 3 additions & 0 deletions docs/PACKAGES_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ EduWork maintains its public plugins in one source repository. Each npm package
| `@eduwork/dsh-decision` | [SystemOne decision tool and skill](../packages/dsh-decision/README_EN.md) | `packages/dsh-decision` |
| `@eduwork/dsh-annotation` | [Selection quotes and notes](../packages/dsh-annotation/README_EN.md) | `packages/dsh-annotation` |
| `@eduwork/dsh-side-chat` | [Side conversations and selection questions](../packages/dsh-side-chat/README_EN.md) | `packages/dsh-side-chat` |
| `@eduwork/dsh-message-edit` | [Message editing](../packages/dsh-message-edit/README_EN.md) | `packages/dsh-message-edit` |
| `@eduwork/dsh-desktop-pet` | [Desktop pet and host requirements](../packages/dsh-desktop-pet/README_EN.md) | `packages/dsh-desktop-pet` |
| `@eduwork/dsh-literature` | [Literature search, citations and full text](../packages/dsh-literature/README_EN.md) | `packages/dsh-literature` |
| `@eduwork/dsh-oidc` | [Identity, credentials and models](../packages/dsh-oidc/README_EN.md) | `packages/dsh-oidc` |
Expand All @@ -27,6 +28,8 @@ Side chat independently opens from message actions. With annotation `>=0.1.1 <0.

The decision plugin uses native DSH bundles, tools and skills and is preinstalled from its published npm archive. The decision service remains disabled until configured and enabled. It supports explicit API-key, optional OIDC and unauthenticated service configuration. Checks use the locked rc.5 Runtime (`EDUWORK_DECISION_RUNTIME`) without live model requests.

The message-editing plugin resends an edited message through a native DSH fork and is not yet part of desktop assembly. Its build and checks use the locked DSH `0.2.2-rc.1` Runtime (`EDUWORK_MESSAGE_EDIT_RUNTIME`) without live model requests; its browser acceptance script runs locally, outside regular CI.

Use each manifest and lock for Node/DSH requirements; common CI uses Node 24.22.1. From the repository root:

```sh
Expand Down
1 change: 1 addition & 0 deletions packages/dsh-message-edit/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lib/
14 changes: 14 additions & 0 deletions packages/dsh-message-edit/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# 变更记录 / Changelog

## 0.1.0 — Unreleased

- 首个版本:用户消息旁的铅笔按钮打开编辑框,改过的消息从 DSH 原生分叉的新对话里重新发送,新对话接替原对话(保留用户设置的标题和置顶),原对话移进归档。
- 原消息的图片和文件可以逐个移除,也可以选择、粘贴或拖入新的附件;附件在主机内重新登记到新对话,访问控制同时检查原对话和新对话。
- 消息里引用的其他对话保留到编辑后的消息,用户改动或删除引用文字时去掉。
- 生成中不能编辑;插话不能单独编辑,编辑这一轮开头的消息时提示插话会一起替换。
- 同一对话可以同时编辑多条消息,草稿在滚动、切换对话和对话被替换后保留;同一对话一次只发送一条编辑。
- Initial release: a pencil next to each user message opens an editor; the edited message is resent in a new conversation forked natively by DSH, which takes the original's place (keeping a title the user set and the pin), and the original is archived.
- The message's images and files can be removed one by one, and new attachments picked, pasted or dropped in; attachments are re-staged into the new conversation inside the Host, with access control checking both conversations.
- Conversations the message references stay referenced in the edited message, and are dropped when the user changes or deletes the reference text.
- Messages cannot be edited while a reply generates; steered messages cannot be edited on their own, and editing their turn's first message says they are replaced too.
- Several messages of one conversation can be edited at once; drafts survive scrolling, switching conversations and the conversation being replaced; one edit of a conversation is sent at a time.
130 changes: 130 additions & 0 deletions packages/dsh-message-edit/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@

木兰宽松许可证, 第2版

木兰宽松许可证, 第2版

2020年1月 http://license.coscl.org.cn/MulanPSL2

您对“软件”的复制、使用、修改及分发受木兰宽松许可证,第2版(“本许可证”)的如下条款的约束:

0. 定义

“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。

“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。

“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。

“法人实体” 是指提交贡献的机构及其“关联实体”。

“关联实体” 是指,对“本许可证”下的行为方而言,控制、受控制或与其共同受控制的机构,此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。

1. 授予版权许可

每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可,您可以复制、使用、修改、分发其“贡献”,不论修改与否。

2. 授予专利许可

每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的(根据本条规定撤销除外)专利许可,供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求,不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地,就“软件”或其中的“贡献”对任何人发起专利侵权诉讼(包括反诉或交叉诉讼)或其他专利维权行动,指控其侵犯专利权,则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。

3. 无商标许可

“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可,但您为满足第4条规定的声明义务而必须使用除外。

4. 分发限制

您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发,不论修改与否,但您必须向接收者提供“本许可证”的副本,并保留“软件”中的版权、商标、专利及免责声明。

5. 免责声明与责任限制

“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下,“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任,不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。

6. 语言

“本许可证”以中英文双语表述,中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致,以中文版为准。

条款结束

如何将木兰宽松许可证,第2版,应用到您的软件

如果您希望将木兰宽松许可证,第2版,应用到您的新软件,为了方便接收者查阅,建议您完成如下三步:

1, 请您补充如下声明中的空白,包括软件名、软件的首次发表年份以及您作为版权人的名字;

2, 请您在软件包的一级目录下创建以“LICENSE”为名的文件,将整个许可证文本放入该文件中;

3, 请将如下声明文本放入每个源文件的头部注释中。

Copyright (c) [Year] [name of copyright holder]
[Software Name] is licensed under Mulan PSL v2.
You can use this software according to the terms and conditions of the Mulan PSL v2.
You may obtain a copy of Mulan PSL v2 at:
http://license.coscl.org.cn/MulanPSL2
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
See the Mulan PSL v2 for more details.

Mulan Permissive Software License,Version 2

Mulan Permissive Software License,Version 2 (Mulan PSL v2)

January 2020 http://license.coscl.org.cn/MulanPSL2

Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:

0. Definition

Software means the program and related documents which are licensed under this License and comprise all Contribution(s).

Contribution means the copyrightable work licensed by a particular Contributor under this License.

Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.

Legal Entity means the entity making a Contribution and all its Affiliates.

Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.

1. Grant of Copyright License

Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.

2. Grant of Patent License

Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.

3. No Trademark License

No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.

4. Distribution Restriction

You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.

5. Disclaimer of Warranty and Limitation of Liability

THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

6. Language

THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.

END OF THE TERMS AND CONDITIONS

How to Apply the Mulan Permissive Software License,Version 2 (Mulan PSL v2) to Your Software

To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:

i. Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
ii. Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
iii. Attach the statement to the appropriate annotated syntax at the beginning of each source file.

Copyright (c) [Year] [name of copyright holder]
[Software Name] is licensed under Mulan PSL v2.
You can use this software according to the terms and conditions of the Mulan PSL v2.
You may obtain a copy of Mulan PSL v2 at:
http://license.coscl.org.cn/MulanPSL2
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
See the Mulan PSL v2 for more details.
Loading
Loading