newmark-agent 0.4.2 → 0.4.3

package/dist/core/conversationKernel.js

@@ -586,7 +586,40 @@ class ConversationKernel {
                 if (runtime.stopRequestedRunId === runtime.runId)
                     return this.result(runtime, lastTokens);
                 const next = runtime.pendingNextTurn.shift();
-                lastTokens = await this.runSingle(runtime, next.message, next.queueMode);
+                if (next.queueMode === 'steer' && typeof next.message !== 'string' && !!next.message.clientMessageId) {
+                    const batchGuides = [];
+                    const pushGuide = (message) => {
+                        batchGuides.push({
+                            clientMessageId: String(message.clientMessageId || ''),
+                            guideId: message.guideId,
+                            text: message.text,
+                            images: message.images?.map(image => ({ ...image })),
+                            attachments: message.attachments?.map(attachment => ({ ...attachment })),
+                        });
+                    };
+                    pushGuide(next.message);
+                    while (runtime.pendingNextTurn.length > 0
+                        && runtime.pendingNextTurn[0].queueMode === 'steer'
+                        && typeof runtime.pendingNextTurn[0].message !== 'string'
+                        && !!runtime.pendingNextTurn[0].message.clientMessageId) {
+                        const guide = runtime.pendingNextTurn.shift();
+                        pushGuide(guide.message);
+                    }
+                    if (batchGuides.length === 1) {
+                        lastTokens = await this.runSingle(runtime, next.message, next.queueMode);
+                        continue;
+                    }
+                    const batchText = batchGuides.map((guide, index) => `Guide ${index + 1}: ${guide.text}`).join('\n');
+                    const batchMessage = {
+                        text: `Apply the following intervening Guides in submission order within the current Build Block and continue automatically:\n${batchText}`,
+                        hiddenUserInput: true,
+                        batchGuides,
+                    };
+                    lastTokens = await this.runSingle(runtime, batchMessage, 'steer');
+                }
+                else {
+                    lastTokens = await this.runSingle(runtime, next.message, next.queueMode);
+                }
             }
             const rootMessage = runtime.runner.subagents.readRootInbox()[0];
             if (!rootMessage) {

package/dist/core/toolPolicy.js

@@ -23,6 +23,8 @@ const MODE_SCOPED_TOOLS = new Set([
     'read_tool_result',
     'goal_manage',
     'conversation_rename',
+    'task_read',
+    'task_create',
     'question',
     'task',
     'subagent_list',
@@ -36,6 +38,7 @@ const MODE_SCOPED_TOOLS = new Set([
     'branch_create',
 ]);
 const PLAN_READ_ONLY_TOOLS = new Set([
+    'task_read',
     'pwd',
     'read',
     'glob',

package/dist/llm/provider.d.ts

@@ -29,13 +29,25 @@ export declare class LLMProvider {
     openAIMode: OpenAITransportMode | boolean;
     useProviderAdaptersV2: boolean;
     requestTimeoutMs: number;
+    /** dev-0.4.3 模型原生思考强度档位映射（模型名 → { 模型原生档位: Newmark 档位 }）。 */
+    thinkingTierMaps?: Record<string, Record<string, string>> | undefined;
     static nodeHttpTransport: ((method: 'GET' | 'POST', url: string, headers: Record<string, string>, body?: string) => Promise<NodeHttpResult>) | null;
     static powershellTransport: ((method: 'GET' | 'POST', url: string, headers: Record<string, string>, body?: string) => Promise<NodeHttpResult>) | null;
-    constructor(name: string, baseUrl: string, apiKey: string, explicitProtocol?: ProviderProtocol | undefined, openAIMode?: OpenAITransportMode | boolean, useProviderAdaptersV2?: boolean, requestTimeoutMs?: number);
+    constructor(name: string, baseUrl: string, apiKey: string, explicitProtocol?: ProviderProtocol | undefined, openAIMode?: OpenAITransportMode | boolean, useProviderAdaptersV2?: boolean, requestTimeoutMs?: number, 
+    /** dev-0.4.3 模型原生思考强度档位映射（模型名 → { 模型原生档位: Newmark 档位 }）。 */
+    thinkingTierMaps?: Record<string, Record<string, string>> | undefined);
     private effectiveRequestTimeout;
     private withRequestTimeout;
     intelligenceConfig(tier: string): IntelligenceConfig;
     private reasoningEffort;
+    /**
+     * dev-0.4.3 模型原生思考强度档位映射。不同模型的原生 reasoning_effort
+     * 档位配置可能不同（档位数量或档位命名不同）。模型配置 `thinking_tier_map`
+     * 以「模型原生档位名 → Newmark 档位」声明映射，这里把 Newmark 档位反查为
+     * 模型原生档位名；未配置映射（或映射为空）时返回 undefined，由调用方
+     * 维持默认透传行为（默认不变动映射）。
+     */
+    private mappedNativeEffort;
     private applyChatReasoningEffort;
     private protocol;
     private openAITransportMode;

package/dist/llm/provider.js

@@ -98,9 +98,12 @@ class LLMProvider {
     openAIMode;
     useProviderAdaptersV2;
     requestTimeoutMs;
+    thinkingTierMaps;
     static nodeHttpTransport = null;
     static powershellTransport = null;
-    constructor(name, baseUrl, apiKey, explicitProtocol, openAIMode = 'chat_stream', useProviderAdaptersV2 = false, requestTimeoutMs = DEFAULT_PROVIDER_REQUEST_TIMEOUT_MS) {
+    constructor(name, baseUrl, apiKey, explicitProtocol, openAIMode = 'chat_stream', useProviderAdaptersV2 = false, requestTimeoutMs = DEFAULT_PROVIDER_REQUEST_TIMEOUT_MS, 
+    /** dev-0.4.3 模型原生思考强度档位映射（模型名 → { 模型原生档位: Newmark 档位 }）。 */
+    thinkingTierMaps) {
         this.name = name;
         this.baseUrl = baseUrl;
         this.apiKey = apiKey;
@@ -108,6 +111,7 @@ class LLMProvider {
         this.openAIMode = openAIMode;
         this.useProviderAdaptersV2 = useProviderAdaptersV2;
         this.requestTimeoutMs = requestTimeoutMs;
+        this.thinkingTierMaps = thinkingTierMaps;
     }
     effectiveRequestTimeout(timeoutMs) {
         const requested = Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : DEFAULT_PROVIDER_REQUEST_TIMEOUT_MS;
@@ -140,6 +144,9 @@ class LLMProvider {
         }
     }
     reasoningEffort(model, tier) {
+        const mapped = this.mappedNativeEffort(model, tier);
+        if (mapped !== undefined)
+            return mapped;
         if (!/^(?:gpt-5|o[134](?:-|$)|codex)|(?:reasoner|reasoning|deepseek-r1|deepseek-reasoner|\br1\b)/i.test(model))
             return undefined;
         const effort = tier === 'low' || tier === 'high' || tier === 'xhigh' || tier === 'max'
@@ -150,6 +157,39 @@ class LLMProvider {
         // OpenAI-compatible/Codex gateways may expose the user-facing max tier.
         return effort === 'max' && /^https:\/\/(?:api\.)?openai\.com(?:\/|$)/i.test(this.cleanBaseUrl()) ? 'xhigh' : effort;
     }
+    /**
+     * dev-0.4.3 模型原生思考强度档位映射。不同模型的原生 reasoning_effort
+     * 档位配置可能不同（档位数量或档位命名不同）。模型配置 `thinking_tier_map`
+     * 以「模型原生档位名 → Newmark 档位」声明映射，这里把 Newmark 档位反查为
+     * 模型原生档位名；未配置映射（或映射为空）时返回 undefined，由调用方
+     * 维持默认透传行为（默认不变动映射）。
+     */
+    mappedNativeEffort(model, tier) {
+        const map = this.thinkingTierMaps?.[model];
+        if (!map || typeof map !== 'object')
+            return undefined;
+        const order = ['low', 'medium', 'high', 'xhigh', 'max'];
+        const entries = Object.entries(map)
+            .filter((entry) => order.includes(entry[1]))
+            .sort((a, b) => order.indexOf(a[1]) - order.indexOf(b[1]));
+        if (!entries.length)
+            return undefined;
+        const normalized = tier === 'ultra'
+            ? 'max'
+            : (order.includes(tier) ? tier : 'medium');
+        const exact = entries.find(([, newmark]) => newmark === normalized);
+        if (exact)
+            return exact[0];
+        // 就近降级：取强度不超过目标档位的最高已映射档位
+        const targetIndex = order.indexOf(normalized);
+        for (let i = targetIndex; i >= 0; i--) {
+            const candidate = entries.find(([, newmark]) => newmark === order[i]);
+            if (candidate)
+                return candidate[0];
+        }
+        // 全部高于目标档位：取最低档位
+        return entries[0]?.[0];
+    }
     applyChatReasoningEffort(body, model, tier) {
         const effort = this.reasoningEffort(model, tier);
         if (effort)
@@ -859,6 +899,7 @@ class LLMProvider {
             tools: this.toNormalizedTools(tools),
             temperature,
             maxOutputTokens: maxTokens,
+            reasoningEffort: this.reasoningEffort(model, reasoningTier),
             apiKey: this.apiKey,
             baseUrl: this.cleanBaseUrl(),
             ...(sessionId ? { sessionId } : {}),

package/dist/providers/provider-adapter.d.ts

@@ -52,7 +52,9 @@ export interface NormalizedAgentRequest {
     tools: NormalizedTool[];
     temperature: number;
     maxOutputTokens: number;
-    reasoningEffort?: 'low' | 'medium' | 'high' | 'xhigh' | 'max';
+    /** dev-0.4.3：模型原生思考强度档位名。Newmark 档位经模型配置
+     *  `thinking_tier_map` 映射后可能不再是 Newmark 档位名，故为自由字符串。 */
+    reasoningEffort?: string;
     apiKey: string;
     baseUrl: string;
     /** 可选的会话标识。仅当目标 provider 显式支持 session_id 语义的上下文缓存

package/dist/tools/index.js

@@ -372,7 +372,9 @@ class ToolExecutor {
             t('background_tool', 'Run a tool call in the background WITHOUT blocking the conversation turn. Pass the target tool name and its arguments; this tool returns a background_id IMMEDIATELY, and the real tool keeps running in the background. The result is persisted and can be retrieved later with read_tool_result. Use this for long-running or non-critical tools (bash, web_fetch, long read/grep) so the conversation continues without waiting. The background result stays OUT of context until you explicitly read it, preserving prompt-cache hit rate. Orchestration/flow/subagent/question tools cannot be backgrounded.', { tool: { type: 'string', description: 'The tool name to run in the background (e.g. bash, web_fetch, read, grep).' }, args: { type: 'object', description: 'The arguments object for the target tool, matching its normal schema.' } }, ['tool']),
             t('read_tool_result', 'Read the result of a background tool. Pass the background_id returned by background_tool. When status is running, returns a running marker; when done, returns the persisted result (optionally release it from storage after reading); when error, returns the failure. Background results are released from storage only when you set release=true.', { background_id: { type: 'string', description: 'The background_id returned by background_tool.' }, release: { type: 'boolean', description: 'Set true to release the persisted result from storage after reading it.' } }, ['background_id']),
             t('goal_manage', 'Actively manage the persistent Goal state for this conversation. You may enter Goal mode, update (edit) its objective, mark it complete, or exit Goal mode yourself. Call this when the user asks you to pursue a persistent objective, when the objective changes, when you have verified the objective is genuinely achieved, or when you judge the Goal is no longer needed and should be cleared. This is the agent-side state control that mirrors the GUI goal panel controls. enter/update require objective; complete marks the objective verified and exits Goal mode; exit clears the Goal (and returns to Build mode) without claiming completion.', { action: { type: 'string', enum: ['enter', 'update', 'complete', 'exit'], description: 'enter=enter Goal mode and set the objective; update=edit the objective (records a change); complete=mark the objective verified-achieved and exit Goal mode; exit=clear the Goal and return to Build mode without claiming completion.' }, objective: { type: 'string', description: 'The Goal objective text. Required for enter and update.' }, reason: { type: 'string', description: 'Optional one-line reason for the state change, recorded for audit.' } }, ['action']),
-            t('conversation_rename', 'Rename the CURRENT conversation to a concise, descriptive title you choose. On the FIRST Build Block of a NEW conversation the runtime asks you to call this once so the conversation list shows a meaningful name instead of an auto-generated one. Keep the title short (a few words) and cache-friendly: a concrete noun phrase describing the task, never a sentence or quoted prompt.', { title: { type: 'string', description: 'The new conversation title (a short noun phrase, e.g. "Fix TUI color leak", "Add goal_manage tool").' } }, ['title']),
+            t('task_read', 'Read the persistent inline task checklist of the CURRENT conversation (the same list the GUI Task panel and TUI plan view render). Returns bounded items (id, status, task text <=240 chars) plus unfinished count. Read-only and side-effect free; call this whenever you need concrete task-list state instead of assuming it. Kept out of the system prompt so provider prefix caching stays stable.', {}, []),
+            t('task_create', 'Maintain the persistent inline task checklist of the CURRENT conversation. This is the durable replacement for ephemeral in-reply checklists: items you create here appear in the GUI Task panel and TUI plan view immediately and persist across Build Blocks. Actions: create appends one task item; update changes status (pending|in_progress|done) or text of one item by id or index; clear removes completed items. Use create when starting a multi-step task, update as each item progresses, and update status=done when verified. Returns a compact confirmation, never the full list.', { action: { type: 'string', enum: ['create', 'update', 'clear'], description: 'create=append a task item; update=change one item status/text; clear=remove completed items.' }, task: { type: 'string', description: 'Task text for create, or new text for update. Short actionable label (<=400 chars).' }, text: { type: 'string', description: 'Alias of task.' }, id: { type: 'string', description: 'Item id from task_read for update.' }, index: { type: 'number', description: '0-based item index for update (alternative to id).' }, status: { type: 'string', enum: ['pending', 'in_progress', 'done', 'blocked'], description: 'New status for update; blocked is stored as pending.' } }, ['action']),
+            t('conversation_rename', 'Rename the CURRENT conversation to a concise, descriptive title you choose. Use this when the user asks to rename the conversation or when the current auto-generated title no longer describes the work. Keep the title short (a few words) and cache-friendly: a concrete noun phrase describing the task, never a sentence or quoted prompt.', { title: { type: 'string', description: 'The new conversation title (a short noun phrase, e.g. "Fix TUI color leak", "Add goal_manage tool").' } }, ['title']),
             t('question', 'Ask user a multiple-choice question', { questions: { type: 'array' } }, ['questions']),
             t('skill_download', 'Download a skill', { name: { type: 'string' }, source: { type: 'string' } }, ['name', 'source']),
             t('skill', 'Search enabled skill metadata or load one exact skill body on demand. Use query when unsure, then name to load the selected skill.', { query: { type: 'string', maxLength: 200 }, name: { type: 'string', maxLength: 200 } }, []),

package/dist/tui/src/render.js

@@ -430,19 +430,28 @@ function chatView(state, width, height, p) {
     `${p.bold}Conversations${p.reset}`,
     `${p.muted}N new${p.reset}`,
     "",
-    ...state.snapshot.conversations.map((item, i) => {
-      const style = state.focusRegion === "content" && i === state.selected && !state.inputMode ? `${p.selected}${p.bold}` : "";
-      const running = state.runningConversationKeys?.has(`${state.target.workspaceId}::${item.id}`);
-      const marker = running
-        ? `${p.cyan}${["\\", "—", "/", "—"][state.tick % 4]}${p.reset}`
-        : item.title === state.lastConversation
-          ? `${p.cyan}›${p.reset}`
-          : item.pinned
-            ? `${p.amber}◆${p.reset}`
-            : "·";
-      const updated = String(item.updatedAt || "").slice(11, 16) || "—";
-      return `${style}${marker} ${pad(item.title, 19)} ${p.muted}${updated}${p.reset}`;
-    })
+    ...(() => {
+      const conversationRows = state.snapshot.conversations.map((item, i) => {
+        const style = state.focusRegion === "content" && i === state.selected && !state.inputMode ? `${p.selected}${p.bold}` : "";
+        const running = state.runningConversationKeys?.has(`${state.target.workspaceId}::${item.id}`);
+        const marker = running
+          ? `${p.cyan}${["\\", "—", "/", "—"][state.tick % 4]}${p.reset}`
+          : item.title === state.lastConversation
+            ? `${p.cyan}›${p.reset}`
+            : item.pinned
+              ? `${p.amber}◆${p.reset}`
+              : "·";
+        const updated = String(item.updatedAt || "").slice(11, 16) || "—";
+        return `${style}${marker} ${pad(item.title, 19)} ${p.muted}${updated}${p.reset}`;
+      });
+      const listViewport = Math.max(1, height - 3);
+      const listMaxScroll = Math.max(0, conversationRows.length - listViewport);
+      let listScroll = Math.max(0, Math.min(listMaxScroll, Number(state.conversationListScroll) || 0));
+      if (state.selected < listScroll) listScroll = state.selected;
+      else if (state.selected >= listScroll + listViewport) listScroll = state.selected - listViewport + 1;
+      state.conversationListScroll = Math.max(0, Math.min(listMaxScroll, listScroll));
+      return conversationRows.slice(state.conversationListScroll, state.conversationListScroll + listViewport);
+    })()
   ] : [];
   const preview = state.snapshot.conversations[state.selected] || state.snapshot.conversations[0] || {
     id: state.target.conversationId,
@@ -736,20 +745,19 @@ function flowListView(state, width, p) {
 
 function flowTaskView(state, width, p) {
   const components = state.currentFlow?.components || [];
-  return [
+  const rows = [
     ...conversationContext(state, p, "Flow task"),
     `${p.bold}${tr(state, "Flow Task")}${p.reset}   ${p.muted}${state.currentFlow?.name || "No workflow"}${p.reset}`,
-    "",
-    ...components.flatMap((component, index) => {
-      const style = state.focusRegion === "content" && index === state.selected ? `${p.selected}${p.bold}` : "";
-      if (style) state.contentFocusLine = 6 + index * 2;
-      const mode = component.type === "logic" ? "LOGIC" : String(component.mode || "BUILD").toUpperCase();
-      return [
-        `${style} ${String(component.id).padStart(2)}  ${pad(mode, 7)} ${truncate(component.prompt, Math.max(18, width - 16))}`,
-        component.type === "logic" ? `     ${p.muted}true → ${component.goto_true} · false → ${component.goto_false}${p.reset}` : ""
-      ].filter(Boolean);
-    })
+    ""
   ];
+  components.forEach((component, index) => {
+    const style = state.focusRegion === "content" && index === state.selected ? `${p.selected}${p.bold}` : "";
+    if (style) state.contentFocusLine = rows.length;
+    const mode = component.type === "logic" ? "LOGIC" : String(component.mode || "BUILD").toUpperCase();
+    rows.push(`${style} ${String(component.id).padStart(2)}  ${pad(mode, 7)} ${truncate(component.prompt, Math.max(18, width - 16))}`);
+    if (component.type === "logic") rows.push(`     ${p.muted}true → ${component.goto_true} · false → ${component.goto_false}${p.reset}`);
+  });
+  return rows;
 }
 
 function toolsView(state, width, p) {
@@ -1143,11 +1151,19 @@ function overlayLines(state, width, p) {
   }
   if (state.overlay === "palette") {
     const commands = filteredCommands(state);
+    const paletteViewport = Math.min(7, Math.max(1, commands.length));
+    const paletteMaxScroll = Math.max(0, commands.length - paletteViewport);
+    let paletteScroll = Math.max(0, Math.min(paletteMaxScroll, Number(state.paletteScroll) || 0));
+    if (state.paletteIndex < paletteScroll) paletteScroll = state.paletteIndex;
+    else if (state.paletteIndex >= paletteScroll + paletteViewport) paletteScroll = state.paletteIndex - paletteViewport + 1;
+    state.paletteScroll = Math.max(0, Math.min(paletteMaxScroll, paletteScroll));
+    const visibleCommands = commands.slice(state.paletteScroll, state.paletteScroll + paletteViewport);
     const rows = [
       `${p.bold}>${p.reset} ${state.paletteQuery}${p.cyan}▏${p.reset}`,
       `${p.muted}${"─".repeat(Math.max(8, Math.min(64, width - 10)))}${p.reset}`,
-      ...(commands.length ? commands.slice(0, 7).map((command, i) => {
-        const style = i === state.paletteIndex ? `${p.selected}${p.bold}` : "";
+      ...(visibleCommands.length ? visibleCommands.map((command, i) => {
+        const commandIndex = state.paletteScroll + i;
+        const style = commandIndex === state.paletteIndex ? `${p.selected}${p.bold}` : "";
         return `${style} ${pad(command.label, Math.max(18, Math.min(52, width - 18)))} ${p.muted}${command.hint}${p.reset}`;
       }) : [`${p.muted} No matching commands${p.reset}`]),
       "",
@@ -1156,14 +1172,22 @@ function overlayLines(state, width, p) {
     return card(rows, Math.min(72, width - 4), p, "Command palette");
   }
   if (state.overlay === "flow-select") {
+    const flowViewport = Math.min(7, Math.max(1, state.flows.length));
+    const flowMaxScroll = Math.max(0, state.flows.length - flowViewport);
+    let flowScroll = Math.max(0, Math.min(flowMaxScroll, Number(state.flowSelectionScroll) || 0));
+    if (state.flowSelectionIndex < flowScroll) flowScroll = state.flowSelectionIndex;
+    else if (state.flowSelectionIndex >= flowScroll + flowViewport) flowScroll = state.flowSelectionIndex - flowViewport + 1;
+    state.flowSelectionScroll = Math.max(0, Math.min(flowMaxScroll, flowScroll));
+    const visibleFlows = state.flows.slice(state.flowSelectionScroll, state.flowSelectionScroll + flowViewport);
     return card([
       `${p.bold}Flow mode requires a workflow${p.reset}`,
       `${p.muted}This selection is bound to ${state.lastConversation}.${p.reset}`,
       "",
-      ...(state.flows.length
-        ? state.flows.map((name, index) => {
-          const style = index === state.flowSelectionIndex ? `${p.selected}${p.bold}` : "";
-          return `${style} ${index === state.flowSelectionIndex ? "›" : " "} ${name}${p.reset}`;
+      ...(visibleFlows.length
+        ? visibleFlows.map((name, i) => {
+          const flowIndex = state.flowSelectionScroll + i;
+          const style = flowIndex === state.flowSelectionIndex ? `${p.selected}${p.bold}` : "";
+          return `${style} ${flowIndex === state.flowSelectionIndex ? "›" : " "} ${name}${p.reset}`;
         })
         : [`${p.amber}No workflows are configured in ~/.Newmark/Flow.${p.reset}`]),
       "",

package/dist/tui/src/state.js

@@ -183,6 +183,8 @@ function createState(options = {}) {
     workflowDraft: { name: "", mode: "build", prompt: "" },
     workflowFormIndex: 0,
     flowSelectionIndex: 0,
+    flowSelectionScroll: 0,
+    conversationListScroll: 0,
     flowByConversation: initialFlow ? { [`${target.workspaceId}::${target.conversationId}`]: initialFlow } : {},
     currentFlow: initialFlow,
     theme: appearance.theme,
@@ -192,6 +194,7 @@ function createState(options = {}) {
     settingChoiceIndex: 0,
     paletteQuery: "",
     paletteIndex: 0,
+    paletteScroll: 0,
     inputMode: false,
     input: "",
     inputCursor: 0,

package/dist/ui/index.html

@@ -3523,8 +3523,6 @@ button.todo-item { background: transparent; }
 .context-inspector-head { display:flex; align-items:flex-start; gap:8px; margin-bottom:10px; }
 .context-inspector-title { flex:1; min-width:0; color:var(--text-bright); font-size:12px; font-weight:700; }
 .context-inspector-subtitle { margin-top:2px; color:var(--text-dim); font-size:9px; }
-.context-inspector-close { width:22px; height:22px; padding:0; border:0; border-radius:var(--radius-sm); background:transparent; color:var(--text-dim); cursor:pointer; }
-.context-inspector-close:hover, .context-inspector-close:focus-visible { color:var(--text-bright); background:var(--control-hover-bg); outline:none; }
 .context-inspector-meter { height:6px; margin:8px 0 10px; overflow:hidden; border-radius:var(--radius-full); background:rgba(168,168,168,.18); }
 .context-inspector-meter-fill { height:100%; border-radius:inherit; background:var(--accent); transition:width var(--duration-normal) var(--ease-out-expo), background var(--duration-fast) var(--ease-out-expo); }
 .context-inspector-grid { display:grid; grid-template-columns:1fr 1fr; gap:7px; }
@@ -6485,6 +6483,8 @@ var NEWMARK_I18N = {
     'model.contextSize': 'Context size',
     'model.vision': 'Vision',
     'model.thinking': 'Thinking',
+    'model.thinkingTierMap': 'Thinking tier map',
+    'model.thinkingTierMapHelp': 'Map native model effort tiers to Newmark tiers. One "native=Newmark" per line (e.g. minimal=low, balanced=medium, deep=high). Leave empty to keep the default mapping (Newmark tier names are sent as-is).',
     'model.description': 'Description',
     'model.optionalDescription': 'Optional description',
     'model.fuzzyInput': 'API key / provider details',
@@ -6847,6 +6847,8 @@ var NEWMARK_I18N = {
     'status.contextCompressed': 'Context compressed',
     'status.contextCompression': 'Context compression',
     'status.contextTokens': 'Context tokens',
+    'status.conversationTokens': 'Conversation tokens',
+    'status.cacheHitRate': 'Cache hit rate',
     'status.contextNearLimit': 'Context near limit',
     'status.contextOverLimit': 'Context over limit',
     'status.contextModeFallback': 'fallback',
@@ -6854,7 +6856,7 @@ var NEWMARK_I18N = {
     'status.messages': 'messages',
     'status.noCompression': 'No compression event in this conversation',
     'status.contextInspector': 'Context management',
-    'status.contextInspectorHint': 'DSH-inspired live budget; visible chat history stays unchanged.',
+    'status.contextInspectorHint': 'Live context budget; visible chat history stays unchanged.',
     'status.activeBuild': 'Active Build',
     'status.longHistory': 'Long history',
     'status.trigger': 'Trigger',
@@ -7187,6 +7189,8 @@ var NEWMARK_I18N = {
     'model.contextSize': '上下文规模',
     'model.vision': '视觉',
     'model.thinking': '思考',
+    'model.thinkingTierMap': '思考强度档位映射',
+    'model.thinkingTierMapHelp': '将模型原生思考强度档位映射到 Newmark 档位。每行一个「原生档位=Newmark档位」（如 minimal=low、balanced=medium、deep=high）。留空表示不变动映射（按 Newmark 档位名原样发送）。',
     'model.description': '描述',
     'model.optionalDescription': '可选描述',
     'model.fuzzyInput': 'API key / 供应商信息',
@@ -7549,6 +7553,8 @@ var NEWMARK_I18N = {
     'status.contextCompressed': '上下文已压缩',
     'status.contextCompression': '上下文压缩',
     'status.contextTokens': '上下文 token',
+    'status.conversationTokens': '全对话 token',
+    'status.cacheHitRate': '缓存命中率',
     'status.contextNearLimit': '上下文接近上限',
     'status.contextOverLimit': '上下文已超限',
     'status.contextModeFallback': 'fallback',
@@ -7556,7 +7562,7 @@ var NEWMARK_I18N = {
     'status.messages': '条消息',
     'status.noCompression': '当前对话暂无压缩事件',
     'status.contextInspector': '上下文管理',
-    'status.contextInspectorHint': '借鉴 DSH 的动态预算；可见对话历史不会被改写。',
+    'status.contextInspectorHint': '实时上下文预算；可见对话历史不会被改写。',
     'status.activeBuild': '当前 Build',
     'status.longHistory': '长期历史',
     'status.trigger': '触发线',
@@ -10174,7 +10180,7 @@ function renderWorkToolGroup(event, eventIndex) {
     var edited = workToolEditedFile(item);
     if (edited) {
       var editKey = 'edit:' + String(item.id || item.toolCallId || itemIndex) + ':' + edited.path;
-      return '<details class="conversation-work-file conversation-work-file-inline" open data-work-detail-key="' + escAttr(editKey) + '"><summary>' +
+      return '<details class="conversation-work-file conversation-work-file-inline" data-work-detail-key="' + escAttr(editKey) + '"><summary>' +
         iconSvg('pencil', 'edited', 'tiny') +
         '<span class="conversation-work-file-name" title="' + escAttr(edited.path) + '">' + esc(currentLang() === 'zh' ? '已编辑 ' : 'Edited ') + esc(edited.name) + '</span>' +
         '<span class="conversation-work-file-stats"><span class="conversation-work-file-add">+' + edited.added + '</span><span class="conversation-work-file-del">-' + edited.deleted + '</span></span>' +
@@ -12075,6 +12081,12 @@ window.renderContextInspector = function() {
   var historyTrigger = contextInspectorValue(c.longHistoryTriggerTokens);
   var activeRetention = contextInspectorValue(c.buildBlockRetentionTokens);
   var historyRetention = contextInspectorValue(c.longHistoryRetentionTokens);
+  var providerTotalTokens = contextInspectorValue(c.providerTotalTokens);
+  var providerInputTokens = contextInspectorValue(c.providerInputTokens);
+  var providerOutputTokens = contextInspectorValue(c.providerOutputTokens);
+  var providerCacheReadTokens = contextInspectorValue(c.providerCacheReadTokens);
+  var providerCacheReadRatio = Math.max(0, Math.min(1, Number(c.providerCacheReadRatio) || 0));
+  var cacheHitPercent = Math.round(providerCacheReadRatio * 1000) / 10;
   var percent = Math.min(100, Math.round((used / max) * 100));
   var fillColor = c.warning === 'over_limit' ? 'var(--nm-state-danger)' : (c.warning === 'near_limit' ? 'var(--nm-state-warning)' : 'var(--accent)');
   var compression = state.contextCompression || null;
@@ -12083,12 +12095,13 @@ window.renderContextInspector = function() {
     : t('status.noCompressionShort');
   var busy = !!state.contextMutationPending;
   var running = typeof isCurrentConversationRunning === 'function' && isCurrentConversationRunning();
-  panel.innerHTML = '<div class="context-inspector-head"><div><div class="context-inspector-title">' + esc(t('status.contextInspector')) + '</div><div class="context-inspector-subtitle">' + esc(t('status.contextInspectorHint')) + '</div></div>' +
-    '<button type="button" class="context-inspector-close" onclick="window.closeContextInspector()" aria-label="' + esc(t('common.close') || 'Close') + '">×</button></div>' +
+  panel.innerHTML = '<div class="context-inspector-head"><div><div class="context-inspector-title">' + esc(t('status.contextInspector')) + '</div><div class="context-inspector-subtitle">' + esc(t('status.contextInspectorHint')) + '</div></div></div>' +
     '<div class="context-inspector-meter"><div class="context-inspector-meter-fill" style="width:' + percent + '%;background:' + fillColor + '"></div></div>' +
     '<div class="context-inspector-grid">' +
       contextInspectorCell(t('status.contextTokens'), used + ' / ' + max) +
+      contextInspectorCell(t('status.conversationTokens'), providerTotalTokens + ' · ' + providerInputTokens + ' in / ' + providerOutputTokens + ' out') +
       contextInspectorCell(t('status.activeBuild'), active + ' / ' + activeTrigger) +
+      contextInspectorCell(t('status.cacheHitRate'), cacheHitPercent + '% · ' + providerCacheReadTokens + ' cached') +
       contextInspectorCell(t('status.longHistory'), history + ' / ' + historyTrigger) +
       contextInspectorCell(t('status.retention'), activeRetention + ' + ' + historyRetention) +
       contextInspectorCell(t('status.hotCache'), contextInspectorValue(c.cacheEntries) + ' entries') +
@@ -12104,6 +12117,17 @@ window.closeContextInspector = function() {
   window.renderContextInspector();
 };
 
+(function() {
+  document.addEventListener('click', function(event) {
+    if (!state.contextInspectorOpen) return;
+    var ring = document.getElementById('context-token-ring');
+    var panel = document.getElementById('context-inspector');
+    if (!ring || !panel) return;
+    if (panel.contains(event.target) || ring.contains(event.target)) return;
+    window.closeContextInspector();
+  });
+})();
+
 window.toggleContextInspector = function() {
   state.contextInspectorOpen = !state.contextInspectorOpen;
   window.hideContextWindowTooltip();
@@ -15329,9 +15353,11 @@ function renderModelSettings() {
         : (normalizedStatus === 'not checked' ? 'model-eval-pending' : 'model-eval-bad');
       var details = '';
       if (typeof modelEntry !== 'string') {
+        var tierMapCount = modelEntry.thinking_tier_map && typeof modelEntry.thinking_tier_map === 'object' ? Object.keys(modelEntry.thinking_tier_map).length : 0;
         details = '<span class="model-eval-line">ctx ' + esc(modelEntry.max_tokens || '') +
           ' | ' + esc(t('model.vision')) + ' ' + (modelEntry.vision ? t('common.on') : t('common.off')) +
           ' | ' + esc(t('model.thinking')) + ' ' + (modelEntry.thinking ? t('common.on') : t('common.off')) +
+          (tierMapCount ? ' | ' + esc(t('model.thinkingTierMap')) + ' ' + tierMapCount : '') +
           ' | ' + esc(t('model.cost')) + ' ' + esc(evaluation ? evaluation.cost_rating : '-') +
           ' | ' + esc(t('model.performanceShort')) + ' ' + esc(modelEntry.capability_rating || '-') +
           ' | ' + esc(t('model.speed')) + ' ' + esc(modelEntry.speed_rating || '-') + '</span>';
@@ -16040,9 +16066,31 @@ window.addModel = function() {
     '<div style="display:flex;gap:10px;margin-bottom:10px;"><label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="new-model-vision"> ' + esc(t('model.vision')) + '</label>' +
     '<label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="new-model-thinking"> ' + esc(t('model.thinking')) + '</label></div>' +
     '<div class="auto-input-group"><label>' + esc(t('model.description')) + '</label><textarea id="new-model-desc" rows="2" placeholder="' + escAttr(t('model.optionalDescription')) + '"></textarea></div>' +
+    '<div class="auto-input-group"><label>' + esc(t('model.thinkingTierMap')) + '</label><textarea id="new-model-tier-map" rows="3" placeholder="minimal=low&#10;balanced=medium&#10;deep=high"></textarea>' +
+    '<div style="margin-top:10px;font-size:11px;color:var(--text-dim);">' + esc(t('model.thinkingTierMapHelp')) + '</div></div>' +
     '<div style="margin-top:10px;"><button class="sec-btn primary" onclick="window.saveNewModel()">' + esc(t('common.save')) + '</button></div>');
 };
 
+window.parseThinkingTierMap = function(text) {
+  var map = {};
+  if (!text) return map;
+  String(text).split('\n').forEach(function(line) {
+    var trimmed = line.trim();
+    if (!trimmed) return;
+    var eq = trimmed.indexOf('=');
+    if (eq <= 0) return;
+    var native = trimmed.slice(0, eq).trim();
+    var newmark = trimmed.slice(eq + 1).trim();
+    if (native && newmark) map[native] = newmark;
+  });
+  return map;
+};
+
+window.serializeThinkingTierMap = function(map) {
+  if (!map || typeof map !== 'object') return '';
+  return Object.keys(map).map(function(k) { return k + '=' + map[k]; }).join('\n');
+};
+
 window.saveNewModel = function() {
   var name = document.getElementById('new-model-name').value;
   var provIdx = parseInt(document.getElementById('new-model-provider').value);
@@ -16050,9 +16098,11 @@ window.saveNewModel = function() {
   var visionEl = document.getElementById('new-model-vision');
   var thinkingEl = document.getElementById('new-model-thinking');
   var descEl = document.getElementById('new-model-desc');
+  var tierMapEl = document.getElementById('new-model-tier-map');
   if (name && !isNaN(provIdx) && state.providers[provIdx]) {
     if (!state.providers[provIdx].models) state.providers[provIdx].models = [];
-    state.providers[provIdx].models.push({
+    var tierMap = window.parseThinkingTierMap(tierMapEl ? tierMapEl.value : '');
+    var entry = {
       name: name,
       display: name,
       description: descEl ? descEl.value : '',
@@ -16069,7 +16119,9 @@ window.saveNewModel = function() {
         xhigh: { description: 'xhigh' },
         max: { description: 'max' }
       }
-    });
+    };
+    if (Object.keys(tierMap).length) entry.thinking_tier_map = tierMap;
+    state.providers[provIdx].models.push(entry);
     api.saveConfig({providers: state.providers});
     window.refreshModelSelect();
   }
@@ -16089,6 +16141,8 @@ window.editModel = function(provIdx, modelIdx) {
     '<div style="display:flex;gap:10px;margin-bottom:10px;"><label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="edit-model-vision"' + (model.vision ? ' checked' : '') + '> ' + esc(t('model.vision')) + '</label>' +
     '<label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="edit-model-thinking"' + (model.thinking ? ' checked' : '') + '> ' + esc(t('model.thinking')) + '</label></div>' +
     '<div class="auto-input-group"><label>' + esc(t('model.description')) + '</label><textarea id="edit-model-desc" rows="2">' + esc(model.description || '') + '</textarea></div>' +
+    '<div class="auto-input-group"><label>' + esc(t('model.thinkingTierMap')) + '</label><textarea id="edit-model-tier-map" rows="3">' + esc(window.serializeThinkingTierMap(model.thinking_tier_map)) + '</textarea>' +
+    '<div style="margin-top:10px;font-size:11px;color:var(--text-dim);">' + esc(t('model.thinkingTierMapHelp')) + '</div></div>' +
     '<div style="margin-top:10px;"><button class="sec-btn primary" onclick="window.saveModelEdit(' + provIdx + ',' + modelIdx + ')">' + esc(t('common.save')) + '</button></div>');
 };
 
@@ -16101,11 +16155,13 @@ window.saveModelEdit = function(oldProvIdx, modelIdx) {
   var visionEl = document.getElementById('edit-model-vision');
   var thinkingEl = document.getElementById('edit-model-thinking');
   var descEl = document.getElementById('edit-model-desc');
+  var tierMapEl = document.getElementById('edit-model-tier-map');
   var name = nameEl ? nameEl.value.trim() : '';
   var newProvIdx = provEl ? parseInt(provEl.value) : oldProvIdx;
   if (!name || isNaN(newProvIdx) || !state.providers[newProvIdx]) return;
   var previous = oldProvider.models[modelIdx];
   if (typeof previous === 'string') previous = { name: previous, display: previous };
+  var tierMap = window.parseThinkingTierMap(tierMapEl ? tierMapEl.value : '');
   var updated = Object.assign({}, previous, {
     name: name,
     display: name,
@@ -16114,6 +16170,8 @@ window.saveModelEdit = function(oldProvIdx, modelIdx) {
     vision: !!(visionEl && visionEl.checked),
     thinking: !!(thinkingEl && thinkingEl.checked)
   });
+  if (Object.keys(tierMap).length) updated.thinking_tier_map = tierMap;
+  else delete updated.thinking_tier_map;
   oldProvider.models.splice(modelIdx, 1);
   if (!state.providers[newProvIdx].models) state.providers[newProvIdx].models = [];
   state.providers[newProvIdx].models.push(updated);