Merge branch 'main' into feature/mcp-refactor

Author: hqwlkj

.deepcode/AGENTS.md

@@ -8,7 +8,12 @@ src/
 ├── session.ts           # SessionManager — LLM loop, compaction, tool orchestration
 ├── settings.ts          # Settings resolution from ~/.deepcode/settings.json
 ├── prompt.ts            # System prompt builder, tool definitions, agent-drift-guard skill
-├── model-capabilities.ts # Model detection and thinking-mode defaults
+├── common/
+│   ├── model-capabilities.ts # Model detection and thinking-mode defaults
+│   ├── file-utils.ts    # File read/write with encoding and diff preview
+│   ├── shell-utils.ts   # Shell path resolution (Git Bash, zsh, bash)
+│   ├── state.ts         # In-memory file state and snippet tracking
+│   └── runtime.ts       # Tool validation runtime helpers
 ├── ui/
 │   ├── App.tsx          # Root Ink component — state, routing, session orchestration
 │   ├── PromptInput.tsx  # Multi-line input with slash commands, image paste, skills
@@ -20,11 +25,6 @@ src/
 ├── mcp/
 │   ├── mcp-client.ts    # MCP client — JSON-RPC communication with MCP servers
 │   └── mcp-manager.ts   # MCP manager — lifecycle, tool registration, execution
-├── common/
-│   ├── file-utils.ts    # File read/write with encoding and diff preview
-│   ├── shell-utils.ts   # Shell path resolution (Git Bash, zsh, bash)
-│   ├── state.ts         # In-memory file state and snippet tracking
-│   └── runtime.ts       # Tool validation runtime helpers
 ├── tools/
 │   ├── executor.ts      # ToolExecutor — dispatches tool calls to handlers
 │   ├── bash-handler.ts  # Executes shell commands
@@ -52,7 +52,7 @@ dist/                    # Bundled CLI output (gitignored)
 | `npm run format:check` | Prettier in check-only mode |
 | `npm run check` | Runs typecheck + lint + format:check together |
 | `npm run bundle` | esbuild bundles `src/cli.tsx` → `dist/cli.js` (ESM, Node 18) |
-| `npm run build` | `check` + `bundle` — full CI gate before publish |
+| `npm run build` | `check` + `bundle` + chmod 755 — full CI gate before publish |
 | `npm test` | Runs all tests via `tsx --test src/tests/*.test.ts` |
 | `npm run test:single -- <file>` | Run a single test file (e.g., `npm run test:single -- src/tests/session.test.ts`) |
 

src/debug-logger.ts src/common/debug-logger.tssrc/debug-logger.ts renamed to src/common/debug-logger.ts

@@ -1,4 +1,4 @@
-import type { ReasoningEffort } from "./settings";
+import type { ReasoningEffort } from "../settings";
 
 type ThinkingConfig = {
   type: "enabled" | "disabled";

src/error-logger.ts src/common/error-logger.tssrc/error-logger.ts renamed to src/common/error-logger.ts

@@ -6,15 +6,15 @@ import { fileURLToPath } from "url";
 import matter from "gray-matter";
 import ejs from "ejs";
 import type { ChatCompletionMessageParam, ChatCompletionContentPart } from "openai/resources/chat/completions";
-import { launchNotifyScript } from "./notify";
-import { buildThinkingRequestOptions } from "./openai-thinking";
+import { launchNotifyScript } from "./common/notify";
+import { buildThinkingRequestOptions } from "./common/openai-thinking";
 import { DEEPSEEK_V4_MODELS, supportsMultimodal } from "./common/model-capabilities";
 import { getCompactPrompt, getSystemPrompt, getTools, AGENT_DRIFT_GUARD_SKILL, type ToolDefinition } from "./prompt";
 import { ToolExecutor, type CreateOpenAIClient } from "./tools/executor";
 import { McpManager } from "./mcp/mcp-manager";
 import type { McpServerConfig } from "./settings";
-import { logApiError } from "./error-logger";
-import { logOpenAIChatCompletionDebug, normalizeDebugError } from "./debug-logger";
+import { logApiError } from "./common/error-logger";
+import { logOpenAIChatCompletionDebug, normalizeDebugError } from "./common/debug-logger";
 
 const MAX_SESSION_ENTRIES = 50;
 const DEFAULT_NEW_PROMPT_API_URL = "https://deepcode.vegamo.cn/api/plugin/new";

src/notify.ts src/common/notify.tssrc/notify.ts renamed to src/common/notify.ts

@@ -3,7 +3,7 @@ import assert from "node:assert/strict";
 import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
-import { getDebugLogPath, logOpenAIChatCompletionDebug } from "../debug-logger";
+import { getDebugLogPath, logOpenAIChatCompletionDebug } from "../common/debug-logger";
 
 test("debug logger appends full entries without rotation", () => {
   const originalHome = process.env.HOME;

src/openai-thinking.ts src/common/openai-thinking.tssrc/openai-thinking.ts renamed to src/common/openai-thinking.ts

@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { buildThinkingRequestOptions } from "../openai-thinking";
+import { buildThinkingRequestOptions } from "../common/openai-thinking";
 
 test("buildThinkingRequestOptions explicitly disables thinking", () => {
   assert.deepEqual(buildThinkingRequestOptions(false, "https://api.deepseek.com"), {

src/session.ts

@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { buildNotifyEnv, formatDurationSeconds, launchNotifyScript, type NotifySpawn } from "../notify";
+import { buildNotifyEnv, formatDurationSeconds, launchNotifyScript, type NotifySpawn } from "../common/notify";
 import { applyModelConfigSelection, resolveSettings, resolveSettingsSources } from "../settings";
 
 const TEST_PROCESS_ENV = {};

src/tests/debug-logger.test.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import { z } from "zod";
-import { buildThinkingRequestOptions } from "../openai-thinking";
+import { buildThinkingRequestOptions } from "../common/openai-thinking";
 import type { ToolExecutionContext, ToolExecutionResult } from "./executor";
 import {
   buildDiffPreview,