@psnext/slingcli 2.4.20260507-3 → 2.4.20260509-1

package/node_modules/{@mariozechner/pi-agent-core/node_modules/@mariozechner → @earendil-works}/pi-ai/dist/utils/overflow.js

@@ -13,6 +13,7 @@
  * - xAI: "This model's maximum prompt length is 131072 but the request contains 537812 tokens"
  * - Groq: "Please reduce the length of the messages or completion"
  * - OpenRouter: "This endpoint's maximum context length is X tokens. However, you requested about Y tokens"
+ * - Together AI: "The input (X tokens) is longer than the model's context length (Y tokens)."
  * - llama.cpp: "the request exceeds the available context size, try increasing it"
  * - LM Studio: "tokens to keep from the initial prompt is greater than the context length"
  * - GitHub Copilot: "prompt token count of X exceeds the limit of Y"
@@ -35,6 +36,7 @@ const OVERFLOW_PATTERNS = [
     /maximum prompt length is \d+/i, // xAI (Grok)
     /reduce the length of the messages/i, // Groq
     /maximum context length is \d+ tokens/i, // OpenRouter (all backends)
+    /input \(\d+ tokens\) is longer than the model'?s context length \(\d+ tokens\)/i, // Together AI
     /exceeds the limit of \d+/i, // GitHub Copilot
     /exceeds the available context size/i, // llama.cpp server
     /greater than the context length/i, // LM Studio
@@ -82,6 +84,7 @@ const NON_OVERFLOW_PATTERNS = [
  * - Cerebras: 400/413 status code (no body)
  * - Mistral: "Prompt contains X tokens ... too large for model with Y maximum context length"
  * - OpenRouter (all backends): "maximum context length is X tokens"
+ * - Together AI: "The input (X tokens) is longer than the model's context length (Y tokens)."
  * - llama.cpp: "exceeds the available context size"
  * - LM Studio: "greater than the context length"
  * - Kimi For Coding: "exceeded model token limit: X (requested: Y)"

package/node_modules/{@mariozechner/pi-agent-core/node_modules/@mariozechner → @earendil-works}/pi-ai/package.json

@@ -1,6 +1,6 @@
 {
-	"name": "@mariozechner/pi-ai",
-	"version": "0.72.1",
+	"name": "@earendil-works/pi-ai",
+	"version": "0.74.0",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -61,7 +61,8 @@
 	"scripts": {
 		"clean": "shx rm -rf dist",
 		"generate-models": "npx tsx scripts/generate-models.ts",
-		"build": "npm run generate-models && tsgo -p tsconfig.build.json",
+		"generate-image-models": "npx tsx scripts/generate-image-models.ts",
+		"build": "npm run generate-models && npm run generate-image-models && tsgo -p tsconfig.build.json",
 		"dev": "tsgo -p tsconfig.build.json --watch --preserveWatchOutput",
 		"dev:tsc": "tsgo -p tsconfig.build.json --watch --preserveWatchOutput",
 		"test": "vitest --run",
@@ -94,7 +95,7 @@
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/badlogic/pi-mono.git",
+		"url": "git+https://github.com/earendil-works/pi-mono.git",
 		"directory": "packages/ai"
 	},
 	"engines": {

package/node_modules/@earendil-works/pi-coding-agent/dist/bun/register-bedrock.js

@@ -0,0 +1,4 @@
+import { setBedrockProviderModule } from "@earendil-works/pi-ai";
+import { bedrockProviderModule } from "@earendil-works/pi-ai/bedrock-provider";
+setBedrockProviderModule(bedrockProviderModule);
+//# sourceMappingURL=register-bedrock.js.map

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/cli/args.js

@@ -300,6 +300,7 @@ ${chalk.bold("Environment Variables:")}
   CEREBRAS_API_KEY                 - Cerebras API key
   XAI_API_KEY                      - xAI Grok API key
   FIREWORKS_API_KEY                - Fireworks API key
+  TOGETHER_API_KEY                 - Together AI API key
   OPENROUTER_API_KEY               - OpenRouter API key
   AI_GATEWAY_API_KEY               - Vercel AI Gateway API key
   ZAI_API_KEY                      - ZAI API key

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/cli/config-selector.js

@@ -1,7 +1,7 @@
 /**
  * TUI config selector for `pi config` command
  */
-import { ProcessTerminal, TUI } from "@mariozechner/pi-tui";
+import { ProcessTerminal, TUI } from "@earendil-works/pi-tui";
 import { ConfigSelectorComponent } from "../modes/interactive/components/config-selector.js";
 import { initTheme, stopThemeWatcher } from "../modes/interactive/theme/theme.js";
 /** Show TUI config selector and return when closed */

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/cli/list-models.js

@@ -1,7 +1,7 @@
 /**
  * List available models with optional fuzzy search
  */
-import { fuzzyFilter } from "@mariozechner/pi-tui";
+import { fuzzyFilter } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { formatNoModelsAvailableMessage } from "../core/auth-guidance.js";
 /**

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/cli/session-picker.js

@@ -1,7 +1,7 @@
 /**
  * TUI session selector for --resume flag
  */
-import { ProcessTerminal, setKeybindings, TUI } from "@mariozechner/pi-tui";
+import { ProcessTerminal, setKeybindings, TUI } from "@earendil-works/pi-tui";
 import { KeybindingsManager } from "../core/keybindings.js";
 import { SessionSelectorComponent } from "../modes/interactive/components/session-selector.js";
 /** Show TUI session selector and return selected session path or null if cancelled */

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/config.js

@@ -16,6 +16,22 @@ const __dirname = dirname(__filename);
 export const isBunBinary = import.meta.url.includes("$bunfs") || import.meta.url.includes("~BUN") || import.meta.url.includes("%7EBUN");
 /** Detect if Bun is the runtime (compiled binary or bun run) */
 export const isBunRuntime = !!process.versions.bun;
+function makeSelfUpdateCommand(installStep, uninstallStep) {
+    if (!uninstallStep)
+        return installStep;
+    return {
+        ...installStep,
+        display: `${uninstallStep.display} && ${installStep.display}`,
+        steps: [uninstallStep, installStep],
+    };
+}
+function makeSelfUpdateCommandStep(command, args) {
+    return {
+        command,
+        args,
+        display: [command, ...args].map((arg) => (/\s/.test(arg) ? `"${arg}"` : arg)).join(" "),
+    };
+}
 export function detectInstallMethod() {
     if (isBunBinary) {
         return "bun-binary";
@@ -35,46 +51,52 @@ export function detectInstallMethod() {
     }
     return "unknown";
 }
-function getInferredNpmInstall(packageName) {
+function getInferredNpmInstall() {
     const packageDir = getPackageDir();
     const path = process.platform === "win32" || packageDir.includes("\\") ? win32 : { basename, dirname };
-    const [scope, name] = packageName.split("/");
+    const parent = path.dirname(packageDir);
     let root;
-    if (name &&
-        scope?.startsWith("@") &&
-        path.basename(path.dirname(packageDir)) === scope &&
-        path.basename(packageDir) === name) {
-        root = path.dirname(path.dirname(packageDir));
+    if (path.basename(parent).startsWith("@") && path.basename(path.dirname(parent)) === "node_modules") {
+        root = path.dirname(parent);
     }
-    else if (!name && path.basename(packageDir) === packageName) {
-        root = path.dirname(packageDir);
+    else if (path.basename(parent) === "node_modules") {
+        root = parent;
     }
-    if (!root || path.basename(root) !== "node_modules")
+    if (!root)
         return undefined;
-    const parent = path.dirname(root);
-    if (path.basename(parent) === "lib")
-        return { root, prefix: path.dirname(parent) };
+    const rootParent = path.dirname(root);
+    if (path.basename(rootParent) === "lib")
+        return { root, prefix: path.dirname(rootParent) };
     // Windows global npm prefixes use `<prefix>\\node_modules`, which is
     // indistinguishable from local project installs by path shape alone. Do not
     // infer unsupported Windows custom prefixes without `npm root -g` evidence.
     return undefined;
 }
-function getSelfUpdateCommandForMethod(method, packageName, npmCommand) {
+function getSelfUpdateCommandForMethod(method, installedPackageName, updatePackageName = installedPackageName, npmCommand) {
     switch (method) {
         case "bun-binary":
             return undefined;
         case "pnpm":
-            return { command: "pnpm", args: ["install", "-g", packageName], display: `pnpm install -g ${packageName}` };
+            return makeSelfUpdateCommand(makeSelfUpdateCommandStep("pnpm", ["install", "-g", updatePackageName]), updatePackageName === installedPackageName
+                ? undefined
+                : makeSelfUpdateCommandStep("pnpm", ["remove", "-g", installedPackageName]));
         case "yarn":
-            return { command: "yarn", args: ["global", "add", packageName], display: `yarn global add ${packageName}` };
+            return makeSelfUpdateCommand(makeSelfUpdateCommandStep("yarn", ["global", "add", updatePackageName]), updatePackageName === installedPackageName
+                ? undefined
+                : makeSelfUpdateCommandStep("yarn", ["global", "remove", installedPackageName]));
         case "bun":
-            return { command: "bun", args: ["install", "-g", packageName], display: `bun install -g ${packageName}` };
+            return makeSelfUpdateCommand(makeSelfUpdateCommandStep("bun", ["install", "-g", updatePackageName]), updatePackageName === installedPackageName
+                ? undefined
+                : makeSelfUpdateCommandStep("bun", ["uninstall", "-g", installedPackageName]));
         case "npm": {
             const [command = "npm", ...npmArgs] = npmCommand ?? [];
-            const inferred = npmCommand?.length ? undefined : getInferredNpmInstall(packageName);
-            const args = [...npmArgs, ...(inferred ? ["--prefix", inferred.prefix] : []), "install", "-g", packageName];
-            const display = [command, ...args].map((arg) => (/\s/.test(arg) ? `"${arg}"` : arg)).join(" ");
-            return { command, args, display };
+            const inferred = npmCommand?.length ? undefined : getInferredNpmInstall();
+            const prefixArgs = [...npmArgs, ...(inferred ? ["--prefix", inferred.prefix] : [])];
+            const installStep = makeSelfUpdateCommandStep(command, [...prefixArgs, "install", "-g", updatePackageName]);
+            const uninstallStep = updatePackageName === installedPackageName
+                ? undefined
+                : makeSelfUpdateCommandStep(command, [...prefixArgs, "uninstall", "-g", installedPackageName]);
+            return makeSelfUpdateCommand(installStep, uninstallStep);
         }
         case "unknown":
             return undefined;
@@ -94,7 +116,7 @@ function readCommandOutput(command, args, options = {}) {
     }
     return undefined;
 }
-function getGlobalPackageRoots(method, packageName, npmCommand) {
+function getGlobalPackageRoots(method, _packageName, npmCommand) {
     switch (method) {
         case "npm": {
             const configured = !!npmCommand?.length;
@@ -112,7 +134,7 @@ function getGlobalPackageRoots(method, packageName, npmCommand) {
             const root = readCommandOutput(command, [...npmArgs, "root", "-g"], {
                 requireSuccess: configured,
             });
-            const inferred = configured ? undefined : getInferredNpmInstall(packageName);
+            const inferred = configured ? undefined : getInferredNpmInstall();
             return [root, inferred?.root].filter((x) => !!x);
         }
         case "pnpm": {
@@ -173,27 +195,27 @@ function isManagedByGlobalPackageManager(method, packageName, npmCommand) {
                 packageDir.startsWith(normalizedRoot.endsWith(sep) ? normalizedRoot : `${normalizedRoot}${sep}`));
         }));
 }
-export function getSelfUpdateCommand(packageName, npmCommand) {
+export function getSelfUpdateCommand(packageName, npmCommand, updatePackageName = packageName) {
     const method = detectInstallMethod();
-    const command = getSelfUpdateCommandForMethod(method, packageName, npmCommand);
+    const command = getSelfUpdateCommandForMethod(method, packageName, updatePackageName, npmCommand);
     if (!command || !isManagedByGlobalPackageManager(method, packageName, npmCommand) || !isSelfUpdatePathWritable()) {
         return undefined;
     }
     return command;
 }
-export function getSelfUpdateUnavailableInstruction(packageName, npmCommand) {
+export function getSelfUpdateUnavailableInstruction(packageName, npmCommand, updatePackageName = packageName) {
     const method = detectInstallMethod();
     if (method === "bun-binary") {
-        return `Download from: https://github.com/badlogic/pi-mono/releases/latest`;
+        return `Download from: https://github.com/earendil-works/pi-mono/releases/latest`;
     }
-    const command = getSelfUpdateCommandForMethod(method, packageName, npmCommand);
+    const command = getSelfUpdateCommandForMethod(method, packageName, updatePackageName, npmCommand);
     if (command) {
         if (isManagedByGlobalPackageManager(method, packageName, npmCommand) && !isSelfUpdatePathWritable()) {
             return `This installation is managed by a global ${method} install, but the install path is not writable. Update it yourself with: ${command.display}`;
         }
         return `This installation is not managed by a global ${method} install. Update it with the package manager, wrapper, or source checkout that provides it.`;
     }
-    return `Update ${packageName} using the package manager, wrapper, or source checkout that provides this installation.`;
+    return `Update ${updatePackageName} using the package manager, wrapper, or source checkout that provides this installation.`;
 }
 export function getUpdateInstruction(packageName) {
     const method = detectInstallMethod();
@@ -306,7 +328,7 @@ export function getBundledInteractiveAssetPath(name) {
 }
 const pkg = JSON.parse(readFileSync(getPackageJsonPath(), "utf-8"));
 const piConfigName = pkg.piConfig?.name;
-export const PACKAGE_NAME = pkg.name || "@mariozechner/pi-coding-agent";
+export const PACKAGE_NAME = pkg.name || "@earendil-works/pi-coding-agent";
 export const APP_NAME = piConfigName || "pi";
 export const APP_TITLE = piConfigName ? APP_NAME : "π";
 export const CONFIG_DIR_NAME = pkg.piConfig?.configDir || ".pi";

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/core/agent-session.js

@@ -14,7 +14,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, resolve } from "node:path";
-import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, modelsAreEqual, resetApiProviders, } from "@mariozechner/pi-ai";
+import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, modelsAreEqual, resetApiProviders, } from "@earendil-works/pi-ai";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
 import { sleep } from "../utils/sleep.js";

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/core/auth-storage.js

@@ -5,8 +5,8 @@
  * Uses file locking to prevent race conditions when multiple pi instances
  * try to refresh tokens simultaneously.
  */
-import { findEnvKeys, getEnvApiKey, } from "@mariozechner/pi-ai";
-import { getOAuthApiKey, getOAuthProvider, getOAuthProviders } from "@mariozechner/pi-ai/oauth";
+import { findEnvKeys, getEnvApiKey, } from "@earendil-works/pi-ai";
+import { getOAuthApiKey, getOAuthProvider, getOAuthProviders } from "@earendil-works/pi-ai/oauth";
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import lockfile from "proper-lockfile";

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/core/compaction/branch-summarization.js

@@ -4,7 +4,7 @@
  * When navigating to a different point in the session tree, this generates
  * a summary of the branch being left so context isn't lost.
  */
-import { completeSimple } from "@mariozechner/pi-ai";
+import { completeSimple } from "@earendil-works/pi-ai";
 import { convertToLlm, createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "../messages.js";
 import { estimateTokens } from "./compaction.js";
 import { computeFileLists, createFileOps, extractFileOpsFromMessage, formatFileOperations, SUMMARIZATION_SYSTEM_PROMPT, serializeConversation, } from "./utils.js";

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/core/compaction/compaction.js

@@ -4,7 +4,7 @@
  * Pure functions for compaction logic. The session manager handles I/O,
  * and after compaction the session is reloaded.
  */
-import { completeSimple } from "@mariozechner/pi-ai";
+import { completeSimple } from "@earendil-works/pi-ai";
 import { convertToLlm, createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "../messages.js";
 import { buildSessionContext } from "../session-manager.js";
 import { computeFileLists, createFileOps, extractFileOpsFromMessage, formatFileOperations, SUMMARIZATION_SYSTEM_PROMPT, serializeConversation, } from "./utils.js";

package/node_modules/@earendil-works/pi-coding-agent/dist/core/compaction/utils.js

@@ -0,0 +1,153 @@
+/**
+ * Shared utilities for compaction and branch summarization.
+ */
+export function createFileOps() {
+    return {
+        read: new Set(),
+        written: new Set(),
+        edited: new Set(),
+    };
+}
+/**
+ * Extract file operations from tool calls in an assistant message.
+ */
+export function extractFileOpsFromMessage(message, fileOps) {
+    if (message.role !== "assistant")
+        return;
+    if (!("content" in message) || !Array.isArray(message.content))
+        return;
+    for (const block of message.content) {
+        if (typeof block !== "object" || block === null)
+            continue;
+        if (!("type" in block) || block.type !== "toolCall")
+            continue;
+        if (!("arguments" in block) || !("name" in block))
+            continue;
+        const args = block.arguments;
+        if (!args)
+            continue;
+        const path = typeof args.path === "string" ? args.path : undefined;
+        if (!path)
+            continue;
+        switch (block.name) {
+            case "read":
+                fileOps.read.add(path);
+                break;
+            case "write":
+                fileOps.written.add(path);
+                break;
+            case "edit":
+                fileOps.edited.add(path);
+                break;
+        }
+    }
+}
+/**
+ * Compute final file lists from file operations.
+ * Returns readFiles (files only read, not modified) and modifiedFiles.
+ */
+export function computeFileLists(fileOps) {
+    const modified = new Set([...fileOps.edited, ...fileOps.written]);
+    const readOnly = [...fileOps.read].filter((f) => !modified.has(f)).sort();
+    const modifiedFiles = [...modified].sort();
+    return { readFiles: readOnly, modifiedFiles };
+}
+/**
+ * Format file operations as XML tags for summary.
+ */
+export function formatFileOperations(readFiles, modifiedFiles) {
+    const sections = [];
+    if (readFiles.length > 0) {
+        sections.push(`<read-files>\n${readFiles.join("\n")}\n</read-files>`);
+    }
+    if (modifiedFiles.length > 0) {
+        sections.push(`<modified-files>\n${modifiedFiles.join("\n")}\n</modified-files>`);
+    }
+    if (sections.length === 0)
+        return "";
+    return `\n\n${sections.join("\n\n")}`;
+}
+// ============================================================================
+// Message Serialization
+// ============================================================================
+/** Maximum characters for a tool result in serialized summaries. */
+const TOOL_RESULT_MAX_CHARS = 2000;
+/**
+ * Truncate text to a maximum character length for summarization.
+ * Keeps the beginning and appends a truncation marker.
+ */
+function truncateForSummary(text, maxChars) {
+    if (text.length <= maxChars)
+        return text;
+    const truncatedChars = text.length - maxChars;
+    return `${text.slice(0, maxChars)}\n\n[... ${truncatedChars} more characters truncated]`;
+}
+/**
+ * Serialize LLM messages to text for summarization.
+ * This prevents the model from treating it as a conversation to continue.
+ * Call convertToLlm() first to handle custom message types.
+ *
+ * Tool results are truncated to keep the summarization request within
+ * reasonable token budgets. Full content is not needed for summarization.
+ */
+export function serializeConversation(messages) {
+    const parts = [];
+    for (const msg of messages) {
+        if (msg.role === "user") {
+            const content = typeof msg.content === "string"
+                ? msg.content
+                : msg.content
+                    .filter((c) => c.type === "text")
+                    .map((c) => c.text)
+                    .join("");
+            if (content)
+                parts.push(`[User]: ${content}`);
+        }
+        else if (msg.role === "assistant") {
+            const textParts = [];
+            const thinkingParts = [];
+            const toolCalls = [];
+            for (const block of msg.content) {
+                if (block.type === "text") {
+                    textParts.push(block.text);
+                }
+                else if (block.type === "thinking") {
+                    thinkingParts.push(block.thinking);
+                }
+                else if (block.type === "toolCall") {
+                    const args = block.arguments;
+                    const argsStr = Object.entries(args)
+                        .map(([k, v]) => `${k}=${JSON.stringify(v)}`)
+                        .join(", ");
+                    toolCalls.push(`${block.name}(${argsStr})`);
+                }
+            }
+            if (thinkingParts.length > 0) {
+                parts.push(`[Assistant thinking]: ${thinkingParts.join("\n")}`);
+            }
+            if (textParts.length > 0) {
+                parts.push(`[Assistant]: ${textParts.join("\n")}`);
+            }
+            if (toolCalls.length > 0) {
+                parts.push(`[Assistant tool calls]: ${toolCalls.join("; ")}`);
+            }
+        }
+        else if (msg.role === "toolResult") {
+            const content = msg.content
+                .filter((c) => c.type === "text")
+                .map((c) => c.text)
+                .join("");
+            if (content) {
+                parts.push(`[Tool result]: ${truncateForSummary(content, TOOL_RESULT_MAX_CHARS)}`);
+            }
+        }
+    }
+    return parts.join("\n\n");
+}
+// ============================================================================
+// Summarization System Prompt
+// ============================================================================
+export const SUMMARIZATION_SYSTEM_PROMPT = `You are a context summarization assistant. Your task is to read a conversation between a user and an AI coding assistant, then produce a structured summary following the exact format specified.
+
+Do NOT continue the conversation. Do NOT respond to any questions in the conversation. ONLY output the structured summary.`;
+//# sourceMappingURL=utils.js.map

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/core/export-html/template.css

@@ -204,6 +204,10 @@
       color: var(--accent);
     }
 
+    .tree-role-skill {
+      color: var(--customMessageLabel);
+    }
+
     .tree-role-assistant {
       color: var(--success);
     }
@@ -383,7 +387,8 @@
     }
 
     .user-message:hover .copy-link-btn,
-    .assistant-message:hover .copy-link-btn {
+    .assistant-message:hover .copy-link-btn,
+    .skill-user-entry:hover .copy-link-btn {
       opacity: 1;
     }
 
@@ -786,6 +791,45 @@
       font-weight: bold;
     }
 
+    /* Skill invocation - matches compaction style (clickable, collapsed by default) */
+    .skill-invocation {
+      background: var(--customMessageBg);
+      border-radius: 4px;
+      padding: var(--line-height);
+      cursor: pointer;
+    }
+
+    .skill-invocation-label {
+      color: var(--customMessageLabel);
+      font-weight: bold;
+    }
+
+    .skill-invocation-collapsed {
+      color: var(--customMessageText);
+    }
+
+    .skill-invocation-content {
+      display: none;
+      color: var(--customMessageText);
+      margin-top: var(--line-height);
+    }
+
+    .skill-invocation.expanded .skill-invocation-collapsed {
+      display: none;
+    }
+
+    .skill-invocation.expanded .skill-invocation-content {
+      display: block;
+    }
+
+    .skill-invocation + .user-message {
+      margin-top: var(--line-height);
+    }
+
+    .skill-user-entry {
+      position: relative;
+    }
+
     /* Branch summary */
     .branch-summary {
       background: var(--customMessageBg);

package/node_modules/{@mariozechner → @earendil-works}/pi-coding-agent/dist/core/export-html/template.js

@@ -313,6 +313,22 @@
         return '';
       }
 
+      /**
+       * Parse a skill block from message text.
+       * Returns null if the text doesn't contain a skill block.
+       * Matches the format: <skill name="..." location="...">\n...\n</skill>\n\nuser message
+       */
+      function parseSkillBlock(text) {
+        const match = text.match(/^<skill name="([^"]+)" location="([^"]+)">\n([\s\S]*?)\n<\/skill>(?:\n\n([\s\S]+))?$/);
+        if (!match) return null;
+        return {
+          name: match[1],
+          location: match[2],
+          content: match[3],
+          userMessage: match[4]?.trim() || undefined,
+        };
+      }
+
       function getSearchableText(entry, label) {
         const parts = [];
         if (label) parts.push(label);
@@ -613,7 +629,16 @@
           case 'message': {
             const msg = entry.message;
             if (msg.role === 'user') {
-              const content = truncate(normalize(extractContent(msg.content)));
+              const rawContent = extractContent(msg.content);
+              const skillBlock = parseSkillBlock(rawContent);
+              if (skillBlock) {
+                let treeHtml = labelHtml + `<span class="tree-role-skill">skill:</span> ${escapeHtml(skillBlock.name)}`;
+                if (skillBlock.userMessage) {
+                  treeHtml += ` · <span class="tree-role-user">user:</span> ${escapeHtml(truncate(normalize(skillBlock.userMessage)))}`;
+                }
+                return treeHtml;
+              }
+              const content = truncate(normalize(rawContent));
               return labelHtml + `<span class="tree-role-user">user:</span> ${escapeHtml(content)}`;
             }
             if (msg.role === 'assistant') {
@@ -1140,8 +1165,46 @@
           const msg = entry.message;
 
           if (msg.role === 'user') {
-            let html = `<div class="user-message" id="${entryDomId}">${copyBtnHtml}${tsHtml}`;
             const content = msg.content;
+            const text = typeof content === 'string' ? content :
+              content.filter(c => c.type === 'text').map(c => c.text).join('\n');
+            const skillBlock = parseSkillBlock(text);
+
+            if (skillBlock) {
+              // Collect images from content array
+              const images = Array.isArray(content) ? content.filter(c => c.type === 'image') : [];
+              const hasUserContent = skillBlock.userMessage || images.length > 0;
+              let html = `<div class="skill-user-entry" id="${entryDomId}">${copyBtnHtml}${tsHtml}`;
+
+              // Skill invocation (collapsed by default, click to expand)
+              html += `<div class="skill-invocation" onclick="if(window.getSelection().toString())return;this.classList.toggle('expanded')">
+                <div class="skill-invocation-label">[skill] ${escapeHtml(skillBlock.name)}</div>
+                <div class="skill-invocation-collapsed">${escapeHtml(skillBlock.name)} (click to expand)</div>
+                <div class="skill-invocation-content markdown-content">${safeMarkedParse(skillBlock.content)}</div>
+              </div>`;
+
+              // User message (separate block if present)
+              if (hasUserContent) {
+                html += '<div class="user-message">';
+                if (images.length > 0) {
+                  html += '<div class="message-images">';
+                  for (const img of images) {
+                    html += `<img src="data:${escapeHtml(img.mimeType || 'image/png')};base64,${escapeHtml(img.data || '')}" class="message-image" />`;
+                  }
+                  html += '</div>';
+                }
+                if (skillBlock.userMessage) {
+                  html += `<div class="markdown-content">${safeMarkedParse(skillBlock.userMessage)}</div>`;
+                }
+                html += '</div>';
+              }
+
+              html += '</div>';
+              return html;
+            }
+
+            // No skill block - normal user message
+            let html = `<div class="user-message" id="${entryDomId}">${copyBtnHtml}${tsHtml}`;
 
             if (Array.isArray(content)) {
               const images = content.filter(c => c.type === 'image');
@@ -1154,8 +1217,6 @@
               }
             }
 
-            const text = typeof content === 'string' ? content :
-              content.filter(c => c.type === 'text').map(c => c.text).join('\n');
             if (text.trim()) {
               html += `<div class="markdown-content">${safeMarkedParse(text)}</div>`;
             }
@@ -1716,6 +1777,9 @@
         document.querySelectorAll('.compaction').forEach(el => {
           el.classList.toggle('expanded', toolOutputsExpanded);
         });
+        document.querySelectorAll('.skill-invocation').forEach(el => {
+          el.classList.toggle('expanded', toolOutputsExpanded);
+        });
       };
 
       const attachHeaderHandlers = () => {