@koishi-ce/koishi 1.0.2 → 1.0.4

package/README.md

@@ -0,0 +1,89 @@
+# @koishi-ce/koishi
+
+**简体中文** | [English](#english)
+
+Koishi 的社区再发行版（Community Edition）主包与命令行宿主，来自 [Koishi-CE/koishi](https://github.com/Koishi-CE/koishi)——将上游 [koishijs/koishi](https://github.com/koishijs/koishi) 与 [koishijs/webui](https://github.com/koishijs/webui) 合并重构的单一 Bun workspace 单仓库。本包入口与上游 `koishi` 主包同构：合并再导出 [`@koishi-ce/core`](https://github.com/Koishi-CE/koishi/tree/main/packages/node/core) 与 [`@koishi-ce/loader`](https://github.com/Koishi-CE/koishi/tree/main/packages/node/loader)，并内置 `koishi` 命令与守护进程。
+
+命令名保持为 `koishi`，与上游用法一致。本项目与 Koishijs 官方组织无从属关系，感谢原作者 Shigma 及所有上游贡献者，相关声明见 [NOTICE](https://github.com/Koishi-CE/koishi/blob/main/NOTICE) 与 [docs/process/upstream.md](https://github.com/Koishi-CE/koishi/blob/main/docs/process/upstream.md)。
+
+## 安装与启动
+
+```bash
+npm install -g @koishi-ce/koishi
+koishi start
+```
+
+更推荐用脚手架创建完整项目（自带控制台、市场与热重载配置）：
+
+```bash
+bunx create-koishi-ce my-app
+```
+
+## 命令行
+
+| 命令 | 说明 |
+| --- | --- |
+| `koishi start [file]`（别名 `run`） | 启动应用，`file` 为配置文件路径 |
+
+选项：
+
+| 选项 | 默认值 | 说明 |
+| --- | --- | --- |
+| `--debug [namespace]` | - | 开启调试日志，可限定命名空间 |
+| `--log-level [level]` | 2 | 日志等级 |
+| `--log-time [format]` | - | 日志时间戳格式 |
+
+不带子命令运行 `koishi` 时输出帮助。
+
+## 守护进程机制
+
+`koishi start` 是守护父进程：以 Bun.spawn 拉起工作进程并保持 IPC 心跳，心跳超时强制终止。退出码约定：51 = 工作进程请求整体重启（配置文件或框架依赖变更），52 = 请求退出。工作进程内由 loader 读取配置、预检服务器端口（被占则干净退出）、创建应用并挂载 daemon 插件。
+
+## 编程式用法
+
+```ts
+import { App, defineConfig, NodeLoader } from "@koishi-ce/koishi";
+```
+
+对 `koishi` / `@koishijs/core` / `@koishijs/loader` 三个上游名的兼容由 [`@koishi-ce/koishi-shim`](https://github.com/Koishi-CE/koishi/tree/main/packages/shim) 以 npm alias 承担，社区插件无需改动即可在 CE 项目中运行，详见 [packages/shim/README.md](https://github.com/Koishi-CE/koishi/blob/main/packages/shim/README.md)。
+
+## 许可证
+
+[MIT](https://github.com/Koishi-CE/koishi/blob/main/LICENSE)。本包是上游 koishijs/koishi 的社区再分发，版权归属见 [NOTICE](https://github.com/Koishi-CE/koishi/blob/main/NOTICE)。
+
+---
+
+## English
+
+The Community Edition main package and CLI host of Koishi, from [Koishi-CE/koishi](https://github.com/Koishi-CE/koishi) — a single Bun-workspace monorepo merging the upstream [koishijs/koishi](https://github.com/koishijs/koishi) and [koishijs/webui](https://github.com/koishijs/webui). Its entry mirrors the upstream `koishi` package: a merged re-export of `@koishi-ce/core` and `@koishi-ce/loader`, plus the `koishi` command and a daemon. Not affiliated with the Koishijs organization; see [NOTICE](https://github.com/Koishi-CE/koishi/blob/main/NOTICE) and [docs/process/upstream.md](https://github.com/Koishi-CE/koishi/blob/main/docs/process/upstream.md).
+
+## Installation
+
+```bash
+npm install -g @koishi-ce/koishi
+koishi start
+```
+
+Or scaffold a full project (console, market and HMR preconfigured):
+
+```bash
+bunx create-koishi-ce my-app
+```
+
+## CLI
+
+`koishi start [file]` (alias `run`) starts the app, with options `--debug [namespace]`, `--log-level [level]` (default 2) and `--log-time [format]`. Running `koishi` without a subcommand prints help.
+
+The `start` command is a daemon parent: it spawns the worker via Bun.spawn with IPC heartbeats. Exit code 51 asks for a full restart, 52 asks to quit. The worker reads the config through the loader, prechecks server ports, creates the app and mounts the daemon plugin.
+
+## Programmatic usage
+
+```ts
+import { App, defineConfig, NodeLoader } from "@koishi-ce/koishi";
+```
+
+Compatibility with the upstream names `koishi` / `@koishijs/core` / `@koishijs/loader` is provided by `@koishi-ce/koishi-shim` via npm aliases, so community plugins run unmodified in CE projects — see [packages/shim/README.md](https://github.com/Koishi-CE/koishi/blob/main/packages/shim/README.md).
+
+## License
+
+[MIT](https://github.com/Koishi-CE/koishi/blob/main/LICENSE). Community redistribution of upstream koishijs/koishi; see [NOTICE](https://github.com/Koishi-CE/koishi/blob/main/NOTICE) for attribution.

package/lib/cli/index.mjs

@@ -7,7 +7,7 @@ var package_default = {
 	name: "@koishi-ce/koishi",
 	type: "module",
 	description: "Cross-Platform Chatbot Framework Made with Love",
-	version: "1.0.2",
+	version: "1.0.4",
 	main: "lib/index.mjs",
 	module: "lib/index.mjs",
 	types: "lib/index.d.ts",
@@ -58,7 +58,6 @@ var package_default = {
 		"@koishi-ce/plugin-proxy-agent": "workspace:*",
 		"@koishi-ce/plugin-server": "workspace:*",
 		"@koishi-ce/utils": "workspace:*",
-		"@satorijs/core": "^4.6.0",
 		"cac": "^7.0.0",
 		"kleur": "^4.1.5"
 	}

package/lib/index-B9rkkFue.d.ts

@@ -0,0 +1,2 @@
+import loader_default, { Loader as Loader$1 } from "@koishi-ce/loader";
+export { loader_default as n, Loader$1 as t };

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { t as Loader } from "./index-CGzU40S-.js";
-export * from "@koishi-ce/loader";
+import { n as loader_default, t as Loader } from "./index-B9rkkFue.js";
 export * from "@koishi-ce/core";
-export { Loader };
+export * from "@koishi-ce/loader";
+export { Loader, loader_default as default };

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { t as Loader } from "./src-1HtO5Rx4.mjs";
-export * from "@koishi-ce/loader";
+import { n as loader_default, t as Loader } from "./src-BnUZO8R-.mjs";
 export * from "@koishi-ce/core";
-export { Loader };
+export * from "@koishi-ce/loader";
+export { Loader, loader_default as default };

package/lib/src-BnUZO8R-.mjs

@@ -0,0 +1,3 @@
+import "./rolldown-runtime-BBjsoOtd.mjs";
+import loader_default, { Loader as Loader$1 } from "@koishi-ce/loader";
+export { loader_default as n, Loader$1 as t };

package/lib/worker/index.d.ts

@@ -1,7 +1,7 @@
-import { t as Loader } from "../index-CGzU40S-.js";
+import { t as Loader } from "../index-B9rkkFue.js";
 import { Context, Dict, Schema } from "@koishi-ce/core";
-export * from "@koishi-ce/loader";
 export * from "@koishi-ce/core";
+export * from "@koishi-ce/loader";
 //#region src/worker/daemon.d.ts
 /** 守护设置 */
 interface Config$1 {

package/lib/worker/index.mjs

@@ -1,12 +1,12 @@
 import { t as __exportAll } from "../rolldown-runtime-BBjsoOtd.mjs";
-import { t as Loader } from "../src-1HtO5Rx4.mjs";
-import Loader$1, { resolvePlugin } from "@koishi-ce/loader";
+import { t as Loader } from "../src-BnUZO8R-.mjs";
 import { Context, Logger, Schema, Time, defineProperty } from "@koishi-ce/core";
+import Loader$1, { resolvePlugin } from "@koishi-ce/loader";
 import { existsSync, readFileSync } from "node:fs";
 import net from "node:net";
 import { dirname, resolve } from "node:path";
-export * from "@koishi-ce/loader";
 export * from "@koishi-ce/core";
+export * from "@koishi-ce/loader";
 //#region src/worker/daemon.ts
 /**
 * daemon 插件：worker 子进程侧的守护逻辑。

package/package.json

@@ -2,7 +2,7 @@
     "name": "@koishi-ce/koishi",
     "type": "module",
     "description": "Cross-Platform Chatbot Framework Made with Love",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "main": "lib/index.mjs",
     "module": "lib/index.mjs",
     "types": "lib/index.d.ts",
@@ -62,12 +62,11 @@
     },
     "dependencies": {
         "@koishi-ce/core": "^1.0.0",
-        "@koishi-ce/loader": "^1.0.2",
+        "@koishi-ce/loader": "^1.0.4",
         "@koishi-ce/plugin-http": "^1.0.0",
         "@koishi-ce/plugin-proxy-agent": "^1.0.0",
         "@koishi-ce/plugin-server": "^1.0.0",
         "@koishi-ce/utils": "^1.0.0",
-        "@satorijs/core": "^4.6.0",
         "cac": "^7.0.0",
         "kleur": "^4.1.5"
     }

package/src/cli/index.ts

@@ -1,5 +1,9 @@
 #!/usr/bin/env bun
 
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2019-present Shigma and Koishijs contributors.
+// Copyright (c) 2026-present Koishi-CE contributors.
+
 /**
  * Koishi 命令行入口。
  *

package/src/cli/start.ts

@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2019-present Shigma and Koishijs contributors.
+// Copyright (c) 2026-present Koishi-CE contributors.
+
 /**
  * `koishi start` 子命令实现：守护进程（daemon）侧的父进程逻辑。
  *

package/src/index.ts

@@ -1,12 +1,17 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2019-present Shigma and Koishijs contributors.
+// Copyright (c) 2026-present Koishi-CE contributors.
+
 /**
  * `@koishi-ce/koishi` 包入口。
  *
  * 本文件专为不使用 CLI 的用户准备：将 core 与 loader 两包的导出合并再分发，
  * 并默认导出 NodeLoader 实现，使开发者可以直接以编程方式启动 Koishi。
+ * 结构与上游 koishi 主包入口同构（core + loader 合并再导出）——
+ * `packages/shim/koishi-shim` 据此以单一 re-export 兼任 koishi 裸名与
+ * `@koishijs/core` / `@koishijs/loader` 三个上游名的下游 alias 目标。
  */
 
-import Loader from "@koishi-ce/loader";
-
 export * from "@koishi-ce/core";
 export * from "@koishi-ce/loader";
-export { Loader };
+export { default, Loader } from "@koishi-ce/loader";

package/src/worker/daemon.ts

@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2019-present Shigma and Koishijs contributors.
+// Copyright (c) 2026-present Koishi-CE contributors.
+
 /**
  * daemon 插件：worker 子进程侧的守护逻辑。
  *

package/src/worker/index.ts

@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2019-present Shigma and Koishijs contributors.
+// Copyright (c) 2026-present Koishi-CE contributors.
+
 /**
  * worker 子进程入口：真正启动 Koishi 应用的地方。
  *

package/src/worker/logger.ts

@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2019-present Shigma and Koishijs contributors.
+// Copyright (c) 2026-present Koishi-CE contributors.
+
 /**
  * 日志配置的解析与应用（worker 侧）。
  *

package/lib/index-CGzU40S-.d.ts

@@ -1,2 +0,0 @@
-import Loader$1 from "@koishi-ce/loader";
-export { Loader$1 as t };

package/lib/src-1HtO5Rx4.mjs

@@ -1,11 +0,0 @@
-import "./rolldown-runtime-BBjsoOtd.mjs";
-import Loader$1 from "@koishi-ce/loader";
-//#region src/index.ts
-/**
-* `@koishi-ce/koishi` 包入口。
-*
-* 本文件专为不使用 CLI 的用户准备：将 core 与 loader 两包的导出合并再分发，
-* 并默认导出 NodeLoader 实现，使开发者可以直接以编程方式启动 Koishi。
-*/
-//#endregion
-export { Loader$1 as t };

package/readme.md

@@ -1,26 +0,0 @@
-<div align="center">
-  <a href="https://koishi.chat/" target="_blank">
-    <img width="160" src="https://koishi.chat/logo.png" alt="logo">
-  </a>
-  <h1 id="koishi"><a href="https://github.com/Koishi-CE/koishi" target="_blank">Koishi CE</a></h1>
-
-[![npm](https://img.shields.io/npm/v/@koishi-ce/koishi?style=flat-square)](https://www.npmjs.com/package/@koishi-ce/koishi)
-[![GitHub](https://img.shields.io/github/license/Koishi-CE/koishi?style=flat-square)](https://github.com/Koishi-CE/koishi/blob/main/LICENSE)
-
-</div>
-
-`@koishi-ce/koishi` 是 [Koishi](https://koishi.chat) 的社区再发行版 (Community Edition) 命令行工具，来自 [Koishi-CE/koishi](https://github.com/Koishi-CE/koishi) —— 将 Koishi 核心与 webui 合并重构的单一 Bun workspace 单仓库。
-
-命令名保持为 `koishi`，与上游用法一致：
-
-```bash
-npm install -g @koishi-ce/koishi
-```
-
-> 本项目与 Koishijs 官方组织无从属关系。感谢原作者 Shigma 及所有上游贡献者，相关声明见仓库根目录的 NOTICE 与 UPSTREAM 文件。
-
-## 许可证
-
-本包基于 [MIT](./LICENSE) 协议开源。
-
-Copyright © 2019-2023, Shigma; Koishi-CE contributors