@tenonai/yew 1.4.0 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +48 -5
- package/README.md +31 -13
- package/THIRD-PARTY-NOTICES.md +6 -1
- package/dist/cli/app.js +22 -12
- package/dist/cli/export.js +5 -5
- package/dist/cli/mcp.js +7 -7
- package/dist/cli/remote.js +6 -6
- package/dist/cli/run.js +3 -3
- package/dist/cli/schedule.js +3 -3
- package/dist/cli/send.js +4 -4
- package/dist/cli/serve.js +88 -14
- package/dist/cli/service.js +13 -13
- package/dist/server/agent/prompt.js +3 -2
- package/dist/server/agent/runner.js +41 -1
- package/dist/server/data-usage.js +1 -1
- package/dist/server/db/database.js +1 -1
- package/dist/server/export.js +2 -2
- package/dist/server/folder-picker.js +1 -1
- package/dist/server/http/api.js +17 -1
- package/dist/server/http/app.js +13 -5
- package/dist/server/http/data.js +1 -1
- package/dist/server/http/mcp.js +2 -2
- package/dist/server/http/problem.js +1 -1
- package/dist/server/http/security.js +5 -5
- package/dist/server/mail/envelope.js +11 -6
- package/dist/server/mail/post.js +2 -2
- package/dist/server/mcp-builtin.js +15 -2
- package/dist/server/mcp-config.js +4 -4
- package/dist/server/mcp-oauth.js +6 -6
- package/dist/server/mcp.js +70 -8
- package/dist/server/permissions/engine.js +23 -5
- package/dist/server/sandbox.js +447 -0
- package/dist/server/settings.js +34 -1
- package/dist/server/store.js +2 -2
- package/dist/server/tools/jobs.js +3 -2
- package/dist/server/tools/mail.js +11 -1
- package/dist/server/tools/process.js +63 -12
- package/dist/server/tools/search.js +5 -2
- package/dist/server/tools/shell.js +70 -17
- package/dist/shared/policy.js +20 -20
- package/dist/shared/version.js +8 -0
- package/dist/sim/client.d.ts +17 -0
- package/dist/sim/client.js +41 -0
- package/dist/sim/index.d.ts +7 -0
- package/dist/sim/index.js +6 -0
- package/dist/sim/types.d.ts +161 -0
- package/dist/sim/types.js +5 -0
- package/dist/sim/world.d.ts +6 -0
- package/dist/sim/world.js +359 -0
- package/package.json +17 -3
- package/web/dist/THIRD-PARTY-NOTICES.txt +1 -1
- package/web/dist/assets/index-BQdFuM-f.css +1 -0
- package/web/dist/assets/index-Dh9QdEsc.js +70 -0
- package/web/dist/icons/apple-touch-icon.png +0 -0
- package/web/dist/index.html +3 -3
- package/web/dist/mascot/alarm.webp +0 -0
- package/web/dist/mascot/books.webp +0 -0
- package/web/dist/mascot/bow.webp +0 -0
- package/web/dist/mascot/branch.webp +0 -0
- package/web/dist/mascot/clipboard.webp +0 -0
- package/web/dist/mascot/dozing.webp +0 -0
- package/web/dist/mascot/fired-up.webp +0 -0
- package/web/dist/mascot/giftbox.webp +0 -0
- package/web/dist/mascot/halt.webp +0 -0
- package/web/dist/mascot/jump.webp +0 -0
- package/web/dist/mascot/letter-run.webp +0 -0
- package/web/dist/mascot/magnifier.webp +0 -0
- package/web/dist/mascot/mini.webp +0 -0
- package/web/dist/mascot/nap.webp +0 -0
- package/web/dist/mascot/on-duty.webp +0 -0
- package/web/dist/mascot/pajamas.webp +0 -0
- package/web/dist/mascot/paper-plane.webp +0 -0
- package/web/dist/mascot/peek.webp +0 -0
- package/web/dist/mascot/permission.webp +0 -0
- package/web/dist/mascot/phone.webp +0 -0
- package/web/dist/mascot/pointing.webp +0 -0
- package/web/dist/mascot/portrait.webp +0 -0
- package/web/dist/mascot/pout.webp +0 -0
- package/web/dist/mascot/proud.webp +0 -0
- package/web/dist/mascot/reading.webp +0 -0
- package/web/dist/mascot/stamp.webp +0 -0
- package/web/dist/mascot/stretch.webp +0 -0
- package/web/dist/mascot/surprised.webp +0 -0
- package/web/dist/mascot/tea.webp +0 -0
- package/web/dist/mascot/teary.webp +0 -0
- package/web/dist/mascot/typing.webp +0 -0
- package/dist/server/from-jig.js +0 -98
- package/web/dist/assets/index-B9oWPSod.css +0 -1
- package/web/dist/assets/index-C5qBMzFX.js +0 -68
package/CHANGELOG.md
CHANGED
|
@@ -1,15 +1,58 @@
|
|
|
1
1
|
# 更新记录
|
|
2
2
|
|
|
3
|
-
本文件记录 Yew(原名 Jig)各版本中用户能感知的变化。格式参照 [Keep a Changelog 1.1.0](https://keepachangelog.com/zh-CN/1.1.0/),版本号遵循[语义化版本 2.0.0](https://semver.org/lang/zh-CN/)。
|
|
3
|
+
本文件记录 Yew Harness(原名 Jig,1.3.0、1.4.0 叫 Yew)各版本中用户能感知的变化。格式参照 [Keep a Changelog 1.1.0](https://keepachangelog.com/zh-CN/1.1.0/),版本号遵循[语义化版本 2.0.0](https://semver.org/lang/zh-CN/)。
|
|
4
|
+
|
|
5
|
+
## [1.6.0] - 2026-11-18
|
|
6
|
+
|
|
7
|
+
### 新增
|
|
8
|
+
|
|
9
|
+
- 设置改成一个窗口:左边是分区,右边是内容。侧栏底部的「设置」和 ⌘, 都打开它;原来菜单里的主题、语言和「界面里的 Yew」,以及服务商与密钥、默认设置、MCP 服务、技能、手机访问、启动、数据管理和关于,都并进了这个窗口。窗口窄时先列分区,点进去看内容,可以返回。
|
|
10
|
+
- 设置里新增「个性化」,放主题、语言、界面里的 Yew 和开场。开场可以选「点击进入」:启动完成后停在开场,点一下或按任意键再进去;默认仍是自动进入。
|
|
11
|
+
- 会话的命令和你自己加的 MCP 服务器在系统沙箱里运行(Anthropic 开源的 sandbox-runtime;macOS 上是 Seatbelt,Linux 上是 bubblewrap,要装 bubblewrap、socat 和 ripgrep):读写不了 Yew Harness 的数据,读不到钥匙串,只能写工作区、临时文件夹和沙箱自己的缓存,改不了程序和开机启动项,连不上 Yew Harness 的端口和局域网。联网只放行常用的包管理源、GitHub、Gitee 和配了密钥的模型服务商,连别的网站时先问你。凭据文件和 ssh-agent 默认不给,设置的「启动」里可以打开。要在沙箱外跑的命令每次都问你,在外面跑的 git 不执行仓库里的钩子。沙箱起不来时照常运行,`yew serve` 和设置的「启动」里写明原因;起 `yew serve` 时设 `YEW_SANDBOX=off` 可以关掉。
|
|
12
|
+
- 默认设置里新增「会话读不到的目录」:列在这里的文件夹,会话的文件工具读不到也改不了,搜索结果里也没有里面的文件;沙箱里的命令也读不到。
|
|
13
|
+
- 侧栏的 Yew 多了两个姿势:有授权请求等你时,她拿着一张待批的卡片;没有要你处理的事、也没有会话在干活,但有定时任务开着时,她在值守。
|
|
14
|
+
|
|
15
|
+
### 变更
|
|
16
|
+
|
|
17
|
+
- 授权方式的说明写明:按需授权和完全授权下,不问就跑的命令以你的系统账户运行,能改 Yew Harness 自己的记录(包括决定和授权),也能读它保存的密钥;会话要处理网页、邮件、MCP 返回这类外来内容时,建议用逐项授权。README 加了「安全」一节说同样的事。
|
|
18
|
+
- 侧栏和关于页的标志,以及 iPhone 和安卓应用第一屏和关于页的标志,不再带橙色的 T。关于页的出品方写成小号横版组合「出品方 〔T〕榫卯 Tenon AI」;网页加到手机桌面时的图标去掉了右下角的 T。
|
|
19
|
+
- 隐私政策和用户协议更新到 2.6:产品名写成 Yew Harness;用户协议第 4 段写明,Yew Harness、Yew 和榫卯 Tenon 的名称和标志,以及角色 Yew 的形象和图片,不在 MIT 许可证的授权范围内。处理哪些数据、怎样处理都没有变。
|
|
20
|
+
|
|
21
|
+
### 修复
|
|
22
|
+
|
|
23
|
+
- 开场动画里标志超出了外圈:叶尖越过圆圈,果子贴着圈边。现在整个标志缩小后居中放在圈里。
|
|
24
|
+
- 环境里没有 SHELL 时(比如在 Linux 上作为后台服务运行,或在容器里),会话的命令会因为找不到 /bin/zsh 而起不来;现在依次用 zsh、bash、sh 里这台电脑有的那个。
|
|
25
|
+
- 在设置里打开另一个对话框(比如关于页里的隐私政策)后按 Esc,外面的窗口也会跟着关掉;现在只关最上面那个。
|
|
26
|
+
|
|
27
|
+
### 安全
|
|
28
|
+
|
|
29
|
+
- 自带的浏览器只能访问它自己的空文件夹,打不开 file:// 网页,也连不上 Yew Harness 的端口。
|
|
30
|
+
- 会话写的信里如果有一行冒充 Yew Harness 加的核验(比如「[Yew checked decision #3: …]」),收信的会话可能当真。现在 Yew Harness 的核验和说明放在信的结束标记之后,写信的一方写不到那里;信里冒充的行会改用全角的方括号,看得出来不是 Yew Harness 加的。
|
|
31
|
+
|
|
32
|
+
## [1.5.0] - 2026-11-18
|
|
33
|
+
|
|
34
|
+
### 新增
|
|
35
|
+
|
|
36
|
+
- Yew(那个红发女孩)多了 28 个姿势,有侧身、背影、全身、坐着、躺着和从边上探头的,动作对着 Yew Harness 里的事:盖章、送信、读信、打字、打勾、捧礼物、鞠躬、捧茶、打盹等。侧栏里的她按眼下的事从几个姿势里挑一个,每十分钟换一个。
|
|
37
|
+
- 窗口够宽时,会话和首页的右边站着 Yew 的全身立绘,朝左看着对话,不挡正文;这时首页不再放那个小的问候姿势,字标水印也让位。窗口窄、放不下时不显示,仍是字标水印。
|
|
38
|
+
|
|
39
|
+
### 变更
|
|
40
|
+
|
|
41
|
+
- 产品名改为 Yew Harness,红发女孩仍叫 Yew。网页界面、命令行的帮助和输出、iPhone 和安卓应用里说到产品的地方都写 Yew Harness,手机上的应用名和「应用程序」里的启动图标也是;侧栏、关于页和开场的标志在「Yew」字标后面多了一个小一号的「Harness」。命令 `yew`、npm 包 `@tenonai/yew` 和数据目录 `~/.yew` 不变,不用重装,手机也不用重新配对。用过启动图标的,在设置里把它关掉再打开一次,图标的名字就会更新。
|
|
42
|
+
- 设置菜单里控制红发女孩的那一项改叫「界面里的 Yew」:她的名字就是 Yew。关掉后界面里的她都不显示:侧栏、开场、立绘,以及首页、空页面和关于页里的她。
|
|
43
|
+
|
|
44
|
+
### 修复
|
|
45
|
+
|
|
46
|
+
- 1.4.0 的 npm 包里混进了一个 1.3.0 留下的文件(`dist/server/from-jig.js`,不会运行)。这一版起,打包前先清空编译目录。
|
|
4
47
|
|
|
5
48
|
## [1.4.0] - 2026-11-18
|
|
6
49
|
|
|
7
50
|
### 新增
|
|
8
51
|
|
|
9
|
-
-
|
|
10
|
-
- 打开 Yew
|
|
52
|
+
- 侧栏底部站着 Yew(那个红发女孩),旁边的气泡说眼下最要紧的一件事:几件事等你处理、哪个会话出错了或做完了等你核对、哪些会话在干活。说的是一件事或一个会话时,点气泡直接过去。刚打开时她先问候,夜里没事时打瞌睡。
|
|
53
|
+
- 打开 Yew 时有一秒左右的开场:标志画出来,Yew 招手,下面列出连接、读取设置、会话和审批中心这几步。点一下或按任意键跳过;系统设了减少动态效果时不播。
|
|
11
54
|
- 会话和首页的背后多了一个很淡的「Yew」字标。
|
|
12
|
-
-
|
|
55
|
+
- 设置菜单里多了一项,可以把侧栏的 Yew 和开场一起关掉。
|
|
13
56
|
|
|
14
57
|
### 变更
|
|
15
58
|
|
|
@@ -38,7 +81,7 @@
|
|
|
38
81
|
|
|
39
82
|
### 变更
|
|
40
83
|
|
|
41
|
-
- Jig 改名为 Yew,用上 Yew
|
|
84
|
+
- Jig 改名为 Yew,用上 Yew 的名字、标志、配色和红发女孩 Yew 的形象:界面、命令行、文档和手机应用里都叫 Yew。一句话定义不变。
|
|
42
85
|
- 命令改叫 `yew`,npm 包改叫 `@tenonai/yew`,`jig` 命令不再有。第一次运行时,数据目录 `~/.jig` 搬到 `~/.yew`,原处留一个链接;API Key 第一次用到时从钥匙串里 Jig 的位置搬过来;环境变量改叫 `YEW_HOME`、`YEW_KEYCHAIN`、`YEW_MCP_BUILTIN`,旧的 `JIG_*` 仍然认。`yew service install`、`yew app install` 会换掉 Jig 装的开机启动和启动图标。
|
|
43
86
|
- iPhone 和安卓上的 Yew 是新的应用(包名 `cn.tenonai.apps.yew`),装上后要重新配对;配对二维码里的链接改成 `yew://`,手机和电脑之间的握手也换成了 Yew 的,手机上原来的 Jig 应用连不上 Yew。安卓版换了签名证书,SHA-256 指纹是 `9F:F5:6E:EA:A8:3C:DC:01:BA:66:D8:79:23:9C:DE:5A:2A:69:C3:AE:D2:60:5C:D8:E1:B9:34:8D:BF:28:61:B2`,不会覆盖安装 Jig,请先卸载 Jig 再装 Yew。
|
|
44
87
|
- 隐私政策和用户协议更新到 2.4:写明登录 MCP 服务得到的令牌存在系统钥匙串,mcp.json 里存着你填的密钥和自建 Google 客户端的 ID 和密钥;MCP 工具返回的内容(比如邮件、日程、文件)会发给模型服务商;登录过的服务会收到以你的账号发出的请求,境外的服务会把内容发往境外;怎样退出 MCP 服务的登录。用户协议提醒登录过的 MCP 服务也能以你的身份操作。
|
package/README.md
CHANGED
|
@@ -1,42 +1,60 @@
|
|
|
1
|
-
# Yew
|
|
1
|
+
# Yew Harness
|
|
2
2
|
|
|
3
3
|
AI 原生的多 Agent 工作台。
|
|
4
4
|
|
|
5
5
|
按 Session Engineering 的做法组织 Agent 会话:你只对接主对话,要你授权和决定的事都汇到审批中心。
|
|
6
6
|
|
|
7
|
-
每个会话有名字、职责、工作区、模型和权限,按团队组织:常设会话长期负责一块事,任务会话为一件事开设,做完回报,之后可以归档。会话之间用信件分派和回报。会话跑在你电脑上的 Yew 服务里,网页关了也照常干活。
|
|
7
|
+
每个会话有名字、职责、工作区、模型和权限,按团队组织:常设会话长期负责一块事,任务会话为一件事开设,做完回报,之后可以归档。会话之间用信件分派和回报。会话跑在你电脑上的 Yew Harness 服务里,网页关了也照常干活。
|
|
8
8
|
|
|
9
|
-
Yew 以 MIT 许可证开源,当前版本 1.
|
|
9
|
+
Yew Harness 以 MIT 许可证开源,当前版本 1.6.0。能做什么见[更新记录](CHANGELOG.md),为什么这样做见[产品蓝图](docs/blueprint.md)。iPhone 应用的源码在 `ios/`,还没有上架;安卓版的源码在 `android/`,安装包见下面的「手机端」。
|
|
10
10
|
|
|
11
11
|
## 安装与快速开始
|
|
12
12
|
|
|
13
|
-
需要 macOS 或 Linux、Node.js 24 或更高版本和 ripgrep(macOS:`brew install ripgrep`)。Windows 请在 WSL 里使用。
|
|
13
|
+
需要 macOS 或 Linux、Node.js 24 或更高版本和 ripgrep(macOS:`brew install ripgrep`);Linux 上还要 bubblewrap 和 socat(Debian、Ubuntu:`sudo apt install ripgrep bubblewrap socat`)。Windows 请在 WSL 里使用。
|
|
14
14
|
|
|
15
15
|
1. 安装:`npm install -g @tenonai/yew`。
|
|
16
16
|
2. 存入一个模型服务商的 API Key(默认服务商是 DeepSeek):`yew key set deepseek`。Key 只存进系统钥匙串。
|
|
17
17
|
3. 启动服务:`yew serve --open`,浏览器会打开网页界面。以后需要新的登录链接,运行 `yew open`。
|
|
18
|
-
4. 可选:`yew service install` 让 Yew 登录后自动启动;macOS 上 `yew app install` 在「应用程序」里放一个 Yew 图标。
|
|
18
|
+
4. 可选:`yew service install` 让 Yew Harness 登录后自动启动;macOS 上 `yew app install` 在「应用程序」里放一个 Yew Harness 图标。
|
|
19
19
|
|
|
20
20
|
从源码运行:克隆仓库后 `npm install`、`npm run build:web`、`npm link`。
|
|
21
21
|
|
|
22
22
|
## 手机端
|
|
23
23
|
|
|
24
|
-
手机上的 Yew 只连接你自己电脑上的 Yew:在电脑上显示二维码,手机扫码配对,之后在手机上看会话、处理审批中心里的事。两端经中继通信,内容端到端加密;默认用 Tenon AI 运行的中继,也可以自己部署(见 `relay/`)。
|
|
24
|
+
手机上的 Yew Harness 只连接你自己电脑上的 Yew Harness:在电脑上显示二维码,手机扫码配对,之后在手机上看会话、处理审批中心里的事。两端经中继通信,内容端到端加密;默认用 Tenon AI 运行的中继,也可以自己部署(见 `relay/`)。
|
|
25
25
|
|
|
26
|
-
- 安卓:安装包(apk)在 [GitHub](https://github.com/dozybot001/Yew/releases) 和 [Gitee](https://gitee.com/dozybot/yew/releases) 的 Releases 里,由长沙榫卯人工智能科技有限公司签名。签名证书的 SHA-256 指纹是 `9F:F5:6E:EA:A8:3C:DC:01:BA:66:D8:79:23:9C:DE:5A:2A:69:C3:AE:D2:60:5C:D8:E1:B9:34:8D:BF:28:61:B2`;这个指纹也公布在[官网的 Yew 页面](https://tenonai.cn/zh/products/yew/#android)上,可以对照;每个版本的说明里有安装包的 SHA-256。更新时系统如果提示签名不一致,不要安装。
|
|
26
|
+
- 安卓:安装包(apk)在 [GitHub](https://github.com/dozybot001/Yew/releases) 和 [Gitee](https://gitee.com/dozybot/yew/releases) 的 Releases 里,由长沙榫卯人工智能科技有限公司签名。签名证书的 SHA-256 指纹是 `9F:F5:6E:EA:A8:3C:DC:01:BA:66:D8:79:23:9C:DE:5A:2A:69:C3:AE:D2:60:5C:D8:E1:B9:34:8D:BF:28:61:B2`;这个指纹也公布在[官网的 Yew Harness 页面](https://tenonai.cn/zh/products/yew/#android)上,可以对照;每个版本的说明里有安装包的 SHA-256。更新时系统如果提示签名不一致,不要安装。
|
|
27
27
|
- iPhone:还没有上架,之后经 TestFlight 和 App Store 发布。
|
|
28
28
|
|
|
29
29
|
## 隐私
|
|
30
30
|
|
|
31
|
-
Yew 不收集任何数据,也不含统计、遥测或上报代码。会话、消息和设置存在你自己的电脑上,API Key 存在系统钥匙串里。你选用的模型服务商会收到发给它的对话内容,这部分适用该服务商的隐私政策。
|
|
31
|
+
Yew Harness 不收集任何数据,也不含统计、遥测或上报代码。会话、消息和设置存在你自己的电脑上,API Key 存在系统钥匙串里。你选用的模型服务商会收到发给它的对话内容,这部分适用该服务商的隐私政策。
|
|
32
|
+
|
|
33
|
+
## 安全
|
|
34
|
+
|
|
35
|
+
会话的命令和你自己加的 MCP 服务器在系统沙箱里运行。沙箱用的是 Anthropic 开源的 [sandbox-runtime](https://github.com/anthropics/sandbox-runtime)(Apache-2.0),macOS 上底层是系统的 Seatbelt,Linux 上是 bubblewrap。在沙箱里:
|
|
36
|
+
|
|
37
|
+
- 读写不了 Yew Harness 的数据目录(里面有你的决定、登录令牌和日志),也读不到钥匙串里的条目;
|
|
38
|
+
- 只能写会话的工作区、临时文件夹和沙箱自己的缓存,写不了 `~/.zshrc`、`~/.gitconfig` 这类文件,也写不了仓库的钩子和配置;
|
|
39
|
+
- 改不了 Yew Harness 的程序和开机启动项,连不上它的本机端口,也连不上别的本机端口和局域网;
|
|
40
|
+
- 联网只放行常用的包管理源、GitHub、Gitee 和配了密钥的模型服务商,连别的网站时先问你;
|
|
41
|
+
- 读不到 `~/.ssh`、`~/.aws`、`~/.netrc` 这类凭据文件,也用不了 ssh-agent,除非你在设置的「启动」里打开;
|
|
42
|
+
- 读不到你在「默认设置 → 会话读不到的目录」里列的文件夹,会话的文件工具也读不到;
|
|
43
|
+
- Linux 上连不上本机的 Unix 套接字,包括 D-Bus 会话总线。
|
|
44
|
+
|
|
45
|
+
要在沙箱外跑的命令(比如要用钥匙串里凭据的 `git push`、新建或克隆仓库、要监听本机端口的开发服务器、Xcode 构建),每次都先问你;在外面跑的 git 不执行仓库里的钩子。自带的浏览器和电脑操控不进沙箱:浏览器只能访问它自己的空文件夹,打不开 `file://` 网页,也连不上 Yew Harness 的端口。从源码目录运行 Yew Harness 时,这个目录在沙箱里写不了,要用 Yew Harness 改 Yew Harness,请运行 npm 安装的版本。
|
|
46
|
+
|
|
47
|
+
沙箱起不来时,Yew Harness 不进沙箱照常运行,并在 `yew serve` 的输出和设置的「启动」里写明原因:缺少要用的程序(macOS 要 ripgrep,Linux 要 bubblewrap、socat 和 ripgrep),系统不让 bubblewrap 建用户命名空间(比如 Ubuntu 24.04 起的默认设置,放开的办法见 sandbox-runtime 的说明),或起 `yew serve` 时设了 `YEW_SANDBOX=off`。这时按需授权和完全授权下,会话不问就跑的命令以你的系统账户运行,能做你在终端里能做的事,包括改 Yew Harness 自己的记录(决定和授权也在里面)、读它保存的 API Key。Linux 上的沙箱在 Debian 12 的容器里跑过日常的测试,还没在实机上测过。
|
|
48
|
+
|
|
49
|
+
别的会话的信、网页、邮件和 MCP 返回的内容,Yew Harness 只当作数据,不能替你授权;会话要处理这类外来内容时,仍建议给它用逐项授权,让命令每次都先问你。
|
|
32
50
|
|
|
33
51
|
## 文档
|
|
34
52
|
|
|
35
53
|
- [产品蓝图](docs/blueprint.md):为什么做、做什么、不做什么、怎么验收
|
|
36
|
-
- [对外介绍](docs/introduction.md):官网、商店和各渠道介绍 Yew 时用的定义、简介和能写的能力
|
|
54
|
+
- [对外介绍](docs/introduction.md):官网、商店和各渠道介绍 Yew Harness 时用的定义、简介和能写的能力
|
|
37
55
|
- 实现计划:[M1](docs/archive/m1-plan.md)、[M2](docs/archive/m2-plan.md)、[M3](docs/archive/m3-plan.md)
|
|
38
56
|
- [可借鉴的开源项目](docs/prior-art.md)
|
|
39
|
-
- [数据清单](docs/data-inventory.md):Yew 在你电脑上存了哪些数据、怎么删除
|
|
57
|
+
- [数据清单](docs/data-inventory.md):Yew Harness 在你电脑上存了哪些数据、怎么删除
|
|
40
58
|
- [iPhone 应用上架](docs/app-store.md):商店里填什么、进度
|
|
41
59
|
- [更新记录](CHANGELOG.md)
|
|
42
60
|
- [开发约定](AGENTS.md)
|
|
@@ -45,11 +63,11 @@ Yew 不收集任何数据,也不含统计、遥测或上报代码。会话、
|
|
|
45
63
|
|
|
46
64
|
[MIT](LICENSE)。运行时依赖和网页界面里用到的第三方包见 [THIRD-PARTY-NOTICES.md](THIRD-PARTY-NOTICES.md)。
|
|
47
65
|
|
|
48
|
-
##
|
|
66
|
+
## 名称、标志和角色
|
|
49
67
|
|
|
50
|
-
Yew 和榫卯 Tenon 的名称和标志(包括 `web/public/icons/`、`ios/Yew/Assets.xcassets/`
|
|
68
|
+
Yew Harness、Yew 和榫卯 Tenon 的名称和标志(包括 `web/public/icons/`、`ios/Yew/Assets.xcassets/` 里的图标),以及角色 Yew 的形象和图片(包括 `web/public/mascot/`、`android/app/src/main/res/drawable-nodpi/` 里的图片和 `ios/Yew/Assets.xcassets/` 里 Mascot 开头的图片),不在 MIT 许可证的授权范围内。你可以照原样提到这些名称,说明你在使用 Yew Harness 或基于它修改;但不要把这些名称和标志用作你自己产品的名称或标志,不要在你自己的产品里使用 Yew 的形象和图片,也不要让人以为你的产品来自榫卯 Tenon AI 或得到它的认可。
|
|
51
69
|
|
|
52
|
-
|
|
70
|
+
Names, logos and the character: The Yew Harness, Yew and Tenon AI names and logos, including the icons in `web/public/icons/` and `ios/Yew/Assets.xcassets/`, and the design and images of the character Yew, including the images in `web/public/mascot/` and `android/app/src/main/res/drawable-nodpi/` and the Mascot images in `ios/Yew/Assets.xcassets/`, are not licensed under the MIT License. You may refer to the names as they are to say that you use Yew Harness or that your work is based on it, but do not use the names or logos as the name or logo of your own product, do not use the character's design or images in your own product, and do not suggest that your product comes from or is endorsed by Tenon AI.
|
|
53
71
|
|
|
54
72
|
## 出品方
|
|
55
73
|
|
package/THIRD-PARTY-NOTICES.md
CHANGED
|
@@ -7,10 +7,11 @@ generated from `package-lock.json` by `scripts/notices.mjs`.
|
|
|
7
7
|
The web interface is built from further packages; they are listed with their license texts in
|
|
8
8
|
`web/dist/THIRD-PARTY-NOTICES.txt`.
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
114 packages: MIT 59, Apache-2.0 36, BSD-3-Clause 12, BSD-2-Clause 4, Unlicense 1, (BSD-3-Clause OR GPL-2.0) 1, 0BSD 1.
|
|
11
11
|
|
|
12
12
|
| Package | Version | License |
|
|
13
13
|
| --- | --- | --- |
|
|
14
|
+
| @anthropic-ai/sandbox-runtime | 0.0.83 | Apache-2.0 |
|
|
14
15
|
| @anthropic-ai/sdk | 0.129.0 | MIT |
|
|
15
16
|
| @aws-sdk/client-bedrock-runtime | 3.1127.0 | Apache-2.0 |
|
|
16
17
|
| @aws-sdk/core | 3.980.1 | Apache-2.0 |
|
|
@@ -51,6 +52,7 @@ The web interface is built from further packages; they are listed with their lic
|
|
|
51
52
|
| @napi-rs/keyring-win32-arm64-msvc | 2.1.2 | MIT |
|
|
52
53
|
| @napi-rs/keyring-win32-ia32-msvc | 2.1.2 | MIT |
|
|
53
54
|
| @napi-rs/keyring-win32-x64-msvc | 2.1.2 | MIT |
|
|
55
|
+
| @pondwader/socks5-server | 1.0.10 | MIT |
|
|
54
56
|
| @protobufjs/aspromise | 1.1.2 | BSD-3-Clause |
|
|
55
57
|
| @protobufjs/base64 | 1.1.2 | BSD-3-Clause |
|
|
56
58
|
| @protobufjs/codegen | 2.0.5 | BSD-3-Clause |
|
|
@@ -76,6 +78,7 @@ The web interface is built from further packages; they are listed with their lic
|
|
|
76
78
|
| bignumber.js | 9.3.1 | MIT |
|
|
77
79
|
| bowser | 2.15.0 | MIT |
|
|
78
80
|
| buffer-equal-constant-time | 1.0.1 | BSD-3-Clause |
|
|
81
|
+
| commander | 12.1.0 | MIT |
|
|
79
82
|
| data-uri-to-buffer | 4.0.1 | MIT |
|
|
80
83
|
| debug | 4.4.3 | MIT |
|
|
81
84
|
| diff | 9.0.0 | BSD-3-Clause |
|
|
@@ -106,6 +109,7 @@ The web interface is built from further packages; they are listed with their lic
|
|
|
106
109
|
| ms | 2.1.3 | MIT |
|
|
107
110
|
| node-domexception | 1.0.0 | MIT |
|
|
108
111
|
| node-fetch | 3.3.2 | MIT |
|
|
112
|
+
| node-forge | 1.4.3 | (BSD-3-Clause OR GPL-2.0) |
|
|
109
113
|
| openai | 7.19.0 | Apache-2.0 |
|
|
110
114
|
| p-retry | 4.6.2 | MIT |
|
|
111
115
|
| partial-json | 0.1.7 | MIT |
|
|
@@ -120,3 +124,4 @@ The web interface is built from further packages; they are listed with their lic
|
|
|
120
124
|
| uqr | 0.1.3 | MIT |
|
|
121
125
|
| web-streams-polyfill | 3.3.3 | MIT |
|
|
122
126
|
| ws | 8.22.0 | MIT |
|
|
127
|
+
| zod | 4.6.6 | MIT |
|
package/dist/cli/app.js
CHANGED
|
@@ -4,20 +4,21 @@ import { homedir, tmpdir } from "node:os";
|
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { fileURLToPath } from "node:url";
|
|
6
6
|
import { parseArgs } from "node:util";
|
|
7
|
-
import { VERSION } from "../shared/version.js";
|
|
7
|
+
import { PRODUCT, VERSION } from "../shared/version.js";
|
|
8
8
|
import { EXIT_ERROR, EXIT_OK, UsageError } from "./io.js";
|
|
9
9
|
const HELP = `Usage: yew app <install|uninstall|status> [options]
|
|
10
10
|
|
|
11
|
-
Put a Yew icon in your Applications folder (macOS). Clicking it starts
|
|
12
|
-
the background if it is not running, then opens the web
|
|
11
|
+
Put a Yew Harness icon in your Applications folder (macOS). Clicking it starts
|
|
12
|
+
Yew Harness in the background if it is not running, then opens the web
|
|
13
|
+
interface, signed in.
|
|
13
14
|
|
|
14
|
-
The icon is a small launcher for this installation of Yew: it runs the
|
|
15
|
-
yew you run in a terminal, with the Node.js found now. Run install again
|
|
16
|
-
you move or update Node.js or Yew.
|
|
15
|
+
The icon is a small launcher for this installation of Yew Harness: it runs the
|
|
16
|
+
same yew you run in a terminal, with the Node.js found now. Run install again
|
|
17
|
+
after you move or update Node.js or Yew Harness.
|
|
17
18
|
|
|
18
19
|
Commands:
|
|
19
20
|
install Create ~/Applications/Yew.app
|
|
20
|
-
uninstall Remove it; Yew itself and your data stay
|
|
21
|
+
uninstall Remove it; Yew Harness itself and your data stay
|
|
21
22
|
status Show whether it is there
|
|
22
23
|
|
|
23
24
|
Options:
|
|
@@ -41,6 +42,8 @@ export function realAppHost() {
|
|
|
41
42
|
const xml = (text) => text.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">");
|
|
42
43
|
/** A value inside single quotes in a shell script. */
|
|
43
44
|
const quoted = (value) => `'${value.replace(/'/g, `'\\''`)}'`;
|
|
45
|
+
/** Shown for the launcher in every language: macOS falls back to the development region's. */
|
|
46
|
+
export const DISPLAY_NAME = `CFBundleDisplayName = "${PRODUCT}";\nCFBundleName = "${PRODUCT}";\n`;
|
|
44
47
|
export function infoPlist() {
|
|
45
48
|
return `<?xml version="1.0" encoding="UTF-8"?>
|
|
46
49
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
@@ -50,6 +53,10 @@ export function infoPlist() {
|
|
|
50
53
|
<string>Yew</string>
|
|
51
54
|
<key>CFBundleDisplayName</key>
|
|
52
55
|
<string>Yew</string>
|
|
56
|
+
<key>CFBundleDevelopmentRegion</key>
|
|
57
|
+
<string>en</string>
|
|
58
|
+
<key>LSHasLocalizedDisplayName</key>
|
|
59
|
+
<true/>
|
|
53
60
|
<key>CFBundleIdentifier</key>
|
|
54
61
|
<string>cn.tenonai.apps.yew.launcher</string>
|
|
55
62
|
<key>CFBundleExecutable</key>
|
|
@@ -90,7 +97,7 @@ while [ "$tries" -lt 60 ]; do
|
|
|
90
97
|
if ${yew} open >/dev/null 2>&1; then exit 0; fi
|
|
91
98
|
tries=$((tries + 1))
|
|
92
99
|
done
|
|
93
|
-
osascript -e 'display alert "Yew did not start" message "Run yew serve in a terminal to see why."' >/dev/null 2>&1
|
|
100
|
+
osascript -e 'display alert "Yew Harness did not start" message "Run yew serve in a terminal to see why."' >/dev/null 2>&1
|
|
94
101
|
exit 1
|
|
95
102
|
`;
|
|
96
103
|
}
|
|
@@ -110,6 +117,9 @@ export function installApp(host, home, env) {
|
|
|
110
117
|
mkdirSync(join(contents, "MacOS"), { recursive: true });
|
|
111
118
|
mkdirSync(join(contents, "Resources"), { recursive: true });
|
|
112
119
|
writeFileSync(join(contents, "Info.plist"), infoPlist());
|
|
120
|
+
// Finder, Launchpad and the Dock show the product's name; the file keeps the short one.
|
|
121
|
+
mkdirSync(join(contents, "Resources", "en.lproj"));
|
|
122
|
+
writeFileSync(join(contents, "Resources", "en.lproj", "InfoPlist.strings"), DISPLAY_NAME);
|
|
113
123
|
const launcher = join(contents, "MacOS", "yew-launcher");
|
|
114
124
|
writeFileSync(launcher, launcherScript(host, vars, join(home, "logs", "serve.log")));
|
|
115
125
|
chmodSync(launcher, 0o755);
|
|
@@ -148,7 +158,7 @@ export function uninstallApp(host) {
|
|
|
148
158
|
export function appCommand(host = realAppHost()) {
|
|
149
159
|
return {
|
|
150
160
|
name: "app",
|
|
151
|
-
summary: "Put a Yew icon in Applications (macOS)",
|
|
161
|
+
summary: "Put a Yew Harness icon in Applications (macOS)",
|
|
152
162
|
async run(args, io) {
|
|
153
163
|
const { values, positionals } = parseArgs({
|
|
154
164
|
args,
|
|
@@ -172,7 +182,7 @@ export function appCommand(host = realAppHost()) {
|
|
|
172
182
|
if (values.json)
|
|
173
183
|
io.stdout.write(`${JSON.stringify({ installed, app })}\n`);
|
|
174
184
|
else
|
|
175
|
-
io.stdout.write(`Yew icon: ${installed ? app : "not installed"}\n`);
|
|
185
|
+
io.stdout.write(`Yew Harness icon: ${installed ? app : "not installed"}\n`);
|
|
176
186
|
return EXIT_OK;
|
|
177
187
|
}
|
|
178
188
|
if (action === "uninstall") {
|
|
@@ -180,7 +190,7 @@ export function appCommand(host = realAppHost()) {
|
|
|
180
190
|
if (values.json)
|
|
181
191
|
io.stdout.write(`${JSON.stringify({ installed: false, app })}\n`);
|
|
182
192
|
else
|
|
183
|
-
io.stdout.write(installed ? `Removed ${app}.\n` : "The Yew icon was not installed.\n");
|
|
193
|
+
io.stdout.write(installed ? `Removed ${app}.\n` : "The Yew Harness icon was not installed.\n");
|
|
184
194
|
return EXIT_OK;
|
|
185
195
|
}
|
|
186
196
|
const { yewHome } = await import("../server/paths.js");
|
|
@@ -188,7 +198,7 @@ export function appCommand(host = realAppHost()) {
|
|
|
188
198
|
if (values.json)
|
|
189
199
|
io.stdout.write(`${JSON.stringify({ installed: true, app, icon })}\n`);
|
|
190
200
|
else {
|
|
191
|
-
io.stdout.write(`Yew is in your Applications folder: ${app}\nOpen it from Launchpad or Spotlight, or drag it to the Dock.\n`);
|
|
201
|
+
io.stdout.write(`Yew Harness is in your Applications folder: ${app}\nOpen it from Launchpad or Spotlight, or drag it to the Dock.\n`);
|
|
192
202
|
if (!icon)
|
|
193
203
|
io.stderr.write("yew: the icon could not be made; the app has a plain one.\n");
|
|
194
204
|
}
|
package/dist/cli/export.js
CHANGED
|
@@ -3,10 +3,10 @@ import { parseArgs } from "node:util";
|
|
|
3
3
|
import { EXIT_OK, UsageError } from "./io.js";
|
|
4
4
|
const HELP = `Usage: yew export <folder> [options]
|
|
5
5
|
|
|
6
|
-
Write everything Yew keeps into a folder, as files you can read
|
|
7
|
-
each session as Markdown; letters, decision cards,
|
|
8
|
-
settings as JSON; and every version of every artifact. The
|
|
9
|
-
or empty.
|
|
6
|
+
Write everything Yew Harness keeps into a folder, as files you can read
|
|
7
|
+
without Yew Harness: each session as Markdown; letters, decision cards,
|
|
8
|
+
scheduled tasks and settings as JSON; and every version of every artifact. The
|
|
9
|
+
folder must be new or empty.
|
|
10
10
|
|
|
11
11
|
API keys stay in the system keychain and are not exported; neither are paired
|
|
12
12
|
phones or sign-in tokens.
|
|
@@ -18,7 +18,7 @@ Options:
|
|
|
18
18
|
export function exportCommand() {
|
|
19
19
|
return {
|
|
20
20
|
name: "export",
|
|
21
|
-
summary: "Write all of Yew's data into a folder",
|
|
21
|
+
summary: "Write all of Yew Harness's data into a folder",
|
|
22
22
|
async run(args, io) {
|
|
23
23
|
const { values, positionals } = parseArgs({
|
|
24
24
|
args,
|
package/dist/cli/mcp.js
CHANGED
|
@@ -3,18 +3,18 @@ import { VERSION } from "../shared/version.js";
|
|
|
3
3
|
import { EXIT_OK, UsageError } from "./io.js";
|
|
4
4
|
const HELP = `Usage: yew mcp list [options]
|
|
5
5
|
|
|
6
|
-
Show the MCP servers set up in mcp.json in Yew's data folder: whether
|
|
7
|
-
connects, and the tools it offers. The file uses the usual shape:
|
|
6
|
+
Show the MCP servers set up in mcp.json in Yew Harness's data folder: whether
|
|
7
|
+
each one connects, and the tools it offers. The file uses the usual shape:
|
|
8
8
|
|
|
9
9
|
{ "mcpServers": {
|
|
10
10
|
"files": { "command": "npx", "args": ["some-mcp-server"], "env": { "KEY": "\${KEY}" } },
|
|
11
11
|
"search": { "url": "https://example.com/mcp", "headers": { "Authorization": "Bearer \${TOKEN}" } } } }
|
|
12
12
|
|
|
13
|
-
\${NAME} is taken from the environment Yew runs in. Sessions ask you
|
|
14
|
-
they use a tool of a server for the first time. A server with
|
|
15
|
-
stays in the file and is not started. A project's own
|
|
16
|
-
Servers can also be added, disabled and removed in the
|
|
17
|
-
interface.
|
|
13
|
+
\${NAME} is taken from the environment Yew Harness runs in. Sessions ask you
|
|
14
|
+
before they use a tool of a server for the first time. A server with
|
|
15
|
+
"disabled": true stays in the file and is not started. A project's own
|
|
16
|
+
.mcp.json is not read. Servers can also be added, disabled and removed in the
|
|
17
|
+
settings of the web interface.
|
|
18
18
|
|
|
19
19
|
Options:
|
|
20
20
|
--json Print as JSON
|
package/dist/cli/remote.js
CHANGED
|
@@ -4,9 +4,9 @@ import { EXIT_ERROR, EXIT_OK, UsageError } from "./io.js";
|
|
|
4
4
|
import { serviceRunning } from "./serve.js";
|
|
5
5
|
const HELP = `Usage: yew remote <on|off|status|pair> [options]
|
|
6
6
|
|
|
7
|
-
Let your phone reach Yew on this Mac through
|
|
8
|
-
out to the relay, so this Mac opens no port; everything between them
|
|
9
|
-
end-to-end encrypted, and the relay sees only ciphertext.
|
|
7
|
+
Let your phone reach Yew Harness on this Mac through the relay. Both sides
|
|
8
|
+
connect out to the relay, so this Mac opens no port; everything between them
|
|
9
|
+
is end-to-end encrypted, and the relay sees only ciphertext.
|
|
10
10
|
|
|
11
11
|
Commands:
|
|
12
12
|
on Turn on phone access
|
|
@@ -70,7 +70,7 @@ export function remoteCommand() {
|
|
|
70
70
|
io.stdout.write(`Phone access is ${next.enabled ? "on" : "off"} (${next.relayUrl}).\n`);
|
|
71
71
|
// The running service picks the setting up within a few seconds.
|
|
72
72
|
if (!running)
|
|
73
|
-
io.stderr.write("yew: Yew is not running; start it with 'yew serve'.\n");
|
|
73
|
+
io.stderr.write("yew: Yew Harness is not running; start it with 'yew serve'.\n");
|
|
74
74
|
return EXIT_OK;
|
|
75
75
|
}
|
|
76
76
|
if (action === "status") {
|
|
@@ -103,9 +103,9 @@ export function remoteCommand() {
|
|
|
103
103
|
return EXIT_OK;
|
|
104
104
|
}
|
|
105
105
|
const { renderUnicodeCompact } = await import("uqr");
|
|
106
|
-
io.stdout.write(`${renderUnicodeCompact(link)}\nScan this with Yew on your phone within 5 minutes.\n`);
|
|
106
|
+
io.stdout.write(`${renderUnicodeCompact(link)}\nScan this with Yew Harness on your phone within 5 minutes.\n`);
|
|
107
107
|
if (!running)
|
|
108
|
-
io.stderr.write("yew: Yew is not running; start it with 'yew serve'.\n");
|
|
108
|
+
io.stderr.write("yew: Yew Harness is not running; start it with 'yew serve'.\n");
|
|
109
109
|
return EXIT_OK;
|
|
110
110
|
}
|
|
111
111
|
finally {
|
package/dist/cli/run.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { parseArgs } from "node:util";
|
|
2
|
-
import { NAME, PUBLISHER, VERSION, WEBSITE } from "../shared/version.js";
|
|
2
|
+
import { NAME, PRODUCT, PUBLISHER, VERSION, WEBSITE } from "../shared/version.js";
|
|
3
3
|
import { EXIT_ERROR, EXIT_OK, EXIT_USAGE, paint, UsageError } from "./io.js";
|
|
4
4
|
function helpText(io, commands) {
|
|
5
5
|
const bold = (s) => paint("bold", s, io.stdout, io.env);
|
|
6
6
|
const lines = [
|
|
7
|
-
`${
|
|
7
|
+
`${PRODUCT} ${VERSION}`,
|
|
8
8
|
"An AI-native multi-agent workbench.",
|
|
9
9
|
"",
|
|
10
10
|
`${bold("Usage:")} ${NAME} <command> [options]`,
|
|
@@ -22,7 +22,7 @@ function versionText(json) {
|
|
|
22
22
|
if (json) {
|
|
23
23
|
return `${JSON.stringify({ name: NAME, version: VERSION, publisher: PUBLISHER, website: WEBSITE })}\n`;
|
|
24
24
|
}
|
|
25
|
-
return `${
|
|
25
|
+
return `${PRODUCT} ${VERSION}\n${PUBLISHER} · ${WEBSITE}\n`;
|
|
26
26
|
}
|
|
27
27
|
export async function run(argv, io, commands = []) {
|
|
28
28
|
const first = argv[0];
|
package/dist/cli/schedule.js
CHANGED
|
@@ -4,8 +4,8 @@ import { serviceRunning } from "./serve.js";
|
|
|
4
4
|
const HELP = `Usage: yew schedule <list|run> [options] [<task>]
|
|
5
5
|
|
|
6
6
|
Scheduled tasks send a standing session a letter at set times; the session's
|
|
7
|
-
last reply goes to the main conversation as the report. Set them up in Yew
|
|
8
|
-
web interface, or ask the main conversation.
|
|
7
|
+
last reply goes to the main conversation as the report. Set them up in Yew
|
|
8
|
+
Harness's web interface, or ask the main conversation.
|
|
9
9
|
|
|
10
10
|
Commands:
|
|
11
11
|
list List the scheduled tasks with their next and last runs
|
|
@@ -111,7 +111,7 @@ export function scheduleCommand() {
|
|
|
111
111
|
io.stdout.write(`Sent ${schedule.name} to ${sessionName(schedule.sessionId)} (letter ${result.letter.id}).\n`);
|
|
112
112
|
}
|
|
113
113
|
if (!serviceRunning(home)) {
|
|
114
|
-
io.stderr.write("Yew is not running; the letter is delivered when it starts.\n");
|
|
114
|
+
io.stderr.write("Yew Harness is not running; the letter is delivered when it starts.\n");
|
|
115
115
|
}
|
|
116
116
|
return EXIT_OK;
|
|
117
117
|
}
|
package/dist/cli/send.js
CHANGED
|
@@ -7,8 +7,8 @@ Send a letter to a session, from a script, CI or a git hook. <session> is the
|
|
|
7
7
|
session's id or name. Use - as the message to read it from standard input; the
|
|
8
8
|
first line is the summary. The letter is marked as coming from the command
|
|
9
9
|
line, not from you; run inside a session's shell, it comes from that session
|
|
10
|
-
and counts against its letters. A running Yew delivers it within a few
|
|
11
|
-
seconds; otherwise it waits until Yew starts.
|
|
10
|
+
and counts against its letters. A running Yew Harness delivers it within a few
|
|
11
|
+
seconds; otherwise it waits until Yew Harness starts.
|
|
12
12
|
|
|
13
13
|
Options:
|
|
14
14
|
-k, --kind <kind> notice, request or report (default: notice)
|
|
@@ -111,10 +111,10 @@ export function sendCommand() {
|
|
|
111
111
|
io.stdout.write(`Sent letter ${letter.id} to ${session.name}.\n`);
|
|
112
112
|
}
|
|
113
113
|
if (letter.status === "held") {
|
|
114
|
-
io.stderr.write("It is held until you release it in Yew's approval center.\n");
|
|
114
|
+
io.stderr.write("It is held until you release it in Yew Harness's approval center.\n");
|
|
115
115
|
}
|
|
116
116
|
else if (!serviceRunning(home)) {
|
|
117
|
-
io.stderr.write("Yew is not running; the letter is delivered when it starts.\n");
|
|
117
|
+
io.stderr.write("Yew Harness is not running; the letter is delivered when it starts.\n");
|
|
118
118
|
}
|
|
119
119
|
return EXIT_OK;
|
|
120
120
|
}
|