diff --git a/src/agents/builtin-agents/available-skills.ts b/src/agents/builtin-agents/available-skills.ts
index 38a44801..27ed5d69 100644
--- a/src/agents/builtin-agents/available-skills.ts
+++ b/src/agents/builtin-agents/available-skills.ts
@@ -24,7 +24,7 @@ export function buildAvailableSkills(
   }))
 
   const discoveredAvailable: AvailableSkill[] = discoveredSkills
-    .filter(s => !builtinSkillNames.has(s.name))
+    .filter(s => !builtinSkillNames.has(s.name) && !disabledSkills?.has(s.name))
     .map((skill) => ({
       name: skill.name,
       description: skill.definition.description ?? "",
diff --git a/src/cli/get-local-version/get-local-version.ts b/src/cli/get-local-version/get-local-version.ts
index 4ce30e68..c46f9053 100644
--- a/src/cli/get-local-version/get-local-version.ts
+++ b/src/cli/get-local-version/get-local-version.ts
@@ -2,6 +2,7 @@ import {
   findPluginEntry,
   getCachedVersion,
   getLatestVersion,
+  getLocalDevVersion,
   isLocalDevMode,
 } from "../../hooks/auto-update-checker/checker"
 
@@ -15,7 +16,7 @@ export async function getLocalVersion(
 
   try {
     if (isLocalDevMode(directory)) {
-      const currentVersion = getCachedVersion()
+      const currentVersion = getLocalDevVersion(directory) ?? getCachedVersion()
       const info: VersionInfo = {
         currentVersion,
         latestVersion: null,
diff --git a/src/cli/run/event-handlers.ts b/src/cli/run/event-handlers.ts
index 9f1dcabd..50390095 100644
--- a/src/cli/run/event-handlers.ts
+++ b/src/cli/run/event-handlers.ts
@@ -71,6 +71,7 @@ export function handleMessageUpdated(ctx: RunContext, payload: EventPayload, sta
 
   state.hasReceivedMeaningfulWork = true
   state.messageCount++
+  state.lastPartText = ""
 }
 
 export function handleToolExecute(ctx: RunContext, payload: EventPayload, state: EventState): void {
diff --git a/src/cli/tui-installer.ts b/src/cli/tui-installer.ts
index d960769c..dac9e612 100644
--- a/src/cli/tui-installer.ts
+++ b/src/cli/tui-installer.ts
@@ -14,6 +14,11 @@ import { detectedToInitialValues, formatConfigSummary, SYMBOLS } from "./install
 import { promptInstallConfig } from "./tui-install-prompts"
 
 export async function runTuiInstaller(args: InstallArgs, version: string): Promise<number> {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    console.error("Error: Interactive installer requires a TTY. Use --non-interactive or set environment variables directly.")
+    return 1
+  }
+
   const detected = detectCurrentConfig()
   const isUpdate = detected.isInstalled