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

package/src/prompts/tools/task.md

@@ -1,63 +1,65 @@
-Launch a new agent to handle complex, multi-step tasks autonomously.
+# Task
 
-The Task tool launches specialized agents (workers) that autonomously handle complex tasks. Each agent type has specific capabilities and tools available to it.
+Launch a new agent to handle complex, multi-step tasks autonomously. Each agent type has specific capabilities and tools available to it.
 
-**CRITICAL: Subagents have NO access to conversation history.** They only see:
-1. Their agent-specific system prompt
-2. The `context` string you provide
-3. The `task` string you provide
-
-If you discussed requirements, plans, schemas, or decisions with the user, you MUST include that information in `context`. Subagents cannot see prior messages - they start fresh with only what you explicitly pass them.
-
-## Available Agents
-
-{{#list agents prefix="- " join="\n"}}
-{{name}}: {{description}} (Tools: {{default (join tools ", ") "All tools"}}{{#if output}}, Output: structured{{/if}})
+<agents>
+{{#list agents join="\n"}}
+<agent name="{{name}}"{{#if output}} output="structured"{{/if}}>
+<description>{{description}}</description>
+<tools>{{default (join tools ", ") "All tools"}}</tools>
+</agent>
 {{/list}}
-{{#if moreAgents}}
-  ...and {{moreAgents}} more agents
-{{/if}}
-
-Agents with "Output: structured" have a fixed schema enforced via frontmatter; your `output` parameter will be ignored for these agents.
-
-## When NOT to Use
-
-- Reading a specific file path → Use Read tool instead
-- Finding files by pattern/name → Use Find tool instead
-- Searching for a specific class/function definition → Use Grep tool instead
-- Searching code within 2-3 specific files → Use Read tool instead
-- Tasks unrelated to the agent descriptions above
 
-## Usage Notes
+Agents with `output="structured"` have a fixed schema enforced via frontmatter; your `output` parameter will be ignored for these agents.
+</agents>
 
+<instruction>
 - Always include a short description of the task in the task parameter
 - **Plan-then-execute**: Put shared constraints in `context`, keep each task focused, specify acceptance criteria; use `output` when you need structured output
 - **Ask open-ended questions**: For exploration tasks, frame prompts to elicit factual discovery, not confirmation. Avoid yes/no questions that are easy to hallucinate.
-  - Bad: "Is there rate limiting?" or "Does the API validate tokens?" → Binary answers invite hallucination
-  - Good: "Find and describe how rate limiting is implemented" or "How does the API handle token validation?" → Forces investigation and factual reporting
+    - Bad: "Is there rate limiting?" or "Does the API validate tokens?" → Binary answers invite hallucination
+    - Good: "Find and describe how rate limiting is implemented" or "How does the API handle token validation?" → Forces investigation and factual reporting
   - The subagent should report *what exists*, then YOU verify if it meets requirements
-- **Minimize tool chatter**: Avoid repeating large context; use Output tool with output ids for full logs
+- **Minimize tool chatter**: Avoid repeating large context; use `read agent://<id>` for full logs
 - **Structured completion**: If `output` is provided, subagents must call `complete` to finish
 - **Parallelize**: Launch multiple agents whenever possible. You MUST use a single Task call with multiple entries in the `tasks` array to do this.
 - **Isolate file scopes**: Assign each task distinct files or directories so agents don't conflict
 - **Results are intermediate data**: Agent findings provide context for YOU to perform actual work. Do not treat agent reports as "task complete" signals.
-- **Stateless invocations**: Subagents have zero memory of your conversation. Pass ALL relevant context: requirements discussed, decisions made, schemas agreed upon, file paths mentioned. If you reference something from earlier discussion without including it, the subagent will fail.
 - **Trust outputs**: Agent results should generally be trusted
 - **Clarify intent**: Tell the agent whether you expect code changes or just research (search, file reads, web fetches)
 - **Proactive use**: If an agent description says to use it proactively, do so without waiting for explicit user request
+</instruction>
 
-## Parameters
-
+<parameters>
 - `agent`: Agent type to use for all tasks
-- `context`: Template with `{{placeholders}}` for multi-task. Each placeholder is filled from task vars.
-- `model`: (optional) Model override for all tasks (fuzzy matching, e.g., "sonnet", "opus")
-- `tasks`: Array of `{id, description, vars}` - tasks to run in parallel (max {{MAX_PARALLEL_TASKS}}, {{MAX_CONCURRENCY}} concurrent)
-  - `id`: Short CamelCase identifier for display (max 20 chars, e.g., "SessionStore", "LspRefactor")
-  - `description`: Short human-readable description of what the task does
-  - `vars`: Object with keys matching `{{placeholders}}` in context
+- `context`: Template with `\{{placeholders}}` for multi-task. Each placeholder is filled from task args. `\{{id}}` and `\{{description}}` are always available.
+- `isolated`: (optional) Run each task in its own git worktree and return patches; patches are applied only if all apply cleanly.
+- `tasks`: Array of `{id, description, args}` - tasks to run in parallel
+		- `id`: Short CamelCase identifier (max 32 chars, e.g., "SessionStore", "LspRefactor")
+		- `description`: Short human-readable description of what the task does
+		- `args`: Object with keys matching `\{{placeholders}}` in context (always include this, even if empty)
 - `output`: (optional) JTD schema for structured subagent output (used by the complete tool)
+</parameters>
+
+<output>
+Returns task results for each spawned agent:
+- Truncated preview of agent output (use `read agent://<id>` for full content if truncated)
+- Summary with line/character counts
+- For agents with `output` schema: structured JSON accessible via `agent://<id>?q=<query>` or `agent://<id>/<path>`
+
+Results are keyed by task `id` (e.g., "AuthProvider", "AuthApi").
+</output>
+
+<critical>
+**Subagents have NO access to conversation history.** They only see:
+1. Their agent-specific system prompt
+2. The `context` string you provide
+3. The `task` string you provide
 
-## Example
+If you discussed requirements, plans, schemas, or decisions with the user, you MUST include that information in `context`. Subagents cannot see prior messages—they start fresh with only what you explicitly pass them.
+
+**Never call Task multiple times in parallel.** Use a single Task call with multiple entries in the `tasks` array. Parallel Task calls waste resources and bypass coordination.
+</critical>
 
 <example>
 user: "Looks good, execute the plan"
@@ -65,7 +67,7 @@ assistant: I'll execute the refactoring plan.
 assistant: Uses the Task tool:
 {
   "agent": "task",
-  "context": "Refactoring the auth module into separate concerns.\n\nPlan:\n1. AuthProvider - Extract React context and provider from src/auth/index.tsx\n2. AuthApi - Extract API calls to src/auth/api.ts, use existing fetchJson helper\n3. AuthTypes - Move types to types.ts, re-export from index\n\nConstraints:\n- Preserve all existing exports from src/auth/index.tsx\n- Use project's fetchJson (src/utils/http.ts), don't use raw fetch\n- No new dependencies\n\nTask: {{step}}\n\nFiles: {{files}}",
+  "context": "Refactoring the auth module into separate concerns.\n\nPlan:\n1. AuthProvider - Extract React context and provider from src/auth/index.tsx\n2. AuthApi - Extract API calls to src/auth/api.ts, use existing fetchJson helper\n3. AuthTypes - Move types to types.ts, re-export from index\n\nConstraints:\n- Preserve all existing exports from src/auth/index.tsx\n- Use project's fetchJson (src/utils/http.ts), don't use raw fetch\n- No new dependencies\n\nTask: \{{step}}\n\nFiles: \{{files}}",
   "output": {
     "properties": {
       "summary": { "type": "string" },
@@ -74,9 +76,17 @@ assistant: Uses the Task tool:
     }
   },
   "tasks": [
-    { "id": "AuthProvider", "description": "Extract React context", "vars": { "step": "Execute step 1: Extract AuthProvider and AuthContext", "files": "src/auth/index.tsx" } },
-    { "id": "AuthApi", "description": "Extract API layer", "vars": { "step": "Execute step 2: Extract API calls to api.ts", "files": "src/auth/api.ts" } },
-    { "id": "AuthTypes", "description": "Extract types", "vars": { "step": "Execute step 3: Move types to types.ts", "files": "src/auth/types.ts" } }
+    { "id": "AuthProvider", "description": "Extract React context", "args": { "step": "Execute step 1: Extract AuthProvider and AuthContext", "files": "src/auth/index.tsx" } },
+    { "id": "AuthApi", "description": "Extract API layer", "args": { "step": "Execute step 2: Extract API calls to api.ts", "files": "src/auth/api.ts" } },
+    { "id": "AuthTypes", "description": "Extract types", "args": { "step": "Execute step 3: Move types to types.ts", "files": "src/auth/types.ts" } }
   ]
 }
 </example>
+
+<avoid>
+- Reading a specific file path → Use Read tool instead
+- Finding files by pattern/name → Use Find tool instead
+- Searching for a specific class/function definition → Use Grep tool instead
+- Searching code within 2-3 specific files → Use Read tool instead
+- Tasks unrelated to the agent descriptions above
+</avoid>

package/src/prompts/tools/todo-write.md

@@ -1,10 +1,9 @@
-Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
-It also helps the user understand the progress of the task and overall progress of their requests.
+# Todo Write
 
-## When to Use This Tool
+Create and manage a structured task list for your current coding session.
 
+<conditions>
 Use this tool proactively in these scenarios:
-
 1. Complex multi-step tasks - When a task requires 3 or more distinct steps or actions
 2. Non-trivial and complex tasks - Tasks that require careful planning or multiple operations
 3. User explicitly requests todo list - When the user directly asks you to use the todo list
@@ -12,176 +11,66 @@ Use this tool proactively in these scenarios:
 5. After receiving new instructions - Immediately capture user requirements as todos
 6. When you start working on a task - Mark it as in_progress BEFORE beginning work. Ideally you should only have one todo as in_progress at a time
 7. After completing a task - Mark it as completed and add any new follow-up tasks discovered during implementation
+</conditions>
 
-## When NOT to Use This Tool
-
-Skip using this tool when:
-
-1. There is only a single, straightforward task
-2. The task is trivial and tracking it provides no organizational benefit
-3. The task can be completed in less than 3 trivial steps
-4. The task is purely conversational or informational
-
-NOTE that you should not use this tool if there is only one trivial task to do. In this case you are better off just doing the task directly.
-
-## Examples of When to Use the Todo List
-
-<example>
-User: I want to add a dark mode toggle to the application settings. Make sure you run the tests and build when you're done!
-Assistant: I'll help add a dark mode toggle to your application settings. Let me create a todo list to track this implementation.
-*Creates todo list with the following items:*
-1. Creating dark mode toggle component in Settings page
-2. Adding dark mode state management (context/store)
-3. Implementing CSS-in-JS styles for dark theme
-4. Updating existing components to support theme switching
-5. Running tests and build process, addressing any failures or errors that occur
-*Begins working on the first task*
-
-<reasoning>
-The assistant used the todo list because:
-1. Adding dark mode is a multi-step feature requiring UI, state management, and styling changes
-2. The user explicitly requested tests and build be run afterward
-3. The assistant inferred that tests and build need to pass by adding "Ensure tests and build succeed" as the final task
-</reasoning>
-</example>
-
-<example>
-User: Help me rename the function getCwd to getCurrentWorkingDirectory across my project
-Assistant: Let me first search through your codebase to find all occurrences of 'getCwd'.
-*Uses grep or search tools to locate all instances of getCwd in the codebase*
-Assistant: I've found 15 instances of 'getCwd' across 8 different files. Let me create a todo list to track these changes.
-*Creates todo list with specific items for each file that needs updating*
-
-<reasoning>
-The assistant used the todo list because:
-1. First, the assistant searched to understand the scope of the task
-2. Upon finding multiple occurrences across different files, it determined this was a complex task with multiple steps
-3. The todo list helps ensure every instance is tracked and updated systematically
-4. This approach prevents missing any occurrences and maintains code consistency
-</reasoning>
-</example>
-
-<example>
-User: I need to implement these features for my e-commerce site: user registration, product catalog, shopping cart, and checkout flow.
-Assistant: I'll help implement these features. First, let's add all the features to the todo list.
-*Creates a todo list breaking down each feature into specific tasks based on the project architecture*
-Assistant: Let's start with user registration. This will involve creating database models, API endpoints, and frontend forms that integrate with your existing authentication system.
-
-<reasoning>
-The assistant used the todo list because:
-1. The user provided multiple complex features to implement in a comma separated list
-2. The todo list helps organize these large features into manageable tasks
-3. This approach allows for tracking progress across the entire implementation
-</reasoning>
-</example>
-
-<example>
-User: Can you help optimize my React application? It's rendering slowly and has performance issues.</user>
-Assistant: I'll help optimize your React application. First, let me examine your codebase to identify potential performance bottlenecks.
-*Reviews component structure, render patterns, state management, and data fetching*
-Assistant: After analyzing your codebase, I've identified several performance issues. Let me create a todo list to track our optimization efforts.
-*Creates todo list with items like: 1) Implementing memoization for expensive calculations in ProductList, 2) Adding virtualization for long lists in Dashboard, 3) Optimizing image loading in Gallery component, 4) Fixing state update loops in ShoppingCart, 5) Reviewing bundle size and implementing code splitting*
-Let's start by implementing memoization for the expensive calculations in your ProductList component.</assistant>
-
-<reasoning>
-The assistant used the todo list because:
-1. First, the assistant examined the codebase to identify specific performance issues
-2. Based on this analysis, it identified multiple optimization opportunities
-3. Performance optimization is a non-trivial task requiring multiple steps
-4. The todo list helps methodically track improvements across different components
-5. This systematic approach ensures all performance bottlenecks are addressed
-</reasoning>
-</example>
+<protocol>
+1. **Task States**: Use these states to track progress:
+	 - pending: Task not yet started
+	 - in_progress: Currently working on (limit to ONE task at a time)
+	 - completed: Task finished successfully
 
-## Examples of When NOT to Use the Todo List
+2. **Task Management**:
+	 - Update task status in real-time as you work
+	 - Mark tasks complete IMMEDIATELY after finishing (don't batch completions)
+	 - Exactly ONE task must be in_progress at any time (not less, not more)
+	 - Complete current tasks before starting new ones
+	 - Remove tasks that are no longer relevant from the list entirely
 
-<example>
-User: How do I print 'Hello World' in Python?
-Assistant: In Python, you can print "Hello World" with this simple code:
+3. **Task Completion Requirements**:
+	 - ONLY mark a task as completed when you have FULLY accomplished it
+	 - If you encounter errors, blockers, or cannot finish, keep the task as in_progress
+	 - When blocked, create a new task describing what needs to be resolved
+	 - Never mark a task as completed if:
+	   - Tests are failing
+	   - Implementation is partial
+	   - You encountered unresolved errors
+	   - You couldn't find necessary files or dependencies
 
-python
-print("Hello World")
+4. **Task Breakdown**:
+	 - Create specific, actionable items
+	 - Break complex tasks into smaller, manageable steps
+	 - Use clear, descriptive task names
+</protocol>
 
-This will output the text "Hello World" to the console when executed.</assistant>
+<output>
+Returns confirmation that the todo list has been updated. The updated list is displayed to the user in the UI, showing each task's status (pending, in_progress, completed) and description.
+</output>
 
-<reasoning>
-The assistant did not use the todo list because this is a single, trivial task that can be completed in one step. There's no need to track multiple tasks or steps for such a straightforward request.
-</reasoning>
-</example>
-
-<example>
-User: What does the git status command do?
-Assistant: The git status command shows the current state of your working directory and staging area. It displays which changes have been staged, which haven't, and which files aren't being tracked by Git. This is a fundamental command for understanding the current state of your repository before making commits.
+<important>
+When in doubt, use this tool. Being proactive with task management demonstrates attentiveness and ensures you complete all requirements successfully.
+</important>
 
-<reasoning>
-The assistant did not use the todo list because this is an informational request with no actual coding task to complete. The user is simply asking for an explanation, not for the assistant to perform multiple steps or tasks.
-</reasoning>
+<example name="use-dark-mode">
+User: Add dark mode toggle to settings. Run tests when done.
+→ Creates todos: toggle component, state management, theme styles, update components, run tests
 </example>
 
-<example>
-User: Can you add a comment to the calculateTotal function to explain what it does?
-Assistant: Sure, let me add a comment to the calculateTotal function to explain what it does.
-* Uses the ${EDIT_TOOL_NAME} tool to add a comment to the calculateTotal function *
-
-<reasoning>
-The assistant did not use the todo list because this is a single, straightforward task confined to one location in the code. Adding a comment doesn't require tracking multiple steps or systematic organization.
-</reasoning>
+<example name="use-features">
+User: Implement user registration, product catalog, shopping cart, checkout.
+→ Creates todos for each feature, broken into subtasks
 </example>
 
-<example>
-User: Run npm install for me and tell me what happens.
-Assistant: I'll run the npm install command for you.
-
-_Executes: npm install_
-
-The command completed successfully. Here's the output:
-[Output of npm install command]
-
-All dependencies have been installed according to your package.json file.
-
-<reasoning>
-The assistant did not use the todo list because this is a single command execution with immediate results. There are no multiple steps to track or organize, making the todo list unnecessary for this straightforward task.
-</reasoning>
+<example name="skip">
+User: Run npm install / Add a comment to this function / What does git status do?
+→ Just do it directly. Single-step or informational tasks don't need tracking.
 </example>
 
-## Task States and Management
-
-1. **Task States**: Use these states to track progress:
-
-   - pending: Task not yet started
-   - in_progress: Currently working on (limit to ONE task at a time)
-   - completed: Task finished successfully
-
-   **IMPORTANT**: Task descriptions must have two forms:
-
-   - content: The imperative form describing what needs to be done (e.g., "Run tests", "Build the project")
-   - activeForm: The present continuous form shown during execution (e.g., "Running tests", "Building the project")
-
-2. **Task Management**:
-
-   - Update task status in real-time as you work
-   - Mark tasks complete IMMEDIATELY after finishing (don't batch completions)
-   - Exactly ONE task must be in_progress at any time (not less, not more)
-   - Complete current tasks before starting new ones
-   - Remove tasks that are no longer relevant from the list entirely
-
-3. **Task Completion Requirements**:
-
-   - ONLY mark a task as completed when you have FULLY accomplished it
-   - If you encounter errors, blockers, or cannot finish, keep the task as in_progress
-   - When blocked, create a new task describing what needs to be resolved
-   - Never mark a task as completed if:
-     - Tests are failing
-     - Implementation is partial
-     - You encountered unresolved errors
-     - You couldn't find necessary files or dependencies
-
-4. **Task Breakdown**:
-   - Create specific, actionable items
-   - Break complex tasks into smaller, manageable steps
-   - Use clear, descriptive task names
-   - Always provide both forms:
-     - content: "Fix authentication bug"
-     - activeForm: "Fixing authentication bug"
+<avoid>
+Skip using this tool when:
+1. There is only a single, straightforward task
+2. The task is trivial and tracking it provides no organizational benefit
+3. The task can be completed in less than 3 trivial steps
+4. The task is purely conversational or informational
 
-When in doubt, use this tool. Being proactive with task management demonstrates attentiveness and ensures you complete all requirements successfully.
+If there is only one trivial task to do, just do it directly.
+</avoid>

package/src/prompts/tools/web-search.md

@@ -1,12 +1,19 @@
-Allows OMP to search the web and use the results to inform responses
-- Provides up-to-date information for current events and recent data
-- Returns search result information formatted as search result blocks, including links as markdown hyperlinks
-- Use this tool for accessing information beyond Claude's knowledge cutoff
-- Searches are performed automatically within a single API call
+# Web Search
+
+Search the web for up-to-date information beyond Claude's knowledge cutoff.
+
+<instruction>
 - Prefer primary sources (papers, official docs) and corroborate key claims with multiple sources
 - Include links for cited sources in the final response
+</instruction>
+
+<output>
+Returns search results formatted as blocks with:
+- Result summaries and relevant excerpts
+- Links as markdown hyperlinks for citation
+- Provider-dependent structure based on selected backend
+</output>
 
-Common: system_prompt (guides response style)
-Anthropic-specific: max_tokens
-Perplexity-specific: model (sonar/sonar-pro), search_recency_filter, search_domain_filter, search_context_size, return_related_questions
-Exa-specific: num_results
+<important>
+Searches are performed automatically within a single API call—no pagination or follow-up requests needed.
+</important>

package/src/prompts/tools/write.md

@@ -1,10 +1,21 @@
+# Write
+
 Creates or overwrites a file at the specified path.
 
-When to use:
+<conditions>
 - Creating new files explicitly required by the task
 - Replacing entire file contents when editing would be more complex
+</conditions>
+
+<output>
+Confirmation of file creation/write with path. When LSP is available, content may be auto-formatted before writing and diagnostics are returned. Returns error if write fails (permissions, invalid path, disk full).
+</output>
 
-Critical requirements:
+<critical>
 - Prefer Edit tool for modifying existing files (more precise, preserves formatting)
 - Create documentation files (*.md, README) only when explicitly requested
+</critical>
+
+<important>
 - Include emojis only when explicitly requested
+</important>

package/src/{core/sdk.ts → sdk.ts}

@@ -33,20 +33,25 @@ import type { Component } from "@oh-my-pi/pi-tui";
 // Import discovery to register all providers on startup
 import { logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-import { loadCapability } from "../capability/index";
-import { type Rule, ruleCapability } from "../capability/rule";
-import { getAgentDir, getConfigDirPaths } from "../config";
-import "../discovery";
-import { initializeWithSettings } from "../discovery";
-import { AgentSession } from "./agent-session";
-import { AuthStorage } from "./auth-storage";
-import { CursorExecHandlers } from "./cursor/exec-bridge";
+import { loadCapability } from "$c/capability/index";
+import { type Rule, ruleCapability } from "$c/capability/rule";
+import { getAgentDir, getConfigDirPaths } from "$c/config";
+import "./discovery";
+import { CursorExecHandlers } from "$c/cursor";
+import { initializeWithSettings } from "$c/discovery";
+import { TtsrManager } from "$c/export/ttsr";
+import { disposeAllKernelSessions } from "$c/ipy/executor";
+import { closeAllConnections } from "$c/ssh/connection-manager";
+import { unmountAll } from "$c/ssh/sshfs-mount";
+import { ModelRegistry } from "./config/model-registry";
+import { formatModelString, parseModelString } from "./config/model-resolver";
+import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./config/prompt-templates";
+import { type Settings, SettingsManager, type SkillsSettings } from "./config/settings-manager";
 import {
 	type CustomCommandsLoadResult,
 	loadCustomCommands as loadCustomCommandsInternal,
-} from "./custom-commands/index";
-import type { CustomTool, CustomToolContext, CustomToolSessionEvent } from "./custom-tools/types";
-import { EventBus } from "./event-bus";
+} from "./extensibility/custom-commands/index";
+import type { CustomTool, CustomToolContext, CustomToolSessionEvent } from "./extensibility/custom-tools/types";
 import {
 	discoverAndLoadExtensions,
 	type ExtensionContext,
@@ -59,25 +64,26 @@ import {
 	loadExtensions,
 	type ToolDefinition,
 	wrapRegisteredTools,
-} from "./extensions/index";
+} from "./extensibility/extensions/index";
+import { loadSkills as loadSkillsInternal, type Skill, type SkillWarning } from "./extensibility/skills";
+import { type FileSlashCommand, loadSlashCommands as loadSlashCommandsInternal } from "./extensibility/slash-commands";
+import {
+	AgentProtocolHandler,
+	ArtifactProtocolHandler,
+	InternalUrlRouter,
+	RuleProtocolHandler,
+	SkillProtocolHandler,
+} from "./internal-urls";
 import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp/index";
-import { convertToLlm } from "./messages";
-import { ModelRegistry } from "./model-registry";
-import { formatModelString, parseModelString } from "./model-resolver";
-import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./prompt-templates";
-import { disposeAllKernelSessions } from "./python-executor";
-import { SessionManager } from "./session-manager";
-import { type Settings, SettingsManager, type SkillsSettings } from "./settings-manager";
-import { loadSkills as loadSkillsInternal, type Skill, type SkillWarning } from "./skills";
-import { type FileSlashCommand, loadSlashCommands as loadSlashCommandsInternal } from "./slash-commands";
-import { closeAllConnections } from "./ssh/connection-manager";
-import { unmountAll } from "./ssh/sshfs-mount";
-import { migrateJsonStorage } from "./storage-migration";
+import { AgentSession } from "./session/agent-session";
+import { AuthStorage } from "./session/auth-storage";
+import { convertToLlm } from "./session/messages";
+import { SessionManager } from "./session/session-manager";
+import { migrateJsonStorage } from "./session/storage-migration";
 import {
 	buildSystemPrompt as buildSystemPromptInternal,
 	loadProjectContextFiles as loadContextFilesInternal,
 } from "./system-prompt";
-import { time } from "./timings";
 import { ToolContextStore } from "./tools/context";
 import { getGeminiImageTools } from "./tools/gemini-image";
 import {
@@ -99,7 +105,9 @@ import {
 	WriteTool,
 	warmupLspServers,
 } from "./tools/index";
-import { TtsrManager } from "./ttsr";
+import { wrapToolsWithMetaNotice } from "./tools/output-meta";
+import { EventBus } from "./utils/event-bus";
+import { time } from "./utils/timings";
 
 // Types
 export interface CreateAgentSessionOptions {
@@ -193,20 +201,20 @@ export interface CreateAgentSessionResult {
 
 // Re-exports
 
-export type { CustomCommand, CustomCommandFactory } from "./custom-commands/types";
-export type { CustomTool, CustomToolFactory } from "./custom-tools/types";
+export type { PromptTemplate } from "$c/config/prompt-templates";
+export type { Settings, SkillsSettings } from "$c/config/settings-manager";
+export type { CustomCommand, CustomCommandFactory } from "$c/extensibility/custom-commands/types";
+export type { CustomTool, CustomToolFactory } from "$c/extensibility/custom-tools/types";
 export type {
 	ExtensionAPI,
 	ExtensionCommandContext,
 	ExtensionContext,
 	ExtensionFactory,
 	ToolDefinition,
-} from "./extensions/index";
+} from "$c/extensibility/extensions/index";
+export type { Skill } from "$c/extensibility/skills";
+export type { FileSlashCommand } from "$c/extensibility/slash-commands";
 export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp/index";
-export type { PromptTemplate } from "./prompt-templates";
-export type { Settings, SkillsSettings } from "./settings-manager";
-export type { Skill } from "./skills";
-export type { FileSlashCommand } from "./slash-commands";
 export type { Tool } from "./tools/index";
 
 export {
@@ -703,7 +711,30 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		modelRegistry,
 	};
 
-	const builtinTools = await createTools(toolSession, options.toolNames);
+	// Initialize internal URL router for agent:// and skill:// URLs
+	const internalRouter = new InternalUrlRouter();
+	const getArtifactsDir = () => {
+		const sessionFile = sessionManager.getSessionFile();
+		return sessionFile ? sessionFile.slice(0, -6) : null; // strip .jsonl
+	};
+	internalRouter.register(new AgentProtocolHandler({ getArtifactsDir }));
+	internalRouter.register(new ArtifactProtocolHandler({ getArtifactsDir }));
+	internalRouter.register(
+		new SkillProtocolHandler({
+			getSkills: () => skills,
+		}),
+	);
+	internalRouter.register(
+		new RuleProtocolHandler({
+			getRules: () => rulebookRules,
+		}),
+	);
+	toolSession.internalRouter = internalRouter;
+	toolSession.getArtifactsDir = getArtifactsDir;
+
+	// Create and wrap tools with meta notice formatting
+	const rawBuiltinTools = await createTools(toolSession, options.toolNames);
+	const builtinTools = wrapToolsWithMetaNotice(rawBuiltinTools);
 	time("createAllTools");
 
 	// Discover MCP tools from .mcp.json files