codetyper-cli 0.4.2 → 0.4.3

package/README.md

@@ -90,9 +90,11 @@ Full-screen terminal interface with real-time streaming responses.
 ![CodeTyper Status View](assets/CodetyperView.png)
 
 **Key bindings:**
+
 - `Enter` - Send message
 - `Shift+Enter` - New line
-- `/` - Open command menu
+- `@` - Open file picker (works anywhere in input)
+- `/` - Open command menu (works anywhere in input)
 - `Ctrl+M` - Toggle interaction mode
 - `Ctrl+T` - Toggle todo panel
 - `Shift+Up/Down` - Scroll log panel
@@ -103,6 +105,7 @@ Full-screen terminal interface with real-time streaming responses.
 Optional vim-style keyboard navigation for power users. Enable in settings.
 
 **Normal Mode:**
+
 - `j/k` - Scroll down/up
 - `gg/G` - Jump to top/bottom
 - `Ctrl+d/u` - Half page scroll
@@ -111,6 +114,7 @@ Optional vim-style keyboard navigation for power users. Enable in settings.
 - `:` - Command mode (`:q` quit, `:w` save)
 
 **Configuration:**
+
 ```json
 {
   "vim": {
@@ -128,26 +132,26 @@ Press `/` to access all commands organized by category.
 
 **Available Commands:**
 
-| Category | Command | Description |
-|----------|---------|-------------|
-| General | `/help` | Show available commands |
-| General | `/clear` | Clear conversation history |
-| General | `/exit` | Exit the chat |
-| Session | `/save` | Save current session |
-| Session | `/context` | Show context information |
-| Session | `/usage` | Show token usage statistics |
-| Session | `/remember` | Save a learning about the project |
-| Session | `/learnings` | Show saved learnings |
-| Settings | `/model` | Select AI model |
-| Settings | `/agent` | Select agent |
-| Settings | `/mode` | Switch interaction mode |
-| Settings | `/provider` | Switch LLM provider |
-| Settings | `/status` | Show provider status |
-| Settings | `/theme` | Change color theme |
-| Settings | `/mcp` | Manage MCP servers |
-| Account | `/whoami` | Show logged in account |
-| Account | `/login` | Authenticate with provider |
-| Account | `/logout` | Sign out from provider |
+| Category | Command      | Description                       |
+| -------- | ------------ | --------------------------------- |
+| General  | `/help`      | Show available commands           |
+| General  | `/clear`     | Clear conversation history        |
+| General  | `/exit`      | Exit the chat                     |
+| Session  | `/save`      | Save current session              |
+| Session  | `/context`   | Show context information          |
+| Session  | `/usage`     | Show token usage statistics       |
+| Session  | `/remember`  | Save a learning about the project |
+| Session  | `/learnings` | Show saved learnings              |
+| Settings | `/model`     | Select AI model                   |
+| Settings | `/agent`     | Select agent                      |
+| Settings | `/mode`      | Switch interaction mode           |
+| Settings | `/provider`  | Switch LLM provider               |
+| Settings | `/status`    | Show provider status              |
+| Settings | `/theme`     | Change color theme                |
+| Settings | `/mcp`       | Manage MCP servers                |
+| Account  | `/whoami`    | Show logged in account            |
+| Account  | `/login`     | Authenticate with provider        |
+| Account  | `/logout`    | Sign out from provider            |
 
 ### Agent Mode with Diff View
 
@@ -156,6 +160,7 @@ When CodeTyper modifies files, you see a clear diff view of changes.
 ![Agent Mode with Diffs](assets/CodetyperAgentMode.png)
 
 **Interaction Modes:**
+
 - **Agent** - Full access, can modify files
 - **Ask** - Read-only, answers questions
 - **Code Review** - Review PRs and diffs
@@ -167,6 +172,7 @@ Granular control over what CodeTyper can do. Every file operation requires appro
 ![Permission Modal](assets/CodetyperPermissionView.png)
 
 **Permission Scopes:**
+
 - `[y]` Yes, this once
 - `[s]` Yes, for this session
 - `[a]` Always allow for this project
@@ -180,6 +186,7 @@ Access to multiple AI models through GitHub Copilot.
 ![Model Selection](assets/CodetyperCopilotModels.png)
 
 **Available Models:**
+
 - GPT-5, GPT-5-mini (Unlimited)
 - GPT-5.2-codex, GPT-5.1-codex
 - Grok-code-fast-1
@@ -187,19 +194,19 @@ Access to multiple AI models through GitHub Copilot.
 
 ### Theme System
 
-14+ built-in themes to customize your experience.
+15+ built-in themes to customize your experience.
 
 ![Theme Selection](assets/CodetyperThemes.png)
 
 **Available Themes:**
-default, dracula, nord, tokyo-night, gruvbox, monokai, catppuccin, one-dark, solarized-dark, github-dark, rose-pine, kanagawa, ayu-dark, cargdev-cyberpunk
+default, dracula, nord, tokyo-night, gruvbox, monokai, catppuccin, one-dark, solarized-dark, github-dark, rose-pine, kanagawa, ayu-dark, cargdev-cyberpunk, pink-purple
 
 ## Providers
 
-| Provider | Models | Auth Method | Use Case |
-|----------|--------|-------------|----------|
-| **GitHub Copilot** | GPT-5, Claude, Gemini | OAuth (device flow) | Cloud-based, high quality |
-| **Ollama** | Llama, DeepSeek, Qwen, etc. | Local server | Private, offline, zero-cost |
+| Provider           | Models                      | Auth Method         | Use Case                    |
+| ------------------ | --------------------------- | ------------------- | --------------------------- |
+| **GitHub Copilot** | GPT-5, Claude, Gemini       | OAuth (device flow) | Cloud-based, high quality   |
+| **Ollama**         | Llama, DeepSeek, Qwen, etc. | Local server        | Private, offline, zero-cost |
 
 ### Cascade Mode
 
@@ -244,6 +251,7 @@ Settings are stored in `~/.config/codetyper/config.json`:
 ### Project Context
 
 CodeTyper reads project-specific context from:
+
 - `.github/` - GitHub workflows and templates
 - `.codetyper/` - Project-specific rules and learnings
 - `rules.md` - Custom instructions for the AI
@@ -274,18 +282,18 @@ codetyper --print "Explain this codebase"
 
 CodeTyper has access to these built-in tools:
 
-| Tool | Description |
-|------|-------------|
-| `bash` | Execute shell commands |
-| `read` | Read file contents |
-| `write` | Create or overwrite files |
-| `edit` | Find and replace in files |
-| `glob` | Find files by pattern |
-| `grep` | Search file contents |
-| `lsp` | Language Server Protocol operations |
-| `web_search` | Search the web |
-| `todo-read` | Read current todo list |
-| `todo-write` | Update todo list |
+| Tool         | Description                         |
+| ------------ | ----------------------------------- |
+| `bash`       | Execute shell commands              |
+| `read`       | Read file contents                  |
+| `write`      | Create or overwrite files           |
+| `edit`       | Find and replace in files           |
+| `glob`       | Find files by pattern               |
+| `grep`       | Search file contents                |
+| `lsp`        | Language Server Protocol operations |
+| `web_search` | Search the web                      |
+| `todo-read`  | Read current todo list              |
+| `todo-write` | Update todo list                    |
 
 ### MCP Integration
 
@@ -311,6 +319,7 @@ Connect external MCP (Model Context Protocol) servers for extended capabilities:
 ```
 
 **MCP Browser Features:**
+
 - Search by name, description, or tags
 - Filter by category (database, web, AI, etc.)
 - View server details and required environment variables
@@ -324,6 +333,7 @@ Connect external MCP (Model Context Protocol) servers for extended capabilities:
 Lifecycle hooks for intercepting tool execution and session events.
 
 **Hook Events:**
+
 - `PreToolUse` - Validate/modify before tool execution
 - `PostToolUse` - Side effects after tool execution
 - `SessionStart` - At session initialization
@@ -332,16 +342,22 @@ Lifecycle hooks for intercepting tool execution and session events.
 - `Stop` - When execution stops
 
 **Configuration** (`.codetyper/hooks.json`):
+
 ```json
 {
   "hooks": [
-    { "event": "PreToolUse", "script": ".codetyper/hooks/validate.sh", "timeout": 5000 },
+    {
+      "event": "PreToolUse",
+      "script": ".codetyper/hooks/validate.sh",
+      "timeout": 5000
+    },
     { "event": "PostToolUse", "script": ".codetyper/hooks/notify.sh" }
   ]
 }
 ```
 
 **Exit Codes:**
+
 - `0` - Allow (optionally output `{"updatedInput": {...}}` to modify args)
 - `1` - Warn but continue
 - `2` - Block execution
@@ -351,6 +367,7 @@ Lifecycle hooks for intercepting tool execution and session events.
 Extend CodeTyper with custom tools, commands, and hooks.
 
 **Plugin Structure:**
+
 ```
 .codetyper/plugins/{name}/
 ├── plugin.json          # Manifest
@@ -363,6 +380,7 @@ Extend CodeTyper with custom tools, commands, and hooks.
 ```
 
 **Manifest** (`plugin.json`):
+
 ```json
 {
   "name": "my-plugin",
@@ -373,13 +391,18 @@ Extend CodeTyper with custom tools, commands, and hooks.
 ```
 
 **Custom Tool Definition:**
+
 ```typescript
 import { z } from "zod";
 export default {
   name: "custom_tool",
   description: "Does something",
   parameters: z.object({ input: z.string() }),
-  execute: async (args, ctx) => ({ success: true, title: "Done", output: "..." }),
+  execute: async (args, ctx) => ({
+    success: true,
+    title: "Done",
+    output: "...",
+  }),
 };
 ```
 
@@ -404,12 +427,12 @@ Sessions are stored in `.codetyper/sessions/` with automatic commit message sugg
 
 The next major release focuses on production-ready autonomous agent execution:
 
-| Feature | Issue | Status |
-|---------|-------|--------|
-| Plan Approval Gate | [#111](https://github.com/CarGDev/codetyper.cli/issues/111) | Planned |
-| Diff Preview Before Write | [#112](https://github.com/CarGDev/codetyper.cli/issues/112) | Planned |
-| Execution Control (Pause/Resume/Abort) | [#113](https://github.com/CarGDev/codetyper.cli/issues/113) | Planned |
-| Consistent Model Behavior | [#114](https://github.com/CarGDev/codetyper.cli/issues/114) | Planned |
+| Feature                                 | Issue                                                       | Status  |
+| --------------------------------------- | ----------------------------------------------------------- | ------- |
+| Plan Approval Gate                      | [#111](https://github.com/CarGDev/codetyper.cli/issues/111) | Planned |
+| Diff Preview Before Write               | [#112](https://github.com/CarGDev/codetyper.cli/issues/112) | Planned |
+| Execution Control (Pause/Resume/Abort)  | [#113](https://github.com/CarGDev/codetyper.cli/issues/113) | Planned |
+| Consistent Model Behavior               | [#114](https://github.com/CarGDev/codetyper.cli/issues/114) | Planned |
 | Quality Gates (TypeScript, Lint, Tests) | [#115](https://github.com/CarGDev/codetyper.cli/issues/115) | Planned |
 
 ### Known Issues
@@ -439,11 +462,14 @@ bun test
 bun run lint
 ```
 
-## Recent Changes (v0.3.0)
+## Recent Changes (v0.4.2)
 
-- **System Prompt Builder**: New modular prompt system with modes, tiers, and providers
-- **Module Restructure**: Consistent internal organization with improved imports
-- **Solid.js TUI**: Fully migrated to Solid.js + OpenTUI (removed legacy React/Ink)
+- **Pink Purple Theme**: New built-in color theme
+- **Image Paste Fix**: Fixed race condition where pasted images were silently dropped
+- **@ and / Anywhere**: File picker and command menu now work at any cursor position
+- **Plan Approval Gate**: User confirmation before agent executes plans
+- **Execution Control**: Pause, resume, and abort agent execution
+- **Text Clipboard Copy/Read**: Cross-platform clipboard operations with mouse selection
 
 See [CHANGELOG](docs/CHANGELOG.md) for complete version history.
 

package/dist/index.js

@@ -36986,9 +36986,18 @@ var init_source4 = __esm(() => {
 });
 
 // src/constants/copilot.ts
-var COPILOT_PROVIDER_NAME = "copilot", COPILOT_DISPLAY_NAME = "GitHub Copilot", COPILOT_AUTH_URL = "https://api.github.com/copilot_internal/v2/token", COPILOT_MODELS_URL = "https://api.githubcopilot.com/models", GITHUB_CLIENT_ID = "Iv1.b507a08c87ecfe98", GITHUB_DEVICE_CODE_URL = "https://github.com/login/device/code", GITHUB_ACCESS_TOKEN_URL = "https://github.com/login/oauth/access_token", COPILOT_MODELS_CACHE_TTL, COPILOT_MAX_RETRIES = 3, COPILOT_INITIAL_RETRY_DELAY = 1000, COPILOT_DEFAULT_MODEL = "gpt-5-mini", COPILOT_UNLIMITED_MODEL = "gpt-4o", MODEL_COST_MULTIPLIERS, UNLIMITED_MODELS, MODEL_CONTEXT_SIZES, DEFAULT_CONTEXT_SIZE, getModelContextSize = (modelId) => MODEL_CONTEXT_SIZES[modelId] ?? DEFAULT_CONTEXT_SIZE, COPILOT_FALLBACK_MODELS;
+var COPILOT_PROVIDER_NAME = "copilot", COPILOT_DISPLAY_NAME = "GitHub Copilot", COPILOT_AUTH_URL = "https://api.github.com/copilot_internal/v2/token", COPILOT_MODELS_URL = "https://api.githubcopilot.com/models", GITHUB_CLIENT_ID = "Iv1.b507a08c87ecfe98", GITHUB_DEVICE_CODE_URL = "https://github.com/login/device/code", GITHUB_ACCESS_TOKEN_URL = "https://github.com/login/oauth/access_token", COPILOT_MODELS_CACHE_TTL, COPILOT_MAX_RETRIES = 3, COPILOT_INITIAL_RETRY_DELAY = 1000, COPILOT_STREAM_TIMEOUT = 120000, COPILOT_CONNECTION_RETRY_DELAY = 2000, CONNECTION_ERROR_PATTERNS, COPILOT_DEFAULT_MODEL = "gpt-5-mini", COPILOT_UNLIMITED_MODEL = "gpt-4o", MODEL_COST_MULTIPLIERS, UNLIMITED_MODELS, MODEL_CONTEXT_SIZES, DEFAULT_CONTEXT_SIZE, getModelContextSize = (modelId) => MODEL_CONTEXT_SIZES[modelId] ?? DEFAULT_CONTEXT_SIZE, COPILOT_FALLBACK_MODELS;
 var init_copilot = __esm(() => {
   COPILOT_MODELS_CACHE_TTL = 5 * 60 * 1000;
+  CONNECTION_ERROR_PATTERNS = [
+    /socket.*closed/i,
+    /ECONNRESET/i,
+    /ECONNREFUSED/i,
+    /ETIMEDOUT/i,
+    /network.*error/i,
+    /fetch.*failed/i,
+    /aborted/i
+  ];
   MODEL_COST_MULTIPLIERS = {
     "gpt-4o": 0,
     "gpt-4o-mini": 0,
@@ -37321,7 +37330,10 @@ var init_models = __esm(() => {
 });
 
 // src/providers/copilot/utils.ts
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), isRateLimitError = (error2) => {
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), isConnectionError = (error2) => {
+  const message = error2 instanceof Error ? error2.message : String(error2);
+  return CONNECTION_ERROR_PATTERNS.some((pattern) => pattern.test(message));
+}, isRateLimitError = (error2) => {
   if (error2 && typeof error2 === "object" && "response" in error2) {
     const response2 = error2.response;
     return response2?.statusCode === 429;
@@ -66811,40 +66823,53 @@ var formatMessages = (messages) => messages.map((msg) => {
     }
   } catch {}
   return false;
-}, executeStream = (endpoint, token, body, onChunk) => new Promise((resolve3, reject) => {
-  const stream2 = source_default2.stream.post(endpoint, {
-    headers: buildHeaders(token),
-    json: body
+}, executeStream = async (endpoint, token, body, onChunk) => {
+  const response2 = await fetch(endpoint, {
+    method: "POST",
+    headers: {
+      ...buildHeaders(token),
+      Accept: "text/event-stream"
+    },
+    body: JSON.stringify(body),
+    signal: AbortSignal.timeout(COPILOT_STREAM_TIMEOUT)
   });
+  if (!response2.ok) {
+    throw new Error(`Copilot API error: ${response2.status} ${response2.statusText}`);
+  }
+  if (!response2.body) {
+    throw new Error("No response body from Copilot stream");
+  }
+  const reader = response2.body.getReader();
+  const decoder3 = new TextDecoder;
   let buffer = "";
   let doneReceived = false;
-  stream2.on("data", (data) => {
-    buffer += data.toString();
-    const lines = buffer.split(`
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      buffer += decoder3.decode(value, { stream: true });
+      const lines = buffer.split(`
 `);
-    buffer = lines.pop() ?? "";
-    for (const line of lines) {
-      if (processStreamLine(line, onChunk)) {
-        doneReceived = true;
-        return;
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        if (processStreamLine(line, onChunk)) {
+          doneReceived = true;
+          return;
+        }
       }
     }
-  });
-  stream2.on("error", (error2) => {
-    onChunk({ type: "error", error: error2.message });
-    reject(error2);
-  });
-  stream2.on("end", () => {
-    if (buffer.trim()) {
-      processStreamLine(buffer, onChunk);
-    }
-    if (!doneReceived) {
-      addDebugLog("api", "Stream ended without [DONE] message, sending done chunk");
-      onChunk({ type: "done" });
-    }
-    resolve3();
-  });
-}), chatStream = async (messages, options2, onChunk) => {
+  } finally {
+    reader.releaseLock();
+  }
+  if (buffer.trim()) {
+    processStreamLine(buffer, onChunk);
+  }
+  if (!doneReceived) {
+    addDebugLog("api", "Stream ended without [DONE] message, sending done chunk");
+    onChunk({ type: "done" });
+  }
+}, chatStream = async (messages, options2, onChunk) => {
   addDebugLog("api", `Copilot stream request: ${messages.length} messages`);
   const token = await refreshToken();
   const endpoint = getEndpoint(token);
@@ -66874,6 +66899,12 @@ var formatMessages = (messages) => messages.map((msg) => {
         switchedToUnlimited = true;
         continue;
       }
+      if (isConnectionError(error2) && attempt < COPILOT_MAX_RETRIES - 1) {
+        const delay2 = COPILOT_CONNECTION_RETRY_DELAY * Math.pow(2, attempt);
+        addDebugLog("api", `Connection error, retrying in ${delay2}ms (attempt ${attempt + 1})`);
+        await sleep(delay2);
+        continue;
+      }
       if (isRateLimitError(error2) && attempt < COPILOT_MAX_RETRIES - 1) {
         const delay2 = getRetryDelay(error2, attempt);
         await sleep(delay2);
@@ -67247,57 +67278,61 @@ var parseStreamLine = (line, onChunk) => {
       onChunk({ type: "done" });
     }
   } catch {}
-}, processStreamData = (data, buffer, onChunk) => {
-  const combined = buffer + data.toString();
-  const lines = combined.split(`
-`);
-  const remaining = lines.pop() || "";
-  for (const line of lines) {
-    parseStreamLine(line, onChunk);
-  }
-  return remaining;
 }, ollamaChatStream = async (messages, options2, onChunk) => {
   const baseUrl = getOllamaBaseUrl();
   const body = buildChatRequest(messages, options2, true);
   addDebugLog("api", `Ollama stream request: ${messages.length} msgs, model=${body.model}`);
-  const stream2 = source_default2.stream.post(`${baseUrl}${OLLAMA_ENDPOINTS.CHAT}`, {
-    json: body,
-    timeout: { request: OLLAMA_TIMEOUTS.CHAT }
+  const response2 = await fetch(`${baseUrl}${OLLAMA_ENDPOINTS.CHAT}`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    signal: AbortSignal.timeout(OLLAMA_TIMEOUTS.CHAT)
   });
+  if (!response2.ok) {
+    throw new Error(`Ollama API error: ${response2.status} ${response2.statusText}`);
+  }
+  if (!response2.body) {
+    throw new Error("No response body from Ollama stream");
+  }
+  const reader = response2.body.getReader();
+  const decoder3 = new TextDecoder;
   let buffer = "";
   let doneReceived = false;
-  stream2.on("data", (data) => {
-    buffer = processStreamData(data, buffer, (chunk2) => {
-      if (chunk2.type === "done") {
-        doneReceived = true;
-      }
-      onChunk(chunk2);
-    });
-  });
-  stream2.on("error", (error2) => {
-    onChunk({ type: "error", error: error2.message });
-  });
-  return new Promise((resolve3, reject) => {
-    stream2.on("end", () => {
-      if (buffer.trim()) {
-        parseStreamLine(buffer, (chunk2) => {
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      buffer += decoder3.decode(value, { stream: true });
+      const lines = buffer.split(`
+`);
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        parseStreamLine(line, (chunk2) => {
           if (chunk2.type === "done") {
             doneReceived = true;
           }
           onChunk(chunk2);
         });
       }
-      if (!doneReceived) {
-        addDebugLog("api", "Ollama stream ended without done, sending done chunk");
-        onChunk({ type: "done" });
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  if (buffer.trim()) {
+    parseStreamLine(buffer, (chunk2) => {
+      if (chunk2.type === "done") {
+        doneReceived = true;
       }
-      resolve3();
+      onChunk(chunk2);
     });
-    stream2.on("error", reject);
-  });
+  }
+  if (!doneReceived) {
+    addDebugLog("api", "Ollama stream ended without done, sending done chunk");
+    onChunk({ type: "done" });
+  }
 };
 var init_stream2 = __esm(async () => {
-  init_source4();
   init_ollama();
   init_state2();
   init_chat2();
@@ -92500,56 +92535,58 @@ var activePlans, planListeners, COMPLEXITY_KEYWORDS, analyzeTask = (taskDescript
   return activePlans.get(planId);
 }, getActivePlans = () => {
   return Array.from(activePlans.values()).filter((p) => p.status !== "completed" && p.status !== "failed" && p.status !== "rejected");
-}, formatPlanForDisplay = (plan) => {
+}, RISK_ICONS, formatPlanForDisplay = (plan) => {
   const lines = [];
-  lines.push(`# Implementation Plan: ${plan.title}`);
+  lines.push(`Plan to implement`);
+  lines.push("");
+  lines.push(plan.title);
   lines.push("");
-  lines.push(`## Summary`);
   lines.push(plan.summary);
   lines.push("");
   if (plan.context.filesAnalyzed.length > 0) {
-    lines.push(`## Files Analyzed`);
-    plan.context.filesAnalyzed.forEach((f) => lines.push(`- ${f}`));
+    lines.push("Files Analyzed");
+    plan.context.filesAnalyzed.forEach((f) => lines.push(`  ${f}`));
     lines.push("");
   }
   if (plan.context.currentArchitecture) {
-    lines.push(`## Current Architecture`);
-    lines.push(plan.context.currentArchitecture);
+    lines.push("Current Architecture");
+    lines.push(`  ${plan.context.currentArchitecture}`);
+    lines.push("");
+  }
+  if (plan.steps.length > 0) {
+    lines.push("Implementation Steps");
+    plan.steps.forEach((step, i2) => {
+      const icon = RISK_ICONS[step.riskLevel] ?? " ";
+      lines.push(`  ${i2 + 1}. [${icon}] ${step.title}`);
+      lines.push(`     ${step.description}`);
+      if (step.filesAffected.length > 0) {
+        lines.push(`     Files: ${step.filesAffected.join(", ")}`);
+      }
+    });
     lines.push("");
   }
-  lines.push(`## Implementation Steps`);
-  plan.steps.forEach((step, i2) => {
-    const riskIcon = step.riskLevel === "high" ? "⚠️" : step.riskLevel === "medium" ? "⚡" : "✓";
-    lines.push(`${i2 + 1}. ${riskIcon} **${step.title}**`);
-    lines.push(`   ${step.description}`);
-    if (step.filesAffected.length > 0) {
-      lines.push(`   Files: ${step.filesAffected.join(", ")}`);
-    }
-  });
-  lines.push("");
   if (plan.risks.length > 0) {
-    lines.push(`## Risks`);
+    lines.push("Risks");
     plan.risks.forEach((risk) => {
-      lines.push(`- **${risk.impact.toUpperCase()}**: ${risk.description}`);
-      lines.push(`  Mitigation: ${risk.mitigation}`);
+      lines.push(`  [${risk.impact.toUpperCase()}] ${risk.description}`);
+      lines.push(`    Mitigation: ${risk.mitigation}`);
     });
     lines.push("");
   }
-  lines.push(`## Testing Strategy`);
-  lines.push(plan.testingStrategy || "TBD");
-  lines.push("");
-  lines.push(`## Rollback Plan`);
-  lines.push(plan.rollbackPlan || "TBD");
-  lines.push("");
-  lines.push(`## Estimated Changes`);
-  lines.push(`- Files to create: ${plan.estimatedChanges.filesCreated}`);
-  lines.push(`- Files to modify: ${plan.estimatedChanges.filesModified}`);
-  lines.push(`- Files to delete: ${plan.estimatedChanges.filesDeleted}`);
-  lines.push("");
-  lines.push("---");
-  lines.push("**Awaiting approval to proceed with implementation.**");
-  lines.push("Reply with 'proceed', 'approve', or 'go ahead' to start execution.");
-  lines.push("Reply with 'stop', 'cancel', or provide feedback to modify the plan.");
+  if (plan.testingStrategy) {
+    lines.push("Testing Strategy");
+    lines.push(`  ${plan.testingStrategy}`);
+    lines.push("");
+  }
+  if (plan.rollbackPlan) {
+    lines.push("Rollback Plan");
+    lines.push(`  ${plan.rollbackPlan}`);
+    lines.push("");
+  }
+  lines.push("Estimated Changes");
+  lines.push(`  Files to create: ${plan.estimatedChanges.filesCreated}`);
+  lines.push(`  Files to modify: ${plan.estimatedChanges.filesModified}`);
+  lines.push(`  Files to delete: ${plan.estimatedChanges.filesDeleted}`);
   return lines.join(`
 `);
 }, isApprovalMessage = (message) => {
@@ -92607,6 +92644,11 @@ var init_plan_service = __esm(() => {
       "module"
     ]
   };
+  RISK_ICONS = {
+    high: "!",
+    medium: "~",
+    low: " "
+  };
 });
 
 // src/tools/plan-approval/execute.ts
@@ -93906,14 +93948,14 @@ var serviceState, callOllamaEmbed = async (texts, model) => {
     }
   } catch (error49) {
     const message = error49 instanceof Error ? error49.message : String(error49);
-    const isConnectionError = message.includes("ECONNREFUSED") || message.includes("connect");
+    const isConnectionError2 = message.includes("ECONNREFUSED") || message.includes("connect");
     serviceState = {
       initialized: true,
       model: null,
       available: false,
       error: {
-        code: isConnectionError ? "OLLAMA_NOT_RUNNING" : "EMBEDDING_FAILED",
-        message: isConnectionError ? "Ollama is not running. Start it with: ollama serve" : `Embedding service error: ${message}`
+        code: isConnectionError2 ? "OLLAMA_NOT_RUNNING" : "EMBEDDING_FAILED",
+        message: isConnectionError2 ? "Ollama is not running. Start it with: ollama serve" : `Embedding service error: ${message}`
       }
     };
   }
@@ -104147,6 +104189,9 @@ var initializeChatService = async (options2) => {
   initializeBrain().catch(() => {});
   return { state: state4, session };
 };
+// src/services/chat-tui/message-handler.ts
+init_dist_node();
+
 // src/services/agent-stream.ts
 init_dist_node();
 init_tools3();
@@ -107321,6 +107366,46 @@ ${commentsContext}` : ""}`;
         callbacks.onLog("system", formatted);
       }
     }
+    const newPendingPlans = getActivePlans().filter((p) => p.status === "pending");
+    if (newPendingPlans.length > 0) {
+      const plan = newPendingPlans[0];
+      const planContent = formatPlanForDisplay(plan);
+      addDebugLog("state", `Showing plan approval modal: ${plan.id}`);
+      await new Promise((resolve4) => {
+        appStore.setMode("plan_approval");
+        appStore.setPlanApprovalPrompt({
+          id: v4_default(),
+          planTitle: plan.title,
+          planSummary: plan.summary,
+          planContent,
+          resolve: (response2) => {
+            appStore.setPlanApprovalPrompt(null);
+            if (response2.approved) {
+              approvePlan(plan.id, response2.editMode);
+              startPlanExecution(plan.id);
+              addDebugLog("state", `Plan ${plan.id} approved via modal`);
+              appStore.addLog({
+                type: "system",
+                content: `Plan "${plan.title}" approved. Proceeding with implementation.`
+              });
+              state4.messages.push({
+                role: "user",
+                content: `The user approved the plan. Proceed with the implementation of plan "${plan.title}".`
+              });
+            } else {
+              rejectPlan(plan.id, response2.feedback ?? "User cancelled");
+              addDebugLog("state", `Plan ${plan.id} rejected via modal`);
+              appStore.addLog({
+                type: "system",
+                content: `Plan "${plan.title}" cancelled.`
+              });
+            }
+            appStore.setMode("idle");
+            resolve4();
+          }
+        });
+      });
+    }
   } catch (error49) {
     appStore.cancelStreaming();
     appStore.stopThinking();
@@ -113297,92 +113382,106 @@ function PlanApprovalModal(props) {
     }
   });
   return (() => {
-    var _el$ = createElement("box"), _el$2 = createElement("box"), _el$3 = createElement("text");
-    insertNode(_el$, _el$2);
+    var _el$ = createElement("box"), _el$8 = createElement("box"), _el$9 = createElement("text");
+    insertNode(_el$, _el$8);
     setProp(_el$, "flexDirection", "column");
     setProp(_el$, "border", ["top", "bottom", "left", "right"]);
     setProp(_el$, "paddingLeft", 2);
     setProp(_el$, "paddingRight", 2);
     setProp(_el$, "paddingTop", 1);
     setProp(_el$, "paddingBottom", 1);
-    insertNode(_el$2, _el$3);
-    setProp(_el$2, "marginBottom", 1);
-    insertNode(_el$3, createTextNode(`CodeTyper has written up a plan and is ready to execute. Would you like to proceed?`));
     insert(_el$, createComponent2(Show, {
       get when() {
-        return props.prompt.planTitle;
+        return props.prompt.planContent;
       },
       get children() {
-        var _el$5 = createElement("box"), _el$6 = createElement("text");
-        insertNode(_el$5, _el$6);
-        setProp(_el$5, "marginBottom", 1);
-        insert(_el$6, () => props.prompt.planTitle);
+        var _el$2 = createElement("box"), _el$3 = createElement("text");
+        insertNode(_el$2, _el$3);
+        setProp(_el$2, "marginBottom", 1);
+        setProp(_el$2, "flexDirection", "column");
+        insert(_el$3, () => props.prompt.planContent);
+        effect((_$p) => setProp(_el$3, "fg", theme.colors.text, _$p));
+        return _el$2;
+      }
+    }), _el$8);
+    insert(_el$, createComponent2(Show, {
+      get when() {
+        return memo2(() => !!!props.prompt.planContent)() && props.prompt.planTitle;
+      },
+      get children() {
+        var _el$4 = createElement("box"), _el$5 = createElement("text");
+        insertNode(_el$4, _el$5);
+        setProp(_el$4, "marginBottom", 1);
+        insert(_el$5, () => props.prompt.planTitle);
         effect((_p$) => {
           var _v$ = theme.colors.text, _v$2 = TextAttributes.BOLD;
-          _v$ !== _p$.e && (_p$.e = setProp(_el$6, "fg", _v$, _p$.e));
-          _v$2 !== _p$.t && (_p$.t = setProp(_el$6, "attributes", _v$2, _p$.t));
+          _v$ !== _p$.e && (_p$.e = setProp(_el$5, "fg", _v$, _p$.e));
+          _v$2 !== _p$.t && (_p$.t = setProp(_el$5, "attributes", _v$2, _p$.t));
           return _p$;
         }, {
           e: undefined,
           t: undefined
         });
-        return _el$5;
+        return _el$4;
       }
-    }), null);
+    }), _el$8);
     insert(_el$, createComponent2(Show, {
       get when() {
-        return props.prompt.planSummary;
+        return memo2(() => !!!props.prompt.planContent)() && props.prompt.planSummary;
       },
       get children() {
-        var _el$7 = createElement("box"), _el$8 = createElement("text");
-        insertNode(_el$7, _el$8);
-        setProp(_el$7, "marginBottom", 1);
-        insert(_el$8, () => props.prompt.planSummary);
-        effect((_$p) => setProp(_el$8, "fg", theme.colors.textDim, _$p));
-        return _el$7;
+        var _el$6 = createElement("box"), _el$7 = createElement("text");
+        insertNode(_el$6, _el$7);
+        setProp(_el$6, "marginBottom", 1);
+        insert(_el$7, () => props.prompt.planSummary);
+        effect((_$p) => setProp(_el$7, "fg", theme.colors.textDim, _$p));
+        return _el$6;
       }
-    }), null);
+    }), _el$8);
+    insertNode(_el$8, _el$9);
+    setProp(_el$8, "marginBottom", 1);
+    insertNode(_el$9, createTextNode(`Would you like to proceed with this plan?`));
     insert(_el$, createComponent2(Show, {
       get when() {
         return !feedbackMode();
       },
       get children() {
-        var _el$9 = createElement("box");
-        setProp(_el$9, "flexDirection", "column");
-        setProp(_el$9, "marginTop", 1);
-        insert(_el$9, createComponent2(For, {
+        var _el$1 = createElement("box");
+        setProp(_el$1, "flexDirection", "column");
+        setProp(_el$1, "marginTop", 1);
+        insert(_el$1, createComponent2(For, {
           each: PLAN_APPROVAL_OPTIONS,
           children: (option, index) => {
             const isSelected = () => index() === selectedIndex();
             return (() => {
-              var _el$23 = createElement("box"), _el$24 = createElement("text"), _el$25 = createElement("text"), _el$26 = createTextNode(`. `), _el$27 = createElement("text");
-              insertNode(_el$23, _el$24);
-              insertNode(_el$23, _el$25);
-              insertNode(_el$23, _el$27);
-              setProp(_el$23, "flexDirection", "row");
-              insert(_el$24, () => isSelected() ? "> " : "  ");
+              var _el$25 = createElement("box"), _el$26 = createElement("text"), _el$27 = createElement("text"), _el$28 = createTextNode(`. `), _el$29 = createElement("text");
               insertNode(_el$25, _el$26);
-              insert(_el$25, () => option.key, _el$26);
-              insert(_el$27, () => option.label);
-              insert(_el$23, createComponent2(Show, {
+              insertNode(_el$25, _el$27);
+              insertNode(_el$25, _el$29);
+              setProp(_el$25, "flexDirection", "row");
+              insert(_el$26, () => isSelected() ? "> " : "  ");
+              insertNode(_el$27, _el$28);
+              insert(_el$27, () => option.key, _el$28);
+              insert(_el$29, () => option.label);
+              insert(_el$25, createComponent2(Show, {
                 get when() {
                   return option.shortcut;
                 },
                 get children() {
-                  var _el$28 = createElement("text"), _el$29 = createTextNode(` (`), _el$31 = createTextNode(`)`);
-                  insertNode(_el$28, _el$29);
-                  insertNode(_el$28, _el$31);
-                  insert(_el$28, () => option.shortcut, _el$31);
-                  effect((_$p) => setProp(_el$28, "fg", theme.colors.textMuted, _$p));
-                  return _el$28;
+                  var _el$30 = createElement("text"), _el$31 = createTextNode(` (`), _el$33 = createTextNode(`)`);
+                  insertNode(_el$30, _el$31);
+                  insertNode(_el$30, _el$33);
+                  insert(_el$30, () => option.shortcut, _el$33);
+                  effect((_$p) => setProp(_el$30, "fg", theme.colors.textMuted, _$p));
+                  return _el$30;
                 }
               }), null);
               effect((_p$) => {
                 var _v$10 = isSelected() ? theme.colors.primary : theme.colors.textDim, _v$11 = isSelected() ? TextAttributes.BOLD : TextAttributes.NONE, _v$12 = theme.colors.textDim, _v$13 = isSelected() ? theme.colors.text : theme.colors.textDim;
-                _v$10 !== _p$.e && (_p$.e = setProp(_el$24, "fg", _v$10, _p$.e));
-                _v$11 !== _p$.t && (_p$.t = setProp(_el$24, "attributes", _v$11, _p$.t));
-                _v$12 !== _p$.a && (_p$.a = setProp(_el$25, "fg", _v$12, _p$.a));
-                _v$13 !== _p$.o && (_p$.o = setProp(_el$27, "fg", _v$13, _p$.o));
+                _v$10 !== _p$.e && (_p$.e = setProp(_el$26, "fg", _v$10, _p$.e));
+                _v$11 !== _p$.t && (_p$.t = setProp(_el$26, "attributes", _v$11, _p$.t));
+                _v$12 !== _p$.a && (_p$.a = setProp(_el$27, "fg", _v$12, _p$.a));
+                _v$13 !== _p$.o && (_p$.o = setProp(_el$29, "fg", _v$13, _p$.o));
                 return _p$;
               }, {
                 e: undefined,
@@ -113390,11 +113489,11 @@ function PlanApprovalModal(props) {
                 a: undefined,
                 o: undefined
               });
-              return _el$23;
+              return _el$25;
             })();
           }
         }));
-        return _el$9;
+        return _el$1;
       }
     }), null);
     insert(_el$, createComponent2(Show, {
@@ -113402,28 +113501,28 @@ function PlanApprovalModal(props) {
         return feedbackMode();
       },
       get children() {
-        var _el$0 = createElement("box"), _el$1 = createElement("text"), _el$11 = createElement("box"), _el$12 = createElement("text"), _el$13 = createElement("text"), _el$15 = createElement("text");
-        insertNode(_el$0, _el$1);
-        insertNode(_el$0, _el$11);
-        insertNode(_el$0, _el$15);
-        setProp(_el$0, "flexDirection", "column");
-        setProp(_el$0, "marginTop", 1);
-        insertNode(_el$1, createTextNode(`Tell CodeTyper what to change:`));
-        insertNode(_el$11, _el$12);
-        setProp(_el$11, "border", ["left"]);
-        setProp(_el$11, "paddingLeft", 1);
-        setProp(_el$11, "marginTop", 1);
-        insertNode(_el$12, _el$13);
-        insert(_el$12, () => feedbackText() || " ", _el$13);
-        insertNode(_el$13, createTextNode(`_`));
-        insertNode(_el$15, createTextNode(`Enter to submit | Esc to cancel`));
+        var _el$10 = createElement("box"), _el$11 = createElement("text"), _el$13 = createElement("box"), _el$14 = createElement("text"), _el$15 = createElement("text"), _el$17 = createElement("text");
+        insertNode(_el$10, _el$11);
+        insertNode(_el$10, _el$13);
+        insertNode(_el$10, _el$17);
+        setProp(_el$10, "flexDirection", "column");
+        setProp(_el$10, "marginTop", 1);
+        insertNode(_el$11, createTextNode(`Tell CodeTyper what to change:`));
+        insertNode(_el$13, _el$14);
+        setProp(_el$13, "border", ["left"]);
+        setProp(_el$13, "paddingLeft", 1);
+        setProp(_el$13, "marginTop", 1);
+        insertNode(_el$14, _el$15);
+        insert(_el$14, () => feedbackText() || " ", _el$15);
+        insertNode(_el$15, createTextNode(`_`));
+        insertNode(_el$17, createTextNode(`Enter to submit | Esc to cancel`));
         effect((_p$) => {
           var _v$3 = theme.colors.text, _v$4 = theme.colors.borderFocus, _v$5 = theme.colors.text, _v$6 = theme.colors.bgCursor, _v$7 = theme.colors.textDim;
-          _v$3 !== _p$.e && (_p$.e = setProp(_el$1, "fg", _v$3, _p$.e));
-          _v$4 !== _p$.t && (_p$.t = setProp(_el$11, "borderColor", _v$4, _p$.t));
-          _v$5 !== _p$.a && (_p$.a = setProp(_el$12, "fg", _v$5, _p$.a));
-          _v$6 !== _p$.o && (_p$.o = setProp(_el$13, "fg", _v$6, _p$.o));
-          _v$7 !== _p$.i && (_p$.i = setProp(_el$15, "fg", _v$7, _p$.i));
+          _v$3 !== _p$.e && (_p$.e = setProp(_el$11, "fg", _v$3, _p$.e));
+          _v$4 !== _p$.t && (_p$.t = setProp(_el$13, "borderColor", _v$4, _p$.t));
+          _v$5 !== _p$.a && (_p$.a = setProp(_el$14, "fg", _v$5, _p$.a));
+          _v$6 !== _p$.o && (_p$.o = setProp(_el$15, "fg", _v$6, _p$.o));
+          _v$7 !== _p$.i && (_p$.i = setProp(_el$17, "fg", _v$7, _p$.i));
           return _p$;
         }, {
           e: undefined,
@@ -113432,7 +113531,7 @@ function PlanApprovalModal(props) {
           o: undefined,
           i: undefined
         });
-        return _el$0;
+        return _el$10;
       }
     }), null);
     insert(_el$, createComponent2(Show, {
@@ -113440,42 +113539,42 @@ function PlanApprovalModal(props) {
         return !feedbackMode();
       },
       get children() {
-        var _el$17 = createElement("box");
-        setProp(_el$17, "marginTop", 1);
-        setProp(_el$17, "flexDirection", "row");
-        insert(_el$17, createComponent2(Show, {
+        var _el$19 = createElement("box");
+        setProp(_el$19, "marginTop", 1);
+        setProp(_el$19, "flexDirection", "row");
+        insert(_el$19, createComponent2(Show, {
           get when() {
             return props.prompt.planFilePath;
           },
           get children() {
-            var _el$18 = createElement("text"), _el$19 = createTextNode(` - `);
-            insertNode(_el$18, _el$19);
-            insert(_el$18, PLAN_APPROVAL_FOOTER_TEXT, _el$19);
-            insert(_el$18, () => props.prompt.planFilePath, null);
-            effect((_$p) => setProp(_el$18, "fg", theme.colors.textDim, _$p));
-            return _el$18;
+            var _el$20 = createElement("text"), _el$21 = createTextNode(` - `);
+            insertNode(_el$20, _el$21);
+            insert(_el$20, PLAN_APPROVAL_FOOTER_TEXT, _el$21);
+            insert(_el$20, () => props.prompt.planFilePath, null);
+            effect((_$p) => setProp(_el$20, "fg", theme.colors.textDim, _$p));
+            return _el$20;
           }
         }), null);
-        insert(_el$17, createComponent2(Show, {
+        insert(_el$19, createComponent2(Show, {
           get when() {
             return !props.prompt.planFilePath;
           },
           get children() {
-            var _el$20 = createElement("text"), _el$21 = createTextNode(`↑↓ options | Enter select | 1-4 shortcut | Esc cancel`);
-            insertNode(_el$20, _el$21);
-            effect((_$p) => setProp(_el$20, "fg", theme.colors.textDim, _$p));
-            return _el$20;
+            var _el$22 = createElement("text"), _el$23 = createTextNode(`↑↓ options | Enter select | 1-4 shortcut | Esc cancel`);
+            insertNode(_el$22, _el$23);
+            effect((_$p) => setProp(_el$22, "fg", theme.colors.textDim, _$p));
+            return _el$22;
           }
         }), null);
-        return _el$17;
+        return _el$19;
       }
     }), null);
     effect((_p$) => {
       var _v$8 = theme.colors.borderModal, _v$9 = theme.colors.background, _v$0 = theme.colors.primary, _v$1 = TextAttributes.BOLD;
       _v$8 !== _p$.e && (_p$.e = setProp(_el$, "borderColor", _v$8, _p$.e));
       _v$9 !== _p$.t && (_p$.t = setProp(_el$, "backgroundColor", _v$9, _p$.t));
-      _v$0 !== _p$.a && (_p$.a = setProp(_el$3, "fg", _v$0, _p$.a));
-      _v$1 !== _p$.o && (_p$.o = setProp(_el$3, "attributes", _v$1, _p$.o));
+      _v$0 !== _p$.a && (_p$.a = setProp(_el$9, "fg", _v$0, _p$.a));
+      _v$1 !== _p$.o && (_p$.o = setProp(_el$9, "attributes", _v$1, _p$.o));
       return _p$;
     }, {
       e: undefined,
@@ -115680,6 +115779,10 @@ function AppContent(props) {
     props.onPermissionResponse(allowed, scope);
   };
   const handlePlanApprovalResponse = (response2) => {
+    const prompt2 = app.planApprovalPrompt();
+    if (prompt2?.resolve) {
+      prompt2.resolve(response2);
+    }
     props.onPlanApprovalResponse(response2);
   };
   const handleLearningResponse = (save, scope, editedContent) => {
@@ -117123,4 +117226,4 @@ ${plan.steps.map((s) => `${s.id}. ${s.description}`).join(`
 });
 program2.parse(process.argv);
 
-//# debugId=916DA4C2FBA06B5A64756E2164756E21
+//# debugId=07E4A86E6DD680D764756E2164756E21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codetyper-cli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "CodeTyper AI Agent - Standalone CLI for autonomous code generation",
   "main": "dist/index.js",
   "bin": {
@@ -10,9 +10,6 @@
   "scripts": {
     "dev": "bun src/index.ts",
     "dev:nobump": "bun scripts/build.ts && npm link",
-    "dev:watch": "bun scripts/dev-watch.ts",
-    "dev:debug": "bun --inspect=localhost:6499/debug src/index.ts",
-    "dev:debug-brk": "bun --inspect-brk=localhost:6499/debug src/index.ts",
     "build": "bun scripts/build.ts",
     "sync-version": "bun scripts/sync-version.ts",
     "start": "bun src/index.ts",
@@ -20,7 +17,8 @@
     "lint": "bun eslint src/**/*.ts",
     "format": "npx prettier --write \"src/**/*.ts\"",
     "prettier": "npx prettier --write \"src/**/*.ts\" \"src/**/*.tsx\" \"scripts/**/*.ts\"",
-    "typecheck": "bun tsc --noEmit"
+    "typecheck": "bun tsc --noEmit",
+    "version": "bun scripts/sync-version.ts && git add src/version.json"
   },
   "keywords": [
     "ai",
@@ -78,13 +76,13 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.3",
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^10.0.1",
     "@types/inquirer": "^9.0.7",
     "@types/node": "^25.0.10",
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.53.1",
     "@typescript-eslint/parser": "^8.53.1",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-plugin-import": "^2.32.0",

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.4.2"
+  "version": "0.4.3"
 }