merge: resolve conflicts with main (drop heap-pressure, adapt to getHistoryShallow)

Main landed #4286 (replace structuredClone with shallow copy) which:
  - Reverted #4186's heap-pressure auto-compaction safety net (#4286
    removed HEAP_PRESSURE_COMPRESSION_RATIO because the underlying OOM
    cause was fixed by the shallow-copy refactor)
  - Reverted #4168's consecutiveFailures ladder back to single-shot
    hasFailedCompressionAttempt
  - Introduced getHistoryShallow() / peekLastHistoryEntry() to replace
    structuredClone-based history access
  - Added a Chinese-language design doc draft for this exact redesign

Resolution strategy:
  - Take OUR redesign everywhere it conflicts: three-tier threshold
    ladder, consecutiveFailures circuit breaker, hard-rescue, token
    estimator, hard-rescue debug log, CompressOptions plumbing for
    pendingUserMessage / precomputedEffectiveTokens / trigger.
  - DROP all bypassTokenThreshold / heapPressureCompressionCooldownUntil /
    HEAP_PRESSURE_* / mockGetHeapStatistics / mockHeapPressure code
    (heap-pressure mechanism is gone on main; we're not reviving it).
  - Use main's new getHistoryShallow(true) in chatCompressionService and
    in the hard-tier rescue estimator path (was getHistory(true) before
    main's refactor; the shallow path is what other compaction call
    sites now use).
  - For chatCompressionService.test.ts inline mockChat objects, alias
    getHistoryShallow to the same vi.fn() as getHistory so existing
    .mockReturnValue() calls drive both methods.
  - For the design doc, keep our resolved Open Question 2 closure
    rationale and prepend the round-2 blockquote clarifying the
    Background section describes pre-redesign behavior; take main's
    slightly more thorough SUMMARY_RESERVE paragraph where it explains
    both with/without-thinking cases.
  - Replace the round-2 test that asserted "hard-rescue forwards
    consecutiveFailures=3" with a test compatible with the post-merge
    history-access shape (now using getHistoryShallow).

346 core tests passing; CLI typecheck clean for affected files.
Pre-existing provider-config typecheck errors from main's #4287
refactor are unrelated to this PR and not touched here.

Author: LaZzyMan

.github/release.yml

@@ -0,0 +1,6 @@
+# Configuration for GitHub's automatic release notes generation
+# PRs with 'skip-changelog' label will be excluded from release notes
+changelog:
+  exclude:
+    labels:
+      - 'skip-changelog'

docs/design/auto-compaction-threshold-redesign.md

@@ -77,7 +77,7 @@ const MAX_CONSECUTIVE_FAILURES = 3; // 失败熔断阈值
 
 数值来源：全部沿用 claude-code 的实测值（[autoCompact.ts:30,62-65](src/services/compact/autoCompact.ts:30)）。
 
-`SUMMARY_RESERVE = COMPACT_MAX_OUTPUT_TOKENS` 是关键关系：模型受 `maxOutputTokens` 硬限制约束，输出不可能超出 20K，因此 reserve 不需要额外 safety margin。`thinking + summary` 是合并预算（Gemini SDK / 多数 provider 的 `maxOutputTokens` 语义），模型自行在两者间分配。
+`SUMMARY_RESERVE = COMPACT_MAX_OUTPUT_TOKENS` 是关键关系：模型受 `maxOutputTokens` 硬限制约束，输出不可能超出 20K，因此 reserve 不需要额外 safety margin。注意：本设计关闭 thinking 后该等式成立（output budget 全部给 summary）；若保留 thinking，`thinking + summary` 共享预算（Gemini SDK / 多数 provider 的 `maxOutputTokens` 语义），模型自行在两者间分配，此时 summary 的实际可用空间小于 20K（见「风险与注意事项」第 1、2 条）。
 
 ## 计算函数
 

docs/developers/sdk-java.md

@@ -144,7 +144,7 @@ The SDK supports different permission modes for controlling tool execution:
 
 - **`default`**: Write tools are denied unless approved via `canUseTool` callback or in `allowedTools`. Read-only tools execute without confirmation.
 - **`plan`**: Blocks all write tools, instructing AI to present a plan first.
-- **`auto-edit`**: Auto-approve edit tools (edit, write_file) while other tools require confirmation.
+- **`auto-edit`**: Auto-approve edit tools (`edit`, `write_file`, `notebook_edit`) while other tools require confirmation.
 - **`yolo`**: All tools execute automatically without confirmation.
 
 ### Session Event Consumers and Assistant Content Consumers

docs/developers/sdk-typescript.md

@@ -158,7 +158,7 @@ The SDK supports different permission modes for controlling tool execution:
 
 - **`default`**: Write tools are denied unless approved via `canUseTool` callback or in `allowedTools`. Read-only tools execute without confirmation.
 - **`plan`**: Blocks all write tools, instructing AI to present a plan first.
-- **`auto-edit`**: Auto-approve edit tools (edit, write_file) while other tools require confirmation.
+- **`auto-edit`**: Auto-approve edit tools (`edit`, `write_file`, `notebook_edit`) while other tools require confirmation.
 - **`yolo`**: All tools execute automatically without confirmation.
 
 ### Permission Priority Chain

docs/developers/tools/file-system.md

@@ -44,7 +44,72 @@ Qwen Code provides a comprehensive suite of tools for interacting with the local
   - For other binary files: A message like `Cannot display content of binary file: /path/to/data.bin`.
 - **Confirmation:** No.
 
-## 3. `write_file` (WriteFile)
+### Jupyter notebook reads
+
+For Jupyter notebooks (`.ipynb`), `read_file` parses the notebook JSON and returns a structured, model-readable notebook view instead of raw JSON. The rendered output includes the notebook language, ordered cells, cell IDs, source, and summarized outputs.
+
+Notebook cells can then be edited with `notebook_edit`. The model should use the cell IDs shown by `read_file` when targeting a cell.
+
+`offset` and `limit` are not supported for `.ipynb` files. Notebook reads are treated as structured full-file reads; if the rendered notebook output is internally truncated because it is too large, `notebook_edit` will reject cell-level edits and ask you to reduce outputs or split the notebook before editing.
+
+## 3. `notebook_edit` (NotebookEdit)
+
+`notebook_edit` edits Jupyter notebook (`.ipynb`) files safely at the cell level. Use it instead of `edit` or `write_file` when changing notebook cells.
+
+- **Tool name:** `notebook_edit`
+- **Display name:** NotebookEdit
+- **File:** `notebook-edit.ts`
+- **Parameters:**
+  - `notebook_path` (string, required): The absolute path to the `.ipynb` file.
+  - `cell_id` (string, optional): The target cell ID shown by `read_file`. Required for `replace` and `delete`. For `insert`, the new cell is inserted after this cell; if omitted, the new cell is inserted at the beginning.
+  - `new_source` (string, optional): The new cell source for `replace` and `insert`. Not required for `delete`.
+  - `cell_type` (`code` or `markdown`, optional): The cell type for inserted cells, or the target type when replacing a cell.
+  - `edit_mode` (`replace`, `insert`, or `delete`, optional): The edit operation. Defaults to `replace`.
+- **Behavior:**
+  - Requires the notebook to have been read first with `read_file` in the current session.
+  - Targets cells using the IDs rendered by `read_file`, including real notebook cell IDs and displayed `cell-N` fallback IDs.
+  - Rejects ambiguous rendered cell IDs instead of guessing.
+  - For code cells, clears stale outputs and resets `execution_count` when source changes.
+  - Preserves notebook JSON formatting, line endings, encoding, and BOM where possible.
+  - Invalidates the prior-read state after structural edits when displayed fallback IDs can shift, so the next notebook edit requires a fresh `read_file`.
+- **Output (`llmContent`):** A success message describing the edited notebook cell and, for non-delete operations, the updated source.
+- **Confirmation:** Yes. Shows a notebook JSON diff and asks for user approval before writing, unless the current permission mode or rules auto-approve edit tools.
+
+### `notebook_edit` examples
+
+Replace a code cell:
+
+```
+notebook_edit(
+  notebook_path="/path/to/analysis.ipynb",
+  cell_id="load-data",
+  new_source="result = 41 + 1\nprint(result)"
+)
+```
+
+Insert a markdown cell after an existing cell:
+
+```
+notebook_edit(
+  notebook_path="/path/to/analysis.ipynb",
+  edit_mode="insert",
+  cell_id="summary",
+  cell_type="markdown",
+  new_source="## Findings\n\nThe cleaned data is ready for modeling."
+)
+```
+
+Delete a cell:
+
+```
+notebook_edit(
+  notebook_path="/path/to/analysis.ipynb",
+  edit_mode="delete",
+  cell_id="old-experiment"
+)
+```
+
+## 4. `write_file` (WriteFile)
 
 `write_file` writes content to a specified file. If the file exists, it will be overwritten. If the file doesn't exist, it (and any necessary parent directories) will be created.
 
@@ -56,11 +121,12 @@ Qwen Code provides a comprehensive suite of tools for interacting with the local
   - `content` (string, required): The content to write into the file.
 - **Behavior:**
   - Writes the provided `content` to the `file_path`.
+  - Does not write raw Jupyter notebook JSON. Use `notebook_edit` for `.ipynb` cell edits.
   - Creates parent directories if they don't exist.
 - **Output (`llmContent`):** A success message, e.g., `Successfully overwrote file: /path/to/your/file.txt` or `Successfully created and wrote to new file: /path/to/new/file.txt`.
 - **Confirmation:** Yes. Shows a diff of changes and asks for user approval before writing.
 
-## 4. `glob` (Glob)
+## 5. `glob` (Glob)
 
 `glob` finds files matching specific glob patterns (e.g., `src/**/*.ts`, `*.md`), returning absolute paths sorted by modification time (newest first).
 
@@ -78,7 +144,7 @@ Qwen Code provides a comprehensive suite of tools for interacting with the local
 - **Output (`llmContent`):** A message like: `Found 5 file(s) matching "*.ts" within /path/to/search/dir, sorted by modification time (newest first):\n---\n/path/to/file1.ts\n/path/to/subdir/file2.ts\n---\n[95 files truncated] ...`
 - **Confirmation:** No.
 
-## 5. `grep_search` (Grep)
+## 6. `grep_search` (Grep)
 
 `grep_search` searches for a regular expression pattern within the content of files in a specified directory. Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.
 
@@ -131,7 +197,7 @@ Search for a pattern with file filtering and custom result limiting:
 grep_search(pattern="function", glob="*.js", limit=10)
 ```
 
-## 6. `edit` (Edit)
+## 7. `edit` (Edit)
 
 `edit` replaces text within a file. By default it requires `old_string` to match a single unique location; set `replace_all` to `true` when you intentionally want to change every occurrence. This tool is designed for precise, targeted changes and requires significant context around the `old_string` to ensure it modifies the correct location.
 
@@ -148,6 +214,7 @@ grep_search(pattern="function", glob="*.js", limit=10)
   - `replace_all` (boolean, optional): Replace all occurrences of `old_string`. Defaults to `false`.
 
 - **Behavior:**
+  - Does not edit raw Jupyter notebook JSON. Use `notebook_edit` for `.ipynb` cell edits.
   - If `old_string` is empty and `file_path` does not exist, creates a new file with `new_string` as content.
   - If `old_string` is provided, it reads the `file_path` and attempts to find exactly one occurrence unless `replace_all` is true.
   - If the match is unique (or `replace_all` is true), it replaces the text with `new_string`.