tianshu-mcp 0.3.2 → 0.3.3

package/CHANGELOG.en.md

@@ -19,9 +19,29 @@ Chinese version: [CHANGELOG.md](CHANGELOG.md)
 - Best-effort stop of a GUI-side pending session (via a temporary CDP connection) when cancelling
   a task in the `needs_user` state.
 
----
-
-## [0.3.2] — 2026-09-12
+---
+
+## [0.3.3] — 2026-09-12
+
+Fixes issues #4 / #7 by adapting the ZCode GUI driver to the 3.11.2 model-menu and project-binding semantics, while making acceptance fail closed for zero-test and zero-change outcomes.
+
+### Fixed
+
+- ZCode provider selectors now support both `group-provider` and the 3.11.2 `group-family` prefix. Model selection tries the visible model first and only expands a provider/family group as a fallback; failures include visible text and `data-testid` candidates.
+- New-project import dismisses the stale workspace menu before opening Add Project and uses a bounded three-round dismiss/click/verify loop, preventing the first click from being consumed as an outside click.
+- Project binding prioritizes the composer menu's `menuitemcheckbox`; the legacy sidebar item remains a compatibility fallback. Display-name matching normalizes NFKC, whitespace, and case.
+- Binding read-back combines the composer trigger text with the full-path fast path, rejects known unbound placeholders, and retries the idempotent bind operation for up to two rounds.
+- Built-in ZCode and TraeWork discovery paths use `{PROGRAMFILES}` / `{PROGRAMFILES(X86)}`. Environment placeholders in custom profiles are expanded case-insensitively while unknown placeholders remain unchanged.
+- A mandatory test check is failed when it exits with code 0 but its output reports zero executed tests.
+- Git projects now require a change relative to the pre-work baseline by default. Pure question/analysis tasks can explicitly opt out with `"requireChanges": false` in `.tianshu-mcp/acceptance.json`.
+
+### Tests
+
+- Regression coverage now models ZCode 3.11.2 flat family layouts, legacy provider fallback, testid diagnostics, swallowed project clicks, composer binding and read-back retries, plus zero-test/zero-change acceptance gates.
+
+---
+
+## [0.3.2] — 2026-09-12
 
 Fixes for issues #5 / #6: **the MCP task model was disconnected from the state of the turn inside
 the Codex GUI**. The former is the completion-detection deadlock that kept reporting `running`
@@ -494,7 +514,8 @@ project → pick model and reasoning level → send instructions → run detecti
 
 ---
 
-[Unreleased]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.2...HEAD
+[Unreleased]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.2.0...v0.3.0

package/CHANGELOG.md

@@ -17,9 +17,29 @@
 - Codex GUI 的 macOS 真机验证（当前内置状态为 `research`）。
 - needs_user 状态下取消任务时经临时 CDP 连接尽力停止 GUI 内等待中的会话。
 
----
-
-## [0.3.2] — 2026-09-12
+---
+
+## [0.3.3] — 2026-09-12
+
+修复 issue #4 / #7：适配 ZCode 3.11.2 的模型菜单与项目绑定语义，并将验收引擎收紧为 fail-closed，防止零用例、零变更任务假绿。
+
+### 修复
+
+- ZCode 供应商分组选择器同时兼容 `group-provider` 与 3.11.2 `group-family`；模型流程改为直选优先、供应商分组展开兜底，并在失败信息中附带可见文本与 `data-testid` 候选。
+- 添加新项目前收起残留工作区菜单，以最多三轮“收起—点击—验证”闭环消除首次点击被吞。
+- 项目选择优先点击 composer 菜单的 `menuitemcheckbox`，旧版侧栏项仅作回退；项目名称按 NFKC、空白和大小写归一化。
+- 项目绑定回读同时校验 composer 触发器文本与完整路径，未绑定占位词不再误判；绑定失败最多两轮幂等重试。
+- ZCode/TraeWork 内置发现目录统一为 `{PROGRAMFILES}` / `{PROGRAMFILES(X86)}`；自定义 profile 的环境占位符按大小写不敏感方式展开，未知占位符保留原样。
+- 非 optional 测试检查在退出码为 0 但输出显示零用例时改判失败。
+- Git 项目默认要求相对动工前基线产生变更；纯问答/分析任务可在 `.tianshu-mcp/acceptance.json` 设置 `"requireChanges": false` 显式关闭。
+
+### 测试
+
+- 回归覆盖 ZCode 3.11.2 family 平铺模型、旧版分组兜底、testid 诊断、项目点击被吞、composer 绑定与回读重试，以及零用例/零变更门禁。
+
+---
+
+## [0.3.2] — 2026-09-12
 
 修复 issue #5 / #6：**MCP 任务模型与 Codex GUI 内 turn 的状态脱节**。
 前者是"等用户确认时恒报 running"的完成判定死锁，后者是 `cancel_task` 只停 MCP 侧等待、
@@ -431,7 +451,8 @@ Codex 桌面端改为 **GUI 驱动**：新增 `codex-gui` adapter，通过 MSIX
 
 ---
 
-[未发布]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.2...HEAD
+[未发布]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/lanlan0811/tianshu-mcp/compare/v0.2.0...v0.3.0

package/dist/agents/builtin.js

@@ -73,8 +73,8 @@ export const BUILTIN_PROFILES = {
         authNote: "复用本机 ZCode 登录态",
         executableDiscovery: {
             dirs: [
-                "{ProgramFiles}/ZCode",
-                "{ProgramFiles(x86)}/ZCode",
+                "{PROGRAMFILES}/ZCode",
+                "{PROGRAMFILES(X86)}/ZCode",
                 "{LOCALAPPDATA}/Programs/ZCode",
                 "{LOCALAPPDATA}/ZCode",
                 "/Applications/ZCode.app/Contents/MacOS",
@@ -129,8 +129,8 @@ export const BUILTIN_PROFILES = {
         executableDiscovery: {
             dirs: [
                 "D:/TRAE Work CN",
-                "{ProgramFiles}/TRAE WORK CN",
-                "{ProgramFiles(x86)}/TRAE WORK CN",
+                "{PROGRAMFILES}/TRAE WORK CN",
+                "{PROGRAMFILES(X86)}/TRAE WORK CN",
                 "{LOCALAPPDATA}/Programs/TRAE WORK CN",
                 "{LOCALAPPDATA}/TRAE WORK CN",
                 "{APPDATA}/TRAE SOLO CN",

package/dist/agents/zcode/cdp.d.ts

@@ -1,7 +1,7 @@
 import { CdpDisconnectedError, CdpUnavailableError } from "../traework/cdp/client.js";
 import { type ZcodeSelectorKey } from "./selectors.js";
 import type { ZcodePoll } from "./liveness.js";
-import type { ZcodeProjectItem } from "./project.js";
+import { type ZcodeProjectItem } from "./project.js";
 export { CdpDisconnectedError, CdpUnavailableError };
 export declare function retryZcodeEvaluation<T>(operation: () => Promise<T>, sleep?: (ms: number) => Promise<void>): Promise<T>;
 export interface ZcodeSessionItem {
@@ -14,6 +14,12 @@ export interface ZcodeQuestionAnswerResult {
     available: string[];
     error?: string;
 }
+export interface ZcodeClickExactResult {
+    clicked: boolean;
+    count: number;
+    available: string[];
+    testids?: string[];
+}
 export declare class ZcodeCdpClient {
     private readonly selectors;
     private readonly inner;
@@ -27,11 +33,7 @@ export declare class ZcodeCdpClient {
     exists(key: ZcodeSelectorKey): Promise<boolean>;
     text(key: ZcodeSelectorKey): Promise<string>;
     click(key: ZcodeSelectorKey): Promise<boolean>;
-    clickExact(key: ZcodeSelectorKey, value: string): Promise<{
-        clicked: boolean;
-        count: number;
-        available: string[];
-    }>;
+    clickExact(key: ZcodeSelectorKey, value: string): Promise<ZcodeClickExactResult>;
     selection(key: ZcodeSelectorKey): Promise<{
         display: string;
         internal: string;
@@ -39,6 +41,10 @@ export declare class ZcodeCdpClient {
     projects(): Promise<ZcodeProjectItem[]>;
     clickProject(id: string | undefined, projectPath: string | undefined): Promise<boolean>;
     boundProjectPath(): Promise<string>;
+    workspaceBinding(): Promise<{
+        triggerText: string;
+        projectPath: string;
+    }>;
     session(): Promise<{
         id?: string;
         title?: string;

package/dist/agents/zcode/cdp.js

@@ -1,5 +1,6 @@
 import { TraeworkCdpClient, CdpDisconnectedError, CdpUnavailableError, } from "../traework/cdp/client.js";
 import { candidateExpr } from "./selectors.js";
+import { projectDisplayName } from "./project.js";
 import { normalizeZcodeModelSelection } from "./model.js";
 export { CdpDisconnectedError, CdpUnavailableError };
 export async function retryZcodeEvaluation(operation, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))) {
@@ -90,11 +91,21 @@ export class ZcodeCdpClient {
         return true;
     }
     async clickExact(key, value) {
-        const found = await this.evaluate(`(async function(){const norm=s=>(s||'').normalize('NFKC').trim().toLocaleLowerCase();const target=norm(${JSON.stringify(value)});const sels=${candidateExpr(key, this.selectors)};const visible=e=>{const r=e.getBoundingClientRect();if(!(r.width>0&&r.height>0&&r.bottom>0&&r.right>0&&r.top<innerHeight&&r.left<innerWidth))return false;const x=Math.max(0,Math.min(innerWidth-1,r.left+r.width/2)),y=Math.max(0,Math.min(innerHeight-1,r.top+r.height/2)),hit=document.elementFromPoint(x,y);return !!hit&&(hit===e||e.contains(hit))};const items=()=>{const out=[];for(const s of sels)for(const e of document.querySelectorAll(s))if(visible(e)&&!out.includes(e))out.push(e);return out};const leafTexts=e=>[...e.querySelectorAll('*')].filter(n=>n.children.length===0).map(n=>(n.textContent||'').trim()).filter(Boolean);const label=e=>(e.getAttribute('data-value')||e.getAttribute('data-model')||e.getAttribute('data-provider')||leafTexts(e)[0]||e.textContent||'').trim();let nodes=items();let scroller=nodes[0];while(scroller&&scroller!==document.body&&scroller.scrollHeight<=scroller.clientHeight)scroller=scroller.parentElement;const start=scroller?.scrollTop||0;if(scroller)scroller.scrollTop=0;const seen=new Map(),matches=new Map();for(let i=0;i<60;i++){await new Promise(r=>setTimeout(r,25));nodes=items();for(const e of nodes){const text=label(e);if(!text)continue;const id=e.getAttribute('data-id')||e.getAttribute('data-model-id')||e.getAttribute('data-value')||e.getAttribute('data-model')||e.getAttribute('data-provider')||e.getAttribute('data-testid')||text;seen.set(norm(id)+'|'+norm(text),text);if(norm(text)===target)matches.set(norm(id)+'|'+norm(text),{top:scroller?.scrollTop||0,text})}if(!scroller||scroller.scrollTop+scroller.clientHeight>=scroller.scrollHeight-1)break;const before=scroller.scrollTop;scroller.scrollTop=Math.min(scroller.scrollTop+Math.max(100,scroller.clientHeight*.8),scroller.scrollHeight);if(scroller.scrollTop===before)break}const matchesFound=[...matches.values()];if(matchesFound.length===1){if(scroller)scroller.scrollTop=matchesFound[0].top;await new Promise(r=>setTimeout(r,50));const exact=items().filter(e=>norm(label(e))===target);if(exact.length===1){exact[0].scrollIntoView({block:'center'});const r=exact[0].getBoundingClientRect();return {count:1,available:[...seen.values()],point:{x:r.left+r.width/2,y:r.top+r.height/2}}}}if(scroller)scroller.scrollTop=start;return {count:matchesFound.length,available:[...seen.values()]}})()`);
+        const found = await this.evaluate(`(async function(){const norm=s=>(s||'').normalize('NFKC').trim().toLocaleLowerCase();const target=norm(${JSON.stringify(value)});const sels=${candidateExpr(key, this.selectors)};const visible=e=>{const r=e.getBoundingClientRect();if(!(r.width>0&&r.height>0&&r.bottom>0&&r.right>0&&r.top<innerHeight&&r.left<innerWidth))return false;const x=Math.max(0,Math.min(innerWidth-1,r.left+r.width/2)),y=Math.max(0,Math.min(innerHeight-1,r.top+r.height/2)),hit=document.elementFromPoint(x,y);return !!hit&&(hit===e||e.contains(hit))};const items=()=>{const out=[];for(const s of sels)for(const e of document.querySelectorAll(s))if(visible(e)&&!out.includes(e))out.push(e);return out};const leafTexts=e=>[...e.querySelectorAll('*')].filter(n=>n.children.length===0).map(n=>(n.textContent||'').trim()).filter(Boolean);const label=e=>(e.getAttribute('data-value')||e.getAttribute('data-model')||e.getAttribute('data-provider')||leafTexts(e)[0]||e.textContent||'').trim();let nodes=items();let scroller=nodes[0];while(scroller&&scroller!==document.body&&scroller.scrollHeight<=scroller.clientHeight)scroller=scroller.parentElement;const start=scroller?.scrollTop||0;if(scroller)scroller.scrollTop=0;const seen=new Map(),seenTestids=new Map(),matches=new Map();for(let i=0;i<60;i++){await new Promise(r=>setTimeout(r,25));nodes=items();for(const e of nodes){const text=label(e);const testid=e.getAttribute('data-testid')||'';const id=e.getAttribute('data-id')||e.getAttribute('data-model-id')||e.getAttribute('data-value')||e.getAttribute('data-model')||e.getAttribute('data-provider')||testid||text;const key=norm(id)+'|'+norm(text);if(testid)seenTestids.set(key,testid);if(!text)continue;seen.set(key,text);if(norm(text)===target)matches.set(key,{top:scroller?.scrollTop||0,text})}if(!scroller||scroller.scrollTop+scroller.clientHeight>=scroller.scrollHeight-1)break;const before=scroller.scrollTop;scroller.scrollTop=Math.min(scroller.scrollTop+Math.max(100,scroller.clientHeight*.8),scroller.scrollHeight);if(scroller.scrollTop===before)break}const result={available:[...seen.values()],testids:[...seenTestids.values()]};const matchesFound=[...matches.values()];if(matchesFound.length===1){if(scroller)scroller.scrollTop=matchesFound[0].top;await new Promise(r=>setTimeout(r,50));const exact=items().filter(e=>norm(label(e))===target);if(exact.length===1){exact[0].scrollIntoView({block:'center'});const r=exact[0].getBoundingClientRect();return {count:1,...result,point:{x:r.left+r.width/2,y:r.top+r.height/2}}}}if(scroller)scroller.scrollTop=start;return {count:matchesFound.length,...result}})()`);
         if (!found.point)
-            return { clicked: false, count: found.count, available: found.available };
+            return {
+                clicked: false,
+                count: found.count,
+                available: found.available,
+                testids: found.testids,
+            };
         await this.clickAt(found.point.x, found.point.y);
-        return { clicked: true, count: found.count, available: found.available };
+        return {
+            clicked: true,
+            count: found.count,
+            available: found.available,
+            testids: found.testids,
+        };
     }
     async selection(key) {
         const raw = await this.evaluate(`(function(){for(const s of ${candidateExpr(key, this.selectors)})for(const e of document.querySelectorAll(s)){const r=e.getBoundingClientRect();if(!r.width||!r.height)continue;const data=e.closest('[data-model-id],[data-model],[data-value]')||e.querySelector('[data-model-id],[data-model],[data-value]')||e;return {display:(e.value||e.textContent||'').trim(),ariaLabel:(e.getAttribute('aria-label')||'').trim(),currentValue:(e.getAttribute('data-model-current-value')||'').trim(),legacyInternal:(data.getAttribute('data-model-id')||data.getAttribute('data-model')||data.getAttribute('data-value')||'').trim()}}return {display:''}})()`);
@@ -104,14 +115,18 @@ export class ZcodeCdpClient {
         return this.evaluate(`(function(){const out=[];for(const s of ${candidateExpr("projectItem", this.selectors)})for(const e of document.querySelectorAll(s)){const testid=e.getAttribute('data-testid')||'';const testPath=testid.startsWith('workspace-item-')?testid.slice('workspace-item-'.length):undefined;const name=(e.getAttribute('data-project-name')||e.querySelector('[class*=name]')?.textContent||e.textContent||'').trim();const p=e.getAttribute('data-project-path')||e.querySelector('[data-project-path]')?.getAttribute('data-project-path')||testPath||e.getAttribute('title')||undefined;const id=e.getAttribute('data-project-id')||e.getAttribute('data-id')||testid||undefined;if(name)out.push({name,path:p,id})}return out})()`);
     }
     async clickProject(id, projectPath) {
-        const point = await this.evaluate(`(async function(){const matches=[];for(const s of ${candidateExpr("projectItem", this.selectors)})for(const e of document.querySelectorAll(s)){const testid=e.getAttribute('data-testid')||'';const id=e.getAttribute('data-project-id')||e.getAttribute('data-id')||testid;const p=e.getAttribute('data-project-path')||e.querySelector('[data-project-path]')?.getAttribute('data-project-path')||(testid.startsWith('workspace-item-')?testid.slice('workspace-item-'.length):'')||e.getAttribute('title')||'';if((${JSON.stringify(id ?? "")}&&id===${JSON.stringify(id ?? "")})||(${JSON.stringify(projectPath ?? "")}&&p===${JSON.stringify(projectPath ?? "")}))matches.push(e)}if(matches.length!==1)return null;matches[0].scrollIntoView({block:'center'});await new Promise(r=>setTimeout(r,50));const r=matches[0].getBoundingClientRect();return r.width&&r.height&&r.bottom>0&&r.right>0&&r.top<innerHeight&&r.left<innerWidth?{x:r.left+r.width/2,y:r.top+r.height/2}:null})()`);
+        const displayName = projectPath ? projectDisplayName(projectPath) : "";
+        const point = await this.evaluate(`(async function(){const norm=s=>(s||'').normalize('NFKC').trim().toLocaleLowerCase();const visible=e=>{const r=e.getBoundingClientRect();return r.width&&r.height&&r.bottom>0&&r.right>0&&r.top<innerHeight&&r.left<innerWidth};const targetName=norm(${JSON.stringify(displayName)});const triggers=[];for(const s of ${candidateExpr("projectTrigger", this.selectors)})for(const e of document.querySelectorAll(s))if(visible(e)&&!triggers.includes(e))triggers.push(e);const trigger=triggers.length===1?triggers[0]:null;let containers=[];const controlledId=trigger?.getAttribute('aria-controls')||'';if(controlledId){const controlled=document.getElementById(controlledId);if(controlled&&visible(controlled))containers.push(controlled)}if(trigger){let parent=trigger.parentElement;while(parent&&!containers.length){if(parent.querySelector('[role="menuitemcheckbox"]'))containers.push(parent);parent=parent.parentElement}}if(!containers.length)containers=[...document.querySelectorAll('[role="menu"]')].filter(e=>visible(e)&&e.querySelector('[role="menuitemcheckbox"]'));const checkboxMatches=[];for(const container of containers)for(const e of container.querySelectorAll('[role="menuitemcheckbox"]'))if(visible(e)&&norm(e.getAttribute('aria-label')||e.getAttribute('data-value')||e.textContent||'')===targetName&&!checkboxMatches.includes(e))checkboxMatches.push(e);let selected=checkboxMatches.length===1?checkboxMatches[0]:null;if(!selected){const matches=[];for(const s of ${candidateExpr("projectItem", this.selectors)})for(const e of document.querySelectorAll(s)){const testid=e.getAttribute('data-testid')||'';const itemId=e.getAttribute('data-project-id')||e.getAttribute('data-id')||testid;const p=e.getAttribute('data-project-path')||e.querySelector('[data-project-path]')?.getAttribute('data-project-path')||(testid.startsWith('workspace-item-')?testid.slice('workspace-item-'.length):'')||e.getAttribute('title')||'';if((${JSON.stringify(id ?? "")}&&itemId===${JSON.stringify(id ?? "")})||(${JSON.stringify(projectPath ?? "")}&&p===${JSON.stringify(projectPath ?? "")}))matches.push(e)}if(matches.length===1)selected=matches[0]}if(!selected)return null;selected.scrollIntoView({block:'center'});await new Promise(r=>setTimeout(r,50));const r=selected.getBoundingClientRect();return visible(selected)?{x:r.left+r.width/2,y:r.top+r.height/2}:null})()`);
         if (!point)
             return false;
         await this.clickAt(point.x, point.y);
         return true;
     }
     async boundProjectPath() {
-        return ((await this.evaluate(`(function(){for(const s of ${candidateExpr("projectPath", this.selectors)})for(const e of document.querySelectorAll(s)){const p=e.getAttribute('data-project-path')||e.getAttribute('title')||(e.textContent||'').trim();if(p)return p}const trigger=document.querySelector('[data-testid="composer-workspace-trigger"]');const name=(trigger?.textContent||'').trim();if(name){const matches=[...document.querySelectorAll('[data-testid^="workspace-item-"]')].filter(e=>(e.textContent||'').trim()===name);if(matches.length===1)return (matches[0].getAttribute('data-testid')||'').slice('workspace-item-'.length)}return window.__ZCODE_PROJECT_PATH__||''})()`)) || "");
+        return (await this.workspaceBinding()).projectPath;
+    }
+    async workspaceBinding() {
+        return this.evaluate(`(function(){let projectPath='';for(const s of ${candidateExpr("projectPath", this.selectors)})for(const e of document.querySelectorAll(s)){const p=e.getAttribute('data-project-path')||e.getAttribute('title')||(e.textContent||'').trim();if(p){projectPath=p;break}}const triggers=[];for(const s of ${candidateExpr("projectTrigger", this.selectors)})for(const e of document.querySelectorAll(s)){const r=e.getBoundingClientRect();if(r.width&&r.height&&!triggers.includes(e))triggers.push(e)}const triggerText=triggers.length===1?(triggers[0].textContent||'').normalize('NFKC').trim():'';if(!projectPath&&triggerText){const matches=[...document.querySelectorAll('[data-testid^="workspace-item-"]')].filter(e=>(e.textContent||'').normalize('NFKC').trim()===triggerText);if(matches.length===1)projectPath=(matches[0].getAttribute('data-testid')||'').slice('workspace-item-'.length)}return {triggerText,projectPath:projectPath||window.__ZCODE_PROJECT_PATH__||''}})()`);
     }
     async session() {
         return this.evaluate(`(function(){const stable=id=>id&&id!=='draft'?id:undefined;const idOf=e=>{if(!e)return undefined;const explicit=stable(e.getAttribute('data-session-id'));if(explicit)return explicit;const testid=e.getAttribute('data-testid')||'';return testid.startsWith('task-item-')?stable(testid.slice('task-item-'.length)):undefined};const selectors=['[data-testid^="v4-session-pane"][data-session-id]','[data-session-id][aria-current=true]','[data-session-id][aria-selected=true]','[data-testid^="task-item-"][aria-current=true]','[data-testid^="task-item-"][aria-selected=true]','[data-testid^="task-item-"][data-state=active]','[data-testid^="task-item-"][data-state=selected]'];let active=null;for(const s of selectors){active=[...document.querySelectorAll(s)].find(e=>{const r=e.getBoundingClientRect();return r.width&&r.height})||null;if(active)break}const id=idOf(active)||stable(history.state?.sessionId)||stable(history.state?.taskId)||undefined;const item=id?[...document.querySelectorAll('[data-testid^="task-item-"]')].find(e=>(e.getAttribute('data-testid')||'').slice('task-item-'.length)===id):null;return {id,title:id?(item?.getAttribute('title')||item?.textContent||active?.getAttribute('title')||'').trim().slice(0,240)||undefined:undefined}})()`);

package/dist/agents/zcode/project.d.ts

@@ -3,6 +3,10 @@ export interface ZcodeProjectItem {
     path?: string;
     id?: string;
 }
+export declare const PROJECT_PLACEHOLDER_TEXTS: readonly ["选择项目", "select project", "select a project", "choose project"];
+export declare function projectDisplayName(projectPath: string, platform?: NodeJS.Platform): string;
+export declare function sameDisplayName(a: string, b: string): boolean;
+export declare function isUnboundTriggerText(text: string): boolean;
 export declare function normalizeProjectPath(value: string, platform?: NodeJS.Platform): string;
 export declare function matchZcodeProject(items: ZcodeProjectItem[], target: string, platform?: NodeJS.Platform): {
     item?: ZcodeProjectItem;

package/dist/agents/zcode/project.js

@@ -1,4 +1,28 @@
 import path from "node:path";
+export const PROJECT_PLACEHOLDER_TEXTS = [
+    "选择项目",
+    "select project",
+    "select a project",
+    "choose project",
+];
+function normalizeDisplayName(value) {
+    return value.normalize("NFKC").trim().toLocaleLowerCase();
+}
+export function projectDisplayName(projectPath, platform = process.platform) {
+    const api = platform === "win32" ? path.win32 : path.posix;
+    return api.basename(projectPath).normalize("NFKC").trim();
+}
+export function sameDisplayName(a, b) {
+    return normalizeDisplayName(a) === normalizeDisplayName(b);
+}
+export function isUnboundTriggerText(text) {
+    const normalized = normalizeDisplayName(text);
+    const compact = normalized.replace(/\s+/g, "");
+    return PROJECT_PLACEHOLDER_TEXTS.some((placeholder) => {
+        const normalizedPlaceholder = normalizeDisplayName(placeholder);
+        return (normalized === normalizedPlaceholder || compact === normalizedPlaceholder.replace(/\s+/g, ""));
+    });
+}
 export function normalizeProjectPath(value, platform = process.platform) {
     const api = platform === "win32" ? path.win32 : path.posix;
     let out = api.normalize(value).replace(/[\\/]+$/, "");

package/dist/agents/zcode/run.js

@@ -4,9 +4,9 @@ import { createHash } from "node:crypto";
 import { mkdirp } from "../../util/fs.js";
 import { parseZcodeModel, exactUiName } from "./model.js";
 import { validateTaskReferences } from "./references.js";
-import { matchZcodeProject, normalizeProjectPath } from "./project.js";
+import { isUnboundTriggerText, matchZcodeProject, normalizeProjectPath, projectDisplayName, sameDisplayName, } from "./project.js";
 import { judgeZcodePoll } from "./liveness.js";
-import { ZcodeCdpClient, CdpDisconnectedError, CdpUnavailableError } from "./cdp.js";
+import { ZcodeCdpClient, CdpDisconnectedError, CdpUnavailableError, } from "./cdp.js";
 import { ensureZcodeInstance, listZcodeProcesses } from "./instance.js";
 import { listOwnedDialogs, selectZcodeFolder } from "./dialog.js";
 const DEFAULT_DEPS = {
@@ -71,9 +71,14 @@ function prompt(ctx, refs) {
     return out;
 }
 async function waitBound(cdp, target, deps) {
+    const targetName = projectDisplayName(target);
     for (let i = 0; i < 30; i++) {
-        const p = await cdp.boundProjectPath();
-        if (p && normalizeProjectPath(p) === normalizeProjectPath(target))
+        const binding = await cdp.workspaceBinding();
+        if ((binding.projectPath &&
+            normalizeProjectPath(binding.projectPath) === normalizeProjectPath(target)) ||
+            (binding.triggerText &&
+                !isUnboundTriggerText(binding.triggerText) &&
+                sameDisplayName(binding.triggerText, targetName)))
             return true;
         await deps.sleep(300);
     }
@@ -107,9 +112,9 @@ async function connectStableZcode(ready, gui, deps, allowLoginPage = false) {
         // eslint-disable-next-line no-await-in-loop
         await deps.sleep(500);
     }
-    throw (lastError instanceof Error
+    throw lastError instanceof Error
         ? lastError
-        : new Error(`ZCode CDP 未在 ${gui.launchTimeoutMs}ms 内恢复`));
+        : new Error(`ZCode CDP 未在 ${gui.launchTimeoutMs}ms 内恢复`);
 }
 async function clickExactWhenReady(cdp, key, value, deps) {
     let last = { clicked: false, count: 0, available: [] };
@@ -216,6 +221,36 @@ export async function runZcodeTask(args) {
         let session = ctx.resume ? activeSession : {};
         let permission = ctx.resume?.permissionMode ?? gui.defaultPermissionMode ?? "完全访问";
         let answeredQuestion = false;
+        const ensureProjectBound = async (initialItem) => {
+            if (!initialItem && (await waitBound(cdp, ctx.projectPath, deps)))
+                return { bound: true, ambiguous: false };
+            let item = initialItem;
+            for (let round = 0; round < 2; round++) {
+                if (!item || round > 0) {
+                    // eslint-disable-next-line no-await-in-loop
+                    await cdp.dismissMenus();
+                    // eslint-disable-next-line no-await-in-loop
+                    if (!(await cdp.click("projectTrigger")))
+                        continue;
+                    // eslint-disable-next-line no-await-in-loop
+                    await deps.sleep(300);
+                    // eslint-disable-next-line no-await-in-loop
+                    const matched = matchZcodeProject(await cdp.projects(), ctx.projectPath);
+                    if (matched.ambiguous)
+                        return { bound: false, ambiguous: true };
+                    item = matched.item;
+                }
+                if (!item)
+                    continue;
+                // eslint-disable-next-line no-await-in-loop
+                const clicked = await cdp.clickProject(item.id, item.path);
+                // eslint-disable-next-line no-await-in-loop
+                if (clicked && (await waitBound(cdp, ctx.projectPath, deps)))
+                    return { bound: true, ambiguous: false };
+                item = undefined;
+            }
+            return { bound: false, ambiguous: false };
+        };
         if (ctx.resume?.kind === "continue" && ctx.resume.sendMessage) {
             const pending = await cdp.poll();
             if (pending.question) {
@@ -256,44 +291,34 @@ export async function runZcodeTask(args) {
                     endReason: "project_ambiguous",
                 });
             if (matched.item) {
-                if (!(await cdp.clickProject(matched.item.id, matched.item.path)))
+                const binding = await ensureProjectBound(matched.item);
+                if (!binding.bound)
                     return result({
                         hardFailure: true,
-                        error: "精确项目项点击失败",
-                        endReason: "setup_failed",
+                        error: binding.ambiguous
+                            ? "项目绑定重试时目标项目无法唯一匹配"
+                            : "ZCode 项目绑定两轮重试均未生效",
+                        endReason: "project_mismatch",
                     });
-                if (!(await waitBound(cdp, ctx.projectPath, deps))) {
-                    // ZCode may ignore a menu click while its workspace list is still
-                    // animating. Retrying this pre-send, idempotent binding is safe.
-                    if (!(await cdp.click("projectTrigger")))
-                        return result({
-                            hardFailure: true,
-                            error: "项目首次绑定未生效，且无法重新打开项目列表",
-                            endReason: "project_mismatch",
-                        });
-                    await deps.sleep(300);
-                    const retried = matchZcodeProject(await cdp.projects(), ctx.projectPath);
-                    if (retried.ambiguous ||
-                        !retried.item ||
-                        !(await cdp.clickProject(retried.item.id, retried.item.path)))
-                        return result({
-                            hardFailure: true,
-                            error: "项目首次绑定未生效，重试时无法唯一选择目标项目",
-                            endReason: "project_mismatch",
-                        });
-                }
             }
             else {
                 const pids = deps.listProcesses().map((p) => p.pid);
                 const before = await deps.listDialogs(pids);
-                if (!(await cdp.click("addProject")))
-                    return result({
-                        hardFailure: true,
-                        error: "找不到 ZCode 添加项目入口",
-                        endReason: "setup_failed",
-                    });
-                await deps.sleep(300);
-                const folderOption = await clickAnyExactWhenReady(cdp, "chooseFolder", ["打开文件夹", "Open Folder"], deps);
+                let folderOption = {
+                    clicked: false,
+                    count: 0,
+                    available: [],
+                };
+                for (let round = 0; round < 3 && !folderOption.clicked; round++) {
+                    // ZCode 3.11.2 的工作区下拉会吞掉第一次 outside-click。每轮均先收起残留菜单再验证新菜单。
+                    // eslint-disable-next-line no-await-in-loop
+                    await cdp.dismissMenus();
+                    // eslint-disable-next-line no-await-in-loop
+                    if (!(await cdp.click("addProject")))
+                        continue;
+                    // eslint-disable-next-line no-await-in-loop
+                    folderOption = await clickAnyExactWhenReady(cdp, "chooseFolder", ["打开文件夹", "Open Folder"], deps);
+                }
                 if (!folderOption.clicked)
                     return result({
                         hardFailure: true,
@@ -326,10 +351,13 @@ export async function runZcodeTask(args) {
                 cdp = await connectStableZcode(ready, gui, deps);
                 logger.info("[zcode] 项目导入后的 ZCode CDP 页面已恢复");
             }
-            if (!(await waitBound(cdp, ctx.projectPath, deps)))
+            const finalBinding = await ensureProjectBound();
+            if (!finalBinding.bound)
                 return result({
                     hardFailure: true,
-                    error: "ZCode 项目绑定回读与 projectPath 不一致",
+                    error: finalBinding.ambiguous
+                        ? "ZCode 项目绑定回读不一致，且重试时目标项目无法唯一匹配"
+                        : "ZCode 项目绑定回读与 projectPath 不一致，两轮幂等重试均失败",
                     endReason: "project_mismatch",
                 });
             logger.info(`[zcode] 项目绑定回读通过：${ctx.projectPath}`);
@@ -345,19 +373,18 @@ export async function runZcodeTask(args) {
                         endReason: "setup_failed",
                     });
                 await deps.sleep(250);
-                const provider = await clickExactWhenReady(cdp, "providerOption", spec.provider, deps);
-                if (!provider.clicked)
-                    return result({
-                        hardFailure: true,
-                        error: `供应商不存在或同名歧义：${spec.provider}（匹配 ${provider.count}${provider.available?.length ? `；可见候选=${provider.available.slice(0, 20).join("、")}` : ""}）`,
-                        endReason: "model_unavailable",
-                    });
-                await deps.sleep(250);
-                const model = await clickExactWhenReady(cdp, "modelOption", spec.model, deps);
+                let model = await clickExactWhenReady(cdp, "modelOption", spec.model, deps);
+                let provider = { clicked: false, count: 0, available: [] };
+                if (!model.clicked) {
+                    provider = await clickExactWhenReady(cdp, "providerOption", spec.provider, deps);
+                    if (provider.clicked)
+                        await deps.sleep(250);
+                    model = await clickExactWhenReady(cdp, "modelOption", spec.model, deps);
+                }
                 if (!model.clicked)
                     return result({
                         hardFailure: true,
-                        error: `模型不存在或同名歧义：${spec.provider}/${spec.model}（匹配 ${model.count}${model.available?.length ? `；可见候选=${model.available.slice(0, 20).join("、")}` : ""}）`,
+                        error: `模型不存在或同名歧义：${spec.provider}/${spec.model}（模型匹配 ${model.count}${model.available?.length ? `；模型候选=${model.available.slice(0, 20).join("、")}` : ""}${model.testids?.length ? `；模型 testid=${model.testids.slice(0, 20).join("、")}` : ""}；供应商匹配 ${provider.count}${provider.available?.length ? `；供应商候选=${provider.available.slice(0, 20).join("、")}` : ""}${provider.testids?.length ? `；供应商 testid=${provider.testids.slice(0, 20).join("、")}` : ""}）`,
                         endReason: "model_unavailable",
                     });
                 await deps.sleep(300);
@@ -386,7 +413,7 @@ export async function runZcodeTask(args) {
                 if (!perm.clicked)
                     return result({
                         hardFailure: true,
-                        error: `无法唯一选择权限模式：${permission}`,
+                        error: `无法唯一选择权限模式：${permission}（匹配 ${perm.count}${perm.available?.length ? `；可见候选=${perm.available.slice(0, 20).join("、")}` : ""}${perm.testids?.length ? `；可见 testid=${perm.testids.slice(0, 20).join("、")}` : ""}）`,
                         endReason: "permission_unknown",
                     });
                 await deps.sleep(250);
@@ -431,7 +458,8 @@ export async function runZcodeTask(args) {
                 let seenRunning = false;
                 let markedSession = undefined;
                 const confirmationAttempts = Math.ceil(Math.min(60_000, Math.max(5_000, ctx.taskTimeoutMs)) / 250);
-                for (let i = 0; i < confirmationAttempts && !(seenMessage && (seenStateChange || seenRunning || markedSession)); i++) {
+                for (let i = 0; i < confirmationAttempts &&
+                    !(seenMessage && (seenStateChange || seenRunning || markedSession)); i++) {
                     // eslint-disable-next-line no-await-in-loop
                     await deps.sleep(250);
                     // eslint-disable-next-line no-await-in-loop

package/dist/agents/zcode/selectors.js

@@ -113,15 +113,18 @@ export const ZCODE_SELECTORS = {
     },
     providerOption: {
         primary: '[data-testid^="chat-model-select-group-provider:"]',
-        fallbacks: ['[role="option"][data-provider]'],
+        fallbacks: [
+            '[data-testid^="chat-model-select-group-family:"]',
+            '[role="option"][data-provider]',
+        ],
         verifiedVersion: "3.11.x",
-        note: "供应商候选",
+        note: "3.11.2 分组前缀漂移为 family；家族标签可能不可点，仅作兜底展开",
     },
     modelOption: {
         primary: '[data-testid^="chat-model-select-item-"][role="menuitemradio"]',
-        fallbacks: ['[role="option"][data-model]'],
+        fallbacks: ['[data-testid^="chat-model-select-item-"]', '[role="option"][data-model]'],
         verifiedVersion: "3.11.x",
-        note: "模型候选",
+        note: "3.11.2 模型平铺于家族标签下，testid 形如 chat-model-select-item-custom:…",
     },
     modelValue: {
         primary: '[data-testid="chat-model-select-trigger"]',

package/dist/config/schema.d.ts

@@ -1237,6 +1237,7 @@ export declare const AcceptanceConfigSchema: z.ZodObject<{
         timeoutMs?: number | undefined;
         optional?: boolean | undefined;
     }>, "many">>;
+    requireChanges: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     checks: {
         name: string;
@@ -1244,6 +1245,7 @@ export declare const AcceptanceConfigSchema: z.ZodObject<{
         timeoutMs?: number | undefined;
         optional?: boolean | undefined;
     }[];
+    requireChanges: boolean;
 }, {
     checks?: {
         name: string;
@@ -1251,5 +1253,6 @@ export declare const AcceptanceConfigSchema: z.ZodObject<{
         timeoutMs?: number | undefined;
         optional?: boolean | undefined;
     }[] | undefined;
+    requireChanges?: boolean | undefined;
 }>;
 export type AcceptanceConfig = z.infer<typeof AcceptanceConfigSchema>;

package/dist/config/schema.js

@@ -255,4 +255,5 @@ export const ProjectsFileSchema = z.record(z.string().min(1), ProjectRecordSchem
 /* ---------------- 项目内 .tianshu-mcp/acceptance.json ---------------- */
 export const AcceptanceConfigSchema = z.object({
     checks: z.array(AcceptanceCheckSchema).default([]),
+    requireChanges: z.boolean().default(true),
 });

package/dist/util/path.js

@@ -56,11 +56,10 @@ export function expandEnvPath(tpl) {
         SYSTEMDRIVE: process.env.SYSTEMDRIVE ?? process.env.SystemDrive,
         XDG_DATA_HOME: process.env.XDG_DATA_HOME,
     };
-    let out = tpl;
-    for (const [k, v] of Object.entries(envMap)) {
-        if (v)
-            out = out.split(`{${k}}`).join(v);
-    }
+    let out = tpl.replace(/\{([^{}]+)\}/g, (placeholder, key) => {
+        const value = envMap[key.toUpperCase()];
+        return value || placeholder;
+    });
     // Windows 下把模板里的正斜杠统一为平台分隔符（env 值本身已是平台分隔）
     if (process.platform === "win32")
         out = out.split("/").join("\\");

package/dist/verify/acceptance.d.ts

@@ -18,6 +18,7 @@ export interface VerifyRequest {
     store: TaskStore;
     logger: Logger;
 }
+export declare function detectZeroTestCases(output: string): boolean;
 /** 从项目内容推导默认检查集（开发计划 §8.2） */
 export declare function deriveDefaultChecks(projectPath: string): Promise<{
     checks: AcceptanceCheckDef[];

package/dist/verify/acceptance.js

@@ -12,6 +12,23 @@ import { analyzeChanges } from "./code-analysis.js";
 import { captureBaseline, gitDiffCheckSince } from "./git-baseline.js";
 import { nowIso } from "../util/id.js";
 const SCRIPT_NAMES = ["typecheck", "lint", "test", "build"];
+const ZERO_TEST_CASE_PATTERNS = [
+    /#\s+tests\s+0\b/i,
+    /\bno tests (?:were )?found\b/i,
+    /\bno tests ran\b/i,
+    /\b0 tests (?:ran|executed|found)\b/i,
+];
+export function detectZeroTestCases(output) {
+    return ZERO_TEST_CASE_PATTERNS.some((pattern) => pattern.test(output));
+}
+function isTestCheck(name, cmd) {
+    const normalizedName = name.toLocaleLowerCase();
+    const normalizedCmd = cmd.join(" ").toLocaleLowerCase();
+    return (normalizedName.includes("test") ||
+        /\bnode\s+--test\b/.test(normalizedCmd) ||
+        /\bnpm\s+run\s+test(?:\b|:)/.test(normalizedCmd) ||
+        /\bpytest\b|\bgo\s+test\b|\bcargo\s+test\b|\bvitest\b|\bjest\b|\bmocha\b/.test(normalizedCmd));
+}
 /** 从项目内容推导默认检查集（开发计划 §8.2） */
 export async function deriveDefaultChecks(projectPath) {
     const checks = [];
@@ -64,12 +81,13 @@ export class AcceptanceEngine {
         const out = [];
         const mode = req.checksMode ?? "append";
         const hasExtra = !!req.extraChecks?.length;
+        const inProject = await this.readProjectAcceptance(req.projectPath);
+        const requireChanges = inProject?.requireChanges ?? true;
         // 先取基础集（项目/默认），除非 replace 模式只用 extraChecks
         if (!(mode === "replace" && hasExtra)) {
-            const inProject = await this.readProjectAcceptance(req.projectPath);
             if (inProject) {
-                notes.push(`使用项目内验收配置 <project>/.tianshu-mcp/acceptance.json（${inProject.length} 项）。`);
-                out.push(...inProject);
+                notes.push(`使用项目内验收配置 <project>/.tianshu-mcp/acceptance.json（${inProject.checks.length} 项）。`);
+                out.push(...inProject.checks);
             }
             else if (req.projectVerify?.length) {
                 notes.push(`使用 server 数据目录 projects.json 补录的验收配置（${req.projectVerify.length} 项）。`);
@@ -92,7 +110,7 @@ export class AcceptanceEngine {
             }
             out.push(...(req.extraChecks ?? []));
         }
-        return { checks: out, notes };
+        return { checks: out, notes, requireChanges };
     }
     async readProjectAcceptance(projectPath) {
         const p = path.join(projectPath, ".tianshu-mcp", "acceptance.json");
@@ -104,7 +122,11 @@ export class AcceptanceEngine {
             this.logger.warn(`项目 ${projectPath} 的 acceptance.json 解析失败: ${r.error.message}`);
             return null;
         }
-        return r.data.checks.map((c) => toAcceptanceDef(c));
+        const config = r.data;
+        return {
+            checks: config.checks.map((c) => toAcceptanceDef(c)),
+            requireChanges: config.requireChanges,
+        };
     }
     /** 执行一轮完整验收。返回 report + 是否 pass。 */
     async runVerify(req) {
@@ -114,8 +136,9 @@ export class AcceptanceEngine {
         const baseline = req.baseline ?? (await captureBaseline(req.projectPath));
         if (req.baseline)
             this.logger.debug(`使用 run_task 动工前基线（HEAD=${baseline.head ?? "n/a"}）`);
-        const { checks: rawChecks, notes } = await this.resolveChecks(req);
+        const { checks: rawChecks, notes, requireChanges } = await this.resolveChecks(req);
         const checks = [];
+        const zeroTestChecks = [];
         // 内置 git diff --check（相对动工前基线；非 git 仓库跳过并标注）
         if (baseline.isRepo) {
             const r = await gitDiffCheckSince(req.projectPath, baseline.head);
@@ -152,6 +175,16 @@ export class AcceptanceEngine {
                 logFile: verifyLog,
                 env: {},
             });
+            if (!c.optional &&
+                res.exitCode === 0 &&
+                res.passed &&
+                isTestCheck(c.name, argv) &&
+                detectZeroTestCases(res.outputTail)) {
+                res.passed = false;
+                res.outputTail = `${res.outputTail}\n[fail-closed] 命令退出码 0 但未执行任何测试用例`.slice(-4000);
+                res.reason = "fail-closed：命令退出码 0 但未执行任何测试用例";
+                zeroTestChecks.push(c.name);
+            }
             if (c.optional)
                 res.optional = true;
             checks.push(res);
@@ -164,6 +197,30 @@ export class AcceptanceEngine {
         });
         for (const n of notes)
             analysis.notes.push(n);
+        const hasChanges = analysis.changedFiles.length > 0 ||
+            analysis.untrackedFiles.length > 0 ||
+            analysis.diffstat.totalAdd > 0 ||
+            analysis.diffstat.totalDel > 0;
+        if (baseline.isRepo && !hasChanges) {
+            if (requireChanges) {
+                checks.push({
+                    name: "no-changes",
+                    cmd: "requireChanges 门禁",
+                    passed: false,
+                    durationMs: 0,
+                    exitCode: null,
+                    outputTail: "fail-closed：相对动工前基线零文件变更",
+                    timeout: false,
+                    reason: "requireChanges 默认开启，但未检测到任务产出",
+                });
+            }
+            else {
+                analysis.notes.push("requireChanges=false：相对动工前基线零变更，仅提示不拦截。");
+            }
+        }
+        else if (!baseline.isRepo && requireChanges) {
+            analysis.notes.push("requireChanges=true，但项目不是 git 仓库，零变更门禁已跳过。");
+        }
         // optional:true 的失败只记 warning，不使本轮 verdict 失败（R4）
         const failed = checks.filter((c) => !c.passed && !c.skipped && !c.optional);
         const optFailed = checks.filter((c) => !c.passed && !c.skipped && c.optional);
@@ -173,6 +230,12 @@ export class AcceptanceEngine {
         if (failed.length) {
             summaryBits.push(`未通过检查: ${failed.map((c) => c.name).join(", ")}`);
         }
+        if (zeroTestChecks.length) {
+            summaryBits.push(`测试命令零用例: ${zeroTestChecks.join(", ")}`);
+        }
+        if (failed.some((check) => check.name === "no-changes")) {
+            summaryBits.push("相对动工前基线未检测到文件变更");
+        }
         if (optFailed.length) {
             summaryBits.push(`optional 检查未通过（不影响结论）: ${optFailed.map((c) => c.name).join(", ")}`);
         }

package/dist/version.generated.d.ts

@@ -3,4 +3,4 @@
  * 若直接源码运行（未注入），回退读 package.json；再失败给占位。
  * 本文件由 scripts/sync-version.mjs 在每次 build 前重新生成。
  */
-export declare const MCP_SERVER_VERSION = "0.3.2";
+export declare const MCP_SERVER_VERSION = "0.3.3";

package/dist/version.generated.js

@@ -4,4 +4,4 @@
  * 本文件由 scripts/sync-version.mjs 在每次 build 前重新生成。
  */
 // generated: 勿手改 —— 运行 `npm run build` 自动同步
-export const MCP_SERVER_VERSION = "0.3.2";
+export const MCP_SERVER_VERSION = "0.3.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tianshu-mcp",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "天枢 × AI-Agent 编排 MCP server —— 驱动 Codex CLI、TraeWork GUI 与 ZCode GUI 完成项目开发、验收、失败返修与再验收闭环。",
   "type": "module",
   "license": "Apache-2.0",