diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 62aa7a7..0f6df85 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -588,11 +588,12 @@ export default function App() {
   } else if (selectedSession && patternForSession && projectForSession) {
     content = (
         <ChatPane
-          onSend={(c, attachments, messageMode) => api.sendSessionMessage({
+          onSend={(c, attachments, messageMode, promptInvocation) => api.sendSessionMessage({
             sessionId: selectedSession.id,
             content: c,
             attachments: attachments?.length ? attachments : undefined,
             messageMode,
+            promptInvocation,
           })}
           onCancelTurn={() => { void api.cancelSessionTurn({ sessionId: selectedSession.id }); }}
           onResolveApproval={(approvalId, decision, alwaysApprove) =>
diff --git a/src/renderer/components/ChatPane.tsx b/src/renderer/components/ChatPane.tsx
index b55f7bc..e9c6ee5 100644
--- a/src/renderer/components/ChatPane.tsx
+++ b/src/renderer/components/ChatPane.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { AlertCircle, ArrowUp, Bookmark, Bot, Circle, ClipboardList, GitBranch, Loader2, MessageCircleQuestion, Paperclip, RefreshCw, ShieldAlert, Square, User, X } from 'lucide-react';
+import { AlertCircle, ArrowUp, Bookmark, Bot, ChevronDown, ChevronRight, Circle, ClipboardList, FileText, GitBranch, Loader2, MessageCircleQuestion, Paperclip, RefreshCw, ShieldAlert, Square, User, X } from 'lucide-react';
 
 import { MarkdownContent } from '@renderer/components/MarkdownContent';
 import { MarkdownComposer, type MarkdownComposerHandle } from '@renderer/components/MarkdownComposer';
@@ -30,6 +30,7 @@ import {
 import { type PatternDefinition, type ReasoningEffort } from '@shared/domain/pattern';
 import { isScratchpadProject, type ProjectRecord } from '@shared/domain/project';
 import { resolveSessionToolingSelection, type ChatMessageRecord, type SessionBranchOriginAction, type SessionRecord } from '@shared/domain/session';
+import type { ProjectPromptInvocation } from '@shared/domain/projectCustomization';
 import {
   countApprovedToolsInGroups,
   groupApprovalToolsByProvider,
@@ -59,7 +60,7 @@ interface ChatPaneProps {
   terminalRunning?: boolean;
   gitPanelOpen?: boolean;
   gitDirty?: boolean;
-  onSend: (content: string, attachments?: ChatMessageAttachment[], messageMode?: MessageMode) => Promise<void>;
+  onSend: (content: string, attachments?: ChatMessageAttachment[], messageMode?: MessageMode, promptInvocation?: ProjectPromptInvocation) => Promise<void>;
   onCancelTurn?: () => void;
   onResolveApproval?: (approvalId: string, decision: ApprovalDecision, alwaysApprove?: boolean) => Promise<unknown>;
   onResolveUserInput?: (userInputId: string, answer: string, wasFreeform: boolean) => Promise<unknown>;
@@ -504,6 +505,8 @@ export function ChatPane({
                               onSave={(content) => handleEditSave(message.id, content)}
                               onCancel={() => setEditingMessageId(undefined)}
                             />
+                          ) : isUser && message.promptInvocation ? (
+                            <PromptInvocationChrome invocation={message.promptInvocation} />
                           ) : (
                             <div
                               className={
@@ -783,7 +786,7 @@ export function ChatPane({
                   {!isScratchpad && promptFiles.length > 0 && (
                     <InlinePromptPill
                       disabled={isComposerDisabled}
-                      onSubmit={(content) => void onSend(content)}
+                      onSubmit={(promptInvocation) => void onSend('', undefined, undefined, promptInvocation)}
                       promptFiles={promptFiles}
                     />
                   )}
@@ -928,6 +931,54 @@ export function ChatPane({
   );
 }
 
+/* ── Prompt invocation chrome ───────────────────────────────── */
+
+function PromptInvocationChrome({ invocation }: { invocation: ProjectPromptInvocation }) {
+  const [expanded, setExpanded] = useState(false);
+
+  return (
+    <div className="rounded-xl border border-[var(--color-status-success)]/20 bg-[var(--color-status-success)]/5 px-4 py-3">
+      <button
+        className="flex w-full items-center gap-2.5 text-left"
+        onClick={() => setExpanded(!expanded)}
+        type="button"
+        aria-expanded={expanded}
+      >
+        <FileText className="size-3.5 shrink-0 text-[var(--color-status-success)]" />
+        <span className="flex-1 text-[13px] font-medium text-[var(--color-text-primary)]">
+          {invocation.name}
+        </span>
+        <div className="flex items-center gap-1.5">
+          {invocation.agent && (
+            <span className="rounded bg-[var(--color-accent-sky)]/15 px-1.5 py-0.5 text-[9px] font-semibold uppercase tracking-wider text-[var(--color-accent-sky)]">
+              {invocation.agent}
+            </span>
+          )}
+          {invocation.tools && invocation.tools.length > 0 && (
+            <span className="rounded bg-[var(--color-status-warning)]/10 px-1.5 py-0.5 text-[10px] font-medium text-[var(--color-status-warning)]">
+              {invocation.tools.length} tool{invocation.tools.length === 1 ? '' : 's'}
+            </span>
+          )}
+          {expanded
+            ? <ChevronDown className="size-3.5 text-[var(--color-text-muted)]" />
+            : <ChevronRight className="size-3.5 text-[var(--color-text-muted)]" />}
+        </div>
+      </button>
+      {invocation.description && (
+        <p className="mt-1 pl-6 text-[11px] text-[var(--color-text-muted)]">{invocation.description}</p>
+      )}
+      <p className="mt-0.5 pl-6 text-[10px] text-[var(--color-text-muted)]">{invocation.sourcePath}</p>
+      {expanded && (
+        <div className="mt-2.5 rounded-lg border border-[var(--color-border)] bg-[var(--color-surface-1)] p-3">
+          <div className="max-h-48 overflow-y-auto text-[12px] leading-relaxed text-[var(--color-text-secondary)]">
+            <MarkdownContent content={invocation.resolvedPrompt} />
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+
 /* ── Branch origin banner ───────────────────────────────────── */
 
 function BranchOriginBanner({ action, label }: { action?: SessionBranchOriginAction; label?: string }) {
diff --git a/src/renderer/components/ProjectSettingsPanel.tsx b/src/renderer/components/ProjectSettingsPanel.tsx
index 6d5fea2..8282528 100644
--- a/src/renderer/components/ProjectSettingsPanel.tsx
+++ b/src/renderer/components/ProjectSettingsPanel.tsx
@@ -578,6 +578,11 @@ function PromptCard({ prompt }: { prompt: ProjectPromptFile }) {
         <div className="min-w-0 flex-1">
           <div className="flex items-center gap-2">
             <span className="text-[13px] font-medium text-[var(--color-text-primary)]">{prompt.name}</span>
+            {prompt.agent && (
+              <span className="rounded-full bg-[var(--color-accent-sky)]/15 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wider text-[var(--color-accent-sky)]">
+                {prompt.agent}
+              </span>
+            )}
             {prompt.variables.length > 0 && (
               <span className="rounded-full bg-[var(--color-surface-3)] px-2 py-0.5 text-[10px] font-medium text-[var(--color-text-muted)]">
                 {prompt.variables.length} variable{prompt.variables.length === 1 ? '' : 's'}
@@ -587,6 +592,18 @@ function PromptCard({ prompt }: { prompt: ProjectPromptFile }) {
           {prompt.description && (
             <p className="mt-1 text-[12px] leading-relaxed text-[var(--color-text-muted)]">{prompt.description}</p>
           )}
+          {prompt.tools && prompt.tools.length > 0 && (
+            <div className="mt-2 flex flex-wrap gap-1.5">
+              {prompt.tools.map((tool) => (
+                <span
+                  key={tool}
+                  className="rounded-md bg-[var(--color-status-warning)]/10 px-2 py-0.5 text-[10px] font-medium text-[var(--color-status-warning)]"
+                >
+                  {tool}
+                </span>
+              ))}
+            </div>
+          )}
           {prompt.variables.length > 0 && (
             <div className="mt-2 flex flex-wrap gap-1.5">
               {prompt.variables.map((v) => (
diff --git a/src/renderer/components/chat/InlinePromptPill.tsx b/src/renderer/components/chat/InlinePromptPill.tsx
index 8a6822c..5341fda 100644
--- a/src/renderer/components/chat/InlinePromptPill.tsx
+++ b/src/renderer/components/chat/InlinePromptPill.tsx
@@ -2,7 +2,7 @@ import { useCallback, useMemo, useState } from 'react';
 import { ArrowUp, FileText, X } from 'lucide-react';
 
 import { useClickOutside } from '@renderer/hooks/useClickOutside';
-import type { ProjectPromptFile, ProjectPromptVariable } from '@shared/domain/projectCustomization';
+import type { ProjectPromptFile, ProjectPromptInvocation, ProjectPromptVariable } from '@shared/domain/projectCustomization';
 
 const promptVariablePattern = /\$\{input:([a-zA-Z0-9_-]+):[^}]+\}/g;
 
@@ -12,6 +12,21 @@ function resolvePromptTemplate(template: string, values: Record<string, string>)
   });
 }
 
+function buildPromptInvocation(prompt: ProjectPromptFile, resolvedTemplate: string): ProjectPromptInvocation {
+  const invocation: ProjectPromptInvocation = {
+    id: prompt.id,
+    name: prompt.name,
+    sourcePath: prompt.sourcePath,
+    resolvedPrompt: resolvedTemplate,
+  };
+
+  if (prompt.description) invocation.description = prompt.description;
+  if (prompt.agent) invocation.agent = prompt.agent;
+  if (prompt.tools?.length) invocation.tools = prompt.tools;
+
+  return invocation;
+}
+
 export function InlinePromptPill({
   promptFiles,
   disabled,
@@ -19,7 +34,7 @@ export function InlinePromptPill({
 }: {
   promptFiles: ReadonlyArray<ProjectPromptFile>;
   disabled: boolean;
-  onSubmit: (resolvedContent: string) => void;
+  onSubmit: (invocation: ProjectPromptInvocation) => void;
 }) {
   const [open, setOpen] = useState(false);
   const [selectedPrompt, setSelectedPrompt] = useState<ProjectPromptFile | null>(null);
@@ -34,7 +49,7 @@ export function InlinePromptPill({
 
   const handleSelectPrompt = useCallback((prompt: ProjectPromptFile) => {
     if (prompt.variables.length === 0) {
-      onSubmit(prompt.template.trim());
+      onSubmit(buildPromptInvocation(prompt, prompt.template.trim()));
       handleClose();
     } else {
       setSelectedPrompt(prompt);
@@ -46,7 +61,7 @@ export function InlinePromptPill({
     if (!selectedPrompt) return;
     const resolved = resolvePromptTemplate(selectedPrompt.template, variableValues).trim();
     if (!resolved) return;
-    onSubmit(resolved);
+    onSubmit(buildPromptInvocation(selectedPrompt, resolved));
     handleClose();
   }, [selectedPrompt, variableValues, onSubmit, handleClose]);
 
@@ -127,26 +142,36 @@ function PromptList({
         >
           <FileText className="mt-0.5 size-3.5 shrink-0 text-[var(--color-text-muted)]" />
           <div className="min-w-0 flex-1">
-            <div className="truncate text-[12px] font-medium text-[var(--color-text-primary)]">
-              {prompt.name}
+            <div className="flex items-center gap-1.5">
+              <span className="truncate text-[12px] font-medium text-[var(--color-text-primary)]">
+                {prompt.name}
+              </span>
+              {prompt.agent && (
+                <span className="shrink-0 rounded bg-[var(--color-accent-sky)]/15 px-1.5 py-0.5 text-[9px] font-semibold uppercase tracking-wider text-[var(--color-accent-sky)]">
+                  {prompt.agent}
+                </span>
+              )}
             </div>
             {prompt.description && (
               <div className="mt-0.5 truncate text-[11px] text-[var(--color-text-muted)]">
                 {prompt.description}
               </div>
             )}
-            {prompt.variables.length > 0 && (
-              <div className="mt-1 flex flex-wrap gap-1">
-                {prompt.variables.map((v) => (
-                  <span
-                    key={v.name}
-                    className="rounded bg-[var(--color-surface-2)] px-1.5 py-0.5 text-[10px] text-[var(--color-text-muted)]"
-                  >
-                    {v.name}
-                  </span>
-                ))}
-              </div>
-            )}
+            <div className="mt-1 flex flex-wrap gap-1">
+              {prompt.tools && prompt.tools.length > 0 && (
+                <span className="rounded bg-[var(--color-status-warning)]/10 px-1.5 py-0.5 text-[10px] font-medium text-[var(--color-status-warning)]">
+                  {prompt.tools.length} tool{prompt.tools.length === 1 ? '' : 's'}
+                </span>
+              )}
+              {prompt.variables.map((v) => (
+                <span
+                  key={v.name}
+                  className="rounded bg-[var(--color-surface-2)] px-1.5 py-0.5 text-[10px] text-[var(--color-text-muted)]"
+                >
+                  {v.name}
+                </span>
+              ))}
+            </div>
           </div>
         </button>
       ))}