Merge branch 'main' into feature/changelog

Author: hqwlkj

.deepcode/AGENTS.md

@@ -14,12 +14,17 @@ packages/
 │   ├── prompt.ts           # System prompt builder & tool definitions
 │   └── settings.ts         # Settings resolution from ~/.deepcode/settings.json
 ├── cli/src/                # Terminal UI (Ink/React)
-│   ├── cli.tsx             # Entry point — parses args (-p, -v), renders AppContainer
-│   ├── ui/views/           # Top-level screens (App, PromptInput, SessionList, PermissionPrompt, etc.)
+│   ├── cli.tsx             # Entry point — renders AppContainer
+│   ├── cli-args.ts         # CLI argument parsing (yargs: -p, -r, -v, -h)
+│   ├── common/             # Update checker
+│   ├── utils/              # stdio helpers, version, package info
+│   ├── generated/          # Build-time git commit info
+│   ├── ui/views/           # Top-level screens (App, PromptInput, SessionList, PermissionPrompt, WelcomeScreen, UpdatePrompt, McpStatusList, etc.)
 │   ├── ui/components/      # Reusable Ink components (MessageView, DropdownMenu, ModelsDropdown, etc.)
 │   ├── ui/core/            # Prompt buffer, slash commands, file mentions, clipboard, undo/redo
-│   ├── ui/hooks/           # Custom hooks (cursor, history navigation, paste handling, terminal input)
+│   ├── ui/hooks/           # Custom hooks (cursor, history navigation, paste handling, terminal input, statusline)
 │   ├── ui/contexts/        # React contexts (AppContext, RawModeContext)
+│   ├── ui/statusline/      # Pluggable statusline providers (command, module)
 │   └── tests/              # UI-focused tests with run-tests.mjs runner
 ├── vscode-ide-companion/   # VSCode extension companion
 │   └── src/                # extension.ts, provider.ts, utils.ts
@@ -45,6 +50,7 @@ All commands run from the repo root.
 | `npm run check` | Runs typecheck + lint + format:check together |
 | `npm run build` | Orchestrates full build (scripts/build.js) — compiles core + bundles CLI + copies assets |
 | `npm run bundle` | Generates git commit info + esbuild bundle + copies bundled assets |
+| `npm run build:vscode` | Builds the VSCode extension companion |
 | `npm test` | Runs all workspace tests (`npm run test --workspaces --if-present`) |
 | `npm run start` | Runs the locally built CLI (`scripts/start.js`) |
 | `npm run build-and-start` | Builds then starts the CLI |
@@ -115,9 +121,9 @@ A **file history system** (`packages/core/src/common/file-history.ts`) provides
 
 **Slash commands**: `/skills`, `/model`, `/new`, `/init`, `/resume`, `/continue`, `/undo`, `/mcp`, `/raw`, `/exit`, plus dynamic `/skill-name` for each loaded skill.
 
-**Key UI features**: `@` file mentions in the prompt input, `Ctrl+O` to view live process stdout, `Ctrl+V` to paste images, Shift+Enter for newlines, MCP server status display, undo selector, and permission prompts.
+**Key UI features**: `@` file mentions in the prompt input, `Ctrl+O` to view live process stdout, `Ctrl+V` to paste images, `Ctrl+X` to clear images, Shift+Enter for newlines, pluggable statusline, MCP server status display, undo selector, and permission prompts.
 
-**CLI flags**: `-p <prompt>` / `--prompt` to auto-submit a prompt on launch, `-v` / `--version`, `-h` / `--help`.
+**CLI flags**: `-p <prompt>` / `--prompt` to auto-submit a prompt on launch, `-r [sessionId]` / `--resume [sessionId]` to resume a session or show the session picker, `-v` / `--version`, `-h` / `--help`.
 
 ## Agent-Specific Instructions
 

README.md

@@ -159,14 +159,18 @@ cd deepcode-cli
 # 安装依赖
 npm install
 
-# 本地开发（类型检查 + lint + 格式检查 + 构建）
-npm run build
-
 # 运行测试
 npm test
 
-# 链接到全局（即本地全局安装）
+# CLI本地开发（类型检查 + lint + 格式检查 + 构建）
+npm run build
+
+# CLI链接到全局（即本地全局安装）
 npm link
+
+# VSCode插件本地开发
+npm run build:vscode
+
 ```
 
 - 提交 PR 前请确保 `npm run check` 通过（类型检查 + lint + 格式检查）

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@vegamo/deepcode-cli",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Deep Code CLI - Vibe coding for the deepseek-v4 model in your terminal",
   "license": "MIT",
   "type": "module",
@@ -15,6 +15,8 @@
   "main": "./dist/cli.js",
   "files": [
     "dist/cli.js",
+    "dist/chunks/**",
+    "dist/templates/**",
     "dist/bundled/**",
     "README.md",
     "LICENSE"

packages/cli/package.json

@@ -48,6 +48,7 @@ import type {
 } from "@vegamo/deepcode-core";
 import { SessionManager } from "@vegamo/deepcode-core";
 import { getCompactPromptTokenThreshold } from "@vegamo/deepcode-core";
+import { writeStdoutLine } from "../../utils/stdio-helpers";
 
 type View = "chat" | "session-list" | "undo" | "mcp-status";
 
@@ -145,8 +146,8 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
       onAssistantMessage: (message: SessionMessage) => {
         setMessages((prev) => [...prev, message]);
         if (rawModeRef.current === RawMode.Raw) {
-          process.stdout.write("\n");
-          process.stdout.write(renderMessageToStdout(message, rawModeRef.current) + "\n\n");
+          writeStdoutLine("\n");
+          writeStdoutLine(renderMessageToStdout(message, rawModeRef.current) + "\n\n");
         }
       },
       onSessionEntryUpdated: (entry) => {
@@ -196,7 +197,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
   const resetStaticView = useCallback(
     (loadedMessages: SessionMessage[], options?: { clearScreen?: boolean }): Promise<void> => {
       if (options?.clearScreen) {
-        process.stdout.write(ANSI_CLEAR_SCREEN);
+        writeStdoutLine(ANSI_CLEAR_SCREEN);
       }
       setMessages([]);
       setWelcomeNonce((n) => n + 1);
@@ -298,19 +299,19 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
         const session = activeSessionId ? sessionManager.getSession(activeSessionId) : null;
         const resumeHint = buildResumeHintText(activeSessionId ?? undefined);
 
-        process.stdout.write("\n");
+        writeStdoutLine("\n");
         if (showCommand) {
-          process.stdout.write(chalk.rgb(34, 154, 195)("> /exit "));
-          process.stdout.write("\n\n");
+          writeStdoutLine(chalk.rgb(34, 154, 195)(" > /exit "));
+          writeStdoutLine("\n");
         }
         if (showSummary) {
           const summary = buildExitSummaryText({ session, sessionId: activeSessionId ?? undefined });
-          process.stdout.write(summary);
-          process.stdout.write("\n\n");
+          writeStdoutLine(summary);
+          writeStdoutLine("\n");
         }
         if (resumeHint) {
-          process.stdout.write(resumeHint);
-          process.stdout.write("\n");
+          writeStdoutLine(resumeHint);
+          writeStdoutLine("\n");
         }
 
         sessionManager.dispose();
@@ -628,7 +629,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
       setShowWelcome(false);
       setMessages([]);
       // Clear screen to remove stale formatted text.
-      process.stdout.write(ANSI_CLEAR_SCREEN);
+      writeStdoutLine(ANSI_CLEAR_SCREEN);
 
       setTimeout(() => {
         if (nextMode === RawMode.Raw) {
@@ -667,7 +668,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
     if (mode === RawMode.Raw) {
       // In raw mode, re-render all messages directly to stdout at the new width.
       // Use process.stdout.write instead of writeRef to avoid Ink interference.
-      process.stdout.write(ANSI_CLEAR_SCREEN);
+      writeStdoutLine(ANSI_CLEAR_SCREEN);
       const activeSessionId = sessionManager.getActiveSessionId();
       const allMessages = activeSessionId ? loadVisibleMessages(sessionManager, activeSessionId) : [];
       renderRawModeMessages(allMessages, mode);
@@ -898,7 +899,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
           );
         }}
       </Static>
-      {busy || statusLine ? <StatusLine busy={busy} text={statusLine} /> : null}
+      {(busy || statusLine) && !isExiting ? <StatusLine busy={busy} text={statusLine} /> : null}
       {errorLine ? (
         <Box>
           <Text color="red">Error: {errorLine}</Text>

packages/cli/src/ui/views/App.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@vegamo/deepcode-core",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Deep Code core library — LLM session management, tool execution, and shared utilities",
   "license": "MIT",
   "type": "module",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepcode-vscode",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "publisher": "vegamo",
   "displayName": "Deep Code",
   "description": "Deep Code VSCode companion — AI-assisted development in your editor",