@kooka/agent-sdk 0.1.0 → 0.1.3

package/README.md

@@ -24,6 +24,8 @@ pnpm install
 pnpm --filter @kooka/agent-sdk build
 ```
 
+Tip: in a clean monorepo checkout, this auto-builds missing `@kooka/core` outputs (types + runtime entrypoints).
+
 ### As a dependency (local path)
 
 In another project’s `package.json`:
@@ -99,7 +101,31 @@ try {
 }
 ```
 
-CommonJS:
+## Custom Tools
+
+`createLingyunAgent(...)` returns a `ToolRegistry` so hosts can register their own tools:
+
+```ts
+import { createLingyunAgent, type ToolDefinition } from '@kooka/agent-sdk';
+
+const { agent, registry } = createLingyunAgent({ /* ... */ });
+
+const timeTool: ToolDefinition = {
+  id: 'time.now',
+  name: 'time.now',
+  description: 'Get the current time as an ISO string.',
+  parameters: { type: 'object', properties: {} },
+  execution: { type: 'function', handler: 'time.now' },
+  metadata: { readOnly: true },
+};
+
+registry.registerTool(timeTool, async () => ({
+  success: true,
+  data: { now: new Date().toISOString() },
+}));
+```
+
+## CommonJS
 
 ```js
 const { createLingyunAgent, LingyunSession } = await import('@kooka/agent-sdk')
@@ -136,6 +162,7 @@ Useful event types:
 
 - `assistant_token`: user-facing assistant text (with `<think>` and tool-call markers removed)
 - `thought_token`: model “thinking” tokens (only if the provider emits them)
+- `notice`: user-facing notices from the runtime (e.g. unknown `$skill-name`)
 - `tool_call` / `tool_result` / `tool_blocked`: tool lifecycle
 - `compaction_start` / `compaction_end`: context overflow mitigation
 
@@ -153,6 +180,38 @@ You can disable built-ins:
 createLingyunAgent({ llm: { /*...*/ }, tools: { builtin: false } })
 ```
 
+### Skills (`$skill-name`)
+
+The SDK supports Codex-style `$skill-name` mentions.
+If a user message includes `$<skill-name>`, LingYun:
+
+1. Looks up the skill by `name:` in discovered `SKILL.md` files
+2. Injects the skill body as a synthetic `<skill>...</skill>` user message before calling the model
+
+Unknown skills are ignored and emitted as `notice` events (`callbacks.onNotice`).
+
+Configure discovery/injection via `tools.builtinOptions.skills`:
+
+```ts
+createLingyunAgent({
+  llm: { provider: 'openaiCompatible', baseURL: 'http://localhost:8080/v1', model: 'your-model-id' },
+  workspaceRoot: process.cwd(),
+  tools: {
+    builtinOptions: {
+      skills: {
+        enabled: true,
+        paths: ['.lingyun/skills', '~/.codex/skills'],
+        maxPromptSkills: 50,
+        maxInjectSkills: 5,
+        maxInjectChars: 20_000,
+      },
+    },
+  },
+});
+```
+
+Note: the “Available skills” list included in the system prompt is built once per `LingyunAgent` instance. Create a new agent to refresh it.
+
 ### Approvals
 
 Tools can require approval via `ToolDefinition.metadata.requiresApproval`.
@@ -191,6 +250,43 @@ registry.registerTool(
 
 Return formatting hints via `ToolResult.metadata.outputText` / `title` to control what the agent sees.
 
+### Browser automation (agent-browser)
+
+If you install `agent-browser` and Chromium, you can register an **interactive browser toolset** (sessions + snapshot + actions):
+
+```bash
+npm i -g agent-browser
+agent-browser install
+```
+
+Then in your host:
+
+```ts
+import { createLingyunAgent, registerAgentBrowserTools } from '@kooka/agent-sdk';
+
+const { registry } = createLingyunAgent({
+  llm: { provider: 'openaiCompatible', baseURL: 'http://localhost:8080/v1', model: 'your-model-id' },
+  workspaceRoot: process.cwd(),
+});
+
+registerAgentBrowserTools(registry, {
+  artifactsDir: '.kooka/agent-browser',
+  timeoutMs: 30_000,
+});
+```
+
+Tools:
+- `browser.startSession` / `browser.closeSession`
+- `browser.snapshot` (read-only; returns accessibility tree with refs like `@e2`)
+- `browser.run` (requires approval; runs click/fill/type/wait/get/screenshot/pdf/trace actions)
+
+Security defaults:
+- HTTPS-only and blocks private hosts / IPs by default
+- No cookies/storage/state/headers APIs are exposed by this toolset (no auth-state support)
+- Screenshot/PDF/trace artifacts are written under `artifactsDir` (relative to `workspaceRoot` when set)
+
+If `agent-browser` is not on PATH, set `AGENT_BROWSER_BIN` or pass `agentBrowserBin` to `registerAgentBrowserTools`.
+
 ## Inspiration / Compatibility
 
 - **OpenCode SDK**: OpenCode’s JavaScript SDK primarily wraps an HTTP server (client + server helpers). LingYun SDK starts with an **in‑process** agent runtime that can later be wrapped by an HTTP server if needed.
@@ -215,7 +311,52 @@ A session holds:
 - message history (OpenCode-aligned “assistant message + parts”)
 - any pending plan text (optional)
 
-Sessions are serializable; persistence is the host application’s responsibility.
+Sessions are serializable; persistence is the host application’s responsibility. The SDK does not write to disk.
+
+You can snapshot + restore:
+
+```ts
+import { LingyunSession, snapshotSession, restoreSession } from '@kooka/agent-sdk';
+
+const session = new LingyunSession({ sessionId: 's1' });
+
+const snapshot = snapshotSession(session, {
+  sessionId: 's1',
+  // includeFileHandles: false, // omit fileId/path hints if you don't want to persist them
+});
+
+// Persist `snapshot` however you want (JSON files, sqlite, postgres, ...).
+
+const restored = restoreSession(snapshot);
+```
+
+If you want SQLite, the SDK ships a `SqliteSessionStore` that works with any driver you provide:
+
+```ts
+import Database from 'better-sqlite3';
+import { SqliteSessionStore, snapshotSession, restoreSession, type SqliteDriver } from '@kooka/agent-sdk';
+
+const db = new Database('lingyun.db');
+
+const driver: SqliteDriver = {
+  execute: (sql, params = []) => void db.prepare(sql).run(...params),
+  queryOne: (sql, params = []) => db.prepare(sql).get(...params),
+  queryAll: (sql, params = []) => db.prepare(sql).all(...params),
+};
+
+const store = new SqliteSessionStore(driver);
+
+const sessionId = 's1';
+const session = new LingyunSession({ sessionId });
+
+await store.save(sessionId, snapshotSession(session, { sessionId }));
+const loaded = await store.load(sessionId);
+const loadedSession = loaded ? restoreSession(loaded) : new LingyunSession({ sessionId });
+```
+
+Notes:
+- The SDK does not bundle a SQLite client library; you bring your own (e.g. `better-sqlite3`, `sqlite3`).
+- Session snapshots contain conversation text and may include file paths; treat persisted data as sensitive.
 
 ### Run + Streaming
 

package/dist/agent/agent.d.ts

@@ -17,6 +17,13 @@ export type LingyunAgentRuntimeOptions = {
     plugins?: PluginManager;
     workspaceRoot?: string;
     allowExternalPaths?: boolean;
+    skills?: {
+        enabled?: boolean;
+        paths?: string[];
+        maxPromptSkills?: number;
+        maxInjectSkills?: number;
+        maxInjectChars?: number;
+    };
     modelLimits?: Record<string, ModelLimit>;
     compaction?: Partial<CompactionConfig>;
 };
@@ -27,6 +34,8 @@ export declare class LingyunAgent {
     private readonly plugins;
     private readonly workspaceRoot?;
     private allowExternalPaths;
+    private readonly skillsConfig;
+    private skillsPromptTextPromise?;
     private readonly modelLimits?;
     private readonly compactionConfig;
     private registeredPluginTools;
@@ -54,9 +63,11 @@ export declare class LingyunAgent {
     private decorateGlobResultWithFileHandles;
     private createAISDKTools;
     private filterTools;
+    private getSkillsPromptText;
     private composeSystemPrompt;
     private compactSessionInternal;
     private runOnce;
+    private injectSkillsForUserText;
     run(params: {
         session: LingyunSession;
         input: string;

package/dist/agent/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/agent/agent.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAwC,cAAc,EAAE,WAAW,EAAE,WAAW,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5I,OAAO,EAsBL,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,UAAU,EAGhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAK5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AA8GzD,qBAAa,cAAc;IACzB,OAAO,EAAE,mBAAmB,EAAE,CAAM;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;gBAEU,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,GAAG,aAAa,CAAC,CAAC;IAOzG,UAAU,IAAI,mBAAmB,EAAE;CAGpC;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACxC,CAAC;AAEF,qBAAa,YAAY;IASrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAV3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;IACxC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,qBAAqB,CAAqB;gBAG/B,GAAG,EAAE,WAAW,EACzB,MAAM,EAAE,WAAW,EACV,QAAQ,EAAE,YAAY,EACvC,OAAO,CAAC,EAAE,0BAA0B;IAsBtC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAIhD,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAI3C,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,uBAAuB;IA0B/B,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,kBAAkB;YAMZ,2BAA2B;YAiD3B,eAAe;IAgB7B,OAAO,CAAC,iBAAiB;YAUX,gBAAgB;YA+BhB,yBAAyB;IA2BvC,OAAO,CAAC,uBAAuB;IAmB/B,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,iCAAiC;IAgDzC,OAAO,CAAC,gBAAgB;IA8PxB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,mBAAmB;YAWb,sBAAsB;YAkHtB,OAAO;IAoQrB,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,UAAU;CAqEtH"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/agent/agent.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAwC,cAAc,EAAE,WAAW,EAAE,WAAW,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5I,OAAO,EA2BL,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,UAAU,EAGhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAK5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAgHzD,qBAAa,cAAc;IACzB,OAAO,EAAE,mBAAmB,EAAE,CAAM;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;gBAEU,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,GAAG,aAAa,CAAC,CAAC;IAOzG,UAAU,IAAI,mBAAmB,EAAE;CAGpC;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE;QACP,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACxC,CAAC;AAEF,qBAAa,YAAY;IAiBrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAlB3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;IACxC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAM3B;IACF,OAAO,CAAC,uBAAuB,CAAC,CAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,qBAAqB,CAAqB;gBAG/B,GAAG,EAAE,WAAW,EACzB,MAAM,EAAE,WAAW,EACV,QAAQ,EAAE,YAAY,EACvC,OAAO,CAAC,EAAE,0BAA0B;IAgDtC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAIhD,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAI3C,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,uBAAuB;IA0B/B,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,kBAAkB;YAMZ,2BAA2B;YAiD3B,eAAe;IAgB7B,OAAO,CAAC,iBAAiB;YAUX,gBAAgB;YA+BhB,yBAAyB;IA2BvC,OAAO,CAAC,uBAAuB;IAmB/B,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,iCAAiC;IAgDzC,OAAO,CAAC,gBAAgB;IA8PxB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,mBAAmB;YAuBb,mBAAmB;YAcnB,sBAAsB;YAkHtB,OAAO;YAsQP,uBAAuB;IA2FrC,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,UAAU;CA4EtH"}

package/dist/agent/agent.js

@@ -1,12 +1,14 @@
 import * as path from 'path';
 import { convertToModelMessages, extractReasoningMiddleware, jsonSchema, streamText, tool as aiTool, wrapLanguageModel, } from 'ai';
 import { combineAbortSignals } from '../abort.js';
-import { COMPACTION_AUTO_CONTINUE_TEXT, COMPACTION_MARKER_TEXT, COMPACTION_PROMPT_TEXT, COMPACTION_SYSTEM_PROMPT, createAssistantHistoryMessage, createHistoryForModel, createUserHistoryMessage, evaluatePermission, evaluateShellCommand, extractUsageTokens, finalizeStreamingParts, findExternalPathReferencesInShellCommand, getEffectiveHistory, getMessageText, getReservedOutputTokens, isOverflow as isContextOverflow, isPathInsideWorkspace, markPrunableToolOutputs, setDynamicToolError, setDynamicToolOutput, upsertDynamicToolCall, } from '@kooka/core';
+import { COMPACTION_AUTO_CONTINUE_TEXT, COMPACTION_MARKER_TEXT, COMPACTION_PROMPT_TEXT, COMPACTION_SYSTEM_PROMPT, createAssistantHistoryMessage, createHistoryForCompactionPrompt, createHistoryForModel, createUserHistoryMessage, evaluatePermission, evaluateShellCommand, extractSkillMentions, extractUsageTokens, finalizeStreamingParts, findExternalPathReferencesInShellCommand, getEffectiveHistory, getMessageText, getReservedOutputTokens, isOverflow as isContextOverflow, isPathInsideWorkspace, markPreviousAssistantToolOutputs, redactFsPathForPrompt, renderSkillsSectionForPrompt, selectSkillsForText, setDynamicToolError, setDynamicToolOutput, upsertDynamicToolCall, } from '@kooka/core';
 import { PluginManager } from '../plugins/pluginManager.js';
 import { insertModeReminders } from './reminders.js';
 import { DEFAULT_SYSTEM_PROMPT } from './prompts.js';
 import { EDIT_TOOL_IDS, MAX_TOOL_RESULT_LENGTH, THINK_BLOCK_REGEX, TOOL_BLOCK_REGEX } from './constants.js';
 import { delay as getRetryDelayMs, retryable as getRetryableLlmError, sleep as retrySleep } from './retry.js';
+import { DEFAULT_SKILL_PATHS } from '../tools/builtin/index.js';
+import { getSkillIndex, loadSkillFile } from '../skills.js';
 class AsyncQueue {
     state = {
         values: [],
@@ -127,6 +129,8 @@ export class LingyunAgent {
     plugins;
     workspaceRoot;
     allowExternalPaths;
+    skillsConfig;
+    skillsPromptTextPromise;
     modelLimits;
     compactionConfig;
     registeredPluginTools = new Set();
@@ -137,12 +141,31 @@ export class LingyunAgent {
         this.plugins = runtime?.plugins ?? new PluginManager({ workspaceRoot: runtime?.workspaceRoot });
         this.workspaceRoot = runtime?.workspaceRoot ? path.resolve(runtime.workspaceRoot) : undefined;
         this.allowExternalPaths = !!runtime?.allowExternalPaths;
+        const skills = runtime?.skills ?? {};
+        const paths = Array.isArray(skills.paths) && skills.paths.length > 0 ? skills.paths : DEFAULT_SKILL_PATHS;
+        const maxPromptSkills = Number.isFinite(skills.maxPromptSkills) && skills.maxPromptSkills >= 0
+            ? Math.floor(skills.maxPromptSkills)
+            : 50;
+        const maxInjectSkills = Number.isFinite(skills.maxInjectSkills) && skills.maxInjectSkills > 0
+            ? Math.floor(skills.maxInjectSkills)
+            : 5;
+        const maxInjectChars = Number.isFinite(skills.maxInjectChars) && skills.maxInjectChars > 0
+            ? Math.floor(skills.maxInjectChars)
+            : 20_000;
+        this.skillsConfig = {
+            enabled: skills.enabled !== false,
+            paths,
+            maxPromptSkills,
+            maxInjectSkills,
+            maxInjectChars,
+        };
         this.modelLimits = runtime?.modelLimits;
         const baseCompaction = {
             auto: true,
             prune: true,
             pruneProtectTokens: 40_000,
             pruneMinimumTokens: 20_000,
+            toolOutputMode: 'afterToolCall',
         };
         const c = runtime?.compaction ?? {};
         this.compactionConfig = {
@@ -150,6 +173,7 @@ export class LingyunAgent {
             prune: c.prune ?? baseCompaction.prune,
             pruneProtectTokens: Math.max(0, c.pruneProtectTokens ?? baseCompaction.pruneProtectTokens),
             pruneMinimumTokens: Math.max(0, c.pruneMinimumTokens ?? baseCompaction.pruneMinimumTokens),
+            toolOutputMode: c.toolOutputMode ?? baseCompaction.toolOutputMode,
         };
     }
     updateConfig(config) {
@@ -686,11 +710,31 @@ export class LingyunAgent {
             });
         });
     }
-    composeSystemPrompt(modelId) {
+    getSkillsPromptText() {
+        if (!this.skillsConfig.enabled)
+            return Promise.resolve(undefined);
+        if (this.skillsPromptTextPromise)
+            return this.skillsPromptTextPromise;
+        const { paths, maxPromptSkills } = this.skillsConfig;
+        this.skillsPromptTextPromise = getSkillIndex({
+            workspaceRoot: this.workspaceRoot,
+            searchPaths: paths,
+            allowExternalPaths: this.allowExternalPaths,
+        })
+            .then((index) => renderSkillsSectionForPrompt({
+            skills: index.skills,
+            maxSkills: maxPromptSkills,
+            workspaceRoot: this.workspaceRoot,
+        }))
+            .catch(() => undefined);
+        return this.skillsPromptTextPromise;
+    }
+    async composeSystemPrompt(modelId) {
         const basePrompt = this.config.systemPrompt || DEFAULT_SYSTEM_PROMPT;
-        return this.plugins
-            .trigger('experimental.chat.system.transform', { sessionId: this.config.sessionId, mode: this.getMode(), modelId }, { system: [basePrompt] })
-            .then((out) => (Array.isArray(out.system) ? out.system.filter(Boolean) : [basePrompt]));
+        const skillsPromptText = await this.getSkillsPromptText();
+        const system = [basePrompt, skillsPromptText].filter(Boolean);
+        const out = await this.plugins.trigger('experimental.chat.system.transform', { sessionId: this.config.sessionId, mode: this.getMode(), modelId }, { system });
+        return Array.isArray(out.system) ? out.system.filter(Boolean) : system;
     }
     async compactSessionInternal(session, params, callbacks) {
         const maybeAwait = async (value) => {
@@ -721,7 +765,7 @@ export class LingyunAgent {
                 middleware: [extractReasoningMiddleware({ tagName: 'think', startWithReasoning: false })],
             });
             const effective = getEffectiveHistory(session.history);
-            const prepared = createHistoryForModel(effective);
+            const prepared = createHistoryForCompactionPrompt(effective, this.compactionConfig);
             const withoutIds = prepared.map(({ id: _id, ...rest }) => rest);
             const compactionUser = createUserHistoryMessage(promptText, { synthetic: true });
             const compactionModelMessages = await convertToModelMessages([...withoutIds, compactionUser], { tools: {} });
@@ -964,7 +1008,9 @@ export class LingyunAgent {
             session.history.push(assistantMessage);
             const lastAssistantText = getMessageText(assistantMessage).trim();
             lastResponse = lastAssistantText || lastResponse;
-            markPrunableToolOutputs(session.history, this.compactionConfig);
+            if (this.compactionConfig.prune && this.compactionConfig.toolOutputMode === 'afterToolCall') {
+                markPreviousAssistantToolOutputs(session.history);
+            }
             await Promise.resolve(callbacksSafe?.onIterationEnd?.(iteration));
             const modelLimit = this.getModelLimit(modelId);
             const reservedOutputTokens = getReservedOutputTokens({ modelLimit, maxOutputTokens: this.getMaxOutputTokens() });
@@ -990,6 +1036,77 @@ export class LingyunAgent {
         callbacksSafe?.onComplete?.(lastResponse);
         return lastResponse;
     }
+    async injectSkillsForUserText(session, text, callbacks, signal) {
+        if (!this.skillsConfig.enabled)
+            return;
+        const mentions = extractSkillMentions(text);
+        if (mentions.length === 0)
+            return;
+        const index = await getSkillIndex({
+            workspaceRoot: this.workspaceRoot,
+            searchPaths: this.skillsConfig.paths,
+            allowExternalPaths: this.allowExternalPaths,
+            signal,
+        });
+        const { selected, unknown } = selectSkillsForText(text, index);
+        if (unknown.length > 0) {
+            const availableSample = index.skills
+                .map((s) => s.name)
+                .slice(0, 20);
+            const availableLabel = availableSample.length > 0
+                ? ` Available: ${availableSample.map((n) => `$${n}`).join(', ')}${index.skills.length > availableSample.length ? ', ...' : ''}`
+                : '';
+            callbacks?.onNotice?.({
+                level: 'warning',
+                message: `Unknown skills: ${unknown.map((n) => `$${n}`).join(', ')}.${availableLabel}`,
+            });
+        }
+        if (selected.length === 0)
+            return;
+        const maxSkills = this.skillsConfig.maxInjectSkills;
+        const maxChars = this.skillsConfig.maxInjectChars;
+        const selectedForInject = selected.slice(0, maxSkills);
+        const activeLabel = selectedForInject.map((s) => `$${s.name}`).join(', ');
+        const blocks = [];
+        if (activeLabel) {
+            blocks.push([
+                '<skills>',
+                `<active>${activeLabel}</active>`,
+                'You MUST apply ALL active skills for the next user request.',
+                'Treat skill instructions as additive. If they conflict, call it out and ask the user how to proceed (do not ignore a skill silently).',
+                '</skills>',
+            ].join('\n'));
+        }
+        for (const skill of selectedForInject) {
+            if (signal?.aborted)
+                break;
+            let body;
+            try {
+                body = (await loadSkillFile(skill)).content;
+            }
+            catch {
+                continue;
+            }
+            let truncated = false;
+            if (body.length > maxChars) {
+                body = body.slice(0, maxChars);
+                truncated = true;
+            }
+            blocks.push([
+                '<skill>',
+                `<name>${skill.name}</name>`,
+                `<path>${redactFsPathForPrompt(skill.filePath, { workspaceRoot: this.workspaceRoot })}</path>`,
+                body.trimEnd(),
+                truncated ? '\n\n... [TRUNCATED]' : '',
+                '</skill>',
+            ]
+                .filter(Boolean)
+                .join('\n'));
+        }
+        if (blocks.length > 0) {
+            session.history.push(createUserHistoryMessage(blocks.join('\n\n'), { synthetic: true, skill: true }));
+        }
+    }
     run(params) {
         const queue = new AsyncQueue();
         const callbacks = params.callbacks;
@@ -999,6 +1116,10 @@ export class LingyunAgent {
                 callbacks?.onDebug?.(message);
                 queue.push({ type: 'debug', message });
             },
+            onNotice: (notice) => {
+                callbacks?.onNotice?.(notice);
+                queue.push({ type: 'notice', notice });
+            },
             onStatusChange: (status) => {
                 callbacks?.onStatusChange?.(status);
                 queue.push({ type: 'status', status: status });
@@ -1041,6 +1162,7 @@ export class LingyunAgent {
         };
         const done = (async () => {
             try {
+                await this.injectSkillsForUserText(params.session, params.input, proxy, params.signal);
                 params.session.history.push(createUserHistoryMessage(params.input));
                 const text = await this.runOnce(params.session, proxy, params.signal);
                 queue.push({ type: 'status', status: { type: 'done', message: '' } });
@@ -1054,6 +1176,9 @@ export class LingyunAgent {
                 queue.fail(err);
                 throw err;
             }
+            finally {
+                params.session.history = params.session.history.filter((msg) => !(msg.role === 'user' && msg.metadata?.skill));
+            }
         })();
         return { events: queue, done };
     }