@psnext/slingcli 2.5.20260623-1 → 2.5.20260629-1

package/node_modules/@earendil-works/pi-coding-agent/dist/core/model-resolver.js

@@ -11,7 +11,7 @@ export const defaultModelPerProvider = {
     "amazon-bedrock": "us.anthropic.claude-opus-4-6-v1",
     "ant-ling": "Ring-2.6-1T",
     anthropic: "claude-opus-4-8",
-    openai: "gpt-5.4",
+    openai: "gpt-5.5",
     "azure-openai-responses": "gpt-5.4",
     "openai-codex": "gpt-5.5",
     nvidia: "nvidia/nemotron-3-super-120b-a12b",

package/node_modules/@earendil-works/pi-coding-agent/dist/core/resource-loader.js

@@ -11,6 +11,7 @@ import { loadPromptTemplates } from "./prompt-templates.js";
 import { SettingsManager } from "./settings-manager.js";
 import { loadSkills } from "./skills.js";
 import { createSourceInfo } from "./source-info.js";
+import { resetTimings } from "./timings.js";
 function resolvePromptInput(input, description) {
     if (!input) {
         return undefined;
@@ -216,6 +217,7 @@ export class DefaultResourceLoader {
         return this.loadCurrentExtensionSet({ includeInlineFactories: true });
     }
     async reload(options) {
+        resetTimings("extensions");
         if (this.loaded) {
             clearExtensionCache();
         }

package/node_modules/@earendil-works/pi-coding-agent/dist/core/session-manager.js

@@ -533,10 +533,13 @@ export class SessionManager {
         this.sessionFile = resolvePath(sessionFile);
         if (existsSync(this.sessionFile)) {
             this.fileEntries = loadEntriesFromFile(this.sessionFile);
-            // If file was empty or corrupted (no valid header), truncate and start fresh
-            // to avoid appending messages without a session header (which breaks the session)
+            // If file was empty, initialize it with a valid session header. If it was
+            // non-empty but did not parse as a pi session, fail without modifying it.
             if (this.fileEntries.length === 0) {
                 const explicitPath = this.sessionFile;
+                if (statSync(explicitPath).size > 0) {
+                    throw new Error(`Session file is not a valid pi session: ${explicitPath}`);
+                }
                 this.newSession();
                 this.sessionFile = explicitPath;
                 this._rewriteFile();
@@ -744,12 +747,13 @@ export class SessionManager {
     }
     /** Append a session info entry (e.g., display name). Returns entry id. */
     appendSessionInfo(name) {
+        const sanitizedName = name.replace(/[\r\n]+/g, " ").trim();
         const entry = {
             type: "session_info",
             id: generateId(this.byId),
             parentId: this.leafId,
             timestamp: new Date().toISOString(),
-            name: name.trim(),
+            name: sanitizedName,
         };
         this._appendEntry(entry);
         return entry.id;
@@ -1112,8 +1116,8 @@ export class SessionManager {
         return new SessionManager(cwd, dir, undefined, true);
     }
     /** Create an in-memory session (no file persistence) */
-    static inMemory(cwd = process.cwd()) {
-        return new SessionManager(cwd, "", undefined, false);
+    static inMemory(cwd = process.cwd(), options) {
+        return new SessionManager(cwd, "", undefined, false, options);
     }
     /**
      * Fork a session from another project directory into the current project.

package/node_modules/@earendil-works/pi-coding-agent/dist/core/settings-manager.js

@@ -581,6 +581,17 @@ export class SettingsManager {
     getHideThinkingBlock() {
         return this.settings.hideThinkingBlock ?? false;
     }
+    getExternalEditorCommand() {
+        const configuredEditor = this.settings.externalEditor;
+        if (typeof configuredEditor === "string" && configuredEditor.trim() !== "") {
+            return configuredEditor;
+        }
+        const environmentEditor = process.env.VISUAL || process.env.EDITOR;
+        if (environmentEditor) {
+            return environmentEditor;
+        }
+        return process.platform === "win32" ? "notepad" : "nano";
+    }
     setHideThinkingBlock(hide) {
         this.globalSettings.hideThinkingBlock = hide;
         this.markModified("hideThinkingBlock");

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

@@ -3,29 +3,39 @@
  * Enable with PI_TIMING=1 environment variable.
  */
 const ENABLED = process.env.PI_TIMING === "1";
-const timings = [];
-let lastTime = Date.now();
-export function resetTimings() {
+const timingNamespaces = new Map();
+export function resetTimings(namespace = "main") {
     if (!ENABLED)
         return;
-    timings.length = 0;
-    lastTime = Date.now();
+    timingNamespaces.set(namespace, { timings: [], lastTime: Date.now() });
 }
-export function time(label) {
+export function time(label, namespace = "main") {
     if (!ENABLED)
         return;
     const now = Date.now();
-    timings.push({ label, ms: now - lastTime });
-    lastTime = now;
+    if (!timingNamespaces.has(namespace)) {
+        resetTimings(namespace);
+    }
+    const timingNamespace = timingNamespaces.get(namespace);
+    timingNamespace.timings.push({ label, ms: now - timingNamespace.lastTime });
+    timingNamespace.lastTime = now;
 }
-export function printTimings() {
-    if (!ENABLED || timings.length === 0)
+function printTimingGroup(title, timings) {
+    const printableTimings = timings.filter((timing) => timing.ms >= 0);
+    if (printableTimings.length === 0)
         return;
-    console.error("\n--- Startup Timings ---");
-    for (const t of timings) {
+    console.error(`\n--- ${title} ---`);
+    for (const t of printableTimings) {
         console.error(`  ${t.label}: ${t.ms}ms`);
     }
-    console.error(`  TOTAL: ${timings.reduce((a, b) => a + b.ms, 0)}ms`);
-    console.error("------------------------\n");
+    console.error(`  TOTAL: ${printableTimings.reduce((a, b) => a + b.ms, 0)}ms`);
+    console.error(`${"-".repeat(title.length + 8)}\n`);
+}
+export function printTimings() {
+    if (!ENABLED)
+        return;
+    for (const [namespace, timingNamespace] of timingNamespaces) {
+        printTimingGroup(`Startup Timings: ${namespace}`, timingNamespace.timings);
+    }
 }
 //# sourceMappingURL=timings.js.map

package/node_modules/@earendil-works/pi-coding-agent/dist/core/tools/read.js

@@ -6,7 +6,7 @@ import { Type } from "typebox";
 import { getReadmePath } from "../../config.js";
 import { keyHint, keyText } from "../../modes/interactive/components/keybinding-hints.js";
 import { getLanguageFromPath, highlightCode } from "../../modes/interactive/theme/theme.js";
-import { formatDimensionNote, resizeImage } from "../../utils/image-resize.js";
+import { processImage } from "../../utils/image-process.js";
 import { detectSupportedImageMimeTypeFromFile } from "../../utils/mime.js";
 import { formatPathRelativeToCwdOrAbsolute } from "../../utils/paths.js";
 import { resolveReadPathAsync, resolveToCwd } from "./path-utils.js";
@@ -133,7 +133,7 @@ export function createReadToolDefinition(cwd, options) {
     return {
         name: "read",
         label: "read",
-        description: `Read the contents of a file. Supports text files and images (jpg, png, gif, webp). Images are sent as attachments. For text files, output is truncated to ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.`,
+        description: `Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.`,
         promptSnippet: "Read file contents",
         promptGuidelines: ["Use read to examine files instead of cat or sed."],
         parameters: readSchema,
@@ -165,35 +165,22 @@ export function createReadToolDefinition(cwd, options) {
                         if (mimeType) {
                             // Read image as binary.
                             const buffer = await ops.readFile(absolutePath);
-                            if (autoResizeImages) {
-                                // Resize image if needed before sending it back to the model.
-                                const resized = await resizeImage(buffer, mimeType);
-                                if (!resized) {
-                                    let textNote = `Read image file [${mimeType}]\n[Image omitted: could not be resized below the inline image size limit.]`;
-                                    if (nonVisionImageNote)
-                                        textNote += `\n${nonVisionImageNote}`;
-                                    content = [{ type: "text", text: textNote }];
-                                }
-                                else {
-                                    const dimensionNote = formatDimensionNote(resized);
-                                    let textNote = `Read image file [${resized.mimeType}]`;
-                                    if (dimensionNote)
-                                        textNote += `\n${dimensionNote}`;
-                                    if (nonVisionImageNote)
-                                        textNote += `\n${nonVisionImageNote}`;
-                                    content = [
-                                        { type: "text", text: textNote },
-                                        { type: "image", data: resized.data, mimeType: resized.mimeType },
-                                    ];
-                                }
+                            const processed = await processImage(buffer, mimeType, { autoResizeImages });
+                            if (!processed.ok) {
+                                let textNote = `Read image file [${mimeType}]\n${processed.message}`;
+                                if (nonVisionImageNote)
+                                    textNote += `\n${nonVisionImageNote}`;
+                                content = [{ type: "text", text: textNote }];
                             }
                             else {
-                                let textNote = `Read image file [${mimeType}]`;
+                                let textNote = `Read image file [${processed.mimeType}]`;
+                                if (processed.hints.length > 0)
+                                    textNote += `\n${processed.hints.join("\n")}`;
                                 if (nonVisionImageNote)
                                     textNote += `\n${nonVisionImageNote}`;
                                 content = [
                                     { type: "text", text: textNote },
-                                    { type: "image", data: buffer.toString("base64"), mimeType },
+                                    { type: "image", data: processed.data, mimeType: processed.mimeType },
                                 ];
                             }
                         }

package/node_modules/@earendil-works/pi-coding-agent/dist/main.js

@@ -35,6 +35,7 @@ import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme.js"
 import { handleConfigCommand, handlePackageCommand } from "./package-manager-cli.js";
 import { isLocalPath, normalizePath, resolvePath } from "./utils/paths.js";
 import { cleanupWindowsSelfUpdateQuarantine } from "./utils/windows-self-update.js";
+const EXTENSION_LOAD_FAILURE_HINT = 'Hint: Start without extensions using "sling -ne".';
 /**
  * Read all content from piped stdin.
  * Returns undefined if stdin is a TTY (interactive terminal).
@@ -167,7 +168,6 @@ function validateSessionIdFlags(parsed) {
         parsed.session ? "--session" : undefined,
         parsed.continue ? "--continue" : undefined,
         parsed.resume ? "--resume" : undefined,
-        parsed.noSession ? "--no-session" : undefined,
     ].filter((flag) => flag !== undefined);
     if (conflictingFlags.length > 0) {
         console.error(chalk.red(`Error: --session-id cannot be combined with ${conflictingFlags.join(", ")}`));
@@ -182,6 +182,16 @@ function validateSessionIdFlags(parsed) {
         process.exit(1);
     }
 }
+function openSessionOrExit(path, sessionDir) {
+    try {
+        return SessionManager.open(path, sessionDir);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(chalk.red(`Error: ${message}`));
+        process.exit(1);
+    }
+}
 function forkSessionOrExit(sourcePath, cwd, sessionDir, sessionId) {
     try {
         return SessionManager.forkFrom(sourcePath, cwd, sessionDir, { id: sessionId });
@@ -194,7 +204,7 @@ function forkSessionOrExit(sourcePath, cwd, sessionDir, sessionId) {
 }
 async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
     if (parsed.noSession || parsed.help || parsed.listModels !== undefined) {
-        return SessionManager.inMemory(cwd);
+        return SessionManager.inMemory(cwd, parsed.sessionId !== undefined ? { id: parsed.sessionId } : undefined);
     }
     if (parsed.fork) {
         if (parsed.sessionId) {
@@ -220,7 +230,7 @@ async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
         switch (resolved.type) {
             case "path":
             case "local":
-                return SessionManager.open(resolved.path, sessionDir);
+                return openSessionOrExit(resolved.path, sessionDir);
             case "global": {
                 console.log(chalk.yellow(`Session found in different project: ${resolved.cwd}`));
                 const shouldFork = await promptConfirm("Fork this session into current directory?");
@@ -621,6 +631,9 @@ export async function main(args, options) {
     time("resolveModelScope");
     reportDiagnostics(runtime.diagnostics);
     if (runtime.diagnostics.some((diagnostic) => diagnostic.type === "error")) {
+        if (runtime.diagnostics.some((diagnostic) => diagnostic.message.includes("Failed to load extension"))) {
+            console.error(chalk.yellow(EXTENSION_LOAD_FAILURE_HINT));
+        }
         process.exit(1);
     }
     time("createAgentSession");
@@ -650,9 +663,12 @@ export async function main(args, options) {
         if (startupBenchmark) {
             await interactiveMode.init();
             time("interactiveMode.init");
-            printTimings();
+            // Give the TUI's stdin handler a brief chance to consume terminal query replies
+            // (Kitty keyboard protocol, device attributes, cell size) before restoring the terminal.
+            await new Promise((resolve) => setTimeout(resolve, 150));
             interactiveMode.stop();
             stopThemeWatcher();
+            printTimings();
             if (process.stdout.writableLength > 0) {
                 await new Promise((resolve) => process.stdout.once("drain", resolve));
             }

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/assistant-message.js

@@ -93,21 +93,21 @@ export class AssistantMessageComponent extends Container {
                 }
             }
         }
-        // Check if aborted - show after partial content
-        // But only if there are no tool calls (tool execution components will show the error)
+        // Check if incomplete/failed - show after partial content.
+        // For aborted/error tool calls, tool execution components show the error.
+        // Length stops can happen before a tool call is complete, so surface them here too.
         const hasToolCalls = message.content.some((c) => c.type === "toolCall");
         this.hasToolCalls = hasToolCalls;
-        if (!hasToolCalls) {
+        if (message.stopReason === "length") {
+            this.contentContainer.addChild(new Spacer(1));
+            this.contentContainer.addChild(new Text(theme.fg("error", "Error: Model stopped because it reached the maximum output token limit. The response may be incomplete."), 1, 0));
+        }
+        else if (!hasToolCalls) {
             if (message.stopReason === "aborted") {
                 const abortMessage = message.errorMessage && message.errorMessage !== "Request was aborted"
                     ? message.errorMessage
                     : "Operation aborted";
-                if (hasVisibleContent) {
-                    this.contentContainer.addChild(new Spacer(1));
-                }
-                else {
-                    this.contentContainer.addChild(new Spacer(1));
-                }
+                this.contentContainer.addChild(new Spacer(1));
                 this.contentContainer.addChild(new Text(theme.fg("error", abortMessage), 1, 0));
             }
             else if (message.stopReason === "error") {

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/extension-editor.js

@@ -16,6 +16,7 @@ export class ExtensionEditorComponent extends Container {
     onCancelCallback;
     tui;
     keybindings;
+    externalEditorCommand;
     _focused = false;
     get focused() {
         return this._focused;
@@ -24,10 +25,11 @@ export class ExtensionEditorComponent extends Container {
         this._focused = value;
         this.editor.focused = value;
     }
-    constructor(tui, keybindings, title, prefill, onSubmit, onCancel, options) {
+    constructor(tui, keybindings, title, prefill, onSubmit, onCancel, options, externalEditorCommand) {
         super();
         this.tui = tui;
         this.keybindings = keybindings;
+        this.externalEditorCommand = externalEditorCommand;
         this.onSubmitCallback = onSubmit;
         this.onCancelCallback = onCancel;
         // Add top border
@@ -48,7 +50,7 @@ export class ExtensionEditorComponent extends Container {
         this.addChild(this.editor);
         this.addChild(new Spacer(1));
         // Add hint
-        const hasExternalEditor = !!(process.env.VISUAL || process.env.EDITOR);
+        const hasExternalEditor = !!this.getExternalEditorCommand();
         const hint = keyHint("tui.select.confirm", "submit") +
             "  " +
             keyHint("tui.input.newLine", "newline") +
@@ -75,8 +77,15 @@ export class ExtensionEditorComponent extends Container {
         // Forward to editor
         this.editor.handleInput(keyData);
     }
+    getExternalEditorCommand() {
+        const editorCmd = this.externalEditorCommand || process.env.VISUAL || process.env.EDITOR;
+        if (editorCmd) {
+            return editorCmd;
+        }
+        return process.platform === "win32" ? "notepad" : "nano";
+    }
     async openExternalEditor() {
-        const editorCmd = process.env.VISUAL || process.env.EDITOR;
+        const editorCmd = this.getExternalEditorCommand();
         if (!editorCmd) {
             return;
         }

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/session-selector.js

@@ -168,7 +168,7 @@ function buildSessionTree(sessions) {
     const byPath = new Map();
     for (const session of sessions) {
         const sessionPath = canonicalizePath(session.path) ?? session.path;
-        byPath.set(sessionPath, { session, children: [] });
+        byPath.set(sessionPath, { session, children: [], latestActivity: session.modified.getTime() });
     }
     const roots = [];
     for (const session of sessions) {
@@ -182,9 +182,20 @@ function buildSessionTree(sessions) {
             roots.push(node);
         }
     }
-    // Sort children and roots by modified date (descending)
+    const updateLatestActivity = (node) => {
+        let latestActivity = node.session.modified.getTime();
+        for (const child of node.children) {
+            latestActivity = Math.max(latestActivity, updateLatestActivity(child));
+        }
+        node.latestActivity = latestActivity;
+        return latestActivity;
+    };
+    for (const root of roots) {
+        updateLatestActivity(root);
+    }
+    // Sort children and roots by latest activity in each subtree (descending)
     const sortNodes = (nodes) => {
-        nodes.sort((a, b) => b.session.modified.getTime() - a.session.modified.getTime());
+        nodes.sort((a, b) => b.latestActivity - a.latestActivity);
         for (const node of nodes) {
             sortNodes(node.children);
         }

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/user-message.js

@@ -13,7 +13,7 @@ export class UserMessageComponent extends Container {
         this.contentBox = new Box(1, 1, (content) => theme.bg("userMessageBg", content));
         this.contentBox.addChild(new Markdown(text, 0, 0, markdownTheme, {
             color: (content) => theme.fg("userMessageText", content),
-        }, { preserveOrderedListMarkers: true }));
+        }, { preserveOrderedListMarkers: true, preserveBackslashEscapes: true }));
         this.addChild(this.contentBox);
     }
     render(width) {

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/interactive-mode.js

@@ -134,6 +134,7 @@ export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProvi
 export class InteractiveMode {
     runtimeHost;
     ui;
+    loadedResourcesContainer;
     chatContainer;
     pendingMessagesContainer;
     statusContainer;
@@ -246,6 +247,7 @@ export class InteractiveMode {
         this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         this.headerContainer = new Container();
+        this.loadedResourcesContainer = new Container();
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
         this.statusContainer = new Container();
@@ -439,8 +441,10 @@ export class InteractiveMode {
                 : "";
             console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
         }
-        // Add header container as first child. Populate it after detectThemeIfUnset.
+        // Add header container as first child. Populate it after applying theme settings.
+        // Keep loaded resources before chat so restored session messages never precede them.
         this.ui.addChild(this.headerContainer);
+        this.ui.addChild(this.loadedResourcesContainer);
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
@@ -490,7 +494,7 @@ export class InteractiveMode {
                 hint("app.tools.expand", "more"),
             ].join(theme.fg("muted", " · "));
             const compactOnboarding = theme.fg("dim", `Press ${keyText("app.tools.expand")} to show full startup help and loaded resources.`);
-            const onboarding = theme.fg("dim", `Sling can explain its own features and look up its docs. Ask it how to use or extend Sling.`);
+            const onboarding = theme.fg("dim", `Pi can explain its own features and look up its docs. Ask it how to use or extend Pi.`);
             this.builtInHeader = new ExpandableText(() => `${logo}\n${compactInstructions}\n${compactOnboarding}\n\n${onboarding}`, () => `${logo}\n${expandedInstructions}\n\n${onboarding}`, this.getStartupExpansionState(), 1, 0);
             // Setup UI layout
             this.headerContainer.addChild(new Spacer(1));
@@ -657,7 +661,7 @@ export class InteractiveMode {
             return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
         }
         if (extendedKeysFormat === "xterm") {
-            return "tmux extended-keys-format is xterm. Sling works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+            return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
         }
         return undefined;
     }
@@ -990,6 +994,8 @@ export class InteractiveMode {
         return lines.join("\n");
     }
     showLoadedResources(options) {
+        // Resource rendering is idempotent; chat clears no longer clear this separate container.
+        this.loadedResourcesContainer.clear();
         const showListing = options?.force || this.options.verbose || !this.settingsManager.getQuietStartup();
         const showDiagnostics = showListing || options?.showDiagnosticsWhenQuiet === true;
         if (!showListing && !showDiagnostics) {
@@ -1005,8 +1011,8 @@ export class InteractiveMode {
         };
         const addLoadedSection = (name, collapsedBody, expandedBody = collapsedBody, color = "mdHeading") => {
             const section = new ExpandableText(() => `${sectionHeader(name, color)}\n${collapsedBody}`, () => `${sectionHeader(name, color)}\n${expandedBody}`, this.getStartupExpansionState(), 0, 0);
-            this.chatContainer.addChild(section);
-            this.chatContainer.addChild(new Spacer(1));
+            this.loadedResourcesContainer.addChild(section);
+            this.loadedResourcesContainer.addChild(new Spacer(1));
         };
         const skillsResult = this.session.resourceLoader.getSkills();
         const promptsResult = this.session.resourceLoader.getPrompts();
@@ -1040,7 +1046,7 @@ export class InteractiveMode {
         if (showListing) {
             const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
             if (contextFiles.length > 0) {
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
                 const contextList = contextFiles
                     .map((f) => theme.fg("dim", `  ${this.formatDisplayPath(f.path)}`))
                     .join("\n");
@@ -1103,14 +1109,14 @@ export class InteractiveMode {
             const skillDiagnostics = skillsResult.diagnostics;
             if (skillDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const promptDiagnostics = promptsResult.diagnostics;
             if (promptDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const extensionDiagnostics = [];
             const extensionErrors = this.session.resourceLoader.getExtensions().errors;
@@ -1126,14 +1132,14 @@ export class InteractiveMode {
             extensionDiagnostics.push(...shortcutDiagnostics);
             if (extensionDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const themeDiagnostics = themesResult.diagnostics;
             if (themeDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
         }
     }
@@ -1261,6 +1267,7 @@ export class InteractiveMode {
         process.exit(1);
     }
     renderCurrentSessionState() {
+        this.loadedResourcesContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
@@ -1741,7 +1748,7 @@ export class InteractiveMode {
             }, () => {
                 this.hideExtensionEditor();
                 resolve(undefined);
-            });
+            }, undefined, this.settingsManager.getExternalEditorCommand());
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionEditor);
             this.ui.setFocus(this.extensionEditor);
@@ -2677,7 +2684,7 @@ export class InteractiveMode {
         if (this.chatContainer.children.length > 0) {
             this.chatContainer.addChild(new Spacer(1));
         }
-        this.chatContainer.addChild(new Text(theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart sling.`), 1, 0));
+        this.chatContainer.addChild(new Text(theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart pi.`), 1, 0));
     }
     async getUserInput() {
         const queuedInput = this.pendingUserInputs.shift();
@@ -2791,7 +2798,7 @@ export class InteractiveMode {
             this.ui.stop();
         }
         catch { }
-        console.error("sling exiting due to uncaughtException:");
+        console.error("pi exiting due to uncaughtException:");
         console.error(error);
         process.exit(1);
     }
@@ -2965,9 +2972,11 @@ export class InteractiveMode {
         if (isExpandable(activeHeader)) {
             activeHeader.setExpanded(expanded);
         }
-        for (const child of this.chatContainer.children) {
-            if (isExpandable(child)) {
-                child.setExpanded(expanded);
+        for (const container of [this.loadedResourcesContainer, this.chatContainer]) {
+            for (const child of container.children) {
+                if (isExpandable(child)) {
+                    child.setExpanded(expanded);
+                }
             }
         }
         this.ui.requestRender();
@@ -2987,10 +2996,9 @@ export class InteractiveMode {
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
     async openExternalEditor() {
-        // Determine editor (respect $VISUAL, then $EDITOR)
-        const editorCmd = process.env.VISUAL || process.env.EDITOR;
+        const editorCmd = this.settingsManager.getExternalEditorCommand();
         if (!editorCmd) {
-            this.showWarning("No editor configured. Set $VISUAL or $EDITOR environment variable.");
+            this.showWarning("No editor configured. Set externalEditor in settings.json or $VISUAL/$EDITOR.");
             return;
         }
         const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
@@ -3527,7 +3535,7 @@ export class InteractiveMode {
                 onSelect: (selection) => {
                     trustStore.setMany(selection.updates);
                     done();
-                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart sling for this to take effect.`);
+                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
                 },
                 onCancel: () => {
                     done();
@@ -4454,8 +4462,12 @@ export class InteractiveMode {
             return;
         }
         this.session.setSessionName(name);
+        const sessionName = this.sessionManager.getSessionName();
+        if (sessionName !== name) {
+            this.showWarning(`Session name was normalized from ${JSON.stringify(name)} to ${JSON.stringify(sessionName)}`);
+        }
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${name}`), 1, 0));
+        this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${sessionName ?? name}`), 1, 0));
         this.ui.requestRender();
     }
     handleSessionCommand() {

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/rpc/rpc-client.js

@@ -298,6 +298,20 @@ export class RpcClient {
         const response = await this.send({ type: "get_fork_messages" });
         return this.getData(response).messages;
     }
+    /**
+     * Get session entries in append order, optionally only those after the `since` entry id.
+     */
+    async getEntries(since) {
+        const response = await this.send({ type: "get_entries", since });
+        return this.getData(response);
+    }
+    /**
+     * Get the session entry tree.
+     */
+    async getTree() {
+        const response = await this.send({ type: "get_tree" });
+        return this.getData(response);
+    }
     /**
      * Get text of last assistant message.
      */

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/rpc/rpc-mode.js

@@ -477,6 +477,22 @@ export async function runRpcMode(runtimeHost) {
                 const messages = session.getUserMessagesForForking();
                 return success(id, "get_fork_messages", { messages });
             }
+            case "get_entries": {
+                const sessionManager = session.sessionManager;
+                let entries = sessionManager.getEntries();
+                if (command.since !== undefined) {
+                    const sinceIndex = entries.findIndex((e) => e.id === command.since);
+                    if (sinceIndex === -1) {
+                        return error(id, "get_entries", `Entry not found: ${command.since}`);
+                    }
+                    entries = entries.slice(sinceIndex + 1);
+                }
+                return success(id, "get_entries", { entries, leafId: sessionManager.getLeafId() });
+            }
+            case "get_tree": {
+                const sessionManager = session.sessionManager;
+                return success(id, "get_tree", { tree: sessionManager.getTree(), leafId: sessionManager.getLeafId() });
+            }
             case "get_last_assistant_text": {
                 const text = session.getLastAssistantText();
                 return success(id, "get_last_assistant_text", { text });