@dungle-scrubs/tallow 0.9.3 → 0.9.6

package/dist/reset-diagnostics.d.ts

@@ -0,0 +1,69 @@
+/**
+ * Reset diagnostics capture structured reset and deferred-trigger events.
+ *
+ * Keeps an in-memory ring buffer for tests and optional debug inspection.
+ * Production behavior stays quiet unless TALLOW_DEBUG_RESET=1 is set.
+ */
+/** Reset/deferred event emitted during session reset handling. */
+export type ResetDiagnosticEvent = {
+    readonly kind: "deferred_cancelled";
+    readonly reason: string;
+    readonly source: string;
+    timestamp: number;
+} | {
+    readonly kind: "deferred_dropped";
+    readonly reason: string;
+    readonly source: string;
+    timestamp: number;
+} | {
+    readonly kind: "deferred_registered";
+    readonly source: string;
+    timestamp: number;
+} | {
+    readonly kind: "reset_complete";
+    readonly reason: string;
+    timestamp: number;
+} | {
+    readonly kind: "reset_start";
+    readonly reason: string;
+    timestamp: number;
+};
+/** Reset/deferred event input before timestamp attachment. */
+export type ResetDiagnosticInput = {
+    readonly kind: "deferred_cancelled";
+    readonly reason: string;
+    readonly source: string;
+} | {
+    readonly kind: "deferred_dropped";
+    readonly reason: string;
+    readonly source: string;
+} | {
+    readonly kind: "deferred_registered";
+    readonly source: string;
+} | {
+    readonly kind: "reset_complete";
+    readonly reason: string;
+} | {
+    readonly kind: "reset_start";
+    readonly reason: string;
+};
+/**
+ * Record one reset diagnostic event.
+ *
+ * @param event - Structured reset/deferred event
+ * @returns Nothing
+ */
+export declare function recordResetDiagnostic(event: ResetDiagnosticInput): void;
+/**
+ * Return a snapshot of the current reset diagnostics for tests.
+ *
+ * @returns Recorded reset diagnostics
+ */
+export declare function getResetDiagnosticsForTests(): readonly ResetDiagnosticEvent[];
+/**
+ * Clear captured reset diagnostics between tests.
+ *
+ * @returns Nothing
+ */
+export declare function resetResetDiagnosticsForTests(): void;
+//# sourceMappingURL=reset-diagnostics.d.ts.map

package/dist/reset-diagnostics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reset-diagnostics.d.ts","sourceRoot":"","sources":["../src/reset-diagnostics.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,kEAAkE;AAClE,MAAM,MAAM,oBAAoB,GAC7B;IACA,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACjB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACjB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACjB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACjB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACjB,CAAC;AAEL,8DAA8D;AAC9D,MAAM,MAAM,oBAAoB,GAC7B;IACA,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACvB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACvB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACvB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACvB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACvB,CAAC;AAIL;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CASvE;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,IAAI,SAAS,oBAAoB,EAAE,CAE7E;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD"}

package/dist/reset-diagnostics.js

@@ -0,0 +1,41 @@
+/**
+ * Reset diagnostics capture structured reset and deferred-trigger events.
+ *
+ * Keeps an in-memory ring buffer for tests and optional debug inspection.
+ * Production behavior stays quiet unless TALLOW_DEBUG_RESET=1 is set.
+ */
+const MAX_DIAGNOSTIC_EVENTS = 200;
+const diagnostics = [];
+/**
+ * Record one reset diagnostic event.
+ *
+ * @param event - Structured reset/deferred event
+ * @returns Nothing
+ */
+export function recordResetDiagnostic(event) {
+    const entry = { ...event, timestamp: Date.now() };
+    diagnostics.push(entry);
+    if (diagnostics.length > MAX_DIAGNOSTIC_EVENTS) {
+        diagnostics.splice(0, diagnostics.length - MAX_DIAGNOSTIC_EVENTS);
+    }
+    if (process.env.TALLOW_DEBUG_RESET === "1") {
+        console.error(`[reset] ${JSON.stringify(entry)}`);
+    }
+}
+/**
+ * Return a snapshot of the current reset diagnostics for tests.
+ *
+ * @returns Recorded reset diagnostics
+ */
+export function getResetDiagnosticsForTests() {
+    return [...diagnostics];
+}
+/**
+ * Clear captured reset diagnostics between tests.
+ *
+ * @returns Nothing
+ */
+export function resetResetDiagnosticsForTests() {
+    diagnostics.length = 0;
+}
+//# sourceMappingURL=reset-diagnostics.js.map

package/dist/reset-diagnostics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reset-diagnostics.js","sourceRoot":"","sources":["../src/reset-diagnostics.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAyDlC,MAAM,WAAW,GAA2B,EAAE,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAA2B;IAChE,MAAM,KAAK,GAAyB,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;IACxE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,IAAI,WAAW,CAAC,MAAM,GAAG,qBAAqB,EAAE,CAAC;QAChD,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,qBAAqB,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,GAAG,EAAE,CAAC;QAC5C,OAAO,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;AACF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B;IAC1C,OAAO,CAAC,GAAG,WAAW,CAAC,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,6BAA6B;IAC5C,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;AACxB,CAAC"}

package/dist/sdk.d.ts

@@ -1,4 +1,4 @@
-import { type CreateAgentSessionOptions, type CreateAgentSessionResult, type ExtensionFactory, type PromptTemplate, type Skill } from "@mariozechner/pi-coding-agent";
+import { type CreateAgentSessionOptions, type CreateAgentSessionResult, createAgentSessionRuntime, type ExtensionFactory, type PromptTemplate, type Skill } from "@mariozechner/pi-coding-agent";
 import { type TallowTelemetryConfig, type TelemetryHandle } from "./otel.js";
 import { type ResolvedPlugin, type TallowExtensionManifest } from "./plugins.js";
 import { type ProjectTrustStatus } from "./project-trust.js";
@@ -238,8 +238,10 @@ export declare function applyToolResultRetentionToMessages(messages: unknown[],
  */
 export declare function resolveSharedSkillsDirs(globalSettings: Record<string, unknown> | undefined): string[];
 export interface TallowSession {
-    /** The underlying AgentSession */
-    session: CreateAgentSessionResult["session"];
+    /** Runtime host used by interactive/print/rpc modes and session replacement flows. */
+    runtime: Awaited<ReturnType<typeof createAgentSessionRuntime>>;
+    /** The current underlying AgentSession. This getter tracks runtime.session. */
+    readonly session: CreateAgentSessionResult["session"];
     /** Extension loading results */
     extensions: CreateAgentSessionResult["extensionsResult"];
     /** Model fallback message (if session model couldn't be restored) */
@@ -319,24 +321,6 @@ export declare function resolveExtensionSelectors(selectors: readonly string[] |
     cwd?: string;
     catalog?: readonly BundledExtensionCatalogEntry[];
 }): string[];
-/**
- * Create a Tallow session with all bundled extensions, skills, prompts,
- * and agents pre-loaded. This is the main SDK entry point.
- *
- * ```typescript
- * import { createTallowSession } from "tallow";
- *
- * const { session } = await createTallowSession();
- *
- * session.subscribe((event) => {
- *   if (event.type === "message_update" && event.assistantMessageEvent.type === "text_delta") {
- *     process.stdout.write(event.assistantMessageEvent.delta);
- *   }
- * });
- *
- * await session.prompt("Fix the failing tests");
- * ```
- */
 export declare function createTallowSession(options?: TallowSessionOptions): Promise<TallowSession>;
 /**
  * Collect plugin specs from settings files and CLI options.

package/dist/sdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"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"}

package/dist/sdk.js

@@ -1,8 +1,7 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, delimiter, dirname, join, resolve, sep } from "node:path";
-import { bashTool, codingTools, createAgentSession, createEventBus, DefaultPackageManager, DefaultResourceLoader, editTool, findTool, grepTool, lsTool, ModelRegistry, readOnlyTools, readTool, SessionManager, SettingsManager, writeTool, } from "@mariozechner/pi-coding-agent";
-import * as PiTui from "@mariozechner/pi-tui";
+import { bashTool, codingTools, createAgentSession, createAgentSessionRuntime, createEventBus, DefaultPackageManager, DefaultResourceLoader, editTool, findTool, grepTool, lsTool, ModelRegistry, readOnlyTools, readTool, SessionManager, SettingsManager, writeTool, } from "@mariozechner/pi-coding-agent";
 import { atomicWriteFileSync } from "./atomic-write.js";
 import { createSecureAuthStorage, resolveRuntimeApiKeyFromEnv } from "./auth-hardening.js";
 import { applyAgentSessionCompactionCancelPatch } from "./compaction-cancel-patch.js";
@@ -10,6 +9,7 @@ import { BUNDLED, bootstrap, getRuntimeTallowHome, resolveOpSecrets, TALLOW_VERS
 import { applyInteractiveModeStaleUiPatch } from "./interactive-mode-patch.js";
 import { applyKnownModelMetadataOverrides } from "./model-metadata-overrides.js";
 import { createTelemetryHandle, extractTraceContextFromEnv, sessionAttributes, TELEMETRY_API_CHANNELS, } from "./otel.js";
+import { applyPiTuiPatches } from "./pi-tui-patch.js";
 import { cleanupOrphanPids } from "./pid-manager.js";
 import { extractClaudePluginResources, readPluginManifest, resolvePlugins, } from "./plugins.js";
 import { applyProjectTrustContextToEnv, resolveProjectTrust, trustProject, untrustProject, } from "./project-trust.js";
@@ -967,14 +967,41 @@ function applyExtensionStartupPolicies(base, options) {
  * await session.prompt("Fix the failing tests");
  * ```
  */
+/**
+ * Apply tallow runtime setting overrides that must be consistent across initial
+ * startup and runtime-backed session recreation.
+ *
+ * @param settingsManager - Settings manager to mutate
+ * @param runtimeSettings - Optional runtime settings overrides from SDK/CLI
+ * @param trustStatus - Effective project trust status for the target cwd
+ * @returns Nothing
+ */
+function applySessionSettingsOverrides(settingsManager, runtimeSettings, trustStatus) {
+    const global = settingsManager.getGlobalSettings();
+    const project = settingsManager.getProjectSettings();
+    if (global.quietStartup === undefined && project.quietStartup === undefined) {
+        settingsManager.applyOverrides({ quietStartup: true });
+    }
+    if (runtimeSettings) {
+        settingsManager.applyOverrides(runtimeSettings);
+    }
+    if (trustStatus !== "trusted") {
+        const globalPackages = settingsManager.getGlobalSettings().packages;
+        settingsManager.applyOverrides({
+            packages: (Array.isArray(globalPackages) ? globalPackages : []),
+        });
+    }
+}
 export async function createTallowSession(options = {}) {
     const startupProfile = normalizeStartupProfile(options.startupProfile);
     const startupTiming = createStartupTimingLogger(startupProfile);
     const createSessionStartedAtMs = Date.now();
+    const callerCwd = process.cwd();
     // Ensure env is configured before any framework internals resolve paths
     bootstrap();
     ensureTallowHome(startupProfile);
     if (startupProfile === "interactive") {
+        await applyPiTuiPatches();
         await applyInteractiveModeStaleUiPatch();
     }
     await applyAgentSessionCompactionCancelPatch();
@@ -1015,26 +1042,7 @@ export async function createTallowSession(options = {}) {
     }
     // ── Settings ─────────────────────────────────────────────────────────────
     const settingsManager = SettingsManager.create(cwd, tallowHome);
-    // Default to quiet startup — the welcome-screen extension provides the branded
-    // header, so the built-in keybinding list and resource listing are redundant.
-    // Only apply when the user/project settings haven't explicitly set the value.
-    {
-        const global = settingsManager.getGlobalSettings();
-        const project = settingsManager.getProjectSettings();
-        if (global.quietStartup === undefined && project.quietStartup === undefined) {
-            settingsManager.applyOverrides({ quietStartup: true });
-        }
-    }
-    // Runtime overrides from options.settings come last so they win.
-    if (options.settings) {
-        settingsManager.applyOverrides(options.settings);
-    }
-    if (projectTrust.status !== "trusted") {
-        const globalPackages = settingsManager.getGlobalSettings().packages;
-        settingsManager.applyOverrides({
-            packages: (Array.isArray(globalPackages) ? globalPackages : []),
-        });
-    }
+    applySessionSettingsOverrides(settingsManager, options.settings, projectTrust.status);
     const toolResultRetentionPolicy = resolveToolResultRetentionPolicy({
         globalSettings: settingsManager.getGlobalSettings(),
         projectSettings: settingsManager.getProjectSettings(),
@@ -1143,9 +1151,6 @@ export async function createTallowSession(options = {}) {
     // ── Package AGENTS.md loading ────────────────────────────────────────────
     // Packages contribute extensions, skills, prompts, themes — but the framework
     // doesn't load AGENTS.md from packages. Use agentsFilesOverride to inject them.
-    const packageAgentsFiles = loadAgentsFilesFromPackages(settingsManager, cwd);
-    const projectExtensionsDir = resolve(cwd, ".tallow", "extensions");
-    const shouldBlockProjectExtensions = projectTrust.status !== "trusted";
     if (projectTrust.status !== "trusted") {
         console.error(projectTrust.status === "stale_fingerprint"
             ? "\x1b[33m⚠ Project trust is stale — repo-controlled execution surfaces are blocked until /trust-project\x1b[0m"
@@ -1153,72 +1158,137 @@ export async function createTallowSession(options = {}) {
     }
     const dedupedExtensionPaths = [...new Set(additionalExtensionPaths)];
     const disabledExtensionNames = new Set(options.disabledExtensions ?? []);
-    const shouldApplyExtensionStartupPolicies = shouldBlockProjectExtensions ||
-        startupProfile === "headless" ||
-        disabledExtensionNames.size > 0;
     const explicitToolRestrictionNames = resolveExplicitToolRestrictionNames(options);
-    const loader = new DefaultResourceLoader({
-        cwd,
-        agentDir: tallowHome,
-        settingsManager,
-        eventBus,
-        additionalExtensionPaths: dedupedExtensionPaths,
-        additionalSkillPaths,
-        additionalPromptTemplatePaths: additionalPromptPaths,
-        additionalThemePaths,
-        extensionFactories: [
-            createRebrandSystemPromptExtension(contextBudgetPolicy),
-            injectImageFilePaths,
-            createToolResultRetentionExtension(toolResultRetentionPolicy, contextBudgetPolicy),
-            createContextBudgetPlannerExtension(contextBudgetPolicy),
-            detectOutputTruncation,
-            createProjectTrustExtension(cwd, projectTrust),
-            createTelemetryExtension(telemetry, cwd),
-            ...(explicitToolRestrictionNames
-                ? [createExplicitToolRestrictionExtension(explicitToolRestrictionNames)]
-                : []),
-            ...(options.extensionFactories ?? []),
-        ],
-        noExtensions: extensionsOnly,
-        extensionsOverride: shouldApplyExtensionStartupPolicies
-            ? (base) => applyExtensionStartupPolicies(base, {
-                blockProjectExtensions: shouldBlockProjectExtensions,
-                disabledExtensionNames,
-                projectExtensionsDir,
-                startupProfile,
-            })
-            : undefined,
-        systemPromptOverride: options.systemPrompt ? () => options.systemPrompt : undefined,
-        appendSystemPromptOverride: options.appendSystemPrompt
-            ? (base) => {
-                const append = options.appendSystemPrompt;
-                return append ? [...base, append] : base;
-            }
-            : undefined,
-        agentsFilesOverride: packageAgentsFiles.length > 0
-            ? (base) => ({
-                agentsFiles: [...base.agentsFiles, ...packageAgentsFiles],
-            })
-            : undefined,
-        skillsOverride: (base) => {
-            const normalized = normalizeSkillNames(base);
-            const extra = options.additionalSkills;
-            return {
-                skills: extra ? [...normalized.skills, ...extra] : normalized.skills,
-                diagnostics: normalized.diagnostics,
-            };
-        },
-        promptsOverride: options.additionalPrompts
-            ? (base) => {
-                const extra = options.additionalPrompts;
+    /**
+     * Create a runtime-backed session for the given cwd/session target.
+     *
+     * @param runtimeCwd - Effective session cwd
+     * @param runtimeSessionManager - Session manager to attach
+     * @param sessionStartEvent - Optional lifecycle metadata for replacement flows
+     * @returns Created session, extension load result, and runtime services
+     */
+    const createRuntime = async ({ cwd: runtimeCwd, sessionManager: runtimeSessionManager, sessionStartEvent, }) => {
+        const runtimeProjectTrust = resolveProjectTrust(runtimeCwd);
+        applyProjectTrustContextToEnv(runtimeProjectTrust);
+        const runtimeSettingsManager = SettingsManager.create(runtimeCwd, tallowHome);
+        applySessionSettingsOverrides(runtimeSettingsManager, options.settings, runtimeProjectTrust.status);
+        const runtimePackageAgentsFiles = loadAgentsFilesFromPackages(runtimeSettingsManager, runtimeCwd);
+        const runtimeProjectExtensionsDir = resolve(runtimeCwd, ".tallow", "extensions");
+        const runtimeShouldBlockProjectExtensions = runtimeProjectTrust.status !== "trusted";
+        const runtimeShouldApplyExtensionStartupPolicies = runtimeShouldBlockProjectExtensions ||
+            startupProfile === "headless" ||
+            disabledExtensionNames.size > 0;
+        const runtimeLoader = new DefaultResourceLoader({
+            cwd: runtimeCwd,
+            agentDir: tallowHome,
+            settingsManager: runtimeSettingsManager,
+            eventBus,
+            additionalExtensionPaths: dedupedExtensionPaths,
+            additionalSkillPaths,
+            additionalPromptTemplatePaths: additionalPromptPaths,
+            additionalThemePaths,
+            extensionFactories: [
+                createRebrandSystemPromptExtension(contextBudgetPolicy),
+                createToolResultRetentionExtension(toolResultRetentionPolicy, contextBudgetPolicy),
+                createContextBudgetPlannerExtension(contextBudgetPolicy),
+                detectOutputTruncation,
+                createProjectTrustExtension(runtimeCwd, runtimeProjectTrust),
+                createTelemetryExtension(telemetry, runtimeCwd),
+                ...(explicitToolRestrictionNames
+                    ? [createExplicitToolRestrictionExtension(explicitToolRestrictionNames)]
+                    : []),
+                ...(options.extensionFactories ?? []),
+            ],
+            noExtensions: extensionsOnly,
+            extensionsOverride: runtimeShouldApplyExtensionStartupPolicies
+                ? (base) => applyExtensionStartupPolicies(base, {
+                    blockProjectExtensions: runtimeShouldBlockProjectExtensions,
+                    disabledExtensionNames,
+                    projectExtensionsDir: runtimeProjectExtensionsDir,
+                    startupProfile,
+                })
+                : undefined,
+            systemPromptOverride: options.systemPrompt ? () => options.systemPrompt : undefined,
+            appendSystemPromptOverride: options.appendSystemPrompt
+                ? (base) => {
+                    const append = options.appendSystemPrompt;
+                    return append ? [...base, append] : base;
+                }
+                : undefined,
+            agentsFilesOverride: runtimePackageAgentsFiles.length > 0
+                ? (base) => ({
+                    agentsFiles: [...base.agentsFiles, ...runtimePackageAgentsFiles],
+                })
+                : undefined,
+            skillsOverride: (base) => {
+                const normalized = normalizeSkillNames(base);
+                const extra = options.additionalSkills;
                 return {
-                    prompts: extra ? [...base.prompts, ...extra] : base.prompts,
-                    diagnostics: base.diagnostics,
+                    skills: extra ? [...normalized.skills, ...extra] : normalized.skills,
+                    diagnostics: normalized.diagnostics,
                 };
+            },
+            promptsOverride: options.additionalPrompts
+                ? (base) => {
+                    const extra = options.additionalPrompts;
+                    return {
+                        prompts: extra ? [...base.prompts, ...extra] : base.prompts,
+                        diagnostics: base.diagnostics,
+                    };
+                }
+                : undefined,
+        });
+        await runtimeLoader.reload();
+        applySessionSettingsOverrides(runtimeSettingsManager, options.settings, runtimeProjectTrust.status);
+        let resolvedModel = options.model;
+        if (!resolvedModel && options.provider) {
+            const modelId = options.modelId ?? runtimeSettingsManager.getDefaultModel();
+            if (modelId) {
+                resolvedModel = modelRegistry.find(options.provider, modelId) ?? undefined;
+                if (!resolvedModel) {
+                    throw new Error(`Model ${options.provider}/${modelId} not found`);
+                }
             }
-            : undefined,
-    });
-    await loader.reload();
+            else {
+                const available = modelRegistry.getAll().filter((m) => m.provider === options.provider);
+                if (available.length === 0) {
+                    throw new Error(`No models found for provider "${options.provider}"`);
+                }
+                resolvedModel = available[0];
+            }
+        }
+        const result = await createAgentSession({
+            cwd: runtimeCwd,
+            agentDir: tallowHome,
+            model: resolvedModel,
+            thinkingLevel: options.thinkingLevel,
+            authStorage,
+            modelRegistry,
+            resourceLoader: runtimeLoader,
+            sessionManager: runtimeSessionManager,
+            settingsManager: runtimeSettingsManager,
+            tools: options.tools,
+            customTools: options.customTools,
+            sessionStartEvent,
+        });
+        if (explicitToolRestrictionNames) {
+            const sessionWithToolControl = result.session;
+            sessionWithToolControl.setActiveToolsByName?.(explicitToolRestrictionNames);
+        }
+        return {
+            ...result,
+            diagnostics: [],
+            services: {
+                agentDir: tallowHome,
+                authStorage,
+                cwd: runtimeCwd,
+                diagnostics: [],
+                modelRegistry,
+                resourceLoader: runtimeLoader,
+                settingsManager: runtimeSettingsManager,
+            },
+        };
+    };
     // ── Session Manager ──────────────────────────────────────────────────────
     let sessionManager;
     const sessionOpt = options.session ?? { type: "new" };
@@ -1259,49 +1329,35 @@ export async function createTallowSession(options = {}) {
             break;
         }
     }
-    // ── Model resolution (string → Model object) ────────────────────────────
-    let resolvedModel = options.model;
-    if (!resolvedModel && options.provider) {
-        const modelId = options.modelId ?? settingsManager.getDefaultModel();
-        if (modelId) {
-            resolvedModel = modelRegistry.find(options.provider, modelId) ?? undefined;
-            if (!resolvedModel) {
-                throw new Error(`Model ${options.provider}/${modelId} not found`);
-            }
-        }
-        else {
-            // Provider without model: find any available model for this provider
-            const available = modelRegistry.getAll().filter((m) => m.provider === options.provider);
-            if (available.length === 0) {
-                throw new Error(`No models found for provider "${options.provider}"`);
-            }
-            resolvedModel = available[0];
+    const initialSessionStartEvent = sessionOpt.type === "continue" || sessionOpt.type === "open" || sessionOpt.type === "resume"
+        ? {
+            type: "session_start",
+            reason: "resume",
+            previousSessionFile: sessionManager.getSessionFile(),
         }
-    }
-    // ── Create Session ───────────────────────────────────────────────────────
-    const result = await createAgentSession({
+        : undefined;
+    const runtime = await createAgentSessionRuntime(({ cwd: runtimeCwd, sessionManager: runtimeSessionManager, sessionStartEvent }) => createRuntime({
+        cwd: runtimeCwd,
+        sessionManager: runtimeSessionManager,
+        sessionStartEvent,
+    }), {
         cwd,
         agentDir: tallowHome,
-        model: resolvedModel,
-        thinkingLevel: options.thinkingLevel,
-        authStorage,
-        modelRegistry,
-        resourceLoader: loader,
         sessionManager,
-        settingsManager,
-        tools: options.tools,
-        customTools: options.customTools,
+        sessionStartEvent: initialSessionStartEvent,
     });
-    if (explicitToolRestrictionNames) {
-        const sessionWithToolControl = result.session;
-        sessionWithToolControl.setActiveToolsByName?.(explicitToolRestrictionNames);
+    if (process.cwd() !== callerCwd) {
+        process.chdir(callerCwd);
     }
     startupTiming.mark("create-session", createSessionStartedAtMs);
-    instrumentSessionStartupTimings(result.session, startupTiming);
+    instrumentSessionStartupTimings(runtime.session, startupTiming);
     return {
-        session: result.session,
-        extensions: result.extensionsResult,
-        modelFallbackMessage: result.modelFallbackMessage,
+        runtime,
+        get session() {
+            return runtime.session;
+        },
+        extensions: runtime.services.resourceLoader.getExtensions(),
+        modelFallbackMessage: runtime.modelFallbackMessage,
         version: TALLOW_VERSION,
         extensionOverrides,
         resolvedPlugins,
@@ -1679,29 +1735,6 @@ function createRebrandSystemPromptExtension(budgetPolicy) {
         });
     };
 }
-/**
- * Injects file paths into Image components for clickable OSC 8 links.
- * When the read tool returns an image, sets the pending file path so
- * the next Image constructor picks it up automatically.
- *
- * @param pi - Extension API
- */
-function injectImageFilePaths(pi) {
-    pi.on("tool_result", async (event) => {
-        if (event.toolName !== "read")
-            return;
-        const hasImage = event.content?.some((c) => c.type === "image");
-        if (hasImage && event.input?.path) {
-            const filePath = resolve(String(event.input.path));
-            // pi-tui >= 0.55 may not expose this helper; skip injection when unavailable.
-            const maybeSetNextImageFilePath = PiTui
-                .setNextImageFilePath;
-            if (typeof maybeSetNextImageFilePath === "function") {
-                maybeSetNextImageFilePath(filePath);
-            }
-        }
-    });
-}
 /**
  * Create a built-in extension that summarizes oversized historical tool results.
  *
@@ -1897,7 +1930,7 @@ function truncateTextToBytes(text, maxBytes) {
  * message content and allocates a budget envelope for each one, keyed
  * by toolCallId. Envelopes are single-use (consumed via the API) and
  * automatically cleaned up on turn_end, agent_end, session_before_switch,
- * and session_switch events.
+ * and post-transition session_start events.
  *
  * @param budgetPolicy - Resolved context-budget policy
  * @returns Extension factory
@@ -2003,6 +2036,7 @@ function createContextBudgetPlannerExtension(budgetPolicy) {
             },
         };
         pi.on("session_start", async () => {
+            clearEnvelopes();
             publishBudgetApi();
         });
         pi.events.on(CONTEXT_BUDGET_API_CHANNELS.budgetApiRequest, () => {
@@ -2017,9 +2051,6 @@ function createContextBudgetPlannerExtension(budgetPolicy) {
         pi.on("session_before_switch", async () => {
             clearEnvelopes();
         });
-        pi.on("session_switch", async () => {
-            clearEnvelopes();
-        });
     };
 }
 /**