@nextclaw/kernel 0.6.4 → 0.6.5

package/dist/index.js

@@ -8904,16 +8904,6 @@ const createToolCallStyleContextProvider = () => staticBlock([
 	"Keep narration brief and value-dense; avoid repeating obvious steps.",
 	"Use plain human language for narration unless in a technical context."
 ]);
-const createInlineInteractiveSurfaceContextProvider = () => staticBlock([
-	"## Inline Interactive Surfaces",
-	"Do not make every UI an inline card. Choose inline only when the intended result is a compact, immediately usable card or short interaction; use the side panel for normal Panel Apps, long reading, rich editing, file browsing, large tables, multi-page workflows, or sustained workspaces.",
-	"Inline Panel App display is Markdown-only: in the final reply, output a `nextclaw-inline` fenced JSON block so the display remains message content.",
-	"`show_panel_app` is side-panel only. Never call `show_panel_app` for inline display, including when the user asks which Panel Apps are suitable for inline display or says \"show/display them inline\".",
-	"To open a local image or document in the side panel, call `show_file`; its automatic viewer handles supported visual formats, including SVG. When an image should appear in the final reply, prefer standard Markdown image syntax under the Reply Formatting Contract. `view_image` is only for giving the model visual input and is not a user-display action.",
-	"For ordinary local HTML files or page prototypes, call `show_file` with `path` and `viewer=\"rendered\"`; use `viewer=\"source\"` when the user needs to inspect source text. Markdown file links open source by default; append `?viewer=rendered` only when the link itself should open the rendered HTML view. Do not convert a plain HTML file into a Panel App just to preview it.",
-	"A Panel Card must be designed card-first: prefer a landscape composition where width carries the main information and the card is wider than it is tall; collapse to one column only in narrow containers. Core value must be visible in the first 220-420px, with no horizontal scrolling, no reliance on document-level internal scrolling, compact controls, at most one primary action, clear loading/empty/error states, and an obvious expand path for details.",
-	"Typical Panel Card fits: weather cards, calculators, timers, checklists, pickers, compact forms, previews, and small dashboards. If the UI needs more space than a card, use the side panel instead. Inline hosts may pass `nextclawDisplayMode=card` and `nextclawPlacement=inline`; use those hints to render a compact card layout instead of a full page."
-]);
 const createChatComposerTokensContextProvider = () => staticBlock([
 	"## Chat Composer Tokens",
 	"When a user message contains tokens like `$weather` or `$web-search`, treat each `$<skill-spec>` token as a user-visible marker that the corresponding skill was explicitly selected in the chat composer.",
@@ -9068,15 +9058,23 @@ var ProjectContextProvider = class {
 //#region src/contributions/context-provider/providers/reply-format-context.provider.ts
 var ReplyFormatContextProvider = class {
 	provide = (_request) => [[
-		"## Reply Formatting Contract",
-		"Goal: openable files in user-visible replies must be clickable, local images should appear directly in the reply when appropriate, and inert inline display declarations are only for content that should appear as part of the reply.",
-		"File links: use Markdown links only, with a plain text label and an openable href: [MEMORY.md](MEMORY.md), [report.docx](report.docx), [file](packages/example/file.ts), [notes.md](/Users/example/Documents/notes.md). Use project-relative hrefs for files under the active/session project root, and absolute hrefs for local files outside it. File links open source by default; supported visual and Office documents open their automatic preview. Use a viewer query such as [diagram.svg](diagram.svg?viewer=source) when source is explicitly required, or [preview.html](preview.html?viewer=rendered) when an HTML link should open rendered output.",
+		"## Agent Output & Reply Formatting Contract",
+		"Goal: make the directly visible final reply self-contained, concise, and easy to act on; make openable files clickable, show local images directly when appropriate, and use richer display surfaces only when they improve delivery.",
+		"Visible final reply: after a completed assistant turn, the UI collapses reasoning and tool activity through the last tool call under a Processed summary. Content after the last tool call remains directly visible. Therefore, after the final tool call, always write a self-contained final response with the outcome, important caveats, relevant links, and the next useful action. Do not put the final answer only before a tool call, and do not assume raw tool output remains directly visible.",
+		"Progress narration before or between tool calls may be brief and contextual, but do not repeat it in the final reply. The final reply must still make sense when all earlier narration and tool activity are collapsed.",
+		"Markdown structure: prefer short paragraphs. Use headings, lists, tables, blockquotes, and code blocks only when they materially improve scanning or comparison; do not over-format a simple answer. Keep link labels descriptive and plain, and place each link next to the claim or artifact it supports.",
+		"Mermaid diagrams: use a fenced `mermaid` block when a relationship, flow, sequence, state transition, or hierarchy is materially clearer as a diagram than as short prose or a small list. Keep diagrams focused, quote node labels that contain punctuation, and do not add a diagram merely because an answer has several steps.",
+		"File links: every concrete local file or directory mentioned in the final reply must be clickable. Use Markdown links only, with a plain text label and an openable href: [MEMORY.md](MEMORY.md), [report.docx](report.docx), [file](packages/example/file.ts), [notes.md](/Users/example/Documents/notes.md). Use project-relative hrefs for files under the active/session project root, and absolute hrefs for local files outside it. File links open source by default; supported visual and Office documents open their automatic preview. Use a viewer query such as [diagram.svg](diagram.svg?viewer=source) when source is explicitly required, or [preview.html](preview.html?viewer=rendered) when an HTML link should open rendered output.",
 		"Markdown syntax and resource availability are separate: emit a proper Markdown link even when you cannot verify that its target still exists. The UI will report missing or unavailable content when the user opens it; never downgrade a valid link to bare text preemptively.",
-		"Local images: prefer standard Markdown image syntax when the image should be visible in the reply: ![chart](assets/chart.png) or ![diagram](/Users/example/Pictures/diagram.svg). Local image hrefs follow the same project-relative or absolute path rules as file links. Do not invent an internal API URL or a file:// URL. Use show_file only when the file should immediately open in the side panel; use view_image only to give the model visual input.",
+		"Local images: prefer standard Markdown image syntax when the image should be visible in the reply: ![chart](assets/chart.png) or ![diagram](/Users/example/Pictures/diagram.svg). Local image hrefs follow the same project-relative or absolute path rules as file links. Do not invent an internal API URL or a file:// URL. Use `show_file` only when the file should immediately open in the side panel; `view_image` is only for giving the model visual input.",
+		"Display choice: Do not make every UI an inline card. Choose inline only for a compact, immediately usable card or short interaction. Use the side panel for normal Panel Apps, long reading, rich editing, file browsing, large tables, multi-page workflows, or sustained workspaces.",
 		"Inline display: when the final reply should include a non-clickable inline display placeholder, output a fenced `nextclaw-inline` JSON block:",
 		"```nextclaw-inline\n{\"target\":{\"type\":\"panel_app\",\"payload\":{\"appId\":\"timer\"}},\"title\":\"Timer\"}\n```",
 		"Supported targets are `panel_app`, `json`, `file`, and `url`. Prefer `panel_app` for inline Panel App display; use `file` and `url` only as non-clickable placeholders when a clickable link is not intended; use `json` for inert JSON snapshots.",
-		"It is display-only: no opening, executing, or tool action. Never call `show_panel_app` for inline display; `show_panel_app` is only for immediately opening a Panel App outside the final reply in the side panel. Use Markdown links for clickable resources and show_file/show_url/show_panel_app tools only when you want the UI to immediately show or run content outside the final reply.",
+		"Inline display is Markdown-only and display-only: no opening, executing, or tool action. Never call `show_panel_app` for inline display, including when the user asks which Panel Apps are suitable for inline display or says to show them inline. `show_panel_app` is only for immediately opening a Panel App outside the final reply in the side panel. Use Markdown links for clickable resources and `show_file` / `show_url` / `show_panel_app` only when the UI should immediately show or run content outside the final reply.",
+		"For ordinary local HTML files or page prototypes, call `show_file` with `path` and `viewer=\"rendered\"`; use `viewer=\"source\"` when the user needs source text. Markdown file links open source by default; append `?viewer=rendered` only when the link itself should open the rendered HTML view. Do not convert a plain HTML file into a Panel App just to preview it.",
+		"A Panel Card must be card-first: prefer a landscape composition where width carries the main information and the card is wider than it is tall; collapse to one column only in narrow containers. Core value must be visible in the first 220-420px, with no horizontal scrolling, no reliance on document-level internal scrolling, compact controls, at most one primary action, clear loading/empty/error states, and an obvious expand path for details.",
+		"Typical Panel Card fits: weather cards, calculators, timers, checklists, pickers, compact forms, previews, and small dashboards. If the UI needs more space than a card, use the side panel. Inline hosts may pass `nextclawDisplayMode=card` and `nextclawPlacement=inline`; use those hints to render a compact card layout instead of a full page.",
 		"Forbidden forms: bare file names or paths, inline-code file names, bold-only file names, code-styled link labels, code blocks for file references, file:// URLs, internal API URLs, action semantics inside `nextclaw-inline`, tool calls for inline display, and unlinked comma-separated file lists.",
 		"Examples: bad `MEMORY.md` -> good [MEMORY.md](MEMORY.md); bad `memory/` -> good [memory/](memory/); bad `report.docx` -> good [report.docx](report.docx); bad `/Users/example/chart.png` -> good ![chart](/Users/example/chart.png); bad `2026-03-07.md` / `feishu-notes.md` -> good [2026-03-07.md](memory/2026-03-07.md) / [feishu-notes.md](memory/feishu-notes.md).",
 		"Self-check before sending: scan the final visible reply for local file names, paths, and images. Make every concrete file clickable, render intended images with Markdown image syntax, or ensure it is intentionally represented by `nextclaw-inline`; otherwise remove the exact names and summarize instead."
@@ -9096,7 +9094,7 @@ function renderActiveSkillsSection(skills, skillSelectors) {
 	if (!manifest) return "";
 	return [
 		"# Active Skills",
-		"These always-on skills are already active for this session context.",
+		"These user-selected or always-on skills are active for this request.",
 		"If an active skill covers the user's intent, follow it before considering unrelated available skills.",
 		"For NextClaw self-management intents, read the built-in NextClaw self-management guide before loading any unrelated generic skill.",
 		"Skill refs are unique identities; names may repeat.",
@@ -9105,12 +9103,23 @@ function renderActiveSkillsSection(skills, skillSelectors) {
 		wrapSkillTag("active_skills", manifest)
 	].join("\n\n");
 }
+function renderSkillSourcesSection(params) {
+	return [
+		"## Skill Sources",
+		"Skills in <available_skills> are grouped by source.",
+		params.projectSkillsRoot ? `- project: project-only skills. When creating or updating a skill specifically for this active project, use \`${params.projectSkillsRoot}/<skill-name>/SKILL.md\`.` : "- project: no session-bound project is active, so do not invent a project skill location.",
+		`- workspace: skills installed for NextClaw in \`${params.hostWorkspace}/skills\`.`,
+		"- global: user-wide Agent Skills loaded from ~/.agents/skills.",
+		"- builtin: skills packaged with NextClaw.",
+		"A project's AGENTS.md is loaded separately in Agent Bootstrap Context; it is not a skill."
+	].join("\n");
+}
 function renderAvailableSkillsSection(skills) {
 	const summary = skills.buildSkillsSummary();
 	if (!summary) return "";
 	return [
 		"## Skills (mandatory)",
-		"Always-on skills in <active_skills> take precedence over this list.",
+		"User-selected and always-on skills in <active_skills> take precedence over this list.",
 		"Before replying: first check whether any entry in <available_skills> may be relevant to the user's intent, task type, or requested output. Do not skip this check just because the task seems familiar.",
 		"- If one skill looks like the best relevant match, read its SKILL.md at <location> with `read_file`, then decide whether following it is actually helpful.",
 		"- If a SKILL.md read says `Use offset=... to continue`, continue reading until the relevant trigger, required workflow, constraints, and output requirements are covered.",
@@ -9141,15 +9150,19 @@ var SkillsContextProvider = class {
 		this.context = context;
 	}
 	provide = async (request) => {
-		const { projectContext } = await this.context.resolve(request);
+		const { projectContext, runContext } = await this.context.resolve(request);
 		const skills = new SkillsLoader({
 			workspace: projectContext.hostWorkspace,
-			projectRoot: projectContext.projectRoot
+			projectRoot: projectContext.projectRoot,
+			includeGlobal: true
 		});
-		const blocks = [];
-		const alwaysSkills = skills.getAlwaysSkills();
-		if (alwaysSkills.length) {
-			const activeSection = renderActiveSkillsSection(skills, alwaysSkills);
+		const blocks = [renderSkillSourcesSection({
+			hostWorkspace: projectContext.hostWorkspace,
+			projectSkillsRoot: projectContext.projectSkillsRoot
+		})];
+		const activeSkills = [...runContext.requestedSkills.selectors, ...skills.getAlwaysSkills()];
+		if (activeSkills.length) {
+			const activeSection = renderActiveSkillsSection(skills, activeSkills);
 			if (activeSection) blocks.push(activeSection);
 		}
 		const availableSkillsSection = renderAvailableSkillsSection(skills);
@@ -9222,6 +9235,8 @@ function buildAgentRunRequestMetadata(params) {
 	const model = normalizeString(request.model ?? session?.model);
 	return {
 		...structuredClone(session?.metadata ?? {}),
+		...structuredClone(request.message.metadata ?? {}),
+		...structuredClone(request.metadata ?? {}),
 		agentId,
 		projectRoot,
 		project_root: projectRoot,
@@ -9333,7 +9348,6 @@ var ContextProviderContribution = class {
 			createAssistantIdentityContextProvider(),
 			new ToolingContextProvider(context),
 			createToolCallStyleContextProvider(),
-			createInlineInteractiveSurfaceContextProvider(),
 			createChatComposerTokensContextProvider(),
 			createSafetyContextProvider(),
 			createCliQuickReferenceContextProvider(),