codemate-ai 1.0.7 → 1.0.8

package/dist/cli.js

@@ -5,7 +5,7 @@ import * as fs21 from 'fs';
 import fs21__default, { existsSync, statSync, promises } from 'fs';
 import * as path18 from 'pathe';
 import { join, resolve, extname, basename } from 'pathe';
-import React, { createContext, useState, useRef, useEffect, useCallback, useMemo, useContext } from 'react';
+import React, { createContext, useState, useRef, useCallback, useEffect, useMemo, useContext } from 'react';
 import { render, useApp, useInput, Box, Text } from 'ink';
 import Spinner3 from 'ink-spinner';
 import defu from 'defu';
@@ -739,36 +739,43 @@ var init_WorkspaceCommand = __esm({
         super();
         this.configManager = configManager;
       }
-      async execute(args) {
+      async execute(args, app) {
         const subcommand = args[0];
+        const sessionService = app.getContainer().get("session");
         try {
           switch (subcommand) {
             case "create":
-              await this.create(this.parseCreateOptions(args.slice(1)));
+              await this.create(this.parseCreateOptions(args.slice(1)), sessionService);
               break;
             case "list":
-              await this.list();
+              await this.list(sessionService);
               break;
             case "remove":
             case "delete":
-              await this.remove(args[1]);
+              await this.remove(args[1], sessionService);
               break;
             case "complete":
-              await this.complete();
+              await this.complete(sessionService);
               break;
             default:
-              console.log("Usage: /workspace <create|list|remove|complete> [options]");
-              console.log("");
-              console.log("Commands:");
-              console.log("  create [--name <name>] [-b <branch>]  Create a new workspace");
-              console.log("  list                                   List all workspaces");
-              console.log("  remove <name>                          Remove a workspace");
-              console.log(
-                "  complete                               Complete and merge current workspace"
+              await this.output(
+                sessionService,
+                [
+                  "Usage: /workspace <create|list|remove|complete> [options]",
+                  "",
+                  "Commands:",
+                  "  create [--name <name>] [-b <branch>]  Create a new workspace",
+                  "  list                                   List all workspaces",
+                  "  remove <name>                          Remove a workspace",
+                  "  complete                               Complete and merge current workspace"
+                ].join("\n")
               );
           }
         } catch (error) {
-          console.error("\u274C Error:", error instanceof Error ? error.message : String(error));
+          await this.output(
+            sessionService,
+            `\u274C Error: ${error instanceof Error ? error.message : String(error)}`
+          );
         }
       }
       /**
@@ -796,110 +803,121 @@ var init_WorkspaceCommand = __esm({
       /**
        * 创建工作区
        */
-      async create(options) {
+      async create(options, sessionService) {
         const workspaceName = options.name;
         if (!workspaceName) {
-          console.log("\u274C Workspace name is required");
-          console.log("Usage: /workspace create --name <workspace-name> [-b <branch>]");
-          console.log("");
-          console.log("Example:");
-          console.log("  /workspace create --name feature-auth");
-          console.log("  /workspace create --name bugfix-login -b develop");
+          await this.output(
+            sessionService,
+            [
+              "\u274C Workspace name is required",
+              "Usage: /workspace create --name <workspace-name> [-b <branch>]",
+              "",
+              "Example:",
+              "  /workspace create --name feature-auth",
+              "  /workspace create --name bugfix-login -b develop"
+            ].join("\n")
+          );
           return;
         }
         const config = this.configManager.config;
         const baseBranch = options.baseBranch || config.workspace?.baseBranch || "main";
         if (!this.branchExists(baseBranch)) {
-          console.log(`\u274C Base branch '${baseBranch}' does not exist`);
-          console.log("Available branches:");
+          let message = `\u274C Base branch '${baseBranch}' does not exist
+Available branches:`;
           try {
             const branches = this.execGit("branch -a").split("\n").map(
               (line) => line.trim().replace(/^\*\s*/, "").replace(/^remotes\/origin\//, "")
             ).filter((line) => line && !line.includes("HEAD")).slice(0, 5);
-            for (const branch of branches) {
-              console.log(`  - ${branch}`);
-            }
+            message += `
+${branches.map((branch) => `  - ${branch}`).join("\n")}`;
           } catch {
-            console.log("  (Unable to list branches)");
+            message += "\n  (Unable to list branches)";
           }
+          await this.output(sessionService, message);
           return;
         }
         const workspacePath = this.getWorkspacePath(workspaceName);
         if (existsSync(workspacePath)) {
-          console.log(`\u274C Workspace already exists: ${workspacePath}`);
+          await this.output(sessionService, `\u274C Workspace already exists: ${workspacePath}`);
           return;
         }
         const branchExists = this.branchExists(workspaceName);
-        console.log(`\u{1F33F} Creating workspace '${workspaceName}'...`);
+        await this.output(sessionService, `\u{1F33F} Creating workspace '${workspaceName}'...`);
         try {
           if (branchExists && !options.newBranch) {
             this.execGit(`worktree add ${workspacePath} ${workspaceName}`);
           } else {
             this.execGit(`worktree add -b ${workspaceName} ${workspacePath} ${baseBranch}`);
           }
-          console.log(`\u2705 Workspace created at: ${workspacePath}`);
-          console.log(`\u{1F4A1} To start working: cd ${workspacePath}`);
+          await this.output(
+            sessionService,
+            `\u2705 Workspace created at: ${workspacePath}
+\u{1F4A1} To start working: cd ${workspacePath}`
+          );
         } catch (error) {
-          console.error("\u274C Failed to create workspace");
+          await this.output(sessionService, "\u274C Failed to create workspace");
           throw error;
         }
       }
       /**
        * 列出所有工作区
        */
-      async list() {
+      async list(sessionService) {
         try {
           const output = this.execGit("worktree list --porcelain");
           const workspaces = this.parseWorktreeList(output);
           if (workspaces.length === 0) {
-            console.log("\u{1F4CB} No workspaces found");
+            await this.output(sessionService, "\u{1F4CB} No workspaces found");
             return;
           }
-          console.log("\u{1F4CB} Workspaces:\n");
+          const lines = ["\u{1F4CB} Workspaces:", ""];
           for (const workspace of workspaces) {
             const marker = workspace.isCurrent ? "\u2192" : " ";
             const name = basename(workspace.path);
-            console.log(`${marker} ${name}`);
-            console.log(`  Path:   ${workspace.path}`);
-            console.log(`  Branch: ${workspace.branch}`);
-            console.log(`  Commit: ${workspace.commit.substring(0, 7)}`);
-            console.log("");
+            lines.push(`${marker} ${name}`);
+            lines.push(`  Path:   ${workspace.path}`);
+            lines.push(`  Branch: ${workspace.branch}`);
+            lines.push(`  Commit: ${workspace.commit.substring(0, 7)}`);
+            lines.push("");
           }
+          await this.output(sessionService, lines.join("\n").trimEnd());
         } catch (error) {
-          console.error("\u274C Failed to list workspaces");
+          await this.output(sessionService, "\u274C Failed to list workspaces");
           throw error;
         }
       }
       /**
        * 删除工作区
        */
-      async remove(name) {
+      async remove(name, sessionService) {
         if (!name) {
-          console.log("\u274C Workspace name is required");
-          console.log("Usage: /workspace remove <name>");
+          await this.output(
+            sessionService,
+            "\u274C Workspace name is required\nUsage: /workspace remove <name>"
+          );
           return;
         }
         const workspacePath = this.getWorkspacePath(name);
         if (!existsSync(workspacePath)) {
-          console.log(`\u274C Workspace not found: ${workspacePath}`);
+          await this.output(sessionService, `\u274C Workspace not found: ${workspacePath}`);
           return;
         }
-        console.log(`\u{1F5D1}\uFE0F  Removing workspace '${name}'...`);
+        await this.output(sessionService, `\u{1F5D1}\uFE0F  Removing workspace '${name}'...`);
         try {
           this.execGit(`worktree remove ${workspacePath}`);
-          console.log(`\u2705 Workspace removed: ${workspacePath}`);
+          await this.output(sessionService, `\u2705 Workspace removed: ${workspacePath}`);
         } catch (error) {
-          console.error("\u274C Failed to remove workspace");
+          await this.output(sessionService, "\u274C Failed to remove workspace");
           throw error;
         }
       }
       /**
        * 完成并合并工作区
        */
-      async complete() {
+      async complete(sessionService) {
         const currentBranch = this.getCurrentBranch();
         if (!currentBranch) {
-          console.log("\u274C Not in a Git repository");
+          await this.output(sessionService, "\u274C Not in a Git repository");
           return;
         }
         const config = this.configManager.config;
@@ -908,28 +926,41 @@ var init_WorkspaceCommand = __esm({
         try {
           this.execGit("diff-index --quiet HEAD --");
         } catch {
-          console.log("\u274C You have uncommitted changes. Please commit or stash them first.");
+          await this.output(
+            sessionService,
+            "\u274C You have uncommitted changes. Please commit or stash them first."
+          );
           return;
         }
-        console.log(`\u{1F500} Merging ${currentBranch} into ${baseBranch}...`);
+        await this.output(sessionService, `\u{1F500} Merging ${currentBranch} into ${baseBranch}...`);
         try {
           this.execGit(`checkout ${baseBranch}`);
           this.execGit(`merge ${currentBranch}`);
-          console.log(`\u2705 Merged ${currentBranch} into ${baseBranch}`);
+          await this.output(sessionService, `\u2705 Merged ${currentBranch} into ${baseBranch}`);
           const workspacePath = process.cwd();
-          console.log("\u{1F5D1}\uFE0F  Removing workspace...");
+          await this.output(sessionService, "\u{1F5D1}\uFE0F  Removing workspace...");
           process.chdir("..");
           this.execGit(`worktree remove ${workspacePath}`);
           if (autoDelete) {
-            console.log(`\u{1F5D1}\uFE0F  Deleting branch ${currentBranch}...`);
+            await this.output(sessionService, `\u{1F5D1}\uFE0F  Deleting branch ${currentBranch}...`);
             this.execGit(`branch -d ${currentBranch}`);
           }
-          console.log("\u2705 Workspace completed and merged!");
+          await this.output(sessionService, "\u2705 Workspace completed and merged!");
         } catch (error) {
-          console.error("\u274C Failed to complete workspace");
+          await this.output(sessionService, "\u274C Failed to complete workspace");
           throw error;
         }
       }
+      async output(sessionService, message) {
+        if (sessionService) {
+          await sessionService.addMessage({
+            role: "assistant",
+            content: message
+          });
+          return;
+        }
+        console.log(message);
+      }
       /**
        * 获取项目名称
        */
@@ -8705,7 +8736,6 @@ var SessionService = class {
   }
   /**
    * 清除当前会话并创建新会话
-   * 对标Neovate的clear命令功能
    */
   async clear() {
     const newSession = await this.create();
@@ -9529,6 +9559,11 @@ var ExitCommand = class extends SlashCommand {
   description = "Exit the program";
   aliases = ["quit", "q"];
   async execute(_args, app) {
+    const eventBus = app.getContainer().get("eventBus");
+    if (eventBus.listenerCount("exit_app") > 0) {
+      eventBus.emit("exit_app");
+      return;
+    }
     console.log("\u{1F44B} Goodbye!");
     await app.stop();
     process.exit(0);
@@ -9647,8 +9682,9 @@ var ConfigCommand = class extends SlashCommand {
    */
   async execute(args, app) {
     const configService = app.getContainer().get("config");
+    const sessionService = app.getContainer().get("session");
     if (!configService) {
-      console.log("\u274C ConfigService not available");
+      await this.outputResult(sessionService, "\u274C ConfigService not available");
       return;
     }
     const [action, ...rest] = args;
@@ -9672,6 +9708,16 @@ var ConfigCommand = class extends SlashCommand {
       default:
         result = this.getHelp();
     }
+    await this.outputResult(sessionService, result);
+  }
+  async outputResult(sessionService, result) {
+    if (sessionService) {
+      await sessionService.addMessage({
+        role: "assistant",
+        content: result
+      });
+      return;
+    }
     console.log(result);
   }
   /**
@@ -9834,17 +9880,17 @@ var ForkCommand = class extends SlashCommand {
   async execute(args, app) {
     const sessionService = app.getContainer().get("session");
     if (!sessionService) {
-      console.log("\u274C SessionService not available");
+      await this.output(void 0, "\u274C SessionService not available");
       return;
     }
     const currentSession = sessionService.getCurrent();
     if (!currentSession) {
-      console.log("\u274C No active session");
+      await this.output(sessionService, "\u274C No active session");
       return;
     }
     const messages = currentSession.messages;
     if (messages.length === 0) {
-      console.log("\u274C No messages to fork from");
+      await this.output(sessionService, "\u274C No messages to fork from");
       return;
     }
     if (args.length > 0) {
@@ -9852,7 +9898,7 @@ var ForkCommand = class extends SlashCommand {
       await this.forkFromMessage(sessionService, messageUuid);
       return;
     }
-    this.showForkSelector(messages);
+    await this.showForkSelector(sessionService, messages);
   }
   /**
    * 从指定消息分叉
@@ -9862,27 +9908,36 @@ var ForkCommand = class extends SlashCommand {
       const newSession = await sessionService.fork({
         fromMessageUuid: messageUuid
       });
-      console.log(`\u2705 Session forked: ${newSession.id}`);
-      console.log("Use /sessions to switch to it.");
+      await this.output(
+        sessionService,
+        `\u2705 Session forked: ${newSession.id}
+Use /sessions to switch to it.`
+      );
     } catch (error) {
-      console.log(`\u274C Fork failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+      await this.output(
+        sessionService,
+        `\u274C Fork failed: ${error instanceof Error ? error.message : "Unknown error"}`
+      );
     }
   }
   /**
    * 显示分叉选择器
    */
-  showForkSelector(messages) {
+  async showForkSelector(sessionService, messages) {
     const messagesWithUuid = messages.filter((msg) => msg.uuid);
     if (messagesWithUuid.length === 0) {
-      console.log("\u274C No messages with UUID found. Fork requires enhanced messages.");
-      console.log("\u{1F4A1} Tip: New messages will have UUIDs automatically.");
+      await this.output(
+        sessionService,
+        "\u274C No messages with UUID found. Fork requires enhanced messages.\n\u{1F4A1} Tip: New messages will have UUIDs automatically."
+      );
       return;
     }
     const messageList = messagesWithUuid.map((msg, index) => {
       const preview = this.getMessagePreview(msg);
       return `${index + 1}. [${msg.uuid.slice(0, 8)}] ${msg.role}: ${preview}`;
     }).join("\n");
-    console.log(
+    await this.output(
+      sessionService,
       `
 \u{1F4CB} Select a message to fork from:
 
@@ -9894,6 +9949,16 @@ Example: /fork ${messagesWithUuid[0].uuid}
     `.trim()
     );
   }
+  async output(sessionService, message) {
+    if (sessionService) {
+      await sessionService.addMessage({
+        role: "assistant",
+        content: message
+      });
+      return;
+    }
+    console.log(message);
+  }
   /**
    * 获取消息预览
    */
@@ -18181,22 +18246,23 @@ var SkillCommand = class extends SlashCommand {
    *
    * @param args 命令参数
    */
-  async execute(args) {
+  async execute(args, app) {
     const subcommand = args[0];
+    const sessionService = app.getContainer().get("session");
     switch (subcommand) {
       case "add":
-        await this.handleAdd(args.slice(1));
+        await this.handleAdd(args.slice(1), sessionService);
         break;
       case "remove":
       case "rm":
-        await this.handleRemove(args.slice(1));
+        await this.handleRemove(args.slice(1), sessionService);
         break;
       case "list":
       case "ls":
-        await this.handleList();
+        await this.handleList(sessionService);
         break;
       default:
-        this.showHelp();
+        await this.showHelp(sessionService);
     }
   }
   /**
@@ -18204,10 +18270,12 @@ var SkillCommand = class extends SlashCommand {
    *
    * 从 GitHub 安装技能
    */
-  async handleAdd(args) {
+  async handleAdd(args, sessionService) {
     if (args.length === 0) {
-      console.error("Error: GitHub source is required");
-      console.log("Usage: /skill add <user/repo> [--name <name>] [--overwrite]");
+      await this.output(
+        sessionService,
+        "Error: GitHub source is required\nUsage: /skill add <user/repo> [--name <name>] [--overwrite]"
+      );
       return;
     }
     const source = args[0];
@@ -18223,8 +18291,12 @@ var SkillCommand = class extends SlashCommand {
     }
     try {
       await this.skillManager.addSkill(source, options);
+      await this.output(
+        sessionService,
+        `\u2705 Skill installed: ${options.name || source.split("/").pop() || source}`
+      );
     } catch (error) {
-      console.error(`Error: ${error}`);
+      await this.output(sessionService, `Error: ${error}`);
     }
   }
   /**
@@ -18232,17 +18304,20 @@ var SkillCommand = class extends SlashCommand {
    *
    * 删除已安装的技能
    */
-  async handleRemove(args) {
+  async handleRemove(args, sessionService) {
     if (args.length === 0) {
-      console.error("Error: Skill name is required");
-      console.log("Usage: /skill remove <name>");
+      await this.output(
+        sessionService,
+        "Error: Skill name is required\nUsage: /skill remove <name>"
+      );
       return;
     }
     const name = args[0];
     try {
       await this.skillManager.removeSkill(name);
+      await this.output(sessionService, `\u2705 Skill removed: ${name}`);
     } catch (error) {
-      console.error(`Error: ${error}`);
+      await this.output(sessionService, `Error: ${error}`);
     }
   }
   /**
@@ -18250,25 +18325,28 @@ var SkillCommand = class extends SlashCommand {
    *
    * 列出所有可用的技能
    */
-  async handleList() {
+  async handleList(sessionService) {
     const skills = this.skillManager.listSkills();
     if (skills.length === 0) {
-      console.log("No skills found");
+      await this.output(sessionService, "No skills found");
       return;
     }
-    console.log("\nAvailable Skills:\n");
+    const lines = ["Available Skills:", ""];
     for (const skill of skills) {
-      console.log(`  /${skill.name}`);
-      console.log(`    ${skill.description}`);
-      console.log(`    Source: ${skill.source}`);
-      console.log();
+      lines.push(`  /${skill.name}`);
+      lines.push(`    ${skill.description}`);
+      lines.push(`    Source: ${skill.source}`);
+      lines.push("");
     }
+    await this.output(sessionService, lines.join("\n").trimEnd());
   }
   /**
    * 显示帮助信息
    */
-  showHelp() {
-    console.log(`
+  async showHelp(sessionService) {
+    await this.output(
+      sessionService,
+      `
 Usage: /skill <subcommand> [options]
 
 Subcommands:
@@ -18282,7 +18360,18 @@ Examples:
   /skill add user/repo --name my-skill --overwrite
   /skill remove my-skill
   /skill list
-    `);
+    `.trim()
+    );
+  }
+  async output(sessionService, message) {
+    if (sessionService) {
+      await sessionService.addMessage({
+        role: "assistant",
+        content: message
+      });
+      return;
+    }
+    console.log(message);
   }
 };
 
@@ -18298,86 +18387,95 @@ var AgentCommand = class extends SlashCommand {
     super();
     this.agentManager = agentManager;
   }
-  async execute(args) {
+  async execute(args, app) {
+    const sessionService = app.getContainer().get("session");
     if (args.length === 0) {
-      this.showHelp();
+      await this.showHelp(sessionService);
       return;
     }
     const subcommand = args[0];
     if (subcommand === "list") {
-      this.listAgents();
+      await this.listAgents(sessionService);
       return;
     }
     const agentName = subcommand;
     const goal = args.slice(1).join(" ");
     if (!goal) {
-      console.log("\u274C Please provide a goal for the agent");
-      console.log(`Usage: /agent ${agentName} <goal>`);
+      await this.output(
+        sessionService,
+        `\u274C Please provide a goal for the agent
+Usage: /agent ${agentName} <goal>`
+      );
       return;
     }
-    await this.delegateTask(agentName, goal);
+    await this.delegateTask(agentName, goal, sessionService);
   }
   /**
    * 显示帮助信息
    */
-  showHelp() {
-    console.log("Agent Management Commands:");
-    console.log("");
-    console.log("  /agent list              - List all available agents");
-    console.log("  /agent <name> <goal>     - Delegate a task to an agent");
-    console.log("");
-    console.log("Examples:");
-    console.log("  /agent list");
-    console.log('  /agent explore "Find all TypeScript files"');
-    console.log('  /agent code-reviewer "Review the authentication code"');
+  async showHelp(sessionService) {
+    await this.output(
+      sessionService,
+      [
+        "Agent Management Commands:",
+        "",
+        "  /agent list              - List all available agents",
+        "  /agent <name> <goal>     - Delegate a task to an agent",
+        "",
+        "Examples:",
+        "  /agent list",
+        '  /agent explore "Find all TypeScript files"',
+        '  /agent general-purpose "Summarize current project status"'
+      ].join("\n")
+    );
   }
   /**
    * 列出所有 Agent
    */
-  listAgents() {
+  async listAgents(sessionService) {
     const agents = this.agentManager.listAll();
     if (agents.length === 0) {
-      console.log("No agents available");
+      await this.output(sessionService, "No agents available");
       return;
     }
-    console.log(`
-\u{1F4CB} Available Agents (${agents.length}):
-`);
+    const lines = [`\u{1F4CB} Available Agents (${agents.length}):`, ""];
     for (const agent of agents) {
-      console.log(`  \u{1F916} ${agent.name} (${agent.source})`);
-      console.log(`     ${agent.description}`);
+      lines.push(`  \u{1F916} ${agent.name} (${agent.source})`);
+      lines.push(`     ${agent.description}`);
       if (agent.tools) {
-        console.log(`     Tools: ${agent.tools.join(", ")}`);
+        lines.push(`     Tools: ${agent.tools.join(", ")}`);
       }
       if (agent.disallowedTools) {
-        console.log(`     Disallowed: ${agent.disallowedTools.join(", ")}`);
+        lines.push(`     Disallowed: ${agent.disallowedTools.join(", ")}`);
       }
       if (agent.model) {
-        console.log(`     Model: ${agent.model}`);
+        lines.push(`     Model: ${agent.model}`);
       }
       if (agent.forkContext) {
-        console.log(`     Fork Context: ${agent.forkContext}`);
+        lines.push(`     Fork Context: ${agent.forkContext}`);
       }
       if (agent.color) {
-        console.log(`     Color: ${agent.color}`);
+        lines.push(`     Color: ${agent.color}`);
       }
-      console.log("");
+      lines.push("");
     }
+    await this.output(sessionService, lines.join("\n").trimEnd());
   }
   /**
    * 委托任务给 Agent
    */
-  async delegateTask(agentName, goal) {
+  async delegateTask(agentName, goal, sessionService) {
     if (!this.agentManager.has(agentName)) {
-      console.log(`\u274C Agent not found: ${agentName}`);
-      console.log("\u{1F4A1} Use /agent list to see available agents");
+      await this.output(
+        sessionService,
+        `\u274C Agent not found: ${agentName}
+\u{1F4A1} Use /agent list to see available agents`
+      );
       return;
     }
     try {
-      console.log(`
-\u{1F916} Delegating task to ${agentName}...`);
-      console.log(`   Goal: ${goal}
-`);
+      await this.output(sessionService, `\u{1F916} Delegating task to ${agentName}...
+Goal: ${goal}`);
       const result = await this.agentManager.delegate(
         {
           type: "custom",
@@ -18386,26 +18484,41 @@ var AgentCommand = class extends SlashCommand {
         agentName
       );
       if (result.success) {
-        console.log(`
-\u2705 Task completed by ${agentName}`);
+        let message = `\u2705 Task completed by ${agentName}`;
         if (result.message) {
-          console.log(`   ${result.message}`);
+          message += `
+${result.message}`;
         }
         if (result.data) {
-          console.log(`   Data: ${JSON.stringify(result.data, null, 2)}`);
+          message += `
+Data: ${JSON.stringify(result.data, null, 2)}`;
         }
+        await this.output(sessionService, message);
       } else {
-        console.log(`
-\u274C Task failed`);
+        let message = "\u274C Task failed";
         if (result.message) {
-          console.log(`   ${result.message}`);
+          message += `
+${result.message}`;
         }
+        await this.output(sessionService, message);
       }
     } catch (error) {
-      console.log(`
-\u274C Error: ${error instanceof Error ? error.message : String(error)}`);
+      await this.output(
+        sessionService,
+        `\u274C Error: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
+  async output(sessionService, message) {
+    if (sessionService) {
+      await sessionService.addMessage({
+        role: "assistant",
+        content: message
+      });
+      return;
+    }
+    console.log(message);
+  }
 };
 
 // src/commands/git/CommitCommand.ts
@@ -18422,53 +18535,83 @@ var CommitCommand = class extends SlashCommand {
     this.modelService = modelService;
     this.configManager = configManager;
   }
-  async execute(args) {
+  async execute(args, app) {
     const options = this.parseOptions(args);
+    const sessionService = app.getContainer().get("session");
     try {
       if (options.stage) {
-        console.log("\u{1F4E6} Staging all changes...");
+        await this.output(sessionService, "\u{1F4E6} Staging all changes...");
         this.execCommand("git add -A");
       }
-      console.log("\u{1F50D} Analyzing changes...");
+      await this.output(sessionService, "\u{1F50D} Analyzing changes...");
       const diff = await this.getDiff(true);
       if (!diff || diff.trim().length === 0) {
-        console.log("\u274C No changes to commit");
+        await this.output(
+          sessionService,
+          "\u274C No staged changes to commit. Stage files first or run `/commit --stage`."
+        );
         return;
       }
       let commitHistory = "";
       if (options.followStyle) {
-        console.log("\u{1F4DA} Learning commit style from history...");
+        await this.output(sessionService, "\u{1F4DA} Learning commit style from history...");
         const history = await this.getCommitHistory(50);
         commitHistory = history.join("\n");
       }
-      console.log("\u{1F916} Generating commit message...");
+      await this.output(sessionService, "\u{1F916} Generating commit message...");
       const commitMessage = await this.generateCommitMessage(diff, commitHistory, options);
       if (options.copy) {
         await this.copyToClipboard(commitMessage);
-        console.log("\u{1F4CB} Commit message copied to clipboard");
-        console.log("\n" + commitMessage);
+        await this.output(
+          sessionService,
+          `\u{1F4CB} Commit message copied to clipboard
+
+${commitMessage}`
+        );
         return;
       }
-      console.log("\n\u{1F4DD} Generated commit message:\n");
-      console.log(commitMessage);
-      console.log("");
       if (!options.commit) {
-        const confirmed = await this.confirmCommit();
-        if (!confirmed) {
-          console.log("\u274C Commit cancelled");
-          return;
-        }
+        await this.output(
+          sessionService,
+          `\u{1F4DD} Generated commit message:
+
+${commitMessage}
+
+Use \`/commit --commit\` to create the commit, or \`/commit --copy\` to copy the message.`
+        );
+        return;
       }
+      await this.output(
+        sessionService,
+        `\u{1F4DD} Generated commit message:
+
+${commitMessage}
+
+\u{1F680} Creating commit...`
+      );
       await this.executeCommit(commitMessage, options);
-      console.log("\u2705 Commit successful");
+      await this.output(sessionService, "\u2705 Commit successful");
       if (options.push) {
-        console.log("\u{1F4E4} Pushing to remote...");
+        await this.output(sessionService, "\u{1F4E4} Pushing to remote...");
         this.execCommand("git push");
-        console.log("\u2705 Push successful");
+        await this.output(sessionService, "\u2705 Push successful");
       }
     } catch (error) {
-      console.error("\u274C Error:", error instanceof Error ? error.message : String(error));
+      await this.output(
+        sessionService,
+        `\u274C Error: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  async output(sessionService, message) {
+    if (sessionService) {
+      await sessionService.addMessage({
+        role: "assistant",
+        content: message
+      });
+      return;
     }
+    console.log(message);
   }
   /**
    * 解析命令选项
@@ -18615,17 +18758,6 @@ Requirements:
 
 Output only the commit message, no explanations.`;
   }
-  /**
-   * 确认提交
-   */
-  async confirmCommit() {
-    console.log("Press Enter to commit, or Ctrl+C to cancel...");
-    return new Promise((resolve11) => {
-      process.stdin.once("data", () => {
-        resolve11(true);
-      });
-    });
-  }
   /**
    * 执行提交
    */
@@ -21106,6 +21238,18 @@ function useSession() {
   const { app, currentSession, setCurrentSession, setSessions } = useAppContext();
   const sessionService = app.getContainer().get("session");
   const eventBus = app.getContainer().get("eventBus");
+  const syncCurrentSession = () => {
+    const session = sessionService.getCurrent();
+    if (!session) {
+      return;
+    }
+    setCurrentSession({
+      ...session,
+      messages: session.messages.slice(),
+      config: session.config ? { ...session.config } : void 0
+    });
+    setSessions(sessionService.list());
+  };
   useEffect(() => {
     const initSession = async () => {
       try {
@@ -21145,11 +21289,31 @@ function useSession() {
     const handleSessionLoaded = (data) => {
       setCurrentSession(data.session);
     };
+    const handleMessageSent = () => {
+      syncCurrentSession();
+    };
+    const handleSessionSaved = () => {
+      syncCurrentSession();
+    };
+    const handleSessionUpdated = () => {
+      syncCurrentSession();
+    };
+    const handleSessionResumed = () => {
+      syncCurrentSession();
+    };
     eventBus.on("session.created" /* SESSION_CREATED */, handleSessionCreated);
     eventBus.on("session.loaded" /* SESSION_LOADED */, handleSessionLoaded);
+    eventBus.on("message.sent" /* MESSAGE_SENT */, handleMessageSent);
+    eventBus.on("session.saved" /* SESSION_SAVED */, handleSessionSaved);
+    eventBus.on("session_updated", handleSessionUpdated);
+    eventBus.on("session:resumed", handleSessionResumed);
     return () => {
       eventBus.off("session.created" /* SESSION_CREATED */, handleSessionCreated);
       eventBus.off("session.loaded" /* SESSION_LOADED */, handleSessionLoaded);
+      eventBus.off("message.sent" /* MESSAGE_SENT */, handleMessageSent);
+      eventBus.off("session.saved" /* SESSION_SAVED */, handleSessionSaved);
+      eventBus.off("session_updated", handleSessionUpdated);
+      eventBus.off("session:resumed", handleSessionResumed);
     };
   }, [sessionService, eventBus, setCurrentSession, setSessions]);
   return {
@@ -21391,6 +21555,7 @@ var EnhancedMessageList = ({
 
 // src/ui/components/SimpleInput.tsx
 init_esm_shims();
+var MAX_VISIBLE_SUGGESTIONS = 8;
 var SimpleSuggestionEngine = class {
   commands = [
     "/help",
@@ -21463,6 +21628,7 @@ var SimpleInput = ({
   const [selectedIndex, setSelectedIndex] = useState(0);
   const [showSuggestions, setShowSuggestions] = useState(false);
   const suggestionEngine = useRef(new SimpleSuggestionEngine());
+  const submittedValueRef = useRef(null);
   useEffect(() => {
     if (input.startsWith("/")) {
       const newSuggestions = suggestionEngine.current.getSuggestions(input);
@@ -21481,7 +21647,13 @@ var SimpleInput = ({
     } else if (key.downArrow) {
       setSelectedIndex((prev) => prev === suggestions.length - 1 ? 0 : prev + 1);
     } else if (key.return && suggestions[selectedIndex]) {
-      setInput(suggestions[selectedIndex].text);
+      const selectedSuggestion = suggestions[selectedIndex].text;
+      if (input !== selectedSuggestion) {
+        setInput(selectedSuggestion);
+      } else if (submittedValueRef.current === selectedSuggestion) {
+        setInput("");
+        submittedValueRef.current = null;
+      }
       setShowSuggestions(false);
     } else if (key.escape) {
       setShowSuggestions(false);
@@ -21493,6 +21665,7 @@ var SimpleInput = ({
   const handleSubmit = useCallback(
     (value) => {
       if (!value.trim() || disabled) return;
+      submittedValueRef.current = value;
       setInput("");
       setShowSuggestions(false);
       onSubmit(value);
@@ -21501,6 +21674,16 @@ var SimpleInput = ({
   );
   const promptSymbol = ">";
   const promptColor = input.startsWith("/") ? "blue" : "green";
+  const visibleSuggestions = showSuggestions && suggestions.length > 0 ? Array.from(
+    { length: Math.min(MAX_VISIBLE_SUGGESTIONS, suggestions.length) },
+    (_, offset) => {
+      const index = (selectedIndex + offset) % suggestions.length;
+      return {
+        suggestion: suggestions[index],
+        index
+      };
+    }
+  ) : [];
   const getStatusIndicator = () => {
     switch (status) {
       case "thinking":
@@ -21513,7 +21696,7 @@ var SimpleInput = ({
         return "";
     }
   };
-  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, status !== "idle" && /* @__PURE__ */ React.createElement(Box, { marginBottom: 1, paddingX: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, getStatusIndicator())), !disabled && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Box, { paddingX: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "gray" }, "\u2500".repeat(80))), /* @__PURE__ */ React.createElement(Box, { paddingX: 2, paddingY: 0 }, /* @__PURE__ */ React.createElement(Box, { flexDirection: "row", alignItems: "center" }, /* @__PURE__ */ React.createElement(Text, { color: promptColor, bold: true }, promptSymbol, " "), /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, status !== "idle" && /* @__PURE__ */ React.createElement(Box, { marginBottom: 1, paddingX: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, getStatusIndicator())), input.length === 0 && !showSuggestions && /* @__PURE__ */ React.createElement(Box, { paddingX: 2, marginBottom: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "gray", dimColor: true }, "Type / for commands \u2022 Enter to send")), !disabled && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Box, { paddingX: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "gray" }, "\u2500".repeat(80))), /* @__PURE__ */ React.createElement(Box, { paddingX: 2 }, /* @__PURE__ */ React.createElement(Box, { flexDirection: "row", alignItems: "center" }, /* @__PURE__ */ React.createElement(Text, { color: promptColor, bold: true }, promptSymbol, " "), /* @__PURE__ */ React.createElement(
     TextInput,
     {
       value: input,
@@ -21521,21 +21704,22 @@ var SimpleInput = ({
       onSubmit: handleSubmit,
       placeholder
     }
-  ))), /* @__PURE__ */ React.createElement(Box, { paddingX: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "gray" }, "\u2500".repeat(80)))), showSuggestions && suggestions.length > 0 && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", paddingX: 2, marginTop: 1 }, suggestions.slice(0, 8).map((suggestion, index) => /* @__PURE__ */ React.createElement(Box, { key: index, flexDirection: "row" }, /* @__PURE__ */ React.createElement(Box, { width: 20 }, /* @__PURE__ */ React.createElement(
+  ))), /* @__PURE__ */ React.createElement(Box, { paddingX: 2 }, /* @__PURE__ */ React.createElement(Text, { color: "gray" }, "\u2500".repeat(80)))), showSuggestions && suggestions.length > 0 && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", paddingX: 2, marginTop: 1 }, visibleSuggestions.map(({ suggestion, index }) => /* @__PURE__ */ React.createElement(Box, { key: `${suggestion.text}-${index}`, flexDirection: "row", width: "100%" }, /* @__PURE__ */ React.createElement(Box, { width: 20, flexShrink: 0 }, /* @__PURE__ */ React.createElement(
     Text,
     {
       color: index === selectedIndex ? "cyan" : "gray",
       bold: index === selectedIndex
     },
     suggestion.text
-  )), /* @__PURE__ */ React.createElement(
+  )), /* @__PURE__ */ React.createElement(Box, { flexGrow: 1 }, /* @__PURE__ */ React.createElement(
     Text,
     {
       color: index === selectedIndex ? "white" : "dim",
-      dimColor: index !== selectedIndex
+      dimColor: index !== selectedIndex,
+      wrap: "truncate-end"
     },
     suggestion.description
-  ))), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "gray", dimColor: true }, "\u2191\u2193 navigate \u2022 Enter/Tab select \u2022 Esc cancel"))), input.length === 0 && !showSuggestions && /* @__PURE__ */ React.createElement(Box, { paddingX: 2, paddingTop: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "gray", dimColor: true }, "Type / for commands \u2022 Enter to send")));
+  )))), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "gray", dimColor: true }, "\u2191\u2193 navigate \u2022 Enter/Tab select \u2022 Esc cancel"))));
 };
 
 // src/ui/components/WelcomeScreen.tsx
@@ -22061,6 +22245,20 @@ function AppContent() {
   const [showResumeSelector, setShowResumeSelector] = useState(false);
   const [showMcpManager, setShowMcpManager] = useState(false);
   const [showStatusManager, setShowStatusManager] = useState(false);
+  const resetTransientUi = useCallback(() => {
+    setShowModelSelector(false);
+    setShowRewindSelector(false);
+    setShowResumeSelector(false);
+    setShowMcpManager(false);
+    setShowStatusManager(false);
+  }, []);
+  const requestAppExit = useCallback(async () => {
+    try {
+      await app.stop();
+    } finally {
+      exit();
+    }
+  }, [app, exit]);
   const messagesRef = useRef([]);
   const [, forceUpdate] = useState({});
   const historyMessages = messagesRef.current;
@@ -22184,6 +22382,16 @@ function AppContent() {
   useInput(
     useCallback(
       (input, key) => {
+        if (key.ctrl && input === "c") {
+          if (transcriptMode) {
+            clearTerminal();
+            toggleTranscriptMode();
+            refresh();
+          } else {
+            resetTransientUi();
+          }
+          return;
+        }
         if (key.ctrl && input === "o") {
           clearTerminal();
           toggleTranscriptMode();
@@ -22191,7 +22399,7 @@ function AppContent() {
           return;
         }
         if (transcriptMode) {
-          if (key.escape || key.ctrl && input === "c") {
+          if (key.escape) {
             clearTerminal();
             toggleTranscriptMode();
             refresh();
@@ -22202,7 +22410,17 @@ function AppContent() {
           return;
         }
       },
-      [transcriptMode, toggleTranscriptMode, refresh, showModelSelector]
+      [
+        transcriptMode,
+        toggleTranscriptMode,
+        refresh,
+        showModelSelector,
+        showRewindSelector,
+        showResumeSelector,
+        showMcpManager,
+        showStatusManager,
+        resetTransientUi
+      ]
     )
   );
   const handleSubmit = useCallback(
@@ -22216,7 +22434,7 @@ function AppContent() {
         return;
       }
       if (value.trim().toLowerCase() === "exit" || value.trim().toLowerCase() === "quit") {
-        exit();
+        await requestAppExit();
         return;
       }
       setTasks([]);
@@ -22256,7 +22474,7 @@ function AppContent() {
         setIsLoading(false);
       }
     },
-    [currentSession, app, sessionService, exit]
+    [currentSession, app, sessionService, requestAppExit]
   );
   const handleModelSelect = useCallback(
     async (modelId) => {
@@ -22379,6 +22597,16 @@ function AppContent() {
       eventBus.off("show_model_selector", handleShowModelSelector);
     };
   }, [app]);
+  useEffect(() => {
+    const eventBus = app.getContainer().get("eventBus");
+    const handleExitApp = () => {
+      void requestAppExit();
+    };
+    eventBus.on("exit_app", handleExitApp);
+    return () => {
+      eventBus.off("exit_app", handleExitApp);
+    };
+  }, [app, requestAppExit]);
   useEffect(() => {
     const eventBus = app.getContainer().get("eventBus");
     const handleShowRewindSelector = () => {
@@ -22746,7 +22974,9 @@ program.command("chat", { isDefault: true }).description("Start interactive chat
     await sessionService.initialize();
     console.log("\u2705 SessionService initialized");
     console.log("\n\u{1F3A8} Starting interactive UI...\n");
-    render(React.createElement(App, { app }));
+    const inkApp = render(React.createElement(App, { app }));
+    await inkApp.waitUntilExit();
+    process.exit(0);
   } catch (error) {
     console.error("\u274C Fatal error:", error);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemate-ai",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "type": "module",
   "description": "Enterprise-grade AI coding assistant CLI",
   "main": "dist/cli.js",