Merge branch 'deepcode/main' into feature/deepcode-user-agent

Sync with latest upstream (38 commits) and fix User-Agent header issue.

# Conflicts resolved:
# - packages/cli/src/cli.tsx: kept upstream version (our cli changes were unnecessary)
# - src/common/package-info.ts: moved to packages/core/src/common/package-info.ts
#   (reads from packages/core/package.json instead of root package.json)

Author: chingjustwe

.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
 

.deepcode/plugins/cwd.mjs

@@ -0,0 +1,7 @@
+export default function cwdProvider({ projectRoot }) {
+  const cwd = process.cwd() || projectRoot || "";
+  if (!cwd) return "";
+  const home = process.env.HOME || process.env.USERPROFILE || "";
+  const display = home && cwd.startsWith(home) ? "~" + cwd.slice(home.length) : cwd;
+  return display;
+}

.deepcode/plugins/git-branch.mjs

@@ -0,0 +1,16 @@
+import { execFileSync } from "node:child_process";
+
+export default function gitBranchProvider({ projectRoot }) {
+  try {
+    const out = execFileSync("git", ["branch", "--show-current"], {
+      cwd: projectRoot || process.cwd(),
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 1500,
+    }).trim();
+    if (!out) return "";
+    return `git:${out}`;
+  } catch {
+    return "";
+  }
+}

.deepcode/plugins/model-info.mjs

@@ -0,0 +1,13 @@
+export default function modelInfoProvider({ session }) {
+  if (!session) return "";
+  const parts = [];
+  if (session.model) {
+    parts.push(session.model);
+  }
+  if (session.thinkingEnabled && session.reasoningEffort) {
+    parts.push(`thinking:${session.reasoningEffort}`);
+  } else if (session.thinkingEnabled) {
+    parts.push("thinking");
+  }
+  return parts.join(" ");
+}

.deepcode/plugins/session-stats.mjs

@@ -0,0 +1,22 @@
+function formatTokens(n) {
+  if (n >= 1000) return (n / 1000).toFixed(1).replace(/\.0$/, "") + "k";
+  return String(n);
+}
+
+export default function sessionStatsProvider({ session }) {
+  if (!session || !session.activeSessionId) {
+    return "no session";
+  }
+  const parts = [];
+  parts.push(`msgs:${session.messageCount}`);
+  if (session.requestCount > 0) {
+    parts.push(`reqs:${session.requestCount}`);
+  }
+  if (session.activeTokens > 0 && session.maxContextTokens > 0) {
+    const pct = Math.round((session.activeTokens / session.maxContextTokens) * 100);
+    parts.push(`ctx:${formatTokens(session.activeTokens)}/${formatTokens(session.maxContextTokens)} ${pct}%`);
+  } else if (session.totalTokens > 0) {
+    parts.push(`tokens:${formatTokens(session.totalTokens)}`);
+  }
+  return parts.join(" ");
+}

.deepcode/plugins/tool-usage.mjs

@@ -0,0 +1,23 @@
+const TOOL_ORDER = ["bash", "edit", "read", "write", "AskUserQuestion", "UpdatePlan", "WebSearch"];
+
+export default function toolUsageProvider({ session }) {
+  if (!session || !session.activeSessionId) {
+    return "";
+  }
+  const usage = session.toolUsage;
+  if (!usage || Object.keys(usage).length === 0) {
+    return "";
+  }
+  // Sort: preferred order first, then by count desc
+  const sorted = Object.entries(usage).sort((a, b) => {
+    const ai = TOOL_ORDER.indexOf(a[0]);
+    const bi = TOOL_ORDER.indexOf(b[0]);
+    if (ai !== -1 && bi !== -1) return ai - bi;
+    if (ai !== -1) return -1;
+    if (bi !== -1) return 1;
+    return b[1] - a[1];
+  });
+
+  const shortNames = sorted.slice(0, 6);
+  return shortNames.map(([name, count]) => `${name}×${count}`).join(" ");
+}

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 + 格式检查）

docs/configuration.md

@@ -37,6 +37,7 @@ Deep Code 使用 `settings.json` 设置文件进行持久化配置，支持两
 | `mcpServers`         | object    | MCP 服务器配置（键为服务名，值为 McpServerConfig 对象）              |
 | `temperature`        | number    | 模型采样温度，范围 `0` 到 `2`                           |
 | `enabledSkills`      | object    | 按 skill 名称启用或禁用 skill 的配置                                 |
+| `statusline`         | object    | 状态栏插件配置(参见 [statusline.md](./statusline.md))               |
 
 #### `env` 子字段
 

docs/configuration_en.md

@@ -37,6 +37,7 @@ The following are all the top-level fields supported in `settings.json`, along w
 | `mcpServers`       | object  | MCP server configurations (keys are service names, values are McpServerConfig objects) |
 | `temperature`      | number  | Sampling temperature for LLM, from `0` to `2`                 |
 | `enabledSkills`    | object  | Per-skill enable/disable map, keyed by skill name                           |
+| `statusline`       | object  | Status line plugins (see [statusline_en.md](./statusline_en.md))            |
 
 #### `env` Sub-fields
 

docs/statusline.md

@@ -0,0 +1,149 @@
+# 状态栏插件
+
+Deep Code CLI 支持通过插件向终端底部状态栏注入自定义信息（Git 分支、当前时间、token 用量等),无需修改 CLI 源码。状态栏行展示在输入框下方的快捷键提示行下方,所有 provider 的输出会用分隔符拼接后渲染。
+
+## 配置
+
+在 `~/.deepcode/settings.json`(或项目级 `.deepcode/settings.json`)中添加 `statusline` 字段:
+
+```json
+{
+  "statusline": {
+    "enabled": true,
+    "refreshMs": 2000,
+    "separator": " · ",
+    "providers": [
+      {
+        "type": "command",
+        "id": "git",
+        "command": "git branch --show-current",
+        "color": "cyan"
+      },
+      {
+        "type": "module",
+        "id": "tokens",
+        "path": "./.deepcode/plugins/tokens.mjs",
+        "color": "yellow"
+      }
+    ]
+  }
+}
+```
+
+### 字段
+
+| 字段          | 类型      | 说明                                                                |
+| ------------- | --------- | ------------------------------------------------------------------- |
+| `enabled`     | boolean   | 是否启用。省略时,只要存在至少一个 provider 即视为启用              |
+| `refreshMs`   | number    | 拉取间隔毫秒。最小 500,默认 2000                                  |
+| `separator`   | string    | 多个 provider 输出之间的分隔符,默认 `" · "`                       |
+| `providers`   | array     | provider 列表,按声明顺序渲染                                       |
+
+## Provider 类型
+
+### `command` —— 执行外部命令
+
+每隔 `refreshMs` 在 shell 中执行一次命令,取 stdout 第一行作为状态栏 segment。
+
+| 字段        | 类型    | 必填 | 说明                                                              |
+| ----------- | ------- | ---- | ----------------------------------------------------------------- |
+| `type`      | string  | 是   | 固定为 `"command"`                                                |
+| `command`   | string  | 是   | shell 命令(支持管道、重定向等)                                  |
+| `id`        | string  | 否   | 唯一标识。省略时按下标自动生成                                    |
+| `cwd`       | string  | 否   | 执行目录。相对路径相对于项目根目录,省略时使用项目根目录          |
+| `timeoutMs` | number  | 否   | 超时毫秒,默认 1500。超时返回空串                                  |
+| `color`     | string  | 否   | ink 支持的颜色名(如 `"red"`、`"#229ac3"`)                       |
+
+示例:
+
+```json
+{ "type": "command", "id": "git", "command": "git status -sb | head -1" }
+{ "type": "command", "id": "time", "command": "date +%H:%M" }
+{ "type": "command", "id": "node", "command": "node -v", "color": "green" }
+```
+
+### `module` —— 加载 JS 模块
+
+加载本地 JS/MJS 模块,调用其默认导出函数,把返回值作为 segment 文本。
+
+| 字段        | 类型    | 必填 | 说明                                                                                |
+| ----------- | ------- | ---- | ----------------------------------------------------------------------------------- |
+| `type`      | string  | 是   | 固定为 `"module"`                                                                   |
+| `path`      | string  | 是   | 模块路径。相对路径相对于项目根目录                                                  |
+| `id`        | string  | 否   | 唯一标识                                                                            |
+| `timeoutMs` | number  | 否   | 超时毫秒,默认 2000                                                                  |
+| `color`     | string  | 否   | ink 支持的颜色                                                                      |
+
+模块需导出一个 `default` 函数(或具名 `provider`):
+
+```js
+// .deepcode/plugins/tokens.mjs
+export default function tokensProvider({ projectRoot, session }) {
+  // 返回字符串(同步或异步)
+  if (session?.activeSessionId) {
+    return `msgs:${session.messageCount} reqs:${session.requestCount} tokens:${session.totalTokens}`;
+  }
+  return `tokens: 1.2k`;
+}
+```
+
+函数接收一个对象 `{ projectRoot: string, session: SessionInfo | null }`,返回 `string` 或 `Promise<string>`。
+
+`SessionInfo` 结构:
+
+| 字段              | 类型               | 说明                                                |
+| ----------------- | ------------------ | --------------------------------------------------- |
+| `activeSessionId` | `string \| null`   | 当前活跃会话的 ID，无会话时为 `null`                |
+| `messageCount`    | `number`           | 当前会话中的消息总数                                  |
+| `requestCount`    | `number`           | 当前会话中的 LLM API 请求次数                        |
+| `totalTokens`     | `number`           | 当前会话中消耗的 token 总数                          |
+
+## 安全限制
+
+- **module provider 路径必须位于项目根目录或用户home目录之下**,绝对路径在这两个范围之外会被拒绝加载(防止从任意位置执行代码)。
+- 单个 segment 文本被自动:
+  - 取第一个非空行
+  - 去除 ANSI 转义序列
+  - 折叠空白字符
+  - 截断到 40 个字符(超出加 `…`)
+- command provider 的 stdout 最多读取 4 KB。
+- 任何 provider 抛错、超时、或返回空字符串,**只跳过该 segment**,不影响其它 provider。
+
+## 行为
+
+- 启动 CLI 后立即触发一次拉取,之后按 `refreshMs` 周期刷新。
+- 用户级与项目级配置的 `providers` 数组会**合并**(用户先、项目后);其他字段以项目级为优先。
+- 状态栏行在任何场景下都显示(包括 busy、permission prompt 等),不影响 busy 提示。
+- 修改配置文件后需重启 CLI 生效(不会热加载)。
+
+## 完整示例
+
+```json
+{
+  "statusline": {
+    "enabled": true,
+    "refreshMs": 3000,
+    "providers": [
+      {
+        "type": "command",
+        "id": "branch",
+        "command": "git branch --show-current",
+        "color": "cyan"
+      },
+      {
+        "type": "command",
+        "id": "dirty",
+        "command": "git status --porcelain | wc -l | xargs -I{} echo '{} files changed'",
+        "color": "yellow"
+      },
+      {
+        "type": "module",
+        "id": "ts-errors",
+        "path": "./.deepcode/plugins/ts-errors.mjs",
+        "color": "red",
+        "timeoutMs": 5000
+      }
+    ]
+  }
+}
+```