Skip to content

[Fix] avoid chat prompt injection warning #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dingyi222666 merged 2 commits into from
May 26, 2026
Merged

[Fix] avoid chat prompt injection warning #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
388878c
chore(packages): bump context compression versions
dingyi222666 May 24, 2026
083c189
[Fix] avoid chat prompt injection warning
dingyi222666 May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/adapter-azure-openai/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"resolutions": {
"@langchain/core": "^0.3.80",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-claude/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"resolutions": {
"@langchain/core": "^0.3.80",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-deepseek/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"category": "ai",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-dify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-doubao/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-gemini/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18",
"koishi-plugin-chatluna": "^1.4.0-alpha.19",
"koishi-plugin-chatluna-storage-service": "^1.0.6"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-hunyuan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-ollama/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"resolutions": {
"@langchain/core": "^0.3.80",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-openai-like/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-openai/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-qwen/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-rwkv/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-spark/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-wenxin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-zhipu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna",
"description": "chatluna for koishi",
"version": "1.4.0-alpha.18",
"version": "1.4.0-alpha.19",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/services/chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import { Embeddings } from '@langchain/core/embeddings'
import { RunnableConfig } from '@langchain/core/runnables'
import type { Notifier } from '@koishijs/plugin-notifier'
import { ChatLunaContextManagerService } from 'koishi-plugin-chatluna/llm-core/prompt'
import { createChatPrompt } from 'koishi-plugin-chatluna/utils/chatluna'
import { ChatLunaChatPrompt } from 'koishi-plugin-chatluna/llm-core/chain/prompt'

export class ChatLunaService extends Service<Config> {
private _plugins: Record<string, ChatLunaPlugin> = {}
Expand Down Expand Up @@ -449,8 +449,18 @@ export class ChatLunaService extends Service<Config> {
const { preset, instructions } = resolveAgentPreset(options, (name) =>
computed(() => this._preset.getPreset(name).value)
)
const model = llm.value
const prompt =
options.prompt ?? createChatPrompt(this.ctx, llm.value, preset)
options.prompt ??
new ChatLunaChatPrompt({
preset,
tokenCounter: (text) => model.getNumTokens(text),
sendTokenLimit:
model.invocationParams().maxTokenLimit ??
model.getModelMaxContextSize(),
contextManager: this._contextManager,
promptRenderService: this._promptRenderer
})
Comment thread
dingyi222666 marked this conversation as resolved.

return createAgent({
id: options.id,
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-agent/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"peerDependencies": {
"@koishijs/plugin-console": "^5.30.11",
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18",
"koishi-plugin-chatluna": "^1.4.0-alpha.19",
"koishi-plugin-chatluna-storage-service": "^1.0.6"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-long-memory/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"resolutions": {
"@langchain/core": "^0.3.80",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18",
"koishi-plugin-chatluna": "^1.4.0-alpha.19",
"koishi-plugin-chatluna-agent": "^1.0.30",
"koishi-plugin-chatluna-storage-service": "^1.0.6"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-usage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-usage",
"description": "Usage records for ChatLuna model calls",
"version": "1.0.0",
"version": "1.0.1",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -59,7 +59,7 @@
"peerDependencies": {
"@koishijs/plugin-console": "^5.30.11",
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-variable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"resolutions": {
"@langchain/core": "^0.3.80",
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer-image/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/service-embeddings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/service-multimodal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18",
"koishi-plugin-chatluna": "^1.4.0-alpha.19",
"koishi-plugin-ffmpeg-path": "^2.0.0"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/service-search/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18",
"koishi-plugin-chatluna": "^1.4.0-alpha.19",
"koishi-plugin-chatluna-agent": "^1.0.30"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/service-vector-store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@zilliz/milvus2-sdk-node": "^2.6.2",
"faiss-node": "^0.5.1",
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
},
"peerDependenciesMeta": {
"@zilliz/milvus2-sdk-node": {
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
},
"peerDependencies": {
"koishi": "^4.18.9",
"koishi-plugin-chatluna": "^1.4.0-alpha.18"
"koishi-plugin-chatluna": "^1.4.0-alpha.19"
}
}
Loading