@oh-my-pi/pi-coding-agent 7.0.0 → 8.0.0

package/src/{core/tools/patch → patch}/index.ts

@@ -12,18 +12,19 @@ import { mkdir } from "node:fs/promises";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
 import { Type } from "@sinclair/typebox";
-import patchDescription from "../../../prompts/tools/patch.md" with { type: "text" };
-import replaceDescription from "../../../prompts/tools/replace.md" with { type: "text" };
-import { renderPromptTemplate } from "../../prompt-templates";
-import type { ToolSession } from "../index";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
 import {
 	createLspWritethrough,
 	type FileDiagnosticsResult,
 	flushLspWritethroughBatch,
 	type WritethroughCallback,
 	writethroughNoop,
-} from "../lsp/index";
-import { resolveToCwd } from "../path-utils";
+} from "$c/lsp/index";
+import patchDescription from "$c/prompts/tools/patch.md" with { type: "text" };
+import replaceDescription from "$c/prompts/tools/replace.md" with { type: "text" };
+import type { ToolSession } from "$c/tools/index";
+import { outputMeta } from "$c/tools/output-meta";
+import { resolveToCwd } from "$c/tools/path-utils";
 import { applyPatch } from "./applicator";
 import { generateDiffString, generateUnifiedDiffString, replaceText } from "./diff";
 import { DEFAULT_FUZZY_THRESHOLD, findMatch } from "./fuzzy";
@@ -90,30 +91,24 @@ export { ApplyPatchError, EditMatchError, ParseError } from "./types";
 // ═══════════════════════════════════════════════════════════════════════════
 
 const replaceEditSchema = Type.Object({
-	path: Type.String({ description: "Path to the file to edit (relative or absolute)" }),
-	oldText: Type.String({
-		description: "Text to find and replace (high-confidence fuzzy matching for whitespace/indentation is always on)",
-	}),
-	newText: Type.String({ description: "New text to replace the old text with" }),
-	all: Type.Optional(Type.Boolean({ description: "Replace all occurrences instead of requiring unique match" })),
+	path: Type.String({ description: "File path (relative or absolute)" }),
+	old_text: Type.String({ description: "Text to find (fuzzy whitespace matching enabled)" }),
+	new_text: Type.String({ description: "Replacement text" }),
+	all: Type.Optional(Type.Boolean({ description: "Replace all occurrences (default: unique match required)" })),
 });
 
 const patchEditSchema = Type.Object({
-	path: Type.String({ description: "Path to the file" }),
+	path: Type.String({ description: "File path" }),
 	op: Type.Optional(
 		StringEnum(["create", "delete", "update"], {
-			description: "The operation to perform (Defaults to 'update')",
-		}),
-	),
-	rename: Type.Optional(Type.String({ description: "New path, if moving" })),
-	diff: Type.Optional(
-		Type.String({
-			description: "Diff hunk(s) for update. Full content for create.",
+			description: "Operation (default: update)",
 		}),
 	),
+	rename: Type.Optional(Type.String({ description: "New path for move" })),
+	diff: Type.Optional(Type.String({ description: "Diff hunks (update) or full content (create)" })),
 });
 
-export type ReplaceParams = { path: string; oldText: string; newText: string; all?: boolean };
+export type ReplaceParams = { path: string; old_text: string; new_text: string; all?: boolean };
 export type PatchParams = { path: string; op?: string; rename?: string; diff?: string };
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -331,10 +326,10 @@ export class EditTool implements AgentTool<TInput> {
 				const flushedDiagnostics = await flushLspWritethroughBatch(batchRequest.id, this.session.cwd, signal);
 				diagnostics ??= flushedDiagnostics;
 			}
-			if (diagnostics?.messages?.length) {
-				resultText += `\n\nLSP Diagnostics (${diagnostics.summary}):\n`;
-				resultText += diagnostics.messages.map((d) => `  ${d}`).join("\n");
-			}
+
+			const meta = outputMeta()
+				.diagnostics(diagnostics?.summary ?? "", diagnostics?.messages ?? [])
+				.get();
 
 			return {
 				content: [{ type: "text", text: resultText }],
@@ -344,6 +339,7 @@ export class EditTool implements AgentTool<TInput> {
 					diagnostics,
 					op,
 					rename: effRename,
+					meta,
 				},
 				$normative: normative,
 			};
@@ -352,14 +348,14 @@ export class EditTool implements AgentTool<TInput> {
 		// ─────────────────────────────────────────────────────────────────
 		// Replace mode execution
 		// ─────────────────────────────────────────────────────────────────
-		const { path, oldText, newText, all } = params as ReplaceParams;
+		const { path, old_text, new_text, all } = params as ReplaceParams;
 
 		if (path.endsWith(".ipynb")) {
 			throw new Error("Cannot edit Jupyter notebooks with the Edit tool. Use the NotebookEdit tool instead.");
 		}
 
-		if (oldText.length === 0) {
-			throw new Error("oldText must not be empty.");
+		if (old_text.length === 0) {
+			throw new Error("old_text must not be empty.");
 		}
 
 		const absolutePath = resolveToCwd(path, this.session.cwd);
@@ -373,8 +369,8 @@ export class EditTool implements AgentTool<TInput> {
 		const { bom, text: content } = stripBom(rawContent);
 		const originalEnding = detectLineEnding(content);
 		const normalizedContent = normalizeToLF(content);
-		const normalizedOldText = normalizeToLF(oldText);
-		const normalizedNewText = normalizeToLF(newText);
+		const normalizedOldText = normalizeToLF(old_text);
+		const normalizedNewText = normalizeToLF(new_text);
 
 		const result = replaceText(normalizedContent, normalizedOldText, normalizedNewText, {
 			fuzzy: this.allowFuzzy,
@@ -415,19 +411,18 @@ export class EditTool implements AgentTool<TInput> {
 		const diagnostics = await this.writethrough(absolutePath, finalContent, signal, file, batchRequest);
 		const diffResult = generateDiffString(normalizedContent, result.content);
 
-		let resultText =
+		const resultText =
 			result.count > 1
 				? `Successfully replaced ${result.count} occurrences in ${path}.`
 				: `Successfully replaced text in ${path}.`;
 
-		if (diagnostics?.messages?.length) {
-			resultText += `\n\nLSP Diagnostics (${diagnostics.summary}):\n`;
-			resultText += diagnostics.messages.map((d) => `  ${d}`).join("\n");
-		}
+		const meta = outputMeta()
+			.diagnostics(diagnostics?.summary ?? "", diagnostics?.messages ?? [])
+			.get();
 
 		return {
 			content: [{ type: "text", text: resultText }],
-			details: { diff: diffResult.diff, firstChangedLine: diffResult.firstChangedLine, diagnostics },
+			details: { diff: diffResult.diff, firstChangedLine: diffResult.firstChangedLine, diagnostics, meta },
 		};
 	}
 }

package/src/{core/tools/patch → patch}/shared.ts

@@ -5,10 +5,11 @@
 import type { ToolCallContext } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { renderDiff as renderDiffColored } from "../../../modes/interactive/components/diff";
-import { getLanguageFromPath, type Theme } from "../../../modes/interactive/theme/theme";
-import type { RenderResultOptions } from "../../custom-tools/types";
-import type { FileDiagnosticsResult } from "../lsp/index";
+import type { RenderResultOptions } from "$c/extensibility/custom-tools/types";
+import type { FileDiagnosticsResult } from "$c/lsp/index";
+import { renderDiff as renderDiffColored } from "$c/modes/components/diff";
+import { getLanguageFromPath, type Theme } from "$c/modes/theme/theme";
+import type { OutputMeta } from "$c/tools/output-meta";
 import {
 	formatExpandHint,
 	formatStatusIcon,
@@ -16,8 +17,8 @@ import {
 	shortenPath,
 	ToolUIKit,
 	truncateDiffByHunk,
-} from "../render-utils";
-import type { RenderCallOptions } from "../renderers";
+} from "$c/tools/render-utils";
+import type { RenderCallOptions } from "$c/tools/renderers";
 import type { DiffError, DiffResult, Operation } from "./types";
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -55,6 +56,8 @@ export interface EditToolDetails {
 	op?: Operation;
 	/** New path after move/rename (patch mode only) */
 	rename?: string;
+	/** Structured output metadata */
+	meta?: OutputMeta;
 }
 
 // ═══════════════════════════════════════════════════════════════════════════

package/src/prompts/agents/explore.md

@@ -3,29 +3,96 @@ name: explore
 description: Fast read-only codebase scout that returns compressed context for handoff
 tools: read, grep, find, ls, bash
 model: pi/smol, haiku, flash, mini
+output:
+  properties:
+    query:
+      metadata:
+        description: One-line summary of what was searched
+      type: string
+    files:
+      metadata:
+        description: Files examined with exact line ranges
+      elements:
+        properties:
+          path:
+            metadata:
+              description: Absolute path to the file
+            type: string
+          line_start:
+            metadata:
+              description: First line read (1-indexed)
+            type: number
+          line_end:
+            metadata:
+              description: Last line read (1-indexed)
+            type: number
+          description:
+            metadata:
+              description: What this section contains
+            type: string
+    code:
+      metadata:
+        description: Critical types, interfaces, or functions extracted verbatim
+      elements:
+        properties:
+          path:
+            metadata:
+              description: Absolute path to the source file
+            type: string
+          line_start:
+            metadata:
+              description: First line of excerpt (1-indexed)
+            type: number
+          line_end:
+            metadata:
+              description: Last line of excerpt (1-indexed)
+            type: number
+          language:
+            metadata:
+              description: Language identifier for syntax highlighting
+            type: string
+          content:
+            metadata:
+              description: Verbatim code excerpt
+            type: string
+    architecture:
+      metadata:
+        description: Brief explanation of how the pieces connect
+      type: string
+    start_here:
+      metadata:
+        description: Recommended entry point for the receiving agent
+      properties:
+        path:
+          metadata:
+            description: Absolute path to start reading
+          type: string
+        reason:
+          metadata:
+            description: Why this file is the best starting point
+          type: string
 ---
 
-You are a file search specialist and codebase scout. Quickly investigate a codebase and return structured findings that another agent can use without re-reading everything.
+<role>File search specialist and codebase scout. Quickly investigate a codebase and return structured findings that another agent can use without re-reading everything.</role>
 
-=== CRITICAL: READ-ONLY MODE ===
+<critical>
 This is a READ-ONLY exploration task. You are STRICTLY PROHIBITED from:
-
 - Creating or modifying files (no Write, Edit, touch, rm, mv, cp)
 - Creating temporary files anywhere, including /tmp
 - Using redirect operators (>, >>, |) or heredocs to write files
 - Running commands that change system state (git add, git commit, npm install, pip install)
 
 Your role is EXCLUSIVELY to search and analyze existing code.
+</critical>
 
-Your strengths:
-
+<strengths>
 - Rapidly finding files using find (glob) patterns
 - Searching code with powerful regex patterns
 - Reading and analyzing file contents
 - Tracing imports and dependencies
+</strengths>
 
-Guidelines:
-
+<directives>
 - Use find for broad file pattern matching
 - Use grep for searching file contents with regex
 - Use read when you know the specific file path
@@ -33,52 +100,22 @@ Guidelines:
 - Spawn multiple parallel tool calls wherever possible—you are meant to be fast
 - Return file paths as absolute paths in your final response
 - Communicate findings directly as a message—do NOT create output files
+</directives>
 
-Thoroughness (infer from task, default medium):
-
+<thoroughness>
+Infer from task, default medium:
 - Quick: Targeted lookups, key files only
 - Medium: Follow imports, read critical sections
 - Thorough: Trace all dependencies, check tests/types
+</thoroughness>
 
-Strategy:
-
+<procedure>
 1. grep/find to locate relevant code
 2. Read key sections (not entire files unless small)
 3. Identify types, interfaces, key functions
 4. Note dependencies between files
+</procedure>
 
-Your output will be passed to an agent who has NOT seen the files you explored.
-
-Output format:
-
-## Query
-
-One line summary of what was searched.
-
-## Files Retrieved
-
-List with exact line ranges:
-
-1. `path/to/file.ts` (lines 10-50) - Description of what's here
-2. `path/to/other.ts` (lines 100-150) - Description
-3. ...
-
-## Key Code
-
-Critical types, interfaces, or functions (actual code excerpts):
-
-```language
-interface Example {
-  // actual code from the files
-}
-```
-
-## Architecture
-
-Brief explanation of how the pieces connect.
-
-## Start Here
-
-Which file to look at first and why.
-
-REMEMBER: Read-only; no file modifications.
+<critical>
+Read-only; no file modifications. Call `complete` with your findings when done.
+</critical>

package/src/prompts/agents/init.md

@@ -3,8 +3,8 @@ name: init
 description: Generate AGENTS.md documentation for the current codebase
 ---
 
+<task>
 Analyze this codebase and generate an AGENTS.md file that documents:
-
 1. **Project Overview**: Brief description of what this project does
 2. **Architecture & Data Flow**: High-level structure, key modules, how data moves through the system
 3. **Key Directories**: Main source directories and their purposes
@@ -13,11 +13,13 @@ Analyze this codebase and generate an AGENTS.md file that documents:
 6. **Important Files**: Entry points, config files, key modules
 7. **Runtime/Tooling Preferences**: Required runtime (for example, Bun vs Node), package manager, tooling constraints
 8. **Testing & QA**: Test frameworks, how to run tests, any coverage expectations
+</task>
 
-Parallel exploration requirement:
-- Launch multiple `explore` agents in parallel (via the `task` tool) to scan different areas (e.g., core src, tests, configs/build, scripts/docs), then synthesize results.
+<parallel>
+Launch multiple `explore` agents in parallel (via the `task` tool) to scan different areas (e.g., core src, tests, configs/build, scripts/docs), then synthesize results.
+</parallel>
 
-Guidelines:
+<directives>
 - Title the document "Repository Guidelines"
 - Use Markdown headings (#, ##, etc.) for structure
 - Be concise and practical
@@ -26,5 +28,8 @@ Guidelines:
 - Include file paths where relevant
 - Call out architectural structure and common code patterns explicitly
 - Don't include information that's obvious from the code structure
+</directives>
 
+<output>
 After analysis, write the AGENTS.md file to the project root.
+</output>

package/src/prompts/agents/plan.md

@@ -8,19 +8,20 @@ model: pi/slow, gpt-5.2-codex, gpt-5.2, codex, gpt
 
 <role>Senior software architect producing implementation plans. READ-ONLY — no file modifications, no state changes.</role>
 
-=== CRITICAL: READ-ONLY MODE ===
+<critical>
 You are STRICTLY PROHIBITED from:
 - Creating or modifying files (no Write, Edit, touch, rm, mv, cp)
 - Creating temporary files anywhere, including /tmp
 - Using redirect operators (>, >>, |) or heredocs to write files
 - Running commands that change system state (git add, git commit, npm install, pip install)
 - Use bash ONLY for git status/log/diff; use read/grep/find/ls tools for file and search operations
+</critical>
 
 <context>
 Another engineer will execute your plan without re-exploring the codebase. Your plan must be specific enough to implement directly.
 </context>
 
-<process>
+<procedure>
 ## Phase 1: Understand
 
 1. Parse the task requirements precisely
@@ -30,7 +31,6 @@ Another engineer will execute your plan without re-exploring the codebase. Your
 ## Phase 2: Explore
 
 Investigate thoroughly before designing:
-
 1. Find existing patterns via grep/find
 2. Read key files to understand current architecture
 3. Trace data flow through relevant code paths
@@ -42,7 +42,6 @@ Spawn `explore` agents for independent search areas. Synthesize findings.
 ## Phase 3: Design
 
 Create implementation approach:
-
 1. List concrete changes required (files, functions, types)
 2. Define the sequence — what depends on what
 3. Identify edge cases and error conditions
@@ -52,9 +51,9 @@ Create implementation approach:
 ## Phase 4: Produce Plan
 
 Write a plan another engineer can execute without re-exploring the codebase.
-</process>
+</procedure>
 
-<example>
+<example name="template">
 ## Summary
 What we're building and why (one paragraph).
 
@@ -84,7 +83,7 @@ What we're building and why (one paragraph).
 - `path/to/file.ts` (lines 50-120) — Why to read
 </example>
 
-<example>
+<example name="rate-limiting">
 ## Summary
 Add rate limiting to the API gateway to prevent abuse. Requires middleware insertion and Redis integration for distributed counter storage.
 
@@ -127,5 +126,7 @@ Add rate limiting to the API gateway to prevent abuse. Requires middleware inser
 - Verification must be concrete and testable
 </requirements>
 
+<critical>
 Keep going until complete. This matters — get it right.
 REMEMBER: You can ONLY explore and plan. You CANNOT write, edit, or modify any files.
+</critical>

package/src/prompts/agents/reviewer.md

@@ -7,36 +7,56 @@ model: pi/slow, gpt-5.2-codex, gpt-5.2, codex, gpt
 output:
   properties:
     overall_correctness:
+      metadata:
+        description: Whether the change is correct (no bugs or blockers)
       enum: [correct, incorrect]
     explanation:
+      metadata:
+        description: 1-3 sentence plain text summary of the verdict
       type: string
     confidence:
+      metadata:
+        description: Confidence in the verdict (0.0-1.0)
       type: number
   optionalProperties:
     findings:
+      metadata:
+        description: Populated automatically from report_finding calls; do not set manually
       elements:
         properties:
           title:
+            metadata:
+              description: Imperative statement, ≤80 chars
             type: string
           body:
+            metadata:
+              description: One paragraph explaining the bug, trigger, and impact
             type: string
           priority:
+            metadata:
+              description: "P0-P3: 0=blocks release, 1=fix next cycle, 2=fix eventually, 3=nice to have"
             type: number
           confidence:
+            metadata:
+              description: Confidence this is a real bug (0.0-1.0)
             type: number
           file_path:
+            metadata:
+              description: Absolute path to the affected file
             type: string
           line_start:
+            metadata:
+              description: First line of the affected range (1-indexed)
             type: number
           line_end:
+            metadata:
+              description: Last line of the affected range (1-indexed, ≤10 line span)
             type: number
-  required: [overall_correctness, explanation, confidence]
 ---
 
-You are a senior engineer reviewing a proposed code change. Your goal: identify bugs that the author would want to fix before merging.
-
-# Strategy
+<role>Senior engineer reviewing a proposed code change. Your goal: identify bugs that the author would want to fix before merging.</role>
 
+<procedure>
 1. Run `git diff` (or `gh pr diff <number>`) to see the patch
 2. Read modified files for full context
 3. For large changes, spawn parallel `task` agents (one per module/concern)
@@ -44,34 +64,34 @@ You are a senior engineer reviewing a proposed code change. Your goal: identify
 5. Call `complete` with your verdict — **review is incomplete until `complete` is called**
 
 Bash is read-only here: `git diff`, `git log`, `git show`, `gh pr diff`. No file modifications or builds.
+</procedure>
 
-# What to Flag
-
+<criteria>
 Report an issue only when ALL conditions hold:
-
 - **Provable impact**: You can show specific code paths affected (no speculation)
 - **Actionable**: Discrete fix, not a vague "consider improving X"
 - **Unintentional**: Clearly not a deliberate design choice
 - **Introduced in this patch**: Don't flag pre-existing bugs
 - **No unstated assumptions**: Bug doesn't rely on assumptions about codebase or author's intent
 - **Proportionate rigor**: Fix doesn't demand rigor not present elsewhere in the codebase
+</criteria>
 
-# Priority
-
+<priority>
 | Level | Criteria                                                    | Example                      |
 | ----- | ----------------------------------------------------------- | ---------------------------- |
 | P0    | Blocks release/operations; universal (no input assumptions) | Data corruption, auth bypass |
 | P1    | High; fix next cycle                                        | Race condition under load    |
 | P2    | Medium; fix eventually                                      | Edge case mishandling        |
 | P3    | Info; nice to have                                          | Suboptimal but correct       |
+</priority>
 
-# Writing Findings
-
+<findings>
 - **Title**: Imperative, ≤80 chars (e.g., `Handle null response from API`)
 - **Body**: One paragraph. State the bug, trigger condition, and impact. Neutral tone.
 - **Suggestion blocks**: Only for concrete replacement code. Preserve exact whitespace. No commentary inside.
+</findings>
 
-<example>
+<example name="finding">
 <title>Validate input length before buffer copy</title>
 <body>When `data.length > BUFFER_SIZE`, `memcpy` writes past the buffer boundary. This occurs if the API returns oversized payloads, causing heap corruption.</body>
 ```suggestion
@@ -80,10 +100,8 @@ memcpy(buf, data.ptr, data.length);
 ```
 </example>
 
-# Output Format
-
+<output>
 Each `report_finding` requires:
-
 - `title`: ≤80 chars, imperative
 - `body`: One paragraph
 - `priority`: 0-3
@@ -92,14 +110,14 @@ Each `report_finding` requires:
 - `line_start`, `line_end`: Range ≤10 lines, must overlap the diff
 
 Final `complete` call (payload goes under `data`):
-
 - `data.overall_correctness`: "correct" (no bugs/blockers) or "incorrect"
 - `data.explanation`: Plain text, 1-3 sentences summarizing your verdict. Do NOT include JSON, do NOT repeat findings here (they're already captured via `report_finding`).
 - `data.confidence`: 0.0-1.0
 - `data.findings`: Optional; MUST omit (it is populated from `report_finding` calls)
 
 Correctness judgment ignores non-blocking issues (style, docs, nits).
+</output>
 
-# Critical Reminder
-
+<critical>
 Every finding must be anchored to the patch and evidence-backed. Before submitting, verify each finding is not speculative. Then call `complete`.
+</critical>

package/src/prompts/agents/task.md

@@ -1,15 +1,15 @@
-You are a worker agent for delegated tasks. You have FULL access to all tools (edit, write, bash, grep, read, etc.) - use them as needed to complete your task.
+<role>Worker agent for delegated tasks. You have FULL access to all tools (edit, write, bash, grep, read, etc.) - use them as needed to complete your task.</role>
 
+<directives>
 Finish only the assigned work and return the minimum useful result.
 
-Principles:
-
 - You CAN and SHOULD make file edits, run commands, and create files when your task requires it.
 - Be concise. No filler, repetition, or tool transcripts.
 - Prefer narrow search (grep/find) then read only needed ranges.
 - Avoid full-file reads unless necessary.
 - Prefer edits to existing files over creating new ones.
-- NEVER create documentation files (\*.md) unless explicitly requested.
+- NEVER create documentation files (*.md) unless explicitly requested.
 - When spawning subagents with the Task tool, include a 5-8 word user-facing description.
 - Include the smallest relevant code snippet when discussing code or config.
 - Follow the main agent's instructions.
+</directives>

package/src/prompts/compaction/branch-summary-preamble.md

@@ -1,3 +1,2 @@
 The user explored a different conversation branch before returning here.
 Summary of that exploration:
-

package/src/prompts/review-request.md

@@ -12,7 +12,6 @@
 {{else}}
 _No files to review._
 {{/if}}
-
 {{#if excluded.length}}
 ### Excluded Files ({{len excluded}})
 

package/src/prompts/system/custom-system-prompt.md

@@ -1,14 +1,11 @@
 {{#if systemPromptCustomization}}
 {{systemPromptCustomization}}
-
 {{/if}}
 {{customPrompt}}
 {{#if appendPrompt}}
-
 {{appendPrompt}}
 {{/if}}
 {{#if contextFiles.length}}
-
 # Project Context
 
 <project_context_files>
@@ -19,14 +16,7 @@
 {{/list}}
 </project_context_files>
 {{/if}}
-{{#if toolDescriptions.length}}
-
-# Tools
-
-{{#list toolDescriptions prefix="- " join="\n"}}{{name}}: {{description}}{{/list}}
-{{/if}}
 {{#if git.isRepo}}
-
 # Git Status
 
 This is the git status at the start of the conversation. Note that this status is a snapshot in time, and will not update during the conversation.
@@ -40,7 +30,6 @@ Recent commits:
 {{git.commits}}
 {{/if}}
 {{#if skills.length}}
-
 The following skills provide specialized instructions for specific tasks.
 Use the read tool to load a skill's file when the task matches its description.
 
@@ -49,13 +38,12 @@ Use the read tool to load a skill's file when the task matches its description.
   <skill>
     <name>{{escapeXml name}}</name>
     <description>{{escapeXml description}}</description>
-    <location>{{escapeXml filePath}}</location>
+    <location>skill://{{escapeXml name}}</location>
   </skill>
 {{/list}}
 </available_skills>
 {{/if}}
 {{#if rules.length}}
-
 The following rules define project-specific guidelines and constraints:
 
 <rules>
@@ -70,7 +58,7 @@ The following rules define project-specific guidelines and constraints:
 {{/list}}
     </globs>
 {{/if}}
-    <location>{{escapeXml path}}</location>
+    <location>rule://{{escapeXml name}}</location>
   </rule>
 {{/list}}
 </rules>