From c72f607befaf12e918b097bc76aee0a320900af1 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 03:36:01 +0800
Subject: [PATCH 01/17] feat(core): support functional optionConfig.hidden

---
 packages/koishi-core/src/help.ts    | 9 +++++++--
 packages/koishi-core/src/parser.ts  | 2 +-
 packages/koishi-core/src/session.ts | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/koishi-core/src/help.ts b/packages/koishi-core/src/help.ts
index c7eda0531f..d3f3013efb 100644
--- a/packages/koishi-core/src/help.ts
+++ b/packages/koishi-core/src/help.ts
@@ -3,6 +3,7 @@ import { TableType } from './database'
 import { Session, FieldCollector } from './session'
 import { template } from 'koishi-utils'
 import { Context } from './context'
+import { Domain } from './parser'
 
 interface HelpConfig {
   showHidden?: boolean
@@ -111,12 +112,16 @@ function formatCommands(path: string, session: Session<ValidationField>, childre
   return output
 }
 
+function getOptionVisibility(option: Domain.OptionConfig, session: Session<ValidationField>) {
+  if (session.user && option.authority > session.user.authority) return false
+  return !session.resolveValue(option.hidden)
+}
+
 function getOptions(command: Command, session: Session<ValidationField>, maxUsage: number, config: HelpConfig) {
   if (command.config.hideOptions && !config.showHidden) return []
   const options = config.showHidden
     ? Object.values(command._options)
-    : Object.values(command._options)
-      .filter(option => !option.hidden && (!session.user || option.authority <= session.user.authority))
+    : Object.values(command._options).filter(option => getOptionVisibility(option, session))
   if (!options.length) return []
 
   const output = config.authority && options.some(o => o.authority)
diff --git a/packages/koishi-core/src/parser.ts b/packages/koishi-core/src/parser.ts
index 1e0926abdc..9fd30ac468 100644
--- a/packages/koishi-core/src/parser.ts
+++ b/packages/koishi-core/src/parser.ts
@@ -166,7 +166,7 @@ export namespace Domain {
     fallback?: any
     type?: T
     /** hide the option by default */
-    hidden?: boolean
+    hidden?: boolean | ((session: Session) => boolean)
     authority?: number
     notUsage?: boolean
   }
diff --git a/packages/koishi-core/src/session.ts b/packages/koishi-core/src/session.ts
index 42da40ac82..942a871643 100644
--- a/packages/koishi-core/src/session.ts
+++ b/packages/koishi-core/src/session.ts
@@ -180,7 +180,7 @@ export class Session<
     }))
   }
 
-  private _getValue<T>(source: T | ((session: Session) => T)): T {
+  resolveValue<T>(source: T | ((session: Session) => T)): T {
     return typeof source === 'function' ? Reflect.apply(source, null, [this]) : source
   }
 
@@ -219,7 +219,7 @@ export class Session<
     if (hasActiveCache) return this.channel = cache as any
 
     // 绑定一个新的可观测频道实例
-    const assignee = this._getValue(this.app.options.autoAssign) ? this.selfId : ''
+    const assignee = this.resolveValue(this.app.options.autoAssign) ? this.selfId : ''
     const data = await this.getChannel(channelId, assignee, fieldArray)
     const newChannel = observe(data, diff => this.database.setChannel(platform, channelId, diff), `channel ${this.cid}`)
     this.app._channelCache.set(this.cid, newChannel)
@@ -266,7 +266,7 @@ export class Session<
     // 确保匿名消息不会写回数据库
     if (this.author?.anonymous) {
       const fallback = User.create(this.platform, userId)
-      fallback.authority = this._getValue(this.app.options.autoAuthorize)
+      fallback.authority = this.resolveValue(this.app.options.autoAuthorize)
       const user = observe(fallback, () => Promise.resolve())
       return this.user = user
     }
@@ -278,7 +278,7 @@ export class Session<
     if (hasActiveCache) return this.user = cache as any
 
     // 绑定一个新的可观测用户实例
-    const data = await this.getUser(userId, this._getValue(this.app.options.autoAuthorize), fieldArray)
+    const data = await this.getUser(userId, this.resolveValue(this.app.options.autoAuthorize), fieldArray)
     const newUser = observe(data, diff => this.database.setUser(this.platform, userId, diff), `user ${this.uid}`)
     userCache.set(userId, newUser)
     return this.user = newUser

From a4264e9f302116538fa678aeca9a6f1b6ad13fd6 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 03:39:30 +0800
Subject: [PATCH 02/17] feat(github): add authority/visibility setting for
 github, fix #182

---
 packages/plugin-github/src/index.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/plugin-github/src/index.ts b/packages/plugin-github/src/index.ts
index f990ca6066..9c894257b9 100644
--- a/packages/plugin-github/src/index.ts
+++ b/packages/plugin-github/src/index.ts
@@ -3,7 +3,7 @@
 
 import { createHmac } from 'crypto'
 import { encode } from 'querystring'
-import { Context, camelize, Time, Random, sanitize, Logger } from 'koishi-core'
+import { Context, camelize, Time, Random, sanitize, Logger, Session } from 'koishi-core'
 import { CommonPayload, addListeners, defaultEvents, EventConfig } from './events'
 import { Config, GitHub, ReplyHandler, ReplySession, ReplyPayloads } from './server'
 import axios from 'axios'
@@ -144,11 +144,13 @@ export function apply(ctx: Context, config: Config = {}) {
     }
   }
 
+  const hidden = (sess: Session) => sess.subtype !== 'group'
+
   ctx.command('github [name]')
     .channelFields(['githubWebhooks'])
-    .option('list', '-l  查看当前频道订阅的仓库列表')
-    .option('add', '-a  为当前频道添加仓库订阅')
-    .option('delete', '-d  从当前频道移除仓库订阅')
+    .option('list', '-l  查看当前频道订阅的仓库列表', { hidden })
+    .option('add', '-a  为当前频道添加仓库订阅', { hidden, authority: 2 })
+    .option('delete', '-d  从当前频道移除仓库订阅', { hidden, authority: 2 })
     .action(async ({ session, options }, name) => {
       if (options.list) {
         if (!session.channel) return '当前不是群聊上下文。'

From d23c170af8ccc2ec5d28df18d22b024800d201a6 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 13:05:09 +0800
Subject: [PATCH 03/17] feat(webui): support clear in sandbox

---
 .../plugin-webui/client/views/plugins/plugin-view.vue     | 1 +
 packages/plugin-webui/client/views/sandbox.vue            | 8 +++++++-
 packages/plugin-webui/src/adapter.ts                      | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/plugin-webui/client/views/plugins/plugin-view.vue b/packages/plugin-webui/client/views/plugins/plugin-view.vue
index a911aa19bd..a98d4845c8 100644
--- a/packages/plugin-webui/client/views/plugins/plugin-view.vue
+++ b/packages/plugin-webui/client/views/plugins/plugin-view.vue
@@ -14,6 +14,7 @@
 
 import type { Registry } from '~/server'
 import { ref, computed, defineProps } from 'vue'
+import PluginView from './plugin-view.vue'
 
 const show = ref(false)
 
diff --git a/packages/plugin-webui/client/views/sandbox.vue b/packages/plugin-webui/client/views/sandbox.vue
index a1012f236f..d9a9f98de7 100644
--- a/packages/plugin-webui/client/views/sandbox.vue
+++ b/packages/plugin-webui/client/views/sandbox.vue
@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 
-import { ref, watch, nextTick } from 'vue'
+import { ref, watch, nextTick, onMounted } from 'vue'
 import { send, receive, user, storage } from '~/client'
 
 interface Message {
@@ -33,6 +33,8 @@ function addMessage(from: 'user' | 'bot', content: string) {
   }
 }
 
+onMounted(scrollToBottom)
+
 function scrollToBottom() {
   panel.value.scrollTop = panel.value.scrollHeight - panel.value.clientHeight
 }
@@ -49,6 +51,10 @@ receive('sandbox', (data) => {
   addMessage('bot', data)
 })
 
+receive('clear', (data) => {
+  messages.value = []
+})
+
 </script>
 
 <style lang="scss">
diff --git a/packages/plugin-webui/src/adapter.ts b/packages/plugin-webui/src/adapter.ts
index 7e0b1a5b90..54280c10e0 100644
--- a/packages/plugin-webui/src/adapter.ts
+++ b/packages/plugin-webui/src/adapter.ts
@@ -113,6 +113,9 @@ export class WebAdapter extends Adapter<'web'> {
       server: ctx.app._httpServer,
     })
 
+    ctx.self('sandbox').command('clear', '清空消息列表')
+      .action(({ session }) => this.channels[session.channelId].send('clear'))
+
     ctx.all().middleware(async (session, next) => {
       if (session.subtype !== 'private') return next()
       const state = states[session.uid]

From a2993f7a3409f3cbc3cf604026218eedfa24dea6 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 15:33:03 +0800
Subject: [PATCH 04/17] fix(core): do not send twice when return
 session.execute()

---
 .nycrc.json                         | 3 ++-
 packages/koishi-core/src/session.ts | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.nycrc.json b/.nycrc.json
index 30f824ae7c..42b3da153d 100644
--- a/.nycrc.json
+++ b/.nycrc.json
@@ -10,6 +10,7 @@
     "packages/plugin-*/**/database/**",
     "packages/plugin-*/**/database.js",
     "packages/plugin-mongo/**",
-    "packages/plugin-mysql/**"
+    "packages/plugin-mysql/**",
+    "packages/plugin-webui/**"
   ]
 }
\ No newline at end of file
diff --git a/packages/koishi-core/src/session.ts b/packages/koishi-core/src/session.ts
index 942a871643..670dc492c2 100644
--- a/packages/koishi-core/src/session.ts
+++ b/packages/koishi-core/src/session.ts
@@ -358,8 +358,9 @@ export class Session<
     }
 
     const result = await argv.command.execute(argv, next)
-    if (shouldEmit) await this.send(result)
-    return result
+    if (!shouldEmit) return result
+    await this.send(result)
+    return ''
   }
 
   middleware(middleware: Middleware) {

From 66342989cfaa0c9578d3e6fbee75ea6850420134 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 15:44:35 +0800
Subject: [PATCH 05/17] fix(eval): fix eval error in detached session, fix #197

---
 packages/plugin-eval/src/main.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/plugin-eval/src/main.ts b/packages/plugin-eval/src/main.ts
index 8fdfae862b..51948d5e5a 100644
--- a/packages/plugin-eval/src/main.ts
+++ b/packages/plugin-eval/src/main.ts
@@ -114,12 +114,18 @@ export namespace Trap {
 
     command.userFields([...Trap.user.fields(userAccess.readable)])
     command.channelFields([...Trap.channel.fields(channelAccess.readable)])
-    command.action((argv, ...args) => {
-      const { id } = argv.session
+    command.action(async (argv, ...args) => {
+      const { id, app } = argv.session
       const user = Trap.user.get(argv.session.user, userAccess.readable)
       const channel = Trap.channel.get(argv.session.channel, channelAccess.readable)
       const ctxOptions = { id, user, channel, userWritable, channelWritable }
-      return action({ ...argv, scope: ctxOptions }, ...args)
+      const inactive = !app._sessions[id]
+      app._sessions[id] = argv.session
+      try {
+        return await action({ ...argv, scope: ctxOptions }, ...args)
+      } finally {
+        if (inactive) delete app._sessions[id]
+      }
     })
   }
 }

From 95adc1773591e613ecc70339db688cda96dd6347 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 18:57:01 +0800
Subject: [PATCH 06/17] feat(assets): support base64 url

---
 packages/plugin-assets/src/index.ts | 33 +++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/plugin-assets/src/index.ts b/packages/plugin-assets/src/index.ts
index 682d179083..27f6b149d9 100644
--- a/packages/plugin-assets/src/index.ts
+++ b/packages/plugin-assets/src/index.ts
@@ -2,9 +2,22 @@ import { Assets, Context, Random, sanitize, Time, trimSlash } from 'koishi-core'
 import axios, { AxiosRequestConfig } from 'axios'
 import { promises as fs, createReadStream, existsSync } from 'fs'
 import { extname, resolve } from 'path'
-import { createHmac } from 'crypto'
+import { createHmac, createHash } from 'crypto'
 import FormData from 'form-data'
 
+const PTC_BASE64 = 'base64://'
+
+async function getAssetBuffer(url: string, axiosConfig: AxiosRequestConfig) {
+  if (url.startsWith(PTC_BASE64)) {
+    return Buffer.from(url.slice(PTC_BASE64.length), 'base64')
+  }
+  const { data } = await axios.get<ArrayBuffer>(url, {
+    ...axiosConfig,
+    responseType: 'arraybuffer',
+  })
+  return Buffer.from(data)
+}
+
 interface ServerConfig {
   path?: string
   root?: string
@@ -77,13 +90,10 @@ class AssetServer implements Assets {
     const { selfUrl, path, root, axiosConfig } = this.config
     const filename = resolve(root, file)
     if (!existsSync(filename)) {
-      const { data } = await axios.get<ArrayBuffer>(url, {
-        ...axiosConfig,
-        responseType: 'arraybuffer',
-      })
-      await fs.writeFile(filename, Buffer.from(data))
+      const buffer = await getAssetBuffer(url, axiosConfig)
+      await fs.writeFile(filename, buffer)
       this._stats.assetCount += 1
-      this._stats.assetSize += data.byteLength
+      this._stats.assetSize += buffer.byteLength
     }
     return `${selfUrl}${path}/${file}`
   }
@@ -138,12 +148,9 @@ class SmmsAssets implements Assets {
 
   async upload(url: string, file: string) {
     const { token, endpoint, axiosConfig } = this.config
-    const { data: filedata } = await axios.get<ArrayBuffer>(url, {
-      ...axiosConfig,
-      responseType: 'arraybuffer',
-    })
+    const buffer = await getAssetBuffer(url, axiosConfig)
     const payload = new FormData()
-    payload.append('smfile', filedata, file)
+    payload.append('smfile', buffer, file || createHash('sha1').update(buffer).digest('hex'))
     const { data } = await axios.post(endpoint + '/upload', payload, {
       ...axiosConfig,
       headers: {
@@ -164,6 +171,7 @@ class SmmsAssets implements Assets {
   async stats() {
     const { token, endpoint, axiosConfig } = this.config
     const { data } = await axios.post(endpoint + '/profile', null, {
+      timeout: Time.second * 5,
       ...axiosConfig,
       headers: {
         authorization: token,
@@ -181,7 +189,6 @@ export const name = 'assets'
 
 export function apply(ctx: Context, config: Config = {}) {
   config.axiosConfig = {
-    timeout: Time.second * 5,
     ...ctx.app.options.axiosConfig,
     ...config.axiosConfig,
   }

From 8ec40d7e470209ca770396e310e2d9b2a05c2c6f Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 20:01:42 +0800
Subject: [PATCH 07/17] feat(assets): enhance config deduction

---
 .gitignore                          |  1 +
 packages/plugin-assets/src/index.ts | 67 +++++++++++++++++------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf9daab845..747295a925 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ temp
 /tsconfig.temp.json
 
 /addons
+/public
 /atri
 /coverage
 /docs
diff --git a/packages/plugin-assets/src/index.ts b/packages/plugin-assets/src/index.ts
index 27f6b149d9..358ba13a25 100644
--- a/packages/plugin-assets/src/index.ts
+++ b/packages/plugin-assets/src/index.ts
@@ -18,7 +18,8 @@ async function getAssetBuffer(url: string, axiosConfig: AxiosRequestConfig) {
   return Buffer.from(data)
 }
 
-interface ServerConfig {
+interface LocalConfig {
+  type: 'local'
   path?: string
   root?: string
   selfUrl?: string
@@ -26,7 +27,7 @@ interface ServerConfig {
   axiosConfig?: AxiosRequestConfig
 }
 
-class AssetServer implements Assets {
+class LocalAssets implements Assets {
   types = ['video', 'audio', 'image'] as const
 
   private _promise: Promise<void>
@@ -35,9 +36,13 @@ class AssetServer implements Assets {
     assetSize: 0,
   }
 
-  constructor(public ctx: Context, public config: ServerConfig) {
-    const path = sanitize(config.path || '/assets')
-    config.root ||= resolve(__dirname, '../public')
+  constructor(public ctx: Context, public config: LocalConfig) {
+    config.path = sanitize(config.path || '/assets')
+    if (config.root) {
+      config.root = resolve(process.cwd(), config.root)
+    } else {
+      config.root = resolve(__dirname, '../public')
+    }
 
     if (config.selfUrl) {
       config.selfUrl = trimSlash(config.selfUrl)
@@ -45,17 +50,17 @@ class AssetServer implements Assets {
       throw new Error(`missing configuration "selfUrl" or "server"`)
     }
 
-    ctx.router.get(path, async (ctx) => {
+    ctx.router.get(config.path, async (ctx) => {
       return ctx.body = await this.stats()
     })
 
-    ctx.router.get(path + '/:name', (ctx) => {
+    ctx.router.get(config.path + '/:name', (ctx) => {
       const filename = resolve(config.root, ctx.params.name)
       ctx.type = extname(filename)
       return ctx.body = createReadStream(filename)
     })
 
-    ctx.router.post(path, async (ctx) => {
+    ctx.router.post(config.path, async (ctx) => {
       const { salt, sign, url, file } = ctx.query
       if (Array.isArray(file) || Array.isArray(url)) {
         return ctx.status = 400
@@ -85,15 +90,25 @@ class AssetServer implements Assets {
     }))
   }
 
+  async write(buffer: Buffer, filename: string) {
+    await fs.writeFile(filename, buffer)
+    this._stats.assetCount += 1
+    this._stats.assetSize += buffer.byteLength
+  }
+
   async upload(url: string, file: string) {
     await this._promise
     const { selfUrl, path, root, axiosConfig } = this.config
-    const filename = resolve(root, file)
-    if (!existsSync(filename)) {
+    if (file) {
+      const filename = resolve(root, file)
+      if (!existsSync(filename)) {
+        const buffer = await getAssetBuffer(url, axiosConfig)
+        await this.write(buffer, filename)
+      }
+    } else {
       const buffer = await getAssetBuffer(url, axiosConfig)
-      await fs.writeFile(filename, buffer)
-      this._stats.assetCount += 1
-      this._stats.assetSize += buffer.byteLength
+      file = createHash('sha1').update(buffer).digest('hex')
+      await this.write(buffer, resolve(root, file))
     }
     return `${selfUrl}${path}/${file}`
   }
@@ -104,16 +119,17 @@ class AssetServer implements Assets {
   }
 }
 
-interface ClientConfig {
+interface RemoteConfig {
+  type: 'remote'
   server: string
   secret?: string
   axiosConfig?: AxiosRequestConfig
 }
 
-class AssetClient implements Assets {
+class RemoteAssets implements Assets {
   types = ['video', 'audio', 'image'] as const
 
-  constructor(public ctx: Context, public config: ClientConfig) {}
+  constructor(public ctx: Context, public config: RemoteConfig) {}
 
   async upload(url: string, file: string) {
     const { server, secret, axiosConfig } = this.config
@@ -183,25 +199,20 @@ class SmmsAssets implements Assets {
   }
 }
 
-export type Config = ServerConfig | ClientConfig | SmmsConfig
+export type Config = LocalConfig | RemoteConfig | SmmsConfig
 
 export const name = 'assets'
 
-export function apply(ctx: Context, config: Config = {}) {
+export function apply(ctx: Context, config: Config) {
   config.axiosConfig = {
     ...ctx.app.options.axiosConfig,
     ...config.axiosConfig,
   }
 
-  if ('type' in config) {
-    if (config.type === 'smms') {
-      ctx.assets = new SmmsAssets(ctx, config)
-    } else {
-      throw new Error(`unsupported asset provider type "${config.type}"`)
-    }
-  } else if ('server' in config) {
-    ctx.assets = new AssetClient(ctx, config)
-  } else {
-    ctx.assets = new AssetServer(ctx, config)
+  switch (config.type) {
+    case 'local': ctx.assets = new LocalAssets(ctx, config); break
+    case 'remote': ctx.assets = new RemoteAssets(ctx, config); break
+    case 'smms': ctx.assets = new SmmsAssets(ctx, config); break
+    default: throw new Error(`unsupported asset provider type "${config['type']}"`)
   }
 }

From ee7bf3df3b23281a456bf9e7c05fa7b05c0fdd6e Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 20:01:59 +0800
Subject: [PATCH 08/17] fix(cli): do not reload node modules

---
 packages/koishi/src/worker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/koishi/src/worker.ts b/packages/koishi/src/worker.ts
index 548c74f16e..d379b93ce5 100644
--- a/packages/koishi/src/worker.ts
+++ b/packages/koishi/src/worker.ts
@@ -182,7 +182,7 @@ interface MapOrSet<T> {
 function loadDependencies(filename: string, ignored: MapOrSet<string>) {
   const dependencies = new Set<string>()
   function loadModule({ filename, children }: NodeModule) {
-    if (ignored.has(filename) || dependencies.has(filename)) return
+    if (ignored.has(filename) || dependencies.has(filename) || filename.includes('/node_modules/')) return
     dependencies.add(filename)
     children.forEach(loadModule)
   }

From 7c1724a1b4c9e07dbf004d63ad79014fb37f642f Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 20:20:44 +0800
Subject: [PATCH 09/17] feat(webui): support image

---
 .../plugin-webui/client/components/input.vue  |  3 +-
 .../client/components/message.vue             | 29 ++++++
 packages/plugin-webui/client/index.ts         | 98 +++++++++++++++++++
 packages/plugin-webui/client/main.ts          |  3 +-
 .../client/views/layout/index.vue             |  2 +-
 .../plugin-webui/client/views/sandbox.vue     | 39 ++++++--
 packages/plugin-webui/src/adapter.ts          | 16 ++-
 7 files changed, 174 insertions(+), 16 deletions(-)
 create mode 100644 packages/plugin-webui/client/components/message.vue

diff --git a/packages/plugin-webui/client/components/input.vue b/packages/plugin-webui/client/components/input.vue
index bbafc1832f..12a9414e33 100644
--- a/packages/plugin-webui/client/components/input.vue
+++ b/packages/plugin-webui/client/components/input.vue
@@ -18,6 +18,7 @@
       @input="onInput"
       @focus="onFocus"
       @blur="onBlur"
+      @paste="$emit('paste', $event)"
       @keydown.enter.stop="$emit('enter', $event)"
     />
     <i v-if="suffix" :class="'fas fa-' + suffix" class="suffix" @click="$emit('clickSuffix')"/>
@@ -53,7 +54,7 @@ const inputStyle = computed(() => ({
   paddingRight: +!!(props.suffix) + 1 + 'em',
 }))
 
-const emit = defineEmit(['update:modelValue', 'focus', 'blur', 'enter', 'clickPrefix', 'clickSuffix'])
+const emit = defineEmit(['update:modelValue', 'paste', 'focus', 'blur', 'enter', 'clickPrefix', 'clickSuffix'])
 
 function onInput (event) {
   if (props.validate) {
diff --git a/packages/plugin-webui/client/components/message.vue b/packages/plugin-webui/client/components/message.vue
new file mode 100644
index 0000000000..f2a8050e77
--- /dev/null
+++ b/packages/plugin-webui/client/components/message.vue
@@ -0,0 +1,29 @@
+<template>
+  <div class="k-message">
+    <template v-for="({ type, data }, index) in segment.parse(text)" :key="index">
+      <span v-if="type === 'text'">{{ data.content }}</span>
+      <img v-else-if="type === 'image'" :src="data.url || data.file"/>
+    </template>
+  </div>
+</template>
+
+<script lang="ts" setup>
+
+import { defineProps } from 'vue'
+import { segment } from '~/client'
+
+defineProps<{
+  text: string
+}>()
+
+</script>
+
+<style lang="scss" scoped>
+
+.k-message {
+  img {
+    max-height: 400px;
+  }
+}
+
+</style>
diff --git a/packages/plugin-webui/client/index.ts b/packages/plugin-webui/client/index.ts
index 0909264d98..657917fd9b 100644
--- a/packages/plugin-webui/client/index.ts
+++ b/packages/plugin-webui/client/index.ts
@@ -108,3 +108,101 @@ export async function sha256(password: string) {
   }
   return output
 }
+
+export interface segment {
+  type: string
+  data: segment.Data
+}
+
+export function segment(type: string, data: segment.Data = {}) {
+  if (type === 'text') return String(data.content)
+  let output = '[CQ:' + type
+  for (const key in data) {
+    if (data[key]) output += `,${key}=${segment.escape(data[key], true)}`
+  }
+  return output + ']'
+}
+
+type primitive = string | number | boolean
+
+export namespace segment {
+  export type Chain = segment.Parsed[]
+  export type Data = Record<string, primitive>
+  export type Transformer = string | ((data: Record<string, string>, index: number, chain: Chain) => string)
+
+  export interface Parsed extends segment {
+    data: Record<string, string>
+    capture?: RegExpExecArray
+  }
+
+  export function escape(source: any, inline = false) {
+    const result = String(source)
+      .replace(/&/g, '&amp;')
+      .replace(/\[/g, '&#91;')
+      .replace(/\]/g, '&#93;')
+    return inline
+      ? result.replace(/,/g, '&#44;').replace(/(\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f\ude80-\udeff])|[\u2600-\u2B55]/g, ' ')
+      : result
+  }
+
+  export function unescape(source: string) {
+    return String(source)
+      .replace(/&#91;/g, '[')
+      .replace(/&#93;/g, ']')
+      .replace(/&#44;/g, ',')
+      .replace(/&amp;/g, '&')
+  }
+
+  export function join(codes: segment[]) {
+    return codes.map(code => segment(code.type, code.data)).join('')
+  }
+
+  export function from(source: string, typeRegExp = '\\w+'): segment.Parsed {
+    const capture = new RegExp(`\\[CQ:(${typeRegExp})((,\\w+=[^,\\]]*)*)\\]`).exec(source)
+    if (!capture) return null
+    const [, type, attrs] = capture
+    const data: Record<string, string> = {}
+    attrs && attrs.slice(1).split(',').forEach((str) => {
+      const index = str.indexOf('=')
+      data[str.slice(0, index)] = unescape(str.slice(index + 1))
+    })
+    return { type, data, capture }
+  }
+
+  export function parse(source: string) {
+    const chain: Chain = []
+    let result: segment.Parsed
+    while ((result = from(source))) {
+      const { capture } = result
+      if (capture.index) {
+        chain.push({ type: 'text', data: { content: source.slice(0, capture.index) } })
+      }
+      chain.push(result)
+      source = source.slice(capture.index + capture[0].length)
+    }
+    if (source) chain.push({ type: 'text', data: { content: source } })
+    return chain
+  }
+
+  export function transform(source: string, rules: Record<string, Transformer>, dropOthers = false) {
+    return parse(source).map(({ type, data, capture }, index, chain) => {
+      const transformer = rules[type]
+      return typeof transformer === 'string' ? transformer
+        : typeof transformer === 'function' ? transformer(data, index, chain)
+          : dropOthers ? '' : type === 'text' ? data.content : capture[0]
+    }).join('')
+  }
+
+  export type Factory<T> = (value: T, data?: segment.Data) => string
+
+  function createFactory(type: string, key: string): Factory<primitive> {
+    return (value, data = {}) => segment(type, { ...data, [key]: value })
+  }
+
+  export const at = createFactory('at', 'id')
+  export const sharp = createFactory('sharp', 'id')
+  export const quote = createFactory('quote', 'id')
+  export const image = createFactory('image', 'url')
+  export const video = createFactory('video', 'url')
+  export const audio = createFactory('audio', 'url')
+}
diff --git a/packages/plugin-webui/client/main.ts b/packages/plugin-webui/client/main.ts
index 1efa912154..72c5501a9d 100644
--- a/packages/plugin-webui/client/main.ts
+++ b/packages/plugin-webui/client/main.ts
@@ -5,6 +5,7 @@ import Card from './components/card.vue'
 import Collapse from './components/collapse.vue'
 import Button from './components/button.vue'
 import Input from './components/input.vue'
+import Message from './components/message.vue'
 import Numeric from './components/numeric.vue'
 import App from './views/layout/index.vue'
 import { start, user, receive, router } from '~/client'
@@ -62,9 +63,9 @@ router.addRoute({
 
 app.component('k-card', Card)
 app.component('k-button', Button)
-
 app.component('k-collapse', Collapse)
 app.component('k-input', Input)
+app.component('k-message', Message)
 app.component('k-numeric', Numeric)
 app.component('k-chart', defineAsyncComponent(() => import('./components/echarts')))
 
diff --git a/packages/plugin-webui/client/views/layout/index.vue b/packages/plugin-webui/client/views/layout/index.vue
index 4a415e9553..42ad297bbc 100644
--- a/packages/plugin-webui/client/views/layout/index.vue
+++ b/packages/plugin-webui/client/views/layout/index.vue
@@ -21,7 +21,7 @@ import { useRoute } from 'vue-router'
 const route = useRoute()
 const frameless = computed(() => route.meta.frameless)
 const loaded = computed(() => (route.meta.require || []).every((key) => client[key].value))
-const invalid = computed(() => route.meta.authority > client.user.value.authority)
+const invalid = computed(() => route.meta.authority > client.user.value?.authority)
 
 </script>
 
diff --git a/packages/plugin-webui/client/views/sandbox.vue b/packages/plugin-webui/client/views/sandbox.vue
index d9a9f98de7..d4c5754834 100644
--- a/packages/plugin-webui/client/views/sandbox.vue
+++ b/packages/plugin-webui/client/views/sandbox.vue
@@ -2,17 +2,17 @@
   <k-card class="sandbox">
     <div class="history" ref="panel">
       <p v-for="({ from, content }, index) in messages" :key="index" :class="from">
-        {{ content }}
+        <k-message :text="content"/>
       </p>
     </div>
-    <k-input v-model="text" @enter="onEnter"></k-input>
+    <k-input v-model="text" @enter="onEnter" @paste="onPaste"></k-input>
   </k-card>
 </template>
 
 <script lang="ts" setup>
 
 import { ref, watch, nextTick, onMounted } from 'vue'
-import { send, receive, user, storage } from '~/client'
+import { send, receive, user, storage, segment } from '~/client'
 
 interface Message {
   from: 'user' | 'bot'
@@ -28,7 +28,7 @@ watch(user, () => messages.value = [])
 function addMessage(from: 'user' | 'bot', content: string) {
   messages.value.push({ from, content })
   const { scrollTop, clientHeight, scrollHeight } = panel.value
-  if (Math.abs(scrollTop + clientHeight - scrollHeight) < 1) {
+  if (from === 'user' || Math.abs(scrollTop + clientHeight - scrollHeight) < 1) {
     nextTick(scrollToBottom)
   }
 }
@@ -39,19 +39,40 @@ function scrollToBottom() {
   panel.value.scrollTop = panel.value.scrollHeight - panel.value.clientHeight
 }
 
+function sendSandbox(content: string) {
+  const { token, id } = user.value
+  send('sandbox', { token, id, content })
+}
+
 function onEnter() {
   if (!text.value) return
-  addMessage('user', text.value)
-  const { token, id } = user.value
-  send('sandbox', { token, id, content: text.value })
+  sendSandbox(text.value)
   text.value = ''
 }
 
-receive('sandbox', (data) => {
+async function onPaste(event) {
+  const item = event.clipboardData.items[0]
+  if (item.kind === 'file') {
+    event.preventDefault()
+    const file = item.getAsFile()
+    const reader  = new FileReader()
+    reader.addEventListener('load', function () {
+      const { token, id } = user.value
+      sendSandbox(segment.image('base64://' + reader.result.slice(22)))
+    }, false)
+    reader.readAsDataURL(file)
+  }
+}
+
+receive('sandbox:bot', (data) => {
   addMessage('bot', data)
 })
 
-receive('clear', (data) => {
+receive('sandbox:user', (data) => {
+  addMessage('user', data)
+})
+
+receive('sandbox:clear', (data) => {
   messages.value = []
 })
 
diff --git a/packages/plugin-webui/src/adapter.ts b/packages/plugin-webui/src/adapter.ts
index 54280c10e0..cb4a122d57 100644
--- a/packages/plugin-webui/src/adapter.ts
+++ b/packages/plugin-webui/src/adapter.ts
@@ -1,4 +1,4 @@
-import { Adapter, App, Bot, Context, Logger, omit, pick, Random, Session, Time, User } from 'koishi-core'
+import { Adapter, App, Bot, Context, Logger, omit, pick, Random, remove, Session, Time, User } from 'koishi-core'
 import { Profile } from './data'
 import WebSocket from 'ws'
 
@@ -60,6 +60,8 @@ class SocketChannel {
   async $sandbox({ id, token, content }) {
     const user = await this.validate(id, token, ['name'])
     if (!user) return
+    content = await this.app.transformAssets(content)
+    this.send('sandbox:user', content)
     const session = new Session(this.app, {
       platform: 'web',
       userId: id,
@@ -88,7 +90,7 @@ export class SandboxBot extends Bot<'web'> {
   }
 
   async sendMessage(id: string, content: string) {
-    this.adapter.channels[id]?.send('sandbox', content)
+    this.adapter.channels[id]?.send('sandbox:bot', content)
     return Random.uuid()
   }
 }
@@ -113,8 +115,11 @@ export class WebAdapter extends Adapter<'web'> {
       server: ctx.app._httpServer,
     })
 
-    ctx.self('sandbox').command('clear', '清空消息列表')
-      .action(({ session }) => this.channels[session.channelId].send('clear'))
+    ctx.self('sandbox')
+      .command('clear', '清空消息列表')
+      .action(({ session }) => {
+        this.channels[session.channelId].send('sandbox:clear')
+      })
 
     ctx.all().middleware(async (session, next) => {
       if (session.subtype !== 'private') return next()
@@ -161,5 +166,8 @@ export class WebAdapter extends Adapter<'web'> {
 
   stop() {
     this.server.close()
+    for (const bot of this.bots) {
+      remove(this.app.bots, bot as Bot)
+    }
   }
 }

From 0654893e79e08ce4fc5e348d938ec3689eafd1fc Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 1 Apr 2021 23:55:32 +0800
Subject: [PATCH 10/17] test(core): add runtime tests

---
 .mocharc.js                                |  1 +
 packages/koishi-core/tests/runtime.spec.ts | 41 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.mocharc.js b/.mocharc.js
index 511b889ccf..85ad2bba82 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -20,6 +20,7 @@ const specs = [
   'packages/koishi-core/tests/context.spec.ts',
   'packages/koishi-core/tests/help.spec.ts',
   'packages/koishi-core/tests/hook.spec.ts',
+  'packages/koishi-core/tests/runtime.spec.ts',
   'packages/koishi-core/tests/session.spec.ts',
   'packages/koishi-core/tests/parser.spec.ts',
   'packages/koishi-utils/tests/*.spec.ts',
diff --git a/packages/koishi-core/tests/runtime.spec.ts b/packages/koishi-core/tests/runtime.spec.ts
index f43d2499da..d251ca8bf1 100644
--- a/packages/koishi-core/tests/runtime.spec.ts
+++ b/packages/koishi-core/tests/runtime.spec.ts
@@ -1,6 +1,5 @@
 import { App } from 'koishi-test-utils'
-import { User, Channel, Command } from 'koishi-core'
-import { sleep } from 'koishi-utils'
+import { User, Channel, Command, sleep } from 'koishi-core'
 import { install } from '@sinonjs/fake-timers'
 
 const app = new App({
@@ -33,7 +32,7 @@ const cmd2 = app.command('cmd2')
   .shortcut('foo3', { prefix: true, fuzzy: true })
   .option('--bar', '', { authority: 3 })
   .option('--baz', '', { notUsage: true })
-  .action(({ session }) => session.send('cmd2:' + session.user.id))
+  .action(({ session }) => session.send('cmd2:' + session.userId))
 
 before(async () => {
   await app.start()
@@ -116,7 +115,7 @@ describe('Runtime', () => {
       await session4.shouldNotReply('cmd2')
       await session1.shouldReply('-cmd2', 'cmd2:123')
       await session4.shouldReply('-cmd2', 'cmd2:123')
-      await session4.shouldNotReply(`[CQ:reply,id=123] [CQ:at,qq=${app.selfId}] cmd2`)
+      await session4.shouldNotReply(`[CQ:reply,id=123] [CQ:at,id=${app.selfId}] cmd2`)
     })
 
     it('single nickname', async () => {
@@ -173,13 +172,13 @@ describe('Runtime', () => {
 
     it('nickname prefix & fuzzy', async () => {
       await session4.shouldNotReply('foo3 -t baz')
-      await session4.shouldReply(`[CQ:at,qq=${app.selfId}] foo3 -t baz`, 'cmd2:123')
+      await session4.shouldReply(`[CQ:at,id=${app.selfId}] foo3 -t baz`, 'cmd2:123')
     })
 
     it('one argument & fuzzy', async () => {
       await session4.shouldReply('foo4 bar baz', 'cmd1:bar baz')
       await session4.shouldNotReply('foo4bar baz')
-      await session4.shouldReply(`[CQ:at,qq=${app.selfId}] foo4bar baz`, 'cmd1:bar baz')
+      await session4.shouldReply(`[CQ:at,id=${app.selfId}] foo4bar baz`, 'cmd1:bar baz')
     })
   })
 
@@ -193,19 +192,19 @@ describe('Runtime', () => {
       await session3.shouldNotReply('cmd2')
     })
 
-    it('group.assignee', async () => {
+    it('channel.assignee', async () => {
       await session4.shouldReply('cmd1 test --baz', 'cmd1:test')
       await session4.shouldReply('mid', 'mid')
       await session5.shouldNotReply('cmd1 test --baz')
-      await session5.shouldReply(`[CQ:at,qq=${app.selfId}] cmd1 test --baz`, 'cmd1:test')
+      await session5.shouldReply(`[CQ:at,id=${app.selfId}] cmd1 test --baz`, 'cmd1:test')
     })
 
-    it('group.flag.ignore', async () => {
+    it('channel.flag.ignore', async () => {
       await app.database.setChannel('mock', '321', { flag: Channel.Flag.ignore })
       await sleep(0)
       await session4.shouldNotReply('mid')
       await session4.shouldNotReply('cmd1 --baz')
-      await session4.shouldNotReply(`[CQ:at,qq=${app.selfId}] cmd1 --baz`)
+      await session4.shouldNotReply(`[CQ:at,id=${app.selfId}] cmd1 --baz`)
       await app.database.setChannel('mock', '321', { flag: 0 })
     })
   })
@@ -250,7 +249,7 @@ describe('Runtime', () => {
       cmd1.config.showWarning = true
       await session4.shouldReply('cmd1', '缺少参数，输入帮助以查看用法。')
       await session4.shouldReply('cmd1 foo', 'cmd1:foo')
-      await session4.shouldReply('cmd1 foo bar', '存在多余参数，请检查指令语法。')
+      await session4.shouldReply('cmd1 foo bar', '存在多余参数，输入帮助以查看用法。')
       cmd1.config.showWarning = false
       await session4.shouldNotReply('cmd1')
       cmd1.config.checkArgCount = false
@@ -260,7 +259,7 @@ describe('Runtime', () => {
       cmd2.config.checkUnknown = true
       cmd2.config.showWarning = true
       await session2.shouldReply('cmd2', 'cmd2:456')
-      await session2.shouldReply('cmd2 --foo', '存在未知选项 foo，请检查指令语法。')
+      await session2.shouldReply('cmd2 --foo', '存在未知选项 foo，输入帮助以查看用法。')
       cmd2.config.showWarning = false
       await session2.shouldNotReply('cmd2 --foo')
       cmd2.config.checkUnknown = false
@@ -268,23 +267,23 @@ describe('Runtime', () => {
 
     it('option.validate', async () => {
       const cmd3 = app.command('cmd3').action(() => 'after cmd3')
-      cmd3.option('foo', '', { type: () => true })
-      cmd3.option('bar', '', { type: () => { throw new Error('SUFFIX') } })
-      cmd3.option('baz', '', { type: /$^/ })
+      cmd3.option('foo', '<foo>', { type: () => { throw new Error() } })
+      cmd3.option('bar', '<bar>', { type: () => { throw new Error('SUFFIX') } })
+      cmd3.option('baz', '<baz>', { type: /$^/ })
       await session1.shouldReply('cmd3', 'after cmd3')
-      await session1.shouldReply('cmd3 --foo', '选项 foo 输入无效，请检查指令语法。')
-      await session1.shouldReply('cmd3 --bar', '选项 bar 输入无效，SUFFIX')
-      await session1.shouldReply('cmd3 --baz', '选项 baz 输入无效，请检查指令语法。')
+      await session1.shouldReply('cmd3 --foo xxx', '选项 foo 输入无效，输入帮助以查看用法。')
+      await session1.shouldReply('cmd3 --bar xxx', '选项 bar 输入无效，SUFFIX')
+      await session1.shouldReply('cmd3 --baz xxx', '选项 baz 输入无效，输入帮助以查看用法。')
       cmd3.dispose()
     })
 
-    it('command.before', async () => {
+    it('command.check', async () => {
       const cmd3 = app.command('cmd3').action(() => 'after cmd3')
       await session1.shouldReply('cmd3', 'after cmd3')
-      let value: any = 'before cmd3'
+      let value = 'before cmd3'
       cmd3.check(() => value)
       await session1.shouldReply('cmd3', 'before cmd3')
-      value = true
+      value = ''
       await session1.shouldNotReply('cmd3')
       cmd3.dispose()
     })

From ed1e2d07c43af159bbcfed258a0d840a201a02f4 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Fri, 2 Apr 2021 01:50:41 +0800
Subject: [PATCH 11/17] fix(core): fix interpolate issue, close #190

---
 .mocharc.js                                |   9 +-
 packages/koishi-core/src/parser.ts         |  13 +--
 packages/koishi-core/tests/server.spec.ts  | 130 ---------------------
 packages/koishi-core/tests/session.spec.ts |  26 ++++-
 4 files changed, 32 insertions(+), 146 deletions(-)
 delete mode 100644 packages/koishi-core/tests/server.spec.ts

diff --git a/.mocharc.js b/.mocharc.js
index 85ad2bba82..eb9aed2cec 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -15,14 +15,7 @@ for (const name of readdirSync(__dirname + '/packages')) {
 }
 
 const specs = [
-  // 'packages/koishi-core/tests/*.spec.ts',
-  'packages/koishi-core/tests/command.spec.ts',
-  'packages/koishi-core/tests/context.spec.ts',
-  'packages/koishi-core/tests/help.spec.ts',
-  'packages/koishi-core/tests/hook.spec.ts',
-  'packages/koishi-core/tests/runtime.spec.ts',
-  'packages/koishi-core/tests/session.spec.ts',
-  'packages/koishi-core/tests/parser.spec.ts',
+  'packages/koishi-core/tests/*.spec.ts',
   'packages/koishi-utils/tests/*.spec.ts',
   'packages/koishi-test-utils/tests/*.spec.ts',
   'packages/plugin-common/tests/*.spec.ts',
diff --git a/packages/koishi-core/src/parser.ts b/packages/koishi-core/src/parser.ts
index 9fd30ac468..854664ef20 100644
--- a/packages/koishi-core/src/parser.ts
+++ b/packages/koishi-core/src/parser.ts
@@ -533,10 +533,14 @@ export namespace Argv {
     }
 
     stringify(argv: Argv) {
-      return argv.tokens.reduce((prev, token) => {
+      const output = argv.tokens.reduce((prev, token) => {
         if (token.quoted) prev += leftQuotes[rightQuotes.indexOf(token.terminator[0])]
         return prev + token.content + token.terminator
       }, '')
+      if (argv.rest && !rightQuotes.includes(output[output.length - 1]) || argv.initiator) {
+        return output.slice(0, -1)
+      }
+      return output
     }
   }
 
@@ -547,12 +551,7 @@ export namespace Argv {
   }
 
   export function stringify(argv: Argv) {
-    const source = defaultTokenizer.stringify(argv)
-    if (argv.rest) {
-      const { terminator } = argv.tokens[argv.tokens.length - 1]
-      if (!leftQuotes.includes(terminator[0])) return source.slice(0, -terminator.length)
-    }
-    return source
+    return defaultTokenizer.stringify(argv)
   }
 
   export function revert(token: Token) {
diff --git a/packages/koishi-core/tests/server.spec.ts b/packages/koishi-core/tests/server.spec.ts
deleted file mode 100644
index 35ecea66fe..0000000000
--- a/packages/koishi-core/tests/server.spec.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { App, BASE_SELF_ID } from 'koishi-test-utils'
-import { App as RealApp, Channel, Database, Session } from 'koishi-core'
-import { expect } from 'chai'
-import { fn, spyOn } from 'jest-mock'
-import { Logger } from 'koishi-utils'
-
-describe('Server API', () => {
-  describe('Adaptation API', () => {
-    it('type check', () => {
-      expect(() => new RealApp({ type: 'foo' })).to.throw('unsupported type "foo", you should import the adapter yourself')
-    })
-
-    it('http server 1', async () => {
-      const app = new App({ port: 10000 })
-      expect(app.router).to.equal(app.server.router)
-      const listen = spyOn(app.server.server, 'listen')
-      listen.mockReturnThis()
-      await expect(app.start()).to.be.fulfilled
-      await expect(app.start()).to.be.fulfilled
-    })
-
-    it('http server 2', async () => {
-      const app = new App({ port: 20000 })
-      const listen = spyOn(app.server.server, 'listen')
-      listen.mockImplementation(() => { throw new Error() })
-      await expect(app.start()).to.be.rejected
-      await expect(app.start()).to.be.rejected
-    })
-
-    it('ctx.bots', async () => {
-      const app = new App()
-      expect(app.bots[0]).to.equal(app.bots[BASE_SELF_ID])
-    })
-
-    it('app.getSelfIds 1', async () => {
-      const app = new App()
-      await expect(app.getSelfIds()).eventually.to.deep.equal([BASE_SELF_ID])
-    })
-
-    it('app.getSelfIds 2', async () => {
-      const app = new App()
-      delete app.bots[0].selfId
-      const getSelfId = app.bots[0].getSelfId = fn()
-      getSelfId.mockReturnValue(Promise.resolve(BASE_SELF_ID))
-      await expect(app.getSelfIds()).eventually.to.deep.equal([BASE_SELF_ID])
-    })
-
-    it('server.prepare', async () => {
-      const app = new App()
-      delete app.bots[0].selfId
-      expect(app.server.prepare({ selfId: BASE_SELF_ID + 1 })).to.be.ok
-      expect(app.bots[0].selfId).to.equal(BASE_SELF_ID + 1)
-      expect(app.server.prepare({ selfId: BASE_SELF_ID })).to.be.undefined
-    })
-  })
-
-  describe('Sender API', () => {
-    const app = new App({
-      mockDatabase: true,
-      broadcastDelay: Number.EPSILON,
-    })
-
-    const bot = app.bots[0]
-    const sendGroupMsg = bot.sendGroupMsg = fn(async (id) => {
-      if (id === 456) return 789
-      throw new Error('bar')
-    })
-
-    before(async () => {
-      await app.database.getChannel(123, BASE_SELF_ID)
-      await app.database.getChannel(456, BASE_SELF_ID)
-      await app.database.getChannel(789, BASE_SELF_ID)
-      await app.database.setChannel(456, { flag: Channel.Flag.silent })
-    })
-
-    beforeEach(async () => {
-      sendGroupMsg.mockClear()
-    })
-
-    it('bot.createSession', async () => {
-      const session = bot.createSession('group', 'group', 123, 'foo')
-      expect(session).to.be.instanceof(Session)
-      expect(session.$app).to.equal(app)
-      expect(session.$bot).to.equal(bot)
-      expect(Object.keys(session.toJSON())).to.have.length(6)
-    })
-
-    it('ctx.broadcast 1', async () => {
-      await expect(app.broadcast([123, 456], '')).to.eventually.deep.equal([])
-      expect(sendGroupMsg.mock.calls).to.deep.equal([])
-    })
-
-    it('ctx.broadcast 2', async () => {
-      await expect(app.broadcast([123, 456], 'foo')).to.eventually.deep.equal([])
-      expect(sendGroupMsg.mock.calls).to.deep.equal([[123, 'foo']])
-    })
-
-    it('ctx.broadcast 3', async () => {
-      await expect(app.broadcast([123, 456], 'foo', true)).to.eventually.deep.equal([789])
-      expect(sendGroupMsg.mock.calls).to.deep.equal([[123, 'foo'], [456, 'foo']])
-    })
-  })
-
-  describe('Database API', () => {
-    const app = new App()
-    const warn = spyOn(new Logger('app'), 'warn')
-
-    it('override database', () => {
-      warn.mockClear()
-      app.database = {} as any
-      expect(warn.mock.calls).to.have.length(0)
-      app.database = {} as any
-      expect(warn.mock.calls).to.have.length(1)
-    })
-
-    it('extend database', () => {
-      const callback = fn()
-      const id = 'this-module-does-not-exist'
-      Database.extend(id, callback)
-      expect(callback.mock.calls).to.have.length(0)
-      class CustomDatabase {}
-      const module = require.cache[require.resolve('koishi-core/src/database.ts')]
-      const mockedRequire = spyOn(module, 'require')
-      mockedRequire.mockReturnValue({ default: CustomDatabase })
-      Database.extend(id, callback)
-      expect(callback.mock.calls).to.deep.equal([[CustomDatabase]])
-      mockedRequire.mockRestore()
-    })
-  })
-})
diff --git a/packages/koishi-core/tests/session.spec.ts b/packages/koishi-core/tests/session.spec.ts
index b3da84aa75..33917cebe2 100644
--- a/packages/koishi-core/tests/session.spec.ts
+++ b/packages/koishi-core/tests/session.spec.ts
@@ -2,7 +2,31 @@ import { App } from 'koishi-test-utils'
 import { sleep } from 'koishi-utils'
 
 describe('Session API', () => {
-  describe('Command Suggestions', () => {
+  describe('Command Execution', () => {
+    const app = new App()
+    const sess = app.session('456')
+    app.command('echo [content:text]').action((_, text) => text)
+    app.command('exec [command:text]').action(({ session }, text) => session.execute(text))
+
+    it('basic support', async () => {
+      await sess.shouldReply('echo 0', '0')
+      await sess.shouldReply('exec echo 0', '0')
+    })
+
+    it('interpolate 1', async () => {
+      await sess.shouldReply('echo $(echo 0)', '0')
+      await sess.shouldReply('echo $(exec echo 0)', '0')
+      await sess.shouldReply('echo 1$(echo 0)2', '102')
+      await sess.shouldReply('echo 1 $(echo 0)  2', '1 0  2')
+    })
+
+    it('interpolate 2', async () => {
+      await sess.shouldReply('echo $(echo $(echo 0))', '0')
+      await sess.shouldReply('echo 1 $(echo $(echo 0))2', '1 02')
+    })
+  })
+
+  describe('Command Suggestion', () => {
     const app = new App({ prefix: '/' })
     const session1 = app.session('456')
     const session2 = app.session('789', '987')

From d5c707fe6a1d7e0a3e13b41dced81e3fb8600871 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Fri, 2 Apr 2021 02:41:23 +0800
Subject: [PATCH 12/17] fix(mongo): fix incorrect orm implementation, fix #188

---
 packages/plugin-mongo/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugin-mongo/src/index.ts b/packages/plugin-mongo/src/index.ts
index ac7bcba12a..1442696483 100644
--- a/packages/plugin-mongo/src/index.ts
+++ b/packages/plugin-mongo/src/index.ts
@@ -130,7 +130,7 @@ Database.extend(MongoDatabase, {
     if (!key || key === primary) key = '_id'
     const bulk = this.db.collection(name).initializeUnorderedBulkOp()
     for (const item of data) {
-      bulk.find({ [key]: data[primary] }).updateOne({ $set: omit(item, [primary]) })
+      bulk.find({ [key]: item[primary] }).updateOne({ $set: omit(item, [primary]) })
     }
     await bulk.execute()
   },

From dfede399984728f7fe3350b4e786a5c11641a499 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Fri, 2 Apr 2021 03:19:23 +0800
Subject: [PATCH 13/17] feat(common): delay after each recall

---
 packages/plugin-common/src/basic.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/plugin-common/src/basic.ts b/packages/plugin-common/src/basic.ts
index 594d2ad1da..b5ac89e62e 100644
--- a/packages/plugin-common/src/basic.ts
+++ b/packages/plugin-common/src/basic.ts
@@ -179,13 +179,20 @@ export function recall(ctx: Context, { recallCount = 10 }: RecallConfig) {
   })
 
   ctx.command('common/recall [count:number]', '撤回 bot 发送的消息', { authority: 2 })
-    .action(({ session }, count = 1) => {
+    .action(async ({ session }, count = 1) => {
       const list = recent[session.channelId]
       if (!list) return '近期没有发送消息。'
-      list.splice(0, count).map((id) => {
-        return session.bot.deleteMessage(session.channelId, id)
-      })
+      const removal = list.splice(0, count)
+      const delay = ctx.app.options.delay.broadcast
       if (!list.length) delete recent[session.channelId]
+      for (let index = 0; index < removal.length; index++) {
+        if (index && delay) await sleep(delay)
+        try {
+          await session.bot.deleteMessage(session.channelId, removal[index])
+        } catch (error) {
+          this.app.logger('bot').warn(error)
+        }
+      }
     })
 }
 

From bc1817051a44b215a1f53abc79c89629ae6f3997 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Fri, 2 Apr 2021 11:43:47 +0800
Subject: [PATCH 14/17] fix(kaiheila): fix breaking edge cases

---
 packages/adapter-kaiheila/src/bot.ts | 2 ++
 packages/adapter-kaiheila/src/ws.ts  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/adapter-kaiheila/src/bot.ts b/packages/adapter-kaiheila/src/bot.ts
index c2eb385170..0d8ea1a25e 100644
--- a/packages/adapter-kaiheila/src/bot.ts
+++ b/packages/adapter-kaiheila/src/bot.ts
@@ -133,6 +133,8 @@ export class KaiheilaBot extends Bot {
     } else {
       params.channelId = channelId
       session.subtype = 'group'
+      // FIXME this is incorrect but to workarournd ctx.group()
+      session.groupId = 'unknown'
       path = '/message/create'
     }
 
diff --git a/packages/adapter-kaiheila/src/ws.ts b/packages/adapter-kaiheila/src/ws.ts
index 2d35132cc8..35ffa13714 100644
--- a/packages/adapter-kaiheila/src/ws.ts
+++ b/packages/adapter-kaiheila/src/ws.ts
@@ -30,6 +30,7 @@ export default class WsClient extends Adapter.WsClient<'kaiheila'> {
     }
     let trials = 0
     function send() {
+      if (!bot.socket) return
       if (trials >= 2) {
         return bot.socket.close(1013)
       }

From 0f95246ad269c9c4525bfe90f1181713b8c3129a Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Fri, 2 Apr 2021 15:09:48 +0800
Subject: [PATCH 15/17] feat(webui): support chat-panel component

---
 packages/plugin-chat/client/chat.vue          | 40 +++------
 .../client/components/chat-panel.vue          | 81 +++++++++++++++++++
 .../plugin-webui/client/components/input.vue  |  6 +-
 .../client/components/message.vue             |  4 +-
 packages/plugin-webui/client/global.d.ts      |  2 +-
 packages/plugin-webui/client/main.ts          |  4 +-
 .../plugin-webui/client/views/sandbox.vue     | 71 +++-------------
 7 files changed, 109 insertions(+), 99 deletions(-)
 create mode 100644 packages/plugin-webui/client/components/chat-panel.vue

diff --git a/packages/plugin-chat/client/chat.vue b/packages/plugin-chat/client/chat.vue
index 8784fd26d4..4076935482 100644
--- a/packages/plugin-chat/client/chat.vue
+++ b/packages/plugin-chat/client/chat.vue
@@ -1,48 +1,26 @@
 <template>
-  <k-card class="sandbox">
-    <div class="history" ref="panel">
-      <p v-for="({ username, content }, index) in messages" :key="index">
-        {{ username }}: {{ content }}
+  <k-chat-panel class="sandbox" :messages="messages">
+    <template #default="{ username, content }">
+      <p>
+        {{ username }}: <k-message :content="content"/>
       </p>
-    </div>
-    <k-input v-model="text" @enter="onEnter"></k-input>
-  </k-card>
+    </template>
+  </k-chat-panel>
 </template>
 
 <script lang="ts" setup>
 
-import { receive, storage, send } from '~/client'
-import { ref, nextTick } from 'vue'
+import { receive, storage } from '~/client'
 
 interface Message {
   username: string
   content: string
 }
 
-const text = ref('')
-const panel = ref<Element>(null)
 const messages = storage.create<Message[]>('chat', [])
 
-function addMessage(body: Message) {
+receive('chat', (body) => {
   messages.value.push(body)
-  const { scrollTop, clientHeight, scrollHeight } = panel.value
-  if (Math.abs(scrollTop + clientHeight - scrollHeight) < 1) {
-    nextTick(scrollToBottom)
-  }
-}
-
-function scrollToBottom() {
-  panel.value.scrollTop = panel.value.scrollHeight - panel.value.clientHeight
-}
-
-receive('message', addMessage)
-
-function onEnter() {
-  if (!text.value) return
-  // addMessage('user', text.value)
-  // const { token, id } = user.value
-  // send('chat', { token, id, content: text.value })
-  // text.value = ''
-}
+})
 
 </script>
diff --git a/packages/plugin-webui/client/components/chat-panel.vue b/packages/plugin-webui/client/components/chat-panel.vue
new file mode 100644
index 0000000000..47542ff5ce
--- /dev/null
+++ b/packages/plugin-webui/client/components/chat-panel.vue
@@ -0,0 +1,81 @@
+<template>
+  <k-card class="k-chat-panel">
+    <div class="k-chat-panel-body" ref="body">
+      <template v-for="(message, index) in messages" :key="index">
+        <slot v-bind="message"/>
+      </template>
+    </div>
+    <k-input v-model="text" @enter="onEnter" @paste="onPaste"></k-input>
+  </k-card>
+</template>
+
+<script lang="ts" setup>
+
+import { ref, watch, defineProps, onMounted, nextTick, defineEmit } from 'vue'
+import { segment } from '~/client'
+
+const emit = defineEmit(['enter'])
+const props = defineProps<{ messages: any[], pinned?: boolean }>()
+
+const text = ref('')
+const body = ref<Element>(null)
+
+onMounted(scrollToBottom)
+
+function scrollToBottom() {
+  body.value.scrollTop = body.value.scrollHeight - body.value.clientHeight
+}
+
+watch(props.messages, () => {
+  const { scrollTop, clientHeight, scrollHeight } = body.value
+  if (!props.pinned || Math.abs(scrollTop + clientHeight - scrollHeight) < 1) {
+    nextTick(scrollToBottom)
+  }
+})
+
+function onEnter() {
+  if (!text.value) return
+  emit('enter', text.value)
+  text.value = ''
+}
+
+async function onPaste(event: ClipboardEvent) {
+  const item = event.clipboardData.items[0]
+  if (item.kind === 'file') {
+    event.preventDefault()
+    const file = item.getAsFile()
+    const reader  = new FileReader()
+    reader.addEventListener('load', function () {
+      emit('enter', segment.image('base64://' + reader.result.slice(22)))
+    }, false)
+    reader.readAsDataURL(file)
+  }
+}
+
+</script>
+
+<style lang="scss">
+
+.k-chat-panel {
+  height: 100%;
+  position: relative;
+
+  .k-chat-panel-body {
+    position: absolute;
+    top: 2rem;
+    left: 2rem;
+    right: 2rem;
+    bottom: 6rem;
+    overflow-x: visible;
+    overflow-y: auto;
+  }
+
+  .k-input {
+    position: absolute;
+    bottom: 2rem;
+    left: 2rem;
+    right: 2rem;
+  }
+}
+
+</style>
diff --git a/packages/plugin-webui/client/components/input.vue b/packages/plugin-webui/client/components/input.vue
index 12a9414e33..c75976ef39 100644
--- a/packages/plugin-webui/client/components/input.vue
+++ b/packages/plugin-webui/client/components/input.vue
@@ -56,19 +56,19 @@ const inputStyle = computed(() => ({
 
 const emit = defineEmit(['update:modelValue', 'paste', 'focus', 'blur', 'enter', 'clickPrefix', 'clickSuffix'])
 
-function onInput (event) {
+function onInput(event) {
   if (props.validate) {
     invalid.value = !props.validate(event.target.value)
   }
   emit('update:modelValue', event.target.value)
 }
 
-function onFocus (event) {
+function onFocus(event) {
   focused.value = true
   emit('focus', event)
 }
 
-function onBlur (event) {
+function onBlur(event) {
   focused.value = false
   emit('blur', event)
 }
diff --git a/packages/plugin-webui/client/components/message.vue b/packages/plugin-webui/client/components/message.vue
index f2a8050e77..ad3e448254 100644
--- a/packages/plugin-webui/client/components/message.vue
+++ b/packages/plugin-webui/client/components/message.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="k-message">
-    <template v-for="({ type, data }, index) in segment.parse(text)" :key="index">
+    <template v-for="({ type, data }, index) in segment.parse(content)" :key="index">
       <span v-if="type === 'text'">{{ data.content }}</span>
       <img v-else-if="type === 'image'" :src="data.url || data.file"/>
     </template>
@@ -13,7 +13,7 @@ import { defineProps } from 'vue'
 import { segment } from '~/client'
 
 defineProps<{
-  text: string
+  content: string
 }>()
 
 </script>
diff --git a/packages/plugin-webui/client/global.d.ts b/packages/plugin-webui/client/global.d.ts
index b13404ba8d..75a465393e 100644
--- a/packages/plugin-webui/client/global.d.ts
+++ b/packages/plugin-webui/client/global.d.ts
@@ -6,7 +6,7 @@ declare module '*.vue' {
 }
 
 declare module '~/server' {
-  export * from 'koishi-plugin-webui/src'
+  export * from 'koishi-plugin-webui'
 }
 
 declare module '~/client' {
diff --git a/packages/plugin-webui/client/main.ts b/packages/plugin-webui/client/main.ts
index 72c5501a9d..349f07c46b 100644
--- a/packages/plugin-webui/client/main.ts
+++ b/packages/plugin-webui/client/main.ts
@@ -7,6 +7,7 @@ import Button from './components/button.vue'
 import Input from './components/input.vue'
 import Message from './components/message.vue'
 import Numeric from './components/numeric.vue'
+import ChatPanel from './components/chat-panel.vue'
 import App from './views/layout/index.vue'
 import { start, user, receive, router } from '~/client'
 
@@ -62,12 +63,13 @@ router.addRoute({
 })
 
 app.component('k-card', Card)
+app.component('k-chart', defineAsyncComponent(() => import('./components/echarts')))
 app.component('k-button', Button)
 app.component('k-collapse', Collapse)
 app.component('k-input', Input)
 app.component('k-message', Message)
 app.component('k-numeric', Numeric)
-app.component('k-chart', defineAsyncComponent(() => import('./components/echarts')))
+app.component('k-chat-panel', ChatPanel)
 
 app.provide('ecTheme', 'dark-blue')
 
diff --git a/packages/plugin-webui/client/views/sandbox.vue b/packages/plugin-webui/client/views/sandbox.vue
index d4c5754834..ea3b2a0f7a 100644
--- a/packages/plugin-webui/client/views/sandbox.vue
+++ b/packages/plugin-webui/client/views/sandbox.vue
@@ -1,42 +1,31 @@
 <template>
-  <k-card class="sandbox">
-    <div class="history" ref="panel">
-      <p v-for="({ from, content }, index) in messages" :key="index" :class="from">
-        <k-message :text="content"/>
+  <k-chat-panel class="sandbox" :messages="messages" @enter="sendSandbox" :pinned="pinned">
+    <template #default="{ from, content }">
+      <p :class="from">
+        <k-message :content="content"/>
       </p>
-    </div>
-    <k-input v-model="text" @enter="onEnter" @paste="onPaste"></k-input>
-  </k-card>
+    </template>
+  </k-chat-panel>
 </template>
 
 <script lang="ts" setup>
 
-import { ref, watch, nextTick, onMounted } from 'vue'
-import { send, receive, user, storage, segment } from '~/client'
+import { ref, watch } from 'vue'
+import { send, receive, user, storage } from '~/client'
 
 interface Message {
   from: 'user' | 'bot'
   content: string
 }
 
-const text = ref('')
-const panel = ref<Element>(null)
+const pinned = ref(true)
 const messages = storage.create<Message[]>('sandbox', [])
 
 watch(user, () => messages.value = [])
 
 function addMessage(from: 'user' | 'bot', content: string) {
+  pinned.value = from === 'bot'
   messages.value.push({ from, content })
-  const { scrollTop, clientHeight, scrollHeight } = panel.value
-  if (from === 'user' || Math.abs(scrollTop + clientHeight - scrollHeight) < 1) {
-    nextTick(scrollToBottom)
-  }
-}
-
-onMounted(scrollToBottom)
-
-function scrollToBottom() {
-  panel.value.scrollTop = panel.value.scrollHeight - panel.value.clientHeight
 }
 
 function sendSandbox(content: string) {
@@ -44,26 +33,6 @@ function sendSandbox(content: string) {
   send('sandbox', { token, id, content })
 }
 
-function onEnter() {
-  if (!text.value) return
-  sendSandbox(text.value)
-  text.value = ''
-}
-
-async function onPaste(event) {
-  const item = event.clipboardData.items[0]
-  if (item.kind === 'file') {
-    event.preventDefault()
-    const file = item.getAsFile()
-    const reader  = new FileReader()
-    reader.addEventListener('load', function () {
-      const { token, id } = user.value
-      sendSandbox(segment.image('base64://' + reader.result.slice(22)))
-    }, false)
-    reader.readAsDataURL(file)
-  }
-}
-
 receive('sandbox:bot', (data) => {
   addMessage('bot', data)
 })
@@ -81,19 +50,6 @@ receive('sandbox:clear', (data) => {
 <style lang="scss">
 
 .sandbox {
-  height: 100%;
-  position: relative;
-
-  .history {
-    position: absolute;
-    top: 2rem;
-    left: 2rem;
-    right: 2rem;
-    bottom: 6rem;
-    overflow-x: visible;
-    overflow-y: auto;
-  }
-
   p {
     padding-left: 1rem;
     white-space: break-spaces;
@@ -117,13 +73,6 @@ receive('sandbox:clear', (data) => {
     position: absolute;
     left: -.1rem;
   }
-
-  .k-input {
-    position: absolute;
-    bottom: 2rem;
-    left: 2rem;
-    right: 2rem;
-  }
 }
 
 </style>

From 679e8e00bace7ccc481ee91fb5f50e45908e9464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=BA=E6=99=BA=E7=9A=84=E5=B0=8F=E9=B1=BC=E5=90=9B?=
 <44761872+Dragon-Fish@users.noreply.github.com>
Date: Sat, 3 Apr 2021 02:14:24 +0800
Subject: [PATCH 16/17] fix(discord): use axiosConfig in bot.sendEmbedMessage
 (#198)

---
 packages/adapter-discord/src/bot.ts | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/adapter-discord/src/bot.ts b/packages/adapter-discord/src/bot.ts
index 9bfcc71131..4909c79e63 100644
--- a/packages/adapter-discord/src/bot.ts
+++ b/packages/adapter-discord/src/bot.ts
@@ -16,7 +16,7 @@ export class DiscordBot extends Bot<'discord'> {
   _ping: NodeJS.Timeout
   _sessionId: string = ''
 
-  async request<T = any>(method: Method, path: string, data?: any): Promise<T> {
+  async request<T = any>(method: Method, path: string, data?: any, exHeaders?: any): Promise<T> {
     const { axiosConfig, discord = {} } = this.app.options
     const url = `https://discord.com/api/v8${path}`
     const headers: Record<string, any> = {
@@ -27,7 +27,7 @@ export class DiscordBot extends Bot<'discord'> {
       ...discord.axiosConfig,
       method,
       url,
-      headers,
+      headers: { ...headers, ...exHeaders },
       data,
     })
     return response.data
@@ -43,16 +43,7 @@ export class DiscordBot extends Bot<'discord'> {
     const type = await FileType.fromBuffer(fileBuffer)
     fd.append('file', fileBuffer, 'file.' + type.ext)
     fd.append('payload_json', JSON.stringify(payload_json))
-    const headers: Record<string, any> = {
-      Authorization: `Bot ${this.token}`,
-    }
-    const response = await axios({
-      method: 'post',
-      url: 'https://discord.com/api/v8' + requestUrl,
-      headers: { ...headers, ...fd.getHeaders() },
-      data: fd,
-    })
-    return response.data
+    return this.request('POST', requestUrl, fd, fd.getHeaders())
   }
 
   private parseQuote(chain: segment.Chain) {

From 8a9ef60f5c8e3f24b186d640214b328d303cd4a3 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Sat, 3 Apr 2021 02:22:41 +0800
Subject: [PATCH 17/17] chore: bump versions

---
 packages/adapter-discord/package.json     |  4 ++--
 packages/adapter-kaiheila/package.json    |  4 ++--
 packages/adapter-onebot/package.json      |  2 +-
 packages/adapter-telegram/package.json    |  2 +-
 packages/adapter-tomon/package.json       |  2 +-
 packages/koishi-core/package.json         |  2 +-
 packages/koishi-test-utils/package.json   |  2 +-
 packages/koishi/ecosystem.json            | 18 +++++++++---------
 packages/koishi/package.json              |  4 ++--
 packages/plugin-adventure/package.json    |  4 ++--
 packages/plugin-assets/package.json       |  4 ++--
 packages/plugin-chat/package.json         |  6 +++---
 packages/plugin-chess/package.json        |  2 +-
 packages/plugin-common/package.json       |  4 ++--
 packages/plugin-dice/package.json         |  2 +-
 packages/plugin-eval/package.json         |  4 ++--
 packages/plugin-github/package.json       |  6 +++---
 packages/plugin-image-search/package.json |  2 +-
 packages/plugin-mongo/package.json        |  4 ++--
 packages/plugin-monitor/package.json      |  2 +-
 packages/plugin-mysql/package.json        |  2 +-
 packages/plugin-puppeteer/package.json    |  2 +-
 packages/plugin-rss/package.json          |  2 +-
 packages/plugin-schedule/package.json     |  4 ++--
 packages/plugin-teach/package.json        |  6 +++---
 packages/plugin-tools/package.json        |  2 +-
 packages/plugin-webui/package.json        |  6 +++---
 27 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/packages/adapter-discord/package.json b/packages/adapter-discord/package.json
index 298d108d2a..8eec4246b6 100644
--- a/packages/adapter-discord/package.json
+++ b/packages/adapter-discord/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-adapter-discord",
   "description": "Discord adapter for Koishi",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -28,7 +28,7 @@
     "koishi"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
     "@types/ws": "^7.4.0",
diff --git a/packages/adapter-kaiheila/package.json b/packages/adapter-kaiheila/package.json
index 678a1e66ba..04925dfe10 100644
--- a/packages/adapter-kaiheila/package.json
+++ b/packages/adapter-kaiheila/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-adapter-kaiheila",
   "description": "Kaiheila adapter for Koishi",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -24,7 +24,7 @@
     "koishi"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
     "koishi-test-utils": "^6.0.0-beta.11"
diff --git a/packages/adapter-onebot/package.json b/packages/adapter-onebot/package.json
index 8e0a3a37d5..3e5a9d84e7 100644
--- a/packages/adapter-onebot/package.json
+++ b/packages/adapter-onebot/package.json
@@ -27,7 +27,7 @@
     "koishi"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
     "@types/ws": "^7.4.0",
diff --git a/packages/adapter-telegram/package.json b/packages/adapter-telegram/package.json
index 974c5d72bd..1073972090 100644
--- a/packages/adapter-telegram/package.json
+++ b/packages/adapter-telegram/package.json
@@ -28,7 +28,7 @@
     "koishi"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
     "koishi-test-utils": "^6.0.0-beta.11"
diff --git a/packages/adapter-tomon/package.json b/packages/adapter-tomon/package.json
index 51fbe92af5..8ec79b9bd3 100644
--- a/packages/adapter-tomon/package.json
+++ b/packages/adapter-tomon/package.json
@@ -24,7 +24,7 @@
     "koishi"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
     "@types/pako": "^1.0.1",
diff --git a/packages/koishi-core/package.json b/packages/koishi-core/package.json
index 830b8625e1..35aa1dd21a 100644
--- a/packages/koishi-core/package.json
+++ b/packages/koishi-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-core",
   "description": "Core features for Koishi",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "engines": {
diff --git a/packages/koishi-test-utils/package.json b/packages/koishi-test-utils/package.json
index b9e6038bcb..61aa5c4875 100644
--- a/packages/koishi-test-utils/package.json
+++ b/packages/koishi-test-utils/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "koishi-core": "^3.6.0",
+    "koishi-core": "^3.6.1",
     "koishi-utils": "^4.1.2"
   },
   "devDependencies": {
diff --git a/packages/koishi/ecosystem.json b/packages/koishi/ecosystem.json
index facc681dec..90de0efd15 100644
--- a/packages/koishi/ecosystem.json
+++ b/packages/koishi/ecosystem.json
@@ -1,10 +1,10 @@
 {
   "koishi-adapter-discord": {
-    "version": "1.0.5",
+    "version": "1.0.6",
     "description": "Discord adapter for Koishi"
   },
   "koishi-adapter-kaiheila": {
-    "version": "1.0.3",
+    "version": "1.0.4",
     "description": "Kaiheila adapter for Koishi"
   },
   "koishi-adapter-onebot": {
@@ -24,11 +24,11 @@
     "description": "Adventure Game for Koishi"
   },
   "koishi-plugin-assets": {
-    "version": "1.0.1",
+    "version": "1.1.0",
     "description": "Asset provider plugin for Koishi"
   },
   "koishi-plugin-chat": {
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "Chat plugin for Koishi"
   },
   "koishi-plugin-chess": {
@@ -36,7 +36,7 @@
     "description": "Chess Plugin for Koishi"
   },
   "koishi-plugin-common": {
-    "version": "4.2.0",
+    "version": "4.2.1",
     "description": "Common plugins for Koishi"
   },
   "koishi-plugin-dice": {
@@ -44,11 +44,11 @@
     "description": "COC / DND Tools for Koishi"
   },
   "koishi-plugin-eval": {
-    "version": "3.0.0-beta.12",
+    "version": "3.0.0-beta.13",
     "description": "Execute JavaScript in Koishi"
   },
   "koishi-plugin-github": {
-    "version": "3.0.2",
+    "version": "3.0.3",
     "description": "GitHub webhook plugin for Koishi"
   },
   "koishi-plugin-image-search": {
@@ -56,7 +56,7 @@
     "description": "Image searching plugin for Koishi"
   },
   "koishi-plugin-mongo": {
-    "version": "2.2.0",
+    "version": "2.2.1",
     "description": "MongoDB support for Koishi"
   },
   "koishi-plugin-monitor": {
@@ -87,7 +87,7 @@
     "description": "Some simple tools for Koishi"
   },
   "koishi-plugin-webui": {
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "Show Web UI of Koishi"
   }
 }
diff --git a/packages/koishi/package.json b/packages/koishi/package.json
index 1f918558df..258a1631c8 100644
--- a/packages/koishi/package.json
+++ b/packages/koishi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi",
   "description": "A QQ bot framework based on CQHTTP",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "main": "index.js",
   "typings": "index.d.ts",
   "engines": {
@@ -38,7 +38,7 @@
     "cac": "^6.7.2",
     "chokidar": "^3.5.1",
     "kleur": "^4.1.4",
-    "koishi-core": "^3.6.0",
+    "koishi-core": "^3.6.1",
     "koishi-utils": "^4.1.2",
     "prompts": "^2.4.0"
   }
diff --git a/packages/plugin-adventure/package.json b/packages/plugin-adventure/package.json
index 89216e88ae..9772d5854b 100644
--- a/packages/plugin-adventure/package.json
+++ b/packages/plugin-adventure/package.json
@@ -28,8 +28,8 @@
     "adventure"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0",
-    "koishi-plugin-common": "^4.2.0",
+    "koishi-core": "^3.6.1",
+    "koishi-plugin-common": "^4.2.1",
     "koishi-plugin-mysql": "^3.3.0",
     "koishi-plugin-teach": "^2.1.0",
     "koishi-utils": "^4.1.2"
diff --git a/packages/plugin-assets/package.json b/packages/plugin-assets/package.json
index 611e50e279..25d83adb25 100644
--- a/packages/plugin-assets/package.json
+++ b/packages/plugin-assets/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-assets",
   "description": "Asset provider plugin for Koishi",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -29,7 +29,7 @@
     "server"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "axios": "^0.21.1",
diff --git a/packages/plugin-chat/package.json b/packages/plugin-chat/package.json
index 04b1c30a5a..ebdfa8165a 100644
--- a/packages/plugin-chat/package.json
+++ b/packages/plugin-chat/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat",
   "description": "Chat plugin for Koishi",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -30,9 +30,9 @@
     "server"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
-    "koishi-plugin-webui": "^4.0.0"
+    "koishi-plugin-webui": "^4.0.1"
   }
 }
diff --git a/packages/plugin-chess/package.json b/packages/plugin-chess/package.json
index 328e2a4876..72e635c428 100644
--- a/packages/plugin-chess/package.json
+++ b/packages/plugin-chess/package.json
@@ -29,7 +29,7 @@
     "game"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0",
+    "koishi-core": "^3.6.1",
     "koishi-plugin-puppeteer": "^2.0.1",
     "koishi-utils": "^4.1.2"
   }
diff --git a/packages/plugin-common/package.json b/packages/plugin-common/package.json
index 9d88b63295..be21a3cde2 100644
--- a/packages/plugin-common/package.json
+++ b/packages/plugin-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-common",
   "description": "Common plugins for Koishi",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -30,7 +30,7 @@
     "plugin"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0",
+    "koishi-core": "^3.6.1",
     "koishi-utils": "^4.1.2"
   },
   "devDependencies": {
diff --git a/packages/plugin-dice/package.json b/packages/plugin-dice/package.json
index 69741c0eaf..3ae647f765 100644
--- a/packages/plugin-dice/package.json
+++ b/packages/plugin-dice/package.json
@@ -31,7 +31,7 @@
     "dice"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0",
+    "koishi-core": "^3.6.1",
     "koishi-utils": "^4.1.2"
   },
   "devDependencies": {
diff --git a/packages/plugin-eval/package.json b/packages/plugin-eval/package.json
index 99a13d3e63..5192a202ea 100644
--- a/packages/plugin-eval/package.json
+++ b/packages/plugin-eval/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-eval",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.13",
   "description": "Execute JavaScript in Koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -33,7 +33,7 @@
     "code"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "js-yaml": "^4.0.0",
diff --git a/packages/plugin-github/package.json b/packages/plugin-github/package.json
index 1d13d167e2..b7eccde23e 100644
--- a/packages/plugin-github/package.json
+++ b/packages/plugin-github/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-github",
   "description": "GitHub webhook plugin for Koishi",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -30,13 +30,13 @@
   ],
   "devDependencies": {
     "@types/marked": "^2.0.1",
-    "koishi-plugin-mongo": "^2.2.0",
+    "koishi-plugin-mongo": "^2.2.1",
     "koishi-plugin-mysql": "^3.3.0",
     "koishi-plugin-puppeteer": "^2.0.1",
     "koishi-test-utils": "^6.0.0-beta.11"
   },
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "@octokit/webhooks-definitions": "^3.65.6",
diff --git a/packages/plugin-image-search/package.json b/packages/plugin-image-search/package.json
index 5b50401303..b3c55001ca 100644
--- a/packages/plugin-image-search/package.json
+++ b/packages/plugin-image-search/package.json
@@ -33,7 +33,7 @@
     "pixiv"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "axios": "^0.21.1",
diff --git a/packages/plugin-mongo/package.json b/packages/plugin-mongo/package.json
index ce4b893ef2..66719a6001 100644
--- a/packages/plugin-mongo/package.json
+++ b/packages/plugin-mongo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-mongo",
   "description": "MongoDB support for Koishi",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -35,7 +35,7 @@
     "@types/mongodb": "^3.6.11"
   },
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "mongodb": "^3.6.5"
diff --git a/packages/plugin-monitor/package.json b/packages/plugin-monitor/package.json
index d10dc8180a..5d22e03291 100644
--- a/packages/plugin-monitor/package.json
+++ b/packages/plugin-monitor/package.json
@@ -17,6 +17,6 @@
   },
   "homepage": "https://github.com/koishijs/koishi#readme",
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   }
 }
diff --git a/packages/plugin-mysql/package.json b/packages/plugin-mysql/package.json
index b026bba518..22685f7967 100644
--- a/packages/plugin-mysql/package.json
+++ b/packages/plugin-mysql/package.json
@@ -35,7 +35,7 @@
     "@types/mysql": "^2.15.18"
   },
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "mysql": "^2.18.1"
diff --git a/packages/plugin-puppeteer/package.json b/packages/plugin-puppeteer/package.json
index a02beb2b59..b736e90b82 100644
--- a/packages/plugin-puppeteer/package.json
+++ b/packages/plugin-puppeteer/package.json
@@ -33,7 +33,7 @@
     "koishi-test-utils": "^6.0.0-beta.11"
   },
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "chrome-finder": "^1.0.7",
diff --git a/packages/plugin-rss/package.json b/packages/plugin-rss/package.json
index ebc2a703f6..b765288341 100644
--- a/packages/plugin-rss/package.json
+++ b/packages/plugin-rss/package.json
@@ -31,7 +31,7 @@
     "rss"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
     "koishi-test-utils": "^6.0.0-beta.11"
diff --git a/packages/plugin-schedule/package.json b/packages/plugin-schedule/package.json
index d14264731e..1d5ec504aa 100644
--- a/packages/plugin-schedule/package.json
+++ b/packages/plugin-schedule/package.json
@@ -29,11 +29,11 @@
     "task"
   ],
   "devDependencies": {
-    "koishi-plugin-mongo": "^2.2.0",
+    "koishi-plugin-mongo": "^2.2.1",
     "koishi-plugin-mysql": "^3.3.0",
     "koishi-test-utils": "^6.0.0-beta.11"
   },
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   }
 }
diff --git a/packages/plugin-teach/package.json b/packages/plugin-teach/package.json
index fd7ad94905..f3934e13ee 100644
--- a/packages/plugin-teach/package.json
+++ b/packages/plugin-teach/package.json
@@ -33,12 +33,12 @@
     "conversation"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
-    "koishi-plugin-mongo": "^2.2.0",
+    "koishi-plugin-mongo": "^2.2.1",
     "koishi-plugin-mysql": "^3.3.0",
-    "koishi-plugin-webui": "^4.0.0",
+    "koishi-plugin-webui": "^4.0.1",
     "koishi-test-utils": "^6.0.0-beta.11"
   },
   "dependencies": {
diff --git a/packages/plugin-tools/package.json b/packages/plugin-tools/package.json
index b7ad0cc3f8..60196346e2 100644
--- a/packages/plugin-tools/package.json
+++ b/packages/plugin-tools/package.json
@@ -21,7 +21,7 @@
     "@types/qrcode": "^1.4.0"
   },
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "dependencies": {
     "axios": "^0.21.1",
diff --git a/packages/plugin-webui/package.json b/packages/plugin-webui/package.json
index c4df4c86ed..7d1eb4423d 100644
--- a/packages/plugin-webui/package.json
+++ b/packages/plugin-webui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-webui",
   "description": "Show Web UI of Koishi",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -31,7 +31,7 @@
     "webui"
   ],
   "peerDependencies": {
-    "koishi-core": "^3.6.0"
+    "koishi-core": "^3.6.1"
   },
   "devDependencies": {
     "@types/ws": "^7.4.0",
@@ -40,7 +40,7 @@
     "@vue/compiler-sfc": "^3.0.10",
     "echarts": "^5.0.2",
     "echarts-wordcloud": "^2.0.0",
-    "koishi-plugin-mongo": "^2.2.0",
+    "koishi-plugin-mongo": "^2.2.1",
     "koishi-plugin-mysql": "^3.3.0",
     "koishi-plugin-teach": "^2.1.0",
     "koishi-test-utils": "^6.0.0-beta.11",