@psnext/slingcli 3.0.20260820-2 → 3.1.20260904-1

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

@@ -2,8 +2,29 @@ import { TUI_KEYBINDINGS, KeybindingsManager as TuiKeybindingsManager, } from "@
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
 import { getAgentDir } from "../config.js";
+import { stripBom } from "../utils/text.js";
+export function useWindowsKeybindings(platform = process.platform, env = process.env) {
+    return platform === "win32" || (platform === "linux" && Boolean(env.WSL_DISTRO_NAME || env.WSL_INTEROP));
+}
+const windowsKeybindings = useWindowsKeybindings();
 export const KEYBINDINGS = {
     ...TUI_KEYBINDINGS,
+    "tui.editor.undo": {
+        ...TUI_KEYBINDINGS["tui.editor.undo"],
+        defaultKeys: process.platform === "win32" ? "ctrl+z" : windowsKeybindings ? "alt+z" : "ctrl+-",
+    },
+    "tui.altScreen.previousPrompt": {
+        ...TUI_KEYBINDINGS["tui.altScreen.previousPrompt"],
+        defaultKeys: windowsKeybindings ? "ctrl+up" : ["ctrl+shift+up", "ctrl+up"],
+    },
+    "tui.altScreen.nextPrompt": {
+        ...TUI_KEYBINDINGS["tui.altScreen.nextPrompt"],
+        defaultKeys: windowsKeybindings ? "ctrl+down" : ["ctrl+shift+down", "ctrl+down"],
+    },
+    "tui.altScreen.search": {
+        ...TUI_KEYBINDINGS["tui.altScreen.search"],
+        defaultKeys: windowsKeybindings ? "ctrl+f" : "ctrl+shift+f",
+    },
     "app.interrupt": { defaultKeys: "escape", description: "Cancel or abort" },
     "app.clear": { defaultKeys: "ctrl+c", description: "Clear editor" },
     "app.exit": { defaultKeys: "ctrl+d", description: "Exit when editor is empty" },
@@ -20,7 +41,7 @@ export const KEYBINDINGS = {
         description: "Cycle to next model",
     },
     "app.model.cycleBackward": {
-        defaultKeys: "shift+ctrl+p",
+        defaultKeys: windowsKeybindings ? "alt+p" : "shift+ctrl+p",
         description: "Cycle to previous model",
     },
     "app.model.select": { defaultKeys: "ctrl+l", description: "Open model selector" },
@@ -42,15 +63,15 @@ export const KEYBINDINGS = {
         description: "Copy message to clipboard",
     },
     "app.message.followUp": {
-        defaultKeys: "alt+enter",
+        defaultKeys: windowsKeybindings ? "ctrl+q" : "alt+enter",
         description: "Queue follow-up message",
     },
     "app.message.dequeue": {
-        defaultKeys: "alt+up",
+        defaultKeys: windowsKeybindings ? "alt+q" : "alt+up",
         description: "Restore queued messages",
     },
     "app.clipboard.pasteImage": {
-        defaultKeys: process.platform === "win32" ? "alt+v" : "ctrl+v",
+        defaultKeys: windowsKeybindings ? "alt+v" : "ctrl+v",
         description: "Paste image from clipboard (text fallback)",
     },
     "app.session.new": { defaultKeys: [], description: "Start a new session" },
@@ -258,7 +279,7 @@ function loadRawConfig(path) {
     if (!existsSync(path))
         return undefined;
     try {
-        const parsed = JSON.parse(readFileSync(path, "utf-8"));
+        const parsed = JSON.parse(stripBom(readFileSync(path, "utf-8")));
         if (typeof parsed !== "object" || parsed === null)
             return undefined;
         return parsed;

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

@@ -4,6 +4,7 @@ import { Type } from "typebox";
 import { Compile } from "typebox/compile";
 import { stripJsonComments } from "../utils/json.js";
 import { normalizePath } from "../utils/paths.js";
+import { stripBom } from "../utils/text.js";
 const PercentileCutoffsSchema = Type.Object({
     p50: Type.Optional(Type.Number()),
     p75: Type.Optional(Type.Number()),
@@ -62,6 +63,7 @@ const OpenAICompletionsCompatSchema = Type.Object({
     supportsDeveloperRole: Type.Optional(Type.Boolean()),
     supportsReasoningEffort: Type.Optional(Type.Boolean()),
     supportsUsageInStreaming: Type.Optional(Type.Boolean()),
+    supportsFinishReason: Type.Optional(Type.Boolean()),
     maxTokensField: Type.Optional(Type.Union([Type.Literal("max_completion_tokens"), Type.Literal("max_tokens")])),
     requiresToolResultName: Type.Optional(Type.Boolean()),
     requiresAssistantAfterToolResult: Type.Optional(Type.Boolean()),
@@ -222,7 +224,7 @@ export class ModelConfig {
         }
         let parsed;
         try {
-            parsed = JSON.parse(stripJsonComments(content));
+            parsed = JSON.parse(stripJsonComments(stripBom(content)));
         }
         catch (error) {
             return new ModelConfig(new Map(), `Failed to parse models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${path}`);

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

@@ -22,11 +22,11 @@ export const defaultModelPerProvider = {
     "github-copilot": "gpt-5.4",
     openrouter: "moonshotai/kimi-k2.6",
     "vercel-ai-gateway": "zai/glm-5.1",
-    xai: "grok-4.5",
+    xai: "grok-4.6",
     groq: "openai/gpt-oss-120b",
-    cerebras: "zai-glm-4.7",
-    zai: "glm-5.1",
-    "zai-coding-cn": "glm-5.1",
+    cerebras: "gpt-oss-120b",
+    zai: "glm-5.3",
+    "zai-coding-cn": "glm-5.3",
     mistral: "devstral-medium-latest",
     minimax: "MiniMax-M2.7",
     "minimax-cn": "MiniMax-M2.7",
@@ -470,7 +470,7 @@ export function resolveCliModel(options) {
  * 5. First available model with valid API key
  */
 export async function findInitialModel(options) {
-    const { cliProvider, cliModel, scopedModels, isContinuing, defaultProvider, defaultModelId, defaultThinkingLevel, modelRuntime, } = options;
+    const { cliProvider, cliModel, scopedModels, isContinuing, defaultProvider, defaultModelId, defaultThinkingLevel, modelThinkingLevels, modelRuntime, } = options;
     let model;
     let thinkingLevel = DEFAULT_THINKING_LEVEL;
     // 1. CLI args take priority
@@ -490,9 +490,11 @@ export async function findInitialModel(options) {
     }
     // 2. Use first model from scoped models (skip if continuing/resuming)
     if (scopedModels.length > 0 && !isContinuing) {
+        const scopedModel = scopedModels[0];
+        const perModel = modelThinkingLevels?.[`${scopedModel.model.provider}/${scopedModel.model.id}`];
         return {
-            model: scopedModels[0].model,
-            thinkingLevel: scopedModels[0].thinkingLevel ?? defaultThinkingLevel ?? DEFAULT_THINKING_LEVEL,
+            model: scopedModel.model,
+            thinkingLevel: scopedModel.thinkingLevel ?? perModel ?? defaultThinkingLevel ?? DEFAULT_THINKING_LEVEL,
             fallbackMessage: undefined,
         };
     }
@@ -501,7 +503,11 @@ export async function findInitialModel(options) {
         const found = modelRuntime.getModel(defaultProvider, defaultModelId);
         if (found && modelRuntime.hasConfiguredAuth(found.provider)) {
             model = found;
-            if (defaultThinkingLevel) {
+            const perModel = modelThinkingLevels?.[`${defaultProvider}/${defaultModelId}`];
+            if (perModel) {
+                thinkingLevel = perModel;
+            }
+            else if (defaultThinkingLevel) {
                 thinkingLevel = defaultThinkingLevel;
             }
             return { model, thinkingLevel, fallbackMessage: undefined };

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

@@ -2,6 +2,7 @@ import { join } from "node:path";
 import { getAgentDir } from "../config.js";
 import { raceWithAbortSignal } from "../utils/abort.js";
 import { getFileRevision, normalizePath } from "../utils/paths.js";
+import { stripBom } from "../utils/text.js";
 import { FileAuthStorageBackend } from "./auth-storage.js";
 // Optimize the common path without retaining an unbounded set of custom paths.
 let sharedModelsFileReadState;
@@ -36,7 +37,7 @@ export class FileModelsStore {
         }
     }
     parse(content) {
-        return content ? JSON.parse(content) : {};
+        return content ? JSON.parse(stripBom(content)) : {};
     }
     updateReadState(readState, data, revision) {
         readState.data = data;

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

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, globSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync, } from "node:fs";
 import { homedir } from "node:os";
 function getEnv() {
     if (process.platform !== "linux" || Object.keys(process.env).length > 0) {
@@ -21,14 +21,14 @@ function getEnv() {
     }
 }
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
-import { globSync } from "glob";
 import ignore from "ignore";
 import { minimatch } from "minimatch";
-import { maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
+import { gt, maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
 import { CONFIG_DIR_NAME } from "../config.js";
 import { spawnProcess, spawnProcessSync } from "../utils/child-process.js";
 import { parseGitUrl } from "../utils/git.js";
 import { canonicalizePath, isLocalPath, markPathIgnoredByCloudSync, resolvePath } from "../utils/paths.js";
+import { stripBom } from "../utils/text.js";
 import { isStdoutTakenOver } from "./output-guard.js";
 import { readPiManifest } from "./pi-manifest.js";
 const NETWORK_TIMEOUT_MS = 10000;
@@ -134,6 +134,15 @@ function isOverridePattern(s) {
 function hasGlobPattern(s) {
     return s.includes("*") || s.includes("?");
 }
+/** Glob entries discover visible paths; exact entries can target dot paths or symlinked trees. */
+function expandPackageGlob(pattern, root) {
+    return globSync(pattern, { cwd: root })
+        .map((match) => resolve(root, match))
+        .filter((path) => relative(root, path)
+        .split(sep)
+        .every((segment) => segment === ".." || !segment.startsWith(".")))
+        .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
+}
 function splitPatterns(entries) {
     const plain = [];
     const patterns = [];
@@ -239,7 +248,11 @@ function collectSkillEntries(dir, mode, ignoreMatcher, rootDir) {
                 }
             }
             const relPath = toPosixPath(relative(root, fullPath));
-            if (mode === "pi" && dir === root && isFile && entry.name.endsWith(".md") && !ig.ignores(relPath)) {
+            const shouldIncludeMarkdownFile = isFile &&
+                entry.name.endsWith(".md") &&
+                !ig.ignores(relPath) &&
+                ((mode === "pi" && dir === root) || (mode === "agents" && dir !== root));
+            if (shouldIncludeMarkdownFile) {
                 entries.push(fullPath);
                 continue;
             }
@@ -886,7 +899,7 @@ export class DefaultPackageManager {
         }
         try {
             const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
-            return targetVersion !== installedVersion;
+            return gt(targetVersion, installedVersion);
         }
         catch {
             // Preserve existing update behavior when version lookup fails.
@@ -1172,7 +1185,7 @@ export class DefaultPackageManager {
         }
         try {
             const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
-            return targetVersion !== installedVersion;
+            return gt(targetVersion, installedVersion);
         }
         catch {
             return false;
@@ -1184,7 +1197,7 @@ export class DefaultPackageManager {
             return undefined;
         try {
             const content = readFileSync(packageJsonPath, "utf-8");
-            const pkg = JSON.parse(content);
+            const pkg = JSON.parse(stripBom(content));
             return pkg.version;
         }
         catch {
@@ -1537,7 +1550,7 @@ export class DefaultPackageManager {
         if (!existsSync(packageJsonPath))
             return false;
         try {
-            const manifest = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+            const manifest = JSON.parse(stripBom(readFileSync(packageJsonPath, "utf-8")));
             if (!manifest.dependencies ||
                 typeof manifest.dependencies !== "object" ||
                 Array.isArray(manifest.dependencies)) {
@@ -1905,12 +1918,7 @@ export class DefaultPackageManager {
             if (!hasGlobPattern(entry)) {
                 return [resolve(root, entry)];
             }
-            return globSync(entry, {
-                cwd: root,
-                absolute: true,
-                dot: false,
-                nodir: false,
-            }).map((match) => resolve(match));
+            return expandPackageGlob(entry, root);
         });
         return this.collectFilesFromPaths(resolved, resourceType);
     }

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

@@ -1,11 +1,12 @@
 import { readFileSync } from "node:fs";
+import { stripBom } from "../utils/text.js";
 const RESOURCE_FIELDS = ["extensions", "skills", "prompts", "themes"];
 function isObject(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 export function readPiManifest(packageJsonPath) {
     try {
-        const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+        const pkg = JSON.parse(stripBom(readFileSync(packageJsonPath, "utf-8")));
         if (!isObject(pkg) || !isObject(pkg.pi)) {
             return null;
         }

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

@@ -1,8 +1,8 @@
-import { CONFIG_DIR_NAME } from "../config.js";
+import { APP_NAME, CONFIG_DIR_NAME } from "../config.js";
 import { emitProjectTrustEvent } from "./extensions/runner.js";
 import { getProjectTrustOptions, hasTrustRequiringProjectResources, } from "./trust-manager.js";
 function formatProjectTrustPrompt(cwd) {
-    return `Trust project folder?\n${cwd}\n\nThis allows sling to load ${CONFIG_DIR_NAME} settings and resources, install missing project packages, and execute project extensions.`;
+    return `Trust project folder?\n${cwd}\n\nThis allows ${APP_NAME} to load ${CONFIG_DIR_NAME} settings and resources, install missing project packages, and execute project extensions.`;
 }
 async function selectProjectTrustOption(cwd, ctx) {
     const options = getProjectTrustOptions(cwd, { includeSessionOnly: true });

package/node_modules/@earendil-works/pi-coding-agent/dist/core/remote-catalog-provider.js

@@ -2,6 +2,7 @@ import { VERSION } from "../config.js";
 import { fetchWithRetry } from "../utils/management-http.js";
 import { getPiUserAgent } from "../utils/pi-user-agent.js";
 const DEFAULT_CATALOG_BASE_URL = "https://pi.dev";
+const REMOTE_CATALOG_ATTEMPT_TIMEOUT_MS = 4_000;
 export const REMOTE_CATALOG_REFRESH_INTERVAL_MS = 4 * 60 * 60 * 1000;
 function mergeModels(baseline, dynamic) {
     const merged = [...baseline];
@@ -71,7 +72,7 @@ export function withRemoteCatalog(provider, catalogBaseUrl = DEFAULT_CATALOG_BAS
                     ...(validator ? { "if-none-match": validator } : {}),
                 },
                 signal: context.signal,
-            });
+            }, { attemptTimeoutMs: REMOTE_CATALOG_ATTEMPT_TIMEOUT_MS });
             if (context.signal.aborted)
                 return;
             const checkedAt = Date.now();

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

@@ -4,6 +4,7 @@ import chalk from "chalk";
 import { CONFIG_DIR_NAME } from "../config.js";
 import { loadThemeFromPath } from "../modes/interactive/theme/theme.js";
 import { canonicalizePath, isLocalPath, resolvePath } from "../utils/paths.js";
+import { stripBom } from "../utils/text.js";
 import { createEventBus } from "./event-bus.js";
 import { clearExtensionCache, createExtensionRuntime, loadExtensionFromFactory, loadExtensionsCached, } from "./extensions/loader.js";
 import { findGitPaths } from "./footer-data-provider.js";
@@ -19,7 +20,7 @@ function resolvePromptInput(input, description) {
     }
     if (existsSync(input)) {
         try {
-            return readFileSync(input, "utf-8");
+            return stripBom(readFileSync(input, "utf-8"));
         }
         catch (error) {
             console.error(chalk.yellow(`Warning: Could not read ${description} file ${input}: ${error}`));
@@ -39,7 +40,7 @@ function loadContextFileFromDir(dir) {
                 }
                 return {
                     path: filePath,
-                    content: readFileSync(filePath, "utf-8"),
+                    content: stripBom(readFileSync(filePath, "utf-8")),
                 };
             }
             catch (error) {

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

@@ -14,7 +14,7 @@ import { DefaultResourceLoader } from "./resource-loader.js";
 import { getDefaultSessionDir, SessionManager } from "./session-manager.js";
 import { SettingsManager } from "./settings-manager.js";
 import { time } from "./timings.js";
-import { createBashTool, createCodingTools, createEditTool, createFindTool, createGrepTool, createLsTool, createReadOnlyTools, createReadTool, createWriteTool, withFileMutationQueue, } from "./tools/index.js";
+import { createBashTool, createCodingTools, createEditTool, createFindTool, createGrepTool, createLsTool, createPowerShellTool, createReadOnlyTools, createReadTool, createWriteTool, withFileMutationQueue, } from "./tools/index.js";
 // Preserve the pre-0.81 fallback for extensions that construct Agent instances
 // or invoke low-level agent loops without supplying streamFn. Agent core remains
 // provider-agnostic and does not import pi-ai/compat itself.
@@ -23,7 +23,7 @@ setDefaultStreamFn(streamSimple);
 export * from "./agent-session-runtime.js";
 export { withFileMutationQueue, 
 // Tool factories (for custom cwd)
-createCodingTools, createReadOnlyTools, createReadTool, createBashTool, createEditTool, createWriteTool, createGrepTool, createFindTool, createLsTool, };
+createCodingTools, createReadOnlyTools, createReadTool, createBashTool, createEditTool, createWriteTool, createGrepTool, createFindTool, createLsTool, createPowerShellTool, };
 // Helper Functions
 function getDefaultAgentDir() {
     return getAgentDir();
@@ -101,6 +101,7 @@ export async function createAgentSession(options = {}) {
             defaultProvider: settingsManager.getDefaultProvider(),
             defaultModelId: settingsManager.getDefaultModel(),
             defaultThinkingLevel: settingsManager.getDefaultThinkingLevel(),
+            modelThinkingLevels: settingsManager.getAllModelThinkingLevels(),
             modelRuntime,
         });
         model = result.model;
@@ -118,7 +119,13 @@ export async function createAgentSession(options = {}) {
             ? existingSession.thinkingLevel
             : (settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL);
     }
-    // Fall back to settings default
+    // Fall back to per-model override, then global default
+    if (thinkingLevel === undefined && model) {
+        const perModel = settingsManager.getModelThinkingLevel(model.provider, model.id);
+        if (perModel) {
+            thinkingLevel = perModel;
+        }
+    }
     if (thinkingLevel === undefined) {
         thinkingLevel = settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
     }
@@ -130,10 +137,11 @@ export async function createAgentSession(options = {}) {
         thinkingLevel = clampThinkingLevel(model, thinkingLevel);
     }
     const defaultActiveToolNames = ["read", "bash", "edit", "write"];
+    const configuredDefaultToolNames = settingsManager.getDefaultTools();
     const allowedToolNames = options.tools ?? (options.noTools === "all" ? [] : undefined);
     const excludedToolNames = options.excludeTools;
     const excludedToolNameSet = excludedToolNames ? new Set(excludedToolNames) : undefined;
-    const initialActiveToolNames = (options.tools ? [...options.tools] : options.noTools ? [] : defaultActiveToolNames).filter((name) => !excludedToolNameSet?.has(name));
+    const initialActiveToolNames = (options.tools ?? (options.noTools ? [] : (configuredDefaultToolNames ?? defaultActiveToolNames))).filter((name) => !excludedToolNameSet?.has(name));
     let agent;
     // Create convertToLlm wrapper that filters images if blockImages is enabled (defense-in-depth)
     const convertToLlmWithBlockImages = (messages) => {

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

@@ -0,0 +1,32 @@
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+import { resolvePath } from "../utils/paths.js";
+import { CURRENT_SESSION_VERSION } from "./session-manager.js";
+/** Write the current session branch and optional trailing export-only entries as JSONL. */
+export function exportSessionToJsonl(sessionManager, outputPath, createTrailingEntries) {
+    const filePath = resolvePath(outputPath ?? `session-${new Date().toISOString().replace(/[:.]/g, "-")}.jsonl`, process.cwd());
+    const dir = dirname(filePath);
+    if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+    }
+    const timestamp = new Date().toISOString();
+    const header = {
+        type: "session",
+        version: CURRENT_SESSION_VERSION,
+        id: sessionManager.getSessionId(),
+        timestamp,
+        cwd: sessionManager.getCwd(),
+    };
+    const lines = [JSON.stringify(header)];
+    let parentId = null;
+    for (const entry of sessionManager.getBranch()) {
+        lines.push(JSON.stringify({ ...entry, parentId }));
+        parentId = entry.id;
+    }
+    for (const entry of createTrailingEntries?.(parentId, timestamp) ?? []) {
+        lines.push(JSON.stringify(entry));
+    }
+    writeFileSync(filePath, `${lines.join("\n")}\n`);
+    return filePath;
+}
+//# sourceMappingURL=session-export.js.map

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

@@ -5,7 +5,7 @@ import { readdir, stat } from "fs/promises";
 import { join, resolve } from "path";
 import { createInterface } from "readline";
 import { StringDecoder } from "string_decoder";
-import { getAgentDir as getDefaultAgentDir, getSessionsDir } from "../config.js";
+import { APP_NAME, getAgentDir as getDefaultAgentDir, getSessionsDir } from "../config.js";
 import { normalizePath, resolvePath } from "../utils/paths.js";
 import { createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "./messages.js";
 export const CURRENT_SESSION_VERSION = 3;
@@ -279,11 +279,11 @@ export function loadEntriesFromFile(filePath) {
     if (!existsSync(resolvedFilePath))
         return [];
     const entries = [];
+    let pending = "";
     const fd = openSync(resolvedFilePath, "r");
     try {
         const decoder = new StringDecoder("utf8");
         const buffer = Buffer.allocUnsafe(SESSION_READ_BUFFER_SIZE);
-        let pending = "";
         while (true) {
             const bytesRead = readSync(fd, buffer, 0, buffer.length, null);
             if (bytesRead === 0)
@@ -308,13 +308,15 @@ export function loadEntriesFromFile(filePath) {
     finally {
         closeSync(fd);
     }
-    // Validate session header
+    // Validate session header before repairing the file.
     if (entries.length === 0)
         return entries;
     const header = entries[0];
     if (header.type !== "session" || typeof header.id !== "string") {
         return [];
     }
+    if (pending)
+        appendFileSync(resolvedFilePath, "\n");
     return entries;
 }
 /**
@@ -620,7 +622,7 @@ export class SessionManager {
             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}`);
+                    throw new Error(`Session file is not a valid ${APP_NAME} session: ${explicitPath}`);
                 }
                 this.newSession();
                 this.sessionFile = explicitPath;
@@ -1054,13 +1056,14 @@ export class SessionManager {
         if (branchFromId !== null && !this.byId.has(branchFromId)) {
             throw new Error(`Entry ${branchFromId} not found`);
         }
+        const fromId = this.leafId ?? "root";
         this.leafId = branchFromId;
         const entry = {
             type: "branch_summary",
             id: generateId(this.byId),
             parentId: branchFromId,
             timestamp: new Date().toISOString(),
-            fromId: branchFromId ?? "root",
+            fromId,
             summary,
             details,
             usage,

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

@@ -0,0 +1,21 @@
+export function collectSettingsDiagnostics(settingsManager) {
+    return settingsManager.drainErrors().map(({ scope, path, error }) => ({
+        type: "warning",
+        message: path ? `Invalid settings file ${path}: ${error.message}` : `Invalid ${scope} settings: ${error.message}`,
+    }));
+}
+/**
+ * Remove duplicate type/message diagnostics while preserving their first occurrence.
+ * Startup and runtime settings managers can report the same file error.
+ */
+export function deduplicateDiagnostics(diagnostics) {
+    const seen = new Set();
+    return diagnostics.filter((diagnostic) => {
+        const key = `${diagnostic.type}\0${diagnostic.message}`;
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
+}
+//# sourceMappingURL=settings-diagnostics.js.map