fix: stabilize prompt and mcp cli regressions

Co-authored-by: Autohand Evolve <code-noreply@autohand.ai>

Author: igorcosta

src/core/agent/ProviderConfigManager.ts

@@ -298,14 +298,20 @@ export class ProviderConfigManager {
       );
 
       // Try to fetch available models
-      const ollamaUrl = "http://localhost:11434";
+      const ollamaUrl =
+        this.runtime.config.ollama?.baseUrl?.replace(/\/+$/, "") ??
+        "http://localhost:11434";
       let availableModels: string[] = [];
 
       try {
         const response = await fetch(`${ollamaUrl}/api/tags`);
         if (response.ok) {
           const data = await response.json() as { models?: Array<{ name: string }> };
-          availableModels = data.models?.map((m: any) => m.name) || [];
+          availableModels =
+            data.models
+              ?.map((model) => model.name)
+              .filter((name): name is string => typeof name === "string" && name.length > 0) ??
+            [];
         }
       } catch {
         console.log(

src/index.ts

@@ -30,8 +30,6 @@ import { resolveAutoModeLaunchMode } from './modes/autoModeRouting.js';
 import { PROJECT_DIR_NAME } from './constants.js';
 import { isSessionWorktreeEnabled, prepareSessionWorktree } from './utils/sessionWorktree.js';
 import { buildTmuxLaunchCommand, createTmuxSessionName, isTmuxEnabled } from './utils/tmux.js';
-import { promptNotify } from './ui/inputPrompt.js';
-import { shouldUseInkRenderer } from './ui/inkMode.js';
 import { registerChromeCommand } from './browser/cliCommand.js';
 import { ASCII_FRIEND } from './utils/asciiArt.js';
 import {
@@ -117,22 +115,9 @@ async function loadConfigForMcpScope(scopeInput?: string): Promise<{ config: Loa
   const projectConfigPath = await resolveProjectConfigPath(process.cwd());
   return { config: await loadConfig(projectConfigPath, process.cwd()), scope };
 }
-import { FileActionManager } from './actions/filesystem.js';
-import { configureSearch } from './actions/web.js';
-import { ProviderFactory } from './providers/ProviderFactory.js';
-import { AutohandAgent } from './core/agent.js';
-import { runAutoSkillGeneration } from './skills/autoSkill.js';
-import { runRpcMode } from './modes/rpc/index.js';
-import { runAcpMode } from './modes/acp/index.js';
 import { normalizeMcpCommandForConfig } from './mcp/commandNormalization.js';
-import { SetupWizard } from './onboarding/index.js';
 import type { CLIOptions, AgentRuntime } from './types.js';
-import { safeSetRawMode } from './ui/rawMode.js';
-import {
-  buildPermissionSettingsFromYolo,
-  normalizeYoloInput,
-  parseYoloPattern,
-} from './permissions/yoloMode.js';
+import type { AutohandAgent } from './core/agent.js';
 
 /**
  * Validate auth token on startup
@@ -373,6 +358,7 @@ program
         process.exit(1);
       }
 
+      const { SetupWizard } = await import('./onboarding/index.js');
       const wizard = new SetupWizard(workspaceRoot, config);
       const result = await wizard.run({ skipWelcome: false });
 
@@ -455,12 +441,14 @@ program
 
     // RPC mode takes priority - auto-mode is handled via RPC methods when in RPC mode
     if (opts.mode === 'rpc') {
+      const { runRpcMode } = await import('./modes/rpc/index.js');
       await runRpcMode(opts);
       return;
     }
 
     // Native ACP mode - in-process Agent Client Protocol over stdio
     if (opts.mode === 'acp') {
+      const { runAcpMode } = await import('./modes/acp/index.js');
       await runAcpMode(opts);
       return;
     }
@@ -882,7 +870,7 @@ async function runCLI(options: CLIOptions): Promise<void> {
     let config = await loadConfig(options.config, process.cwd());
     const originalWorkspaceRoot = resolveWorkspaceRoot(config, options.path);
     let workspaceRoot = originalWorkspaceRoot;
-    let sessionWorktree: ReturnType<typeof prepareSessionWorktree> | null = null;
+    let sessionWorktree: ReturnType<typeof import('./utils/sessionWorktree.js')['prepareSessionWorktree']> | null = null;
 
     // Initialize i18n with locale detection
     const { locale: detectedLocale } = detectLocale({
@@ -891,6 +879,11 @@ async function runCLI(options: CLIOptions): Promise<void> {
     });
     await initI18n(detectedLocale);
 
+    const {
+      buildPermissionSettingsFromYolo,
+      normalizeYoloInput,
+      parseYoloPattern,
+    } = await import('./permissions/yoloMode.js');
     const normalizedYolo = normalizeYoloInput(options.yolo as string | boolean | undefined);
     if (normalizedYolo) {
       try {
@@ -912,6 +905,7 @@ async function runCLI(options: CLIOptions): Promise<void> {
 
     if (!providerConfig) {
       // No valid provider config - run the setup wizard
+      const { SetupWizard } = await import('./onboarding/index.js');
       const wizard = new SetupWizard(originalWorkspaceRoot, config);
       const result = await wizard.run({ skipWelcome: !config.isNewConfig });
 
@@ -1003,6 +997,7 @@ async function runCLI(options: CLIOptions): Promise<void> {
     }
     // Store whether Ink will be enabled so we can synchronize startup.
     // Ink is code-defaulted, not controlled by stale config.ui.useInkRenderer.
+    const { shouldUseInkRenderer } = await import('./ui/inkMode.js');
     const inkEnabled = shouldUseInkRenderer();
 
     // Initialize and start ping service (45-minute intervals for usage tracking)
@@ -1090,6 +1085,7 @@ async function runCLI(options: CLIOptions): Promise<void> {
                   if (agentHolder.current) {
                     agentHolder.current.notifyUser(message);
                   } else {
+                    const { promptNotify } = await import('./ui/inputPrompt.js');
                     promptNotify(chalk.yellow(message));
                   }
                 },
@@ -1131,12 +1127,15 @@ async function runCLI(options: CLIOptions): Promise<void> {
       config.agent.debug = true;
     }
 
+    const { ProviderFactory } = await import('./providers/ProviderFactory.js');
+    const { FileActionManager } = await import('./actions/filesystem.js');
     const llmProvider = ProviderFactory.create(config);
     const files = new FileActionManager(workspaceRoot, runtime.additionalDirs);
 
     // Handle --auto-skill flag
     if (options.autoSkill) {
       console.log(chalk.cyan('\nAuto-generating skills for this project...\n'));
+      const { runAutoSkillGeneration } = await import('./skills/autoSkill.js');
       const result = await runAutoSkillGeneration(workspaceRoot, llmProvider);
       if (!result.success) {
         console.log(chalk.yellow(result.error || 'Failed to generate skills'));
@@ -1146,12 +1145,14 @@ async function runCLI(options: CLIOptions): Promise<void> {
 
     // Configure web search provider from CLI flag, config file, or environment
     const searchConfig = config.search ?? {};
+    const { configureSearch } = await import('./actions/web.js');
     configureSearch({
       provider: options.searchEngine ?? searchConfig.provider ?? 'google',
       braveApiKey: searchConfig.braveApiKey ?? process.env.BRAVE_SEARCH_API_KEY,
       parallelApiKey: searchConfig.parallelApiKey ?? process.env.PARALLEL_API_KEY,
     });
 
+    const { AutohandAgent } = await import('./core/agent.js');
     const agent = new AutohandAgent(llmProvider, files, runtime);
     agentHolder.current = agent;
 
@@ -1432,6 +1433,7 @@ async function runLearnNonInteractive(opts: CLIOptions, subcommand: 'recommend'
   await skillsRegistry.setWorkspace(workspaceRoot);
 
   // Initialize LLM provider
+  const { ProviderFactory } = await import('./providers/ProviderFactory.js');
   const llmProvider = ProviderFactory.create(config);
 
   // Initialize hook manager
@@ -1612,6 +1614,8 @@ async function runPatchMode(opts: CLIOptions): Promise<void> {
     }
   }
 
+  const { ProviderFactory } = await import('./providers/ProviderFactory.js');
+  const { FileActionManager } = await import('./actions/filesystem.js');
   const llmProvider = ProviderFactory.create(config);
   const files = new FileActionManager(workspaceRoot, additionalDirs);
 
@@ -1638,13 +1642,15 @@ async function runPatchMode(opts: CLIOptions): Promise<void> {
 
   // Configure web search provider
   const searchConfig = config.search ?? {};
+  const { configureSearch } = await import('./actions/web.js');
   configureSearch({
     provider: searchConfig.provider ?? 'google',
     braveApiKey: searchConfig.braveApiKey ?? process.env.BRAVE_SEARCH_API_KEY,
     parallelApiKey: searchConfig.parallelApiKey ?? process.env.PARALLEL_API_KEY,
   });
 
   try {
+    const { AutohandAgent } = await import('./core/agent.js');
     const agent = new AutohandAgent(llmProvider, files, runtime);
 
     // Run the instruction (changes will be batched in preview mode)
@@ -1812,10 +1818,13 @@ async function runAutoMode(opts: CLIOptions): Promise<void> {
   console.log();
 
   // Create LLM provider
+  const { ProviderFactory } = await import('./providers/ProviderFactory.js');
   const llmProvider = ProviderFactory.create(config);
 
   // Create file manager with effective workspace (worktree if available)
+  const { FileActionManager } = await import('./actions/filesystem.js');
   const files = new FileActionManager(effectiveWorkspace, additionalDirs);
+  const { safeSetRawMode } = await import('./ui/rawMode.js');
 
   // Set up ESC key handling for cancellation
   if (process.stdin.isTTY) {
@@ -1854,12 +1863,14 @@ async function runAutoMode(opts: CLIOptions): Promise<void> {
 
     // Configure web search provider
     const searchConfig = config.search ?? {};
+    const { configureSearch } = await import('./actions/web.js');
     configureSearch({
       provider: searchConfig.provider ?? 'google',
       braveApiKey: searchConfig.braveApiKey ?? process.env.BRAVE_SEARCH_API_KEY,
       parallelApiKey: searchConfig.parallelApiKey ?? process.env.PARALLEL_API_KEY,
     });
 
+    const { AutohandAgent } = await import('./core/agent.js');
     const agent = new AutohandAgent(llmProvider, files, runtime);
 
     // Define the iteration callback

src/utils/stdinDetector.ts

@@ -14,6 +14,11 @@ import { fstatSync as nodeFstatSync } from 'node:fs';
  */
 export type StdinType = 'tty' | 'pipe' | 'none';
 
+type ReadableStdin = NodeJS.ReadableStream & {
+  readableEnded?: boolean;
+  setEncoding?: (encoding: BufferEncoding) => unknown;
+};
+
 /**
  * Detect the type of stdin available to the process.
  *
@@ -60,12 +65,14 @@ export function readPipedStdin(
   stream: NodeJS.ReadableStream = process.stdin,
 ): Promise<string | null> {
   return new Promise<string | null>((resolve) => {
+    const readable = stream as ReadableStdin;
     const chunks: string[] = [];
     let settled = false;
 
     const cleanup = () => {
       stream.removeListener('data', onData);
       stream.removeListener('end', onEnd);
+      stream.removeListener('close', onEnd);
       stream.removeListener('error', onError);
     };
 
@@ -90,16 +97,22 @@ export function readPipedStdin(
     };
 
     // Set encoding so we receive strings instead of Buffers
-    if ('setEncoding' in stream && typeof (stream as NodeJS.ReadStream).setEncoding === 'function') {
-      (stream as NodeJS.ReadStream).setEncoding('utf-8');
+    if (typeof readable.setEncoding === 'function') {
+      readable.setEncoding('utf-8');
     }
 
     stream.on('data', onData);
     stream.on('end', onEnd);
+    stream.on('close', onEnd);
     stream.on('error', onError);
 
     const timer = setTimeout(() => {
       settle(null);
     }, timeoutMs);
+
+    if (readable.readableEnded === true) {
+      settle('');
+      return;
+    }
   });
 }

tests/core/agent/ProviderConfigManager.openai.test.ts

@@ -193,6 +193,32 @@ describe("ProviderConfigManager openai auth mode", () => {
     expect(mockSaveConfig).toHaveBeenCalledOnce();
   });
 
+  it("uses the configured Ollama base URL when selecting local models", async () => {
+    const ollamaBaseUrl = "http://127.0.0.1:4321";
+    const fetchMock = vi.fn().mockResolvedValue({
+      ok: true,
+      json: vi.fn().mockResolvedValue({
+        models: [{ name: "local-model:latest" }],
+      }),
+    });
+    vi.stubGlobal("fetch", fetchMock);
+    runtime.config.ollama = {
+      baseUrl: ollamaBaseUrl,
+      model: "previous-model:latest",
+    };
+    mockShowModal.mockResolvedValueOnce({ value: "local-model:latest" });
+
+    await (manager as unknown as { configureOllama: () => Promise<void> }).configureOllama();
+
+    expect(fetchMock).toHaveBeenCalledWith(`${ollamaBaseUrl}/api/tags`);
+    expect(runtime.config.ollama).toEqual({
+      baseUrl: ollamaBaseUrl,
+      model: "local-model:latest",
+    });
+    expect(runtime.config.provider).toBe("ollama");
+    expect(mockSaveConfig).toHaveBeenCalledOnce();
+  });
+
   it("shows user-facing provider names in provider selection", async () => {
     runtime.config.provider = "zai";
     runtime.config.zai = {

tests/integration/pipeMode.integration.spec.ts

@@ -18,6 +18,7 @@ import os from 'node:os';
  */
 
 const ROOT = path.resolve(import.meta.dirname, '../..');
+const SCRIPT_RUNNER = `${JSON.stringify(process.execPath)} --import tsx`;
 let tempDir: string;
 let scriptPath: string;
 
@@ -61,8 +62,8 @@ describe('Pipe mode integration', () => {
     const diffContent = 'diff --git a/file.ts\\n-old\\n+new';
 
     const result = execSync(
-      `printf '${diffContent}' | bun "${scriptPath}"`,
-      { cwd: ROOT, encoding: 'utf-8', timeout: 15_000 },
+      `printf '${diffContent}' | ${SCRIPT_RUNNER} "${scriptPath}"`,
+      { cwd: ROOT, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 15_000 },
     );
 
     const parsed = JSON.parse(result.trim());
@@ -76,8 +77,8 @@ describe('Pipe mode integration', () => {
 
   it('handles empty piped input gracefully', () => {
     const result = execSync(
-      `echo '' | bun "${scriptPath}"`,
-      { cwd: ROOT, encoding: 'utf-8', timeout: 15_000 },
+      `echo '' | ${SCRIPT_RUNNER} "${scriptPath}"`,
+      { cwd: ROOT, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 15_000 },
     );
 
     const parsed = JSON.parse(result.trim());
@@ -89,8 +90,8 @@ describe('Pipe mode integration', () => {
     const multiLine = 'commit abc123\\nauthor: test\\ndate: today\\n\\nfix: resolved the issue';
 
     const result = execSync(
-      `printf '${multiLine}' | bun "${scriptPath}"`,
-      { cwd: ROOT, encoding: 'utf-8', timeout: 15_000 },
+      `printf '${multiLine}' | ${SCRIPT_RUNNER} "${scriptPath}"`,
+      { cwd: ROOT, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 15_000 },
     );
 
     const parsed = JSON.parse(result.trim());