@selesai/code 0.13.15 → 0.13.18

package/dist/core/messages.d.ts

@@ -40,7 +40,7 @@ export interface CustomMessage<T = unknown> {
 export interface BranchSummaryMessage {
     role: "branchSummary";
     summary: string;
-    fromId: string;
+    fromId: string | null;
     timestamp: number;
 }
 export interface CompactionSummaryMessage {

package/dist/core/model-config.d.ts

@@ -92,6 +92,7 @@ declare const ModelDefinitionSchema: Type.TObject<{
         deferredToolsMode: Type.TOptional<Type.TLiteral<"kimi">>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
+        vllmPriority: Type.TOptional<Type.TNumber>;
     }>, Type.TObject<{
         supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
@@ -100,6 +101,7 @@ declare const ModelDefinitionSchema: Type.TObject<{
         supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
         supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
         supportsToolSearch: Type.TOptional<Type.TBoolean>;
+        supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
     }>, Type.TObject<{
         supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
@@ -109,6 +111,7 @@ declare const ModelDefinitionSchema: Type.TObject<{
         forceAdaptiveThinking: Type.TOptional<Type.TBoolean>;
         allowEmptySignature: Type.TOptional<Type.TBoolean>;
         supportsStrictTools: Type.TOptional<Type.TBoolean>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsToolReferences: Type.TOptional<Type.TBoolean>;
     }>]>>;
 }>;
@@ -201,6 +204,7 @@ declare const ModelOverrideSchema: Type.TObject<{
         deferredToolsMode: Type.TOptional<Type.TLiteral<"kimi">>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
+        vllmPriority: Type.TOptional<Type.TNumber>;
     }>, Type.TObject<{
         supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
@@ -209,6 +213,7 @@ declare const ModelOverrideSchema: Type.TObject<{
         supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
         supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
         supportsToolSearch: Type.TOptional<Type.TBoolean>;
+        supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
     }>, Type.TObject<{
         supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
@@ -218,6 +223,7 @@ declare const ModelOverrideSchema: Type.TObject<{
         forceAdaptiveThinking: Type.TOptional<Type.TBoolean>;
         allowEmptySignature: Type.TOptional<Type.TBoolean>;
         supportsStrictTools: Type.TOptional<Type.TBoolean>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsToolReferences: Type.TOptional<Type.TBoolean>;
     }>]>>;
 }>;
@@ -288,6 +294,7 @@ declare const ProviderConfigSchema: Type.TObject<{
         deferredToolsMode: Type.TOptional<Type.TLiteral<"kimi">>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
+        vllmPriority: Type.TOptional<Type.TNumber>;
     }>, Type.TObject<{
         supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
@@ -296,6 +303,7 @@ declare const ProviderConfigSchema: Type.TObject<{
         supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
         supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
         supportsToolSearch: Type.TOptional<Type.TBoolean>;
+        supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
     }>, Type.TObject<{
         supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
@@ -305,6 +313,7 @@ declare const ProviderConfigSchema: Type.TObject<{
         forceAdaptiveThinking: Type.TOptional<Type.TBoolean>;
         allowEmptySignature: Type.TOptional<Type.TBoolean>;
         supportsStrictTools: Type.TOptional<Type.TBoolean>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsToolReferences: Type.TOptional<Type.TBoolean>;
     }>]>>;
     authHeader: Type.TOptional<Type.TBoolean>;
@@ -400,6 +409,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             deferredToolsMode: Type.TOptional<Type.TLiteral<"kimi">>;
             sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
             supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
+            vllmPriority: Type.TOptional<Type.TNumber>;
         }>, Type.TObject<{
             supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
             sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
@@ -408,6 +418,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
             supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
             supportsToolSearch: Type.TOptional<Type.TBoolean>;
+            supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
         }>, Type.TObject<{
             supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
             supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
@@ -417,6 +428,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             forceAdaptiveThinking: Type.TOptional<Type.TBoolean>;
             allowEmptySignature: Type.TOptional<Type.TBoolean>;
             supportsStrictTools: Type.TOptional<Type.TBoolean>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsToolReferences: Type.TOptional<Type.TBoolean>;
         }>]>>;
     }>>>;
@@ -509,6 +521,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             deferredToolsMode: Type.TOptional<Type.TLiteral<"kimi">>;
             sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
             supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
+            vllmPriority: Type.TOptional<Type.TNumber>;
         }>, Type.TObject<{
             supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
             sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
@@ -517,6 +530,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
             supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
             supportsToolSearch: Type.TOptional<Type.TBoolean>;
+            supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
         }>, Type.TObject<{
             supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
             supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
@@ -526,6 +540,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             forceAdaptiveThinking: Type.TOptional<Type.TBoolean>;
             allowEmptySignature: Type.TOptional<Type.TBoolean>;
             supportsStrictTools: Type.TOptional<Type.TBoolean>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsToolReferences: Type.TOptional<Type.TBoolean>;
         }>]>>;
     }>>>;

package/dist/core/model-config.js

@@ -89,6 +89,7 @@ const OpenAICompletionsCompatSchema = Type.Object({
     deferredToolsMode: Type.Optional(Type.Literal("kimi")),
     sessionAffinityFormat: Type.Optional(Type.Union([Type.Literal("openai"), Type.Literal("openai-nosession"), Type.Literal("openrouter")])),
     supportsLongCacheRetention: Type.Optional(Type.Boolean()),
+    vllmPriority: Type.Optional(Type.Number()),
 });
 const OpenAIResponsesCompatSchema = Type.Object({
     supportsDeveloperRole: Type.Optional(Type.Boolean()),
@@ -98,6 +99,7 @@ const OpenAIResponsesCompatSchema = Type.Object({
     supportsOpenAIGrammarTools: Type.Optional(Type.Boolean()),
     supportsAdditionalTools: Type.Optional(Type.Boolean()),
     supportsToolSearch: Type.Optional(Type.Boolean()),
+    supportsMaxOutputTokens: Type.Optional(Type.Boolean()),
 });
 const AnthropicMessagesCompatSchema = Type.Object({
     supportsEagerToolInputStreaming: Type.Optional(Type.Boolean()),
@@ -108,6 +110,7 @@ const AnthropicMessagesCompatSchema = Type.Object({
     forceAdaptiveThinking: Type.Optional(Type.Boolean()),
     allowEmptySignature: Type.Optional(Type.Boolean()),
     supportsStrictTools: Type.Optional(Type.Boolean()),
+    supportsMidConvoEffort: Type.Optional(Type.Boolean()),
     supportsToolReferences: Type.Optional(Type.Boolean()),
 });
 const ProviderCompatSchema = Type.Union([

package/dist/core/model-runtime.d.ts

@@ -73,6 +73,7 @@ export declare class ModelRuntime implements Models {
     complete<TApi extends Api>(model: Model<TApi>, context: Context, options?: ModelsApiStreamOptions<TApi>): Promise<AssistantMessage>;
     streamSimple(model: Model<Api>, context: Context, options?: ModelsSimpleStreamOptions): AssistantMessageEventStream;
     completeSimple(model: Model<Api>, context: Context, options?: ModelsSimpleStreamOptions): Promise<AssistantMessage>;
+    streamDeferred(model: Model<Api>, handle: DeferredHandle, options?: ModelsDeferredFetchOptions): AssistantMessageEventStream;
     fetchDeferred(model: Model<Api>, handle: DeferredHandle, options?: ModelsDeferredFetchOptions): Promise<AssistantMessage>;
     cancelDeferred(model: Model<Api>, handle: DeferredHandle, options?: ModelsDeferredCancelOptions): Promise<void>;
     login(providerId: string, type: AuthType, interaction: AuthInteraction): Promise<Credential>;

package/dist/core/model-runtime.js

@@ -357,14 +357,17 @@ export class ModelRuntime {
     completeSimple(model, context, options) {
         return this.streamSimple(model, context, options).result();
     }
-    async fetchDeferred(model, handle, options) {
+    streamDeferred(model, handle, options) {
         return lazyStream(model, async () => {
             const prepared = await this.prepareRequest(model, options);
             if (!prepared.provider.fetchDeferred) {
                 throw new ModelsError("provider", `Provider ${model.provider} does not support deferred responses`);
             }
             return prepared.provider.fetchDeferred(prepared.model, handle, prepared.options);
-        }).result();
+        });
+    }
+    async fetchDeferred(model, handle, options) {
+        return this.streamDeferred(model, handle, options).result();
     }
     async cancelDeferred(model, handle, options) {
         const prepared = await this.prepareRequest(model, options);

package/dist/core/provider-composer.js

@@ -85,6 +85,12 @@ function modelFromJson(providerId, definition, providerConfig, defaults) {
         compat: mergeCompat(providerConfig.compat, definition.compat),
     };
 }
+function findModelDefaults(models, modelId, api) {
+    return (models.find((model) => model.id === modelId) ??
+        (api ? models.find((model) => model.api === api) : undefined) ??
+        models.find((model) => model.api === "openai-completions") ??
+        models[0]);
+}
 function applyModelsJson(providerId, baseModels, config) {
     if (!config)
         return [...baseModels];
@@ -109,7 +115,7 @@ function applyModelsJson(providerId, baseModels, config) {
     }));
     for (const definition of config.models ?? []) {
         const existingIndex = models.findIndex((model) => model.id === definition.id);
-        const defaults = existingIndex >= 0 ? models[existingIndex] : models[0];
+        const defaults = findModelDefaults(models, definition.id, definition.api ?? config.api);
         const model = modelFromJson(providerId, definition, config, defaults);
         if (existingIndex >= 0)
             models[existingIndex] = model;
@@ -125,7 +131,7 @@ function applyExtension(providerId, models, config) {
         return config.baseUrl ? models.map((model) => ({ ...model, baseUrl: config.baseUrl })) : [...models];
     }
     return config.models.map((definition) => {
-        const defaults = models.find((model) => model.id === definition.id) ?? models[0];
+        const defaults = findModelDefaults(models, definition.id, definition.api ?? config.api);
         const api = definition.api ?? config.api ?? defaults?.api;
         if (!api) {
             throw new Error(`Provider ${providerId}, model ${definition.id}: no "api" specified. Set at provider or model level.`);

package/dist/core/session-export.d.ts

@@ -0,0 +1,3 @@
+import { type SessionManager } from "./session-manager.ts";
+/** Write the current session branch and optional trailing export-only entries as JSONL. */
+export declare function exportSessionToJsonl(sessionManager: SessionManager, outputPath?: string, createTrailingEntries?: (parentId: string | null, timestamp: string) => readonly object[]): string;

package/dist/core/session-export.js

@@ -0,0 +1,31 @@
+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;
+}

package/dist/core/session-manager.d.ts

@@ -198,6 +198,7 @@ export declare class SessionManager {
     setSessionFile(sessionFile: string): void;
     private _setSessionFile;
     newSession(options?: NewSessionOptions): string | undefined;
+    private _loadEntries;
     private _buildIndex;
     private _rewriteFile;
     isPersisted(): boolean;
@@ -329,8 +330,8 @@ export declare class SessionManager {
      * @param sessionDir Optional session directory. If omitted, uses the configured agent sessions directory.
      */
     static continueRecent(cwd: string, sessionDir?: string): SessionManager;
-    /** Create an in-memory session (no file persistence) */
-    static inMemory(cwd?: string, options?: NewSessionOptions): SessionManager;
+    /** Create an in-memory session (no file persistence), optionally from entries held outside the filesystem. */
+    static inMemory(cwd?: string, options?: NewSessionOptions, entries?: FileEntry[]): SessionManager;
     /**
      * Fork a session from another project directory into the current project.
      * Creates a new session in the target cwd with the full history from the source session.

package/dist/core/session-manager.js

@@ -605,6 +605,9 @@ export class SessionManager {
         if (sessionFile) {
             this._setSessionFile(sessionFile, preloadedFileEntries);
         }
+        else if (preloadedFileEntries?.length) {
+            this._loadEntries(preloadedFileEntries, newSessionOptions);
+        }
         else {
             this.newSession(newSessionOptions);
         }
@@ -616,10 +619,10 @@ export class SessionManager {
     _setSessionFile(sessionFile, preloadedFileEntries) {
         this.sessionFile = resolvePath(sessionFile);
         if (existsSync(this.sessionFile)) {
-            this.fileEntries = preloadedFileEntries ?? loadEntriesFromFile(this.sessionFile);
+            const entries = preloadedFileEntries ?? loadEntriesFromFile(this.sessionFile);
             // 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) {
+            if (entries.length === 0) {
                 const explicitPath = this.sessionFile;
                 if (statSync(explicitPath).size > 0) {
                     throw new Error(`Session file is not a valid ${APP_NAME} session: ${explicitPath}`);
@@ -630,12 +633,7 @@ export class SessionManager {
                 this.flushed = true;
                 return;
             }
-            const header = this.fileEntries.find((e) => e.type === "session");
-            this.sessionId = header?.id ?? createSessionId();
-            if (migrateToCurrentVersion(this.fileEntries)) {
-                this._rewriteFile();
-            }
-            this._buildIndex();
+            this._loadEntries(entries);
             this.flushed = true;
         }
         else {
@@ -670,6 +668,21 @@ export class SessionManager {
         }
         return this.sessionFile;
     }
+    _loadEntries(entries, options) {
+        const header = entries.find((e) => e.type === "session");
+        if (header) {
+            this.fileEntries = entries;
+            this.sessionId = header.id;
+            if (migrateToCurrentVersion(this.fileEntries)) {
+                this._rewriteFile();
+            }
+        }
+        else {
+            this.newSession(options);
+            this.fileEntries = this.fileEntries.concat(entries);
+        }
+        this._buildIndex();
+    }
     _buildIndex() {
         this.byId.clear();
         this.labelsById.clear();
@@ -1086,11 +1099,25 @@ export class SessionManager {
         // Because labels are real tree entries, later entries can be children of labels;
         // removing labels requires re-chaining the retained path to avoid orphaned subtrees.
         const pathWithoutLabels = [];
+        const replacementByLabelId = new Map();
+        const pendingLabelIds = [];
         let pathParentId = null;
         for (const entry of path) {
-            if (entry.type === "label")
+            if (entry.type === "label") {
+                pendingLabelIds.push(entry.id);
                 continue;
-            pathWithoutLabels.push({ ...entry, parentId: pathParentId });
+            }
+            for (const labelId of pendingLabelIds) {
+                replacementByLabelId.set(labelId, entry.id);
+            }
+            pendingLabelIds.length = 0;
+            pathWithoutLabels.push(entry.type === "compaction"
+                ? {
+                    ...entry,
+                    parentId: pathParentId,
+                    firstKeptEntryId: replacementByLabelId.get(entry.firstKeptEntryId) ?? entry.firstKeptEntryId,
+                }
+                : { ...entry, parentId: pathParentId });
             pathParentId = entry.id;
         }
         const newSessionId = createSessionId();
@@ -1222,9 +1249,9 @@ export class SessionManager {
         }
         return new SessionManager(cwd, dir, undefined, true);
     }
-    /** Create an in-memory session (no file persistence) */
-    static inMemory(cwd = process.cwd(), options) {
-        return new SessionManager(cwd, "", undefined, false, options);
+    /** Create an in-memory session (no file persistence), optionally from entries held outside the filesystem. */
+    static inMemory(cwd = process.cwd(), options, entries) {
+        return new SessionManager(cwd, "", undefined, false, options, entries);
     }
     /**
      * Fork a session from another project directory into the current project.

package/dist/core/skills.d.ts

@@ -52,7 +52,7 @@ export declare function loadSkillsFromDir(options: LoadSkillsFromDirOptions): Lo
  * Skills with disableModelInvocation=true are excluded from the prompt
  * (they can only be invoked explicitly via /skill:name commands).
  */
-export declare function formatSkillsForPrompt(skills: Skill[]): string;
+export declare function formatSkillsForPrompt(skills: Skill[], fileReadTool?: "read" | "bash"): string;
 export interface LoadSkillsOptions {
     /** Working directory for project-local skills. */
     cwd: string;

package/dist/core/skills.js

@@ -255,14 +255,16 @@ function loadSkillFromFile(filePath, source) {
  * Skills with disableModelInvocation=true are excluded from the prompt
  * (they can only be invoked explicitly via /skill:name commands).
  */
-export function formatSkillsForPrompt(skills) {
+export function formatSkillsForPrompt(skills, fileReadTool = "read") {
     const visibleSkills = skills.filter((s) => !s.disableModelInvocation);
     if (visibleSkills.length === 0) {
         return "";
     }
     const lines = [
         "\n\nThe following skills provide specialized instructions for specific tasks.",
-        "Use the read tool to load a skill's file when the task matches its description, unless its full instructions are already embedded in the current user message inside a <skill> block.",
+        fileReadTool === "read"
+            ? "Use the read tool to load a skill's file when the task matches its description, unless its full instructions are already embedded in the current user message inside a <skill> block."
+            : "Use bash to load a skill's file when the task matches its description, unless its full instructions are already embedded in the current user message inside a <skill> block.",
         "When a skill file references a relative path, resolve it against the skill directory (parent of SKILL.md / dirname of the path) and use that absolute path in tool commands.",
         "",
         "<available_skills>",

package/dist/core/system-prompt.js

@@ -18,6 +18,9 @@ export function buildSystemPrompt(options) {
     const contextFiles = providedContextFiles ?? [];
     const skills = providedSkills ?? [];
     const agents = options.agents ?? [];
+    const tools = selectedTools || ["read", "bash", "edit", "write"];
+    const hasRead = tools.includes("read");
+    const skillFileReadTool = ["read", "bash"].find((tool) => tools.includes(tool));
     if (customPrompt) {
         let prompt = customPrompt;
         if (appendSection) {
@@ -32,12 +35,11 @@ export function buildSystemPrompt(options) {
             }
             prompt += "</project_context>\n";
         }
-        // Append skills section (only if read tool is available)
-        const customPromptHasRead = !selectedTools || selectedTools.includes("read");
-        if (customPromptHasRead && skills.length > 0) {
-            prompt += formatSkillsForPrompt(skills);
+        // Append skills when a tool capable of reading their files is available.
+        if (skillFileReadTool && skills.length > 0) {
+            prompt += formatSkillsForPrompt(skills, skillFileReadTool);
         }
-        if (customPromptHasRead && agents.length > 0) {
+        if (hasRead && agents.length > 0) {
             prompt += formatAgentsForPrompt(agents);
         }
         // Render active-tool guidelines (e.g., mandatory delegation contracts) in
@@ -60,7 +62,6 @@ export function buildSystemPrompt(options) {
     const examplesPath = getExamplesPath();
     // Build tools list based on selected tools.
     // A tool appears in Available tools only when the caller provides a one-line snippet.
-    const tools = selectedTools || ["read", "bash", "edit", "write", "grep", "find", "ls"];
     const visibleTools = tools.filter((name) => !!toolSnippets?.[name]);
     const toolsList = visibleTools.length > 0 ? visibleTools.map((name) => `- ${name}: ${toolSnippets[name]}`).join("\n") : "(none)";
     // Build guidelines based on which tools are actually available
@@ -77,7 +78,6 @@ export function buildSystemPrompt(options) {
     const hasGrep = tools.includes("grep");
     const hasFind = tools.includes("find");
     const hasLs = tools.includes("ls");
-    const hasRead = tools.includes("read");
     // File exploration guidelines
     if (hasBash && !hasGrep && !hasFind && !hasLs) {
         addGuideline("Use bash for file operations like ls, rg, find");
@@ -117,9 +117,9 @@ When working on pi topics, resolve docs/... and examples/... under those paths (
         }
         prompt += "</project_context>\n";
     }
-    // Append skills section (only if read tool is available)
-    if (hasRead && skills.length > 0) {
-        prompt += formatSkillsForPrompt(skills);
+    // Append skills when a tool capable of reading their files is available.
+    if (skillFileReadTool && skills.length > 0) {
+        prompt += formatSkillsForPrompt(skills, skillFileReadTool);
     }
     if (hasRead && agents.length > 0) {
         prompt += formatAgentsForPrompt(agents);

package/dist/core/tools/bash.js

@@ -1,16 +1,12 @@
 import { constants } from "node:fs";
 import { access as fsAccess } from "node:fs/promises";
-import { Container, Text, truncateToWidth } from "@earendil-works/pi-tui";
 import { spawn } from "child_process";
 import { Type } from "typebox";
-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
-import { truncateToVisualLines } from "../../modes/interactive/components/visual-truncate.js";
-import { theme } from "../../modes/interactive/theme/theme.js";
 import { waitForChildProcess } from "../../utils/child-process.js";
 import { getShellConfig, getShellEnv, killProcessTree, trackDetachedChildPid, untrackDetachedChildPid, } from "../../utils/shell.js";
 import { getExperimentalToolSampling } from "../experimental.js";
 import { OutputAccumulator } from "./output-accumulator.js";
-import { getTextOutput, invalidArgText, str } from "./render-utils.js";
+import { BASH_UPDATE_THROTTLE_MS, createShellRenderers } from "./renderers/bash.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "./truncate.js";
 const MAX_TIMEOUT_MS = 2_147_483_647;
@@ -143,90 +139,6 @@ function resolveSpawnContext(command, cwd, spawnHook, exposeSessionEnvironment,
     const baseContext = { command, cwd, env };
     return spawnHook ? spawnHook(baseContext) : baseContext;
 }
-const BASH_PREVIEW_LINES = 5;
-const BASH_UPDATE_THROTTLE_MS = 100;
-class BashResultRenderComponent extends Container {
-    state = {
-        cachedWidth: undefined,
-        cachedLines: undefined,
-        cachedSkipped: undefined,
-    };
-}
-function formatDuration(ms) {
-    return `${(ms / 1000).toFixed(1)}s`;
-}
-function formatShellCall(args, prompt) {
-    const command = str(args?.command);
-    const timeout = args?.timeout;
-    const timeoutSuffix = timeout ? theme.fg("muted", ` (timeout ${timeout}s)`) : "";
-    const commandDisplay = command === null ? invalidArgText(theme) : command ? command : theme.fg("toolOutput", "...");
-    return theme.fg("toolTitle", theme.bold(`${prompt} ${commandDisplay}`)) + timeoutSuffix;
-}
-function rebuildBashResultRenderComponent(component, result, options, showImages, startedAt, endedAt) {
-    const state = component.state;
-    component.clear();
-    let output = getTextOutput(result, showImages).trim();
-    const truncation = result.details?.truncation;
-    const fullOutputPath = result.details?.fullOutputPath;
-    if (!options.isPartial && truncation?.truncated && fullOutputPath && output.endsWith("]")) {
-        const footerStart = output.lastIndexOf("\n\n[");
-        if (footerStart !== -1 && output.slice(footerStart).includes(fullOutputPath)) {
-            output = output.slice(0, footerStart).trimEnd();
-        }
-    }
-    if (output) {
-        const styledOutput = output
-            .split("\n")
-            .map((line) => theme.fg("toolOutput", line))
-            .join("\n");
-        if (options.expanded) {
-            component.addChild(new Text(`\n${styledOutput}`, 0, 0));
-        }
-        else {
-            component.addChild({
-                render: (width) => {
-                    if (state.cachedLines === undefined || state.cachedWidth !== width) {
-                        const preview = truncateToVisualLines(styledOutput, BASH_PREVIEW_LINES, width);
-                        state.cachedLines = preview.visualLines;
-                        state.cachedSkipped = preview.skippedCount;
-                        state.cachedWidth = width;
-                    }
-                    if (state.cachedSkipped && state.cachedSkipped > 0) {
-                        const hint = theme.fg("muted", `... (${state.cachedSkipped} earlier lines,`) +
-                            ` ${keyHint("app.tools.expand", "to expand")}${theme.fg("muted", ")")}`;
-                        return ["", truncateToWidth(hint, width, "..."), ...(state.cachedLines ?? [])];
-                    }
-                    return ["", ...(state.cachedLines ?? [])];
-                },
-                invalidate: () => {
-                    state.cachedWidth = undefined;
-                    state.cachedLines = undefined;
-                    state.cachedSkipped = undefined;
-                },
-            });
-        }
-    }
-    if (truncation?.truncated || fullOutputPath) {
-        const warnings = [];
-        if (fullOutputPath) {
-            warnings.push(`Full output: ${fullOutputPath}`);
-        }
-        if (truncation?.truncated) {
-            if (truncation.truncatedBy === "lines") {
-                warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
-            }
-            else {
-                warnings.push(`Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`);
-            }
-        }
-        component.addChild(new Text(`\n${theme.fg("warning", `[${warnings.join(". ")}]`)}`, 0, 0));
-    }
-    if (startedAt !== undefined) {
-        const label = options.isPartial ? "Elapsed" : "Took";
-        const endTime = endedAt ?? Date.now();
-        component.addChild(new Text(`\n${theme.fg("muted", `${label} ${formatDuration(endTime - startedAt)}`)}`, 0, 0));
-    }
-}
 export function createShellToolDefinition(cwd, config, options) {
     const ops = options?.operations ?? createLocalBashOperations({ shellPath: options?.shellPath });
     const commandPrefix = options?.commandPrefix;
@@ -242,7 +154,7 @@ export function createShellToolDefinition(cwd, config, options) {
         constrainedSampling: getExperimentalToolSampling(),
         async execute(_toolCallId, { command, timeout }, signal, onUpdate, ctx) {
             const resolvedCommand = commandPrefix ? `${commandPrefix}\n${command}` : command;
-            const spawnContext = resolveSpawnContext(resolvedCommand, cwd, spawnHook, exposeSessionEnvironment, ctx);
+            const spawnContext = resolveSpawnContext(resolvedCommand, ctx?.cwd || cwd, spawnHook, exposeSessionEnvironment, ctx);
             const output = new OutputAccumulator({ tempFilePrefix: config.tempFilePrefix });
             let acceptingOutput = true;
             let updateTimer;
@@ -357,33 +269,7 @@ export function createShellToolDefinition(cwd, config, options) {
                 clearUpdateTimer();
             }
         },
-        renderCall(args, _theme, context) {
-            const state = context.state;
-            if (context.executionStarted && state.startedAt === undefined) {
-                state.startedAt = Date.now();
-                state.endedAt = undefined;
-            }
-            const text = context.lastComponent ?? new Text("", 0, 0);
-            text.setText(formatShellCall(args, config.prompt));
-            return text;
-        },
-        renderResult(result, options, _theme, context) {
-            const state = context.state;
-            if (state.startedAt !== undefined && options.isPartial && !state.interval) {
-                state.interval = setInterval(() => context.invalidate(), 1000);
-            }
-            if (!options.isPartial || context.isError) {
-                state.endedAt ??= Date.now();
-                if (state.interval) {
-                    clearInterval(state.interval);
-                    state.interval = undefined;
-                }
-            }
-            const component = context.lastComponent ?? new BashResultRenderComponent();
-            rebuildBashResultRenderComponent(component, result, options, context.showImages, state.startedAt, state.endedAt);
-            component.invalidate();
-            return component;
-        },
+        ...createShellRenderers(config.prompt),
     };
 }
 const bashToolConfig = {

package/dist/core/tools/edit.d.ts

@@ -1,12 +1,7 @@
 import type { AgentTool } from "@earendil-works/pi-agent-core";
-import { Box } from "@earendil-works/pi-tui";
 import { type Static, Type } from "typebox";
 import type { ToolDefinition } from "../extensions/types.ts";
-import { type EditDiffError, type EditDiffResult } from "./edit-diff.ts";
-type EditPreview = EditDiffResult | EditDiffError;
-type EditRenderState = {
-    callComponent?: EditCallRenderComponent;
-};
+import { type EditRenderState } from "./renderers/edit.ts";
 declare const editSchema: Type.TObject<{
     path: Type.TString;
     edits: Type.TArray<Type.TObject<{
@@ -39,12 +34,6 @@ export interface EditToolOptions {
     /** Custom operations for file editing. Default: local filesystem */
     operations?: EditOperations;
 }
-type EditCallRenderComponent = Box & {
-    preview?: EditPreview;
-    previewArgsKey?: string;
-    previewPending?: boolean;
-    settledError?: boolean;
-};
 export declare function createEditToolDefinition(cwd: string, options?: EditToolOptions): ToolDefinition<typeof editSchema, EditToolDetails | undefined, EditRenderState>;
 export declare function createEditTool(cwd: string, options?: EditToolOptions): AgentTool<typeof editSchema>;
 export {};