dsh-ntr 0.2.0 → 0.2.1

package/README.en.md

@@ -70,12 +70,12 @@ To upgrade later: `git pull` → `npm run build` → restart `dsh web`. `add .`
 
 ---
 
-## Getting started
+## Quick start
 
 ### What you need
 
 1. A working DSH install (web or desktop).
-2. At least one ACP agent CLI. The plugin ships presets for common ones, and accepts any stdio-capable ACP agent.
+2. At least one ACP-capable agent, using its terminal build (CLI / TUI). For example Qoder CLI (`qodercli`), CodeBuddy Code (`codebuddy`), Claude Code, or OpenCode — presets for these ship with the plugin; any other agent that starts from the command line in the same `xxx --acp` style can be filled in directly.
 
 ### Three steps
 
@@ -267,11 +267,14 @@ These servers are handed to the agent when a session is created; the agent launc
 
 ```bash
 npm install          # dependencies
+git config core.hooksPath .githooks   # enable the commit-msg check (rejects AI attribution)
 npm run build        # host TS declarations + browser bundle
 npm test             # test suite
 dsh plugin --profile web add ./   # mount into the Web profile
 ```
 
+`.githooks/commit-msg` only inspects the commit message: it rejects AI-tool attribution in `Co-Authored-By` / `Generated with` lines, while ordinary prose and human attribution pass. `core.hooksPath` is local config — run this once after cloning.
+
 ### Implementation notes
 
 Each item below corresponds to a real past failure; read the linked doc before changing code. The browser half talks to the host half via `/acp` RPC and `/api/acp/stream` SSE; the host half runs one `AgentBridge` per conversation, driving the agent child process over stdio JSON-RPC.

package/README.md

@@ -70,12 +70,12 @@ dsh plugin --profile web add ./
 
 ---
 
-## 上手
+## 快速开始
 
 ### 你需要什么
 
 1. 一个已经装好的 DSH（Web 或桌面版）。
-2. 至少一个 ACP agent 的命令行程序。插件内置了几个常见预设，也可以填任何支持 stdio 的 ACP agent。
+2. 至少一个支持 ACP 协议的 agent，用它的终端版本（CLI / TUI）即可。例如 Qoder CLI（`qodercli`）、CodeBuddy Code（`codebuddy`）、Claude Code、OpenCode——插件内置了这些常见预设；其他 agent 只要能以类似 `xxx --acp` 的方式从命令行启动，也可以直接填。
 
 ### 三步接入
 
@@ -267,11 +267,14 @@ agent 要动敏感的东西时会问你。询问卡出现在对话里、聊天
 
 ```bash
 npm install          # 依赖
+git config core.hooksPath .githooks   # 启用 commit-msg 校验（拒绝 AI 署名）
 npm run build        # 宿主 TS 声明 + 浏览器 Bundle
 npm test             # 测试套件
 dsh plugin --profile web add ./   # 挂载到 Web Profile
 ```
 
+`.githooks/commit-msg` 只校验提交信息：拒绝把 AI 工具写进 `Co-Authored-By` / `Generated with` 之类署名，普通正文与人类署名不受影响。`core.hooksPath` 是本地配置，clone 后执行一次即可。
+
 ### 实现要点
 
 以下每条都对应一处真实故障，改代码前先读对应文档。浏览器半区经 `/acp` RPC 与 `/api/acp/stream` SSE 和宿主半区通信；宿主半区每会话一个 `AgentBridge`，经 stdio JSON-RPC 驱动 agent 子进程。

package/lib/bridge.js

@@ -2051,6 +2051,8 @@ export function releaseAllToolOutputWaiters() {
         for (const waiter of [...set])
             waiter(undefined);
 }
+/** ACP `usage_update` is context occupancy, not request tokens; host usage is a 4-chars/token OUTPUT estimate (tool args excluded). */
+const OUTPUT_CHARS_PER_TOKEN = 4;
 /**
  * The state of ONE ACP prompt, shared across every driver step of the turn.
  *
@@ -2059,7 +2061,7 @@ export function releaseAllToolOutputWaiters() {
  * `transcript.since(cursor)` — events that arrive while no segment is open are
  * recorded, never lost), the seen-call registry (a call id gets exactly one
  * card per turn, wherever its restatements land), and the turn-level facts
- * (`sawVisibleBlock`, usage) that outlive any single segment.
+ * (`sawVisibleBlock`) that outlive any single segment.
  */
 class TurnStreamController {
     manager;
@@ -2073,7 +2075,6 @@ class TurnStreamController {
     disposed = false;
     seenCalls = new Set();
     announcedKinds = new Map();
-    latestUsage = null;
     /** Narrative lines (permission asks) that arrived while no segment was open. */
     pendingProse = [];
     sawVisibleBlock = false;
@@ -2119,6 +2120,7 @@ class TurnStreamController {
             index: -1,
             activeType: null,
             activeText: '',
+            outputChars: 0,
             activeToolCall: undefined,
             hasCard: false,
             finished: false,
@@ -2245,8 +2247,10 @@ class TurnStreamController {
             seg.activeType = null;
             seg.activeToolCall = undefined;
         }
-        if (this.latestUsage !== null)
-            seg.queue.push({ type: 'usage', usage: this.latestUsage });
+        const outputTokens = Math.round(seg.outputChars / OUTPUT_CHARS_PER_TOKEN);
+        // Zero input keeps the host's cache-hit pill hidden instead of faking 0%.
+        if (outputTokens > 0)
+            seg.queue.push({ type: 'usage', usage: { inputTokens: 0, outputTokens } });
         seg.queue.push({ type: 'finish', reason });
         seg.queue.close();
         if (this.segment === seg)
@@ -2289,11 +2293,10 @@ class TurnStreamController {
             const seg = this.segment;
             if (seg === undefined || seg.finished) {
                 // Between segments: tool outputs still reach the shared registry (the
-                // guard's virtual tool may be parked on this very record) and usage
-                // keeps the turn's tally fresh, but the cursor does NOT advance — the
-                // next segment replays everything since it, which re-records those
-                // idempotently and folds the prose the agent streamed while its cards
-                // executed on the host.
+                // guard's virtual tool may be parked on this very record), but the
+                // cursor does NOT advance — the next segment replays everything since
+                // it, which re-records those idempotently and folds the prose the agent
+                // streamed while its cards executed on the host.
                 this.recordWithoutSegment(update);
                 return;
             }
@@ -2337,17 +2340,8 @@ class TurnStreamController {
     /** Events that arrive between segments: recorded, replayed into the next one. */
     recordWithoutSegment(update) {
         const kind = String(update.sessionUpdate ?? '');
-        if (kind === 'usage_update') {
-            this.noteUsage(update);
-        }
-        else if (kind === 'tool_call' || kind === 'tool_call_update') {
+        if (kind === 'tool_call' || kind === 'tool_call_update')
             this.noteToolRecord(update);
-        }
-    }
-    noteUsage(update) {
-        const used = typeof update.used === 'number' ? update.used : 0;
-        const size = typeof update.size === 'number' ? update.size : 0;
-        this.latestUsage = { inputTokens: size, outputTokens: used };
     }
     /** Record a tool call's output (idempotent) and wake any waiter. */
     noteToolRecord(update) {
@@ -2373,6 +2367,7 @@ class TurnStreamController {
                 this.finishSegment(seg, { kind: 'stop' });
                 return false;
             }
+            seg.outputChars += text.length;
             this.emitProse(seg, kind === 'agent_thought_chunk' ? 'reasoning' : 'text', text);
             return true;
         }
@@ -2395,10 +2390,6 @@ class TurnStreamController {
             this.openToolCallBlock(seg, snapshot);
             return true;
         }
-        else if (kind === 'usage_update') {
-            this.noteUsage(update);
-            return true;
-        }
         else if (!BOOKKEEPING_UPDATES.has(kind)) {
             const text = describeUnhandledUpdate(kind, update);
             if (this.announcedKinds.get(kind) === text)