Compare commits

...
Author SHA1 Message Date
阿白叔 488bf027cc feat: update DeepSeek Harness and support runtime upgrades
Core regression / Python core, intervention UI and release configuration (push) Successful in 16m20s
Core regression / JavaScript syntax (push) Successful in 11s
Core regression / Python core, intervention UI and release configuration (pull_request) Failing after 11m11s
Core regression / JavaScript syntax (pull_request) Successful in 7s
2026-11-20 15:43:58 +08:00
abaishu0730 bd80f86357 Merge pull request 'feat: 新增独立工程校验工作台与可追溯换料闭环' (#30) from codex/independent-verification into main
Core regression / Python core, intervention UI and release configuration (push) Successful in 4m43s
Core regression / JavaScript syntax (push) Successful in 6s
2026-11-20 11:23:52 +08:00
18 changed files with 4301 additions and 3312 deletions

No files matched your search

+2 -1
View File
@@ -49,8 +49,9 @@ jobs:
npm install --prefix /opt/ci-node --no-audit --no-fund node@24.11.1
node --version
npm ci --prefix integration/dsh --no-audit --no-fund
- name: Read-only model availability (real Harness, no remote model calls)
- name: Runtime and model availability (real Harness, no remote model calls)
run: |
node tools/verify_dsh_runtime.mjs
node tools/verify_dsh_model_availability.mjs
node --test tests/integration/test_dsh_standard_compat.mjs
node tools/verify_dsh_incident_restart.mjs
+9 -1
View File
@@ -4,7 +4,7 @@
主工具顶部固定显示左右两个入口:左侧 **任务中心**,右侧 **DSH助手**,单击直接切换,无需展开菜单。助手也可按 `Ctrl+Shift+D` 打开;切回任务中心再进入助手时保留同一个网页、会话和未发送草稿。右侧“任务监管”读取主工具当前选中的任务。
这里直接运行 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 的官方前端与运行时,固定 npm 版本 `0.2.1-rc.5`,通过 Qt WebEngine 嵌入主窗口。官方三栏框架、原生 SVG、鲸鱼悬停动画、输入编辑器、模型选择、侧栏与停靠交互均由上游代码提供。项目增加任务监管插件和“DSH助手”名称,不再使用 Qt 控件重画聊天页面。上游许可见 `licenses/DeepSeek-Harness-MIT.txt`。
这里直接运行 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 的官方前端与运行时,通过 Qt WebEngine 嵌入主窗口。当前 npm 版本以 `integration/dsh/package.json` 为准。官方三栏框架、原生 SVG、鲸鱼悬停动画、输入编辑器、模型选择、侧栏与停靠交互均由上游代码提供。项目增加任务监管插件和“DSH助手”名称,不再使用 Qt 控件重画聊天页面。上游许可见 `licenses/DeepSeek-Harness-MIT.txt`。
不显示上游账户登录、注册、充值和首次产品引导,也不注册其账户模型提供方。左下角 **工具设置** 单击打开原生设置页,包含“DSH工具”“通用设置”和“模型”;首页提示和任务监管面板围绕器件替换任务。输入框下方选择已配置的模型。
@@ -178,6 +178,14 @@ node tools/verify_dsh_runtime.mjs
python tools/accept_dsh_desktop.py
```
源码工作区可从 npm 更新 DSH。先退出任务中心,运行更新命令,再重新打开任务中心。
```powershell
powershell -ExecutionPolicy Bypass -File tools/Install-DshRuntime.ps1 -Version latest
```
将 `latest` 换成 `0.2.2-rc.5` 这样的完整版本号即可安装指定版本。脚本先在临时目录启动候选运行时并验证任务插件,通过后更新依赖声明、锁文件和实际依赖。更新成功时会打印 `build/dsh-update-…` 路径,其中 `previous` 保存旧运行时,`verification/report.json` 记录验收结果。便携版随应用打包 DSH,通过重新构建的应用发行包更新。
CLI 验证启动真实官方内核,检查工具与 preset 名单,实际读取快照、执行禁止工具探针,并测试本机请求认证、跨任务与过期动作边界。桌面验收启动真实主工具,用 Qt 鼠标事件单击左右导航,用 Chromium Input 事件操作官方页面,核对全新数据下无账户或引导弹窗、工具设置、任务刷新、会话、侧栏、SVG 动画、模型选择、草稿保留、取消确认和正常退出。验收只使用独立测试数据,不启动 CAD 或修改用户工程;未配置模型的验收不计为真实模型回复验证。
已配置本机模型时,可执行真实 API 桌面验收:
+4138 -3271
View File
File diff suppressed because it is too large. Load diff
+11 -3
View File
@@ -2,7 +2,15 @@
"name": "dxdesigner-dsh-runtime",
"private": true,
"type": "module",
"scripts": {"doctor": "node start.mjs --doctor", "start": "node start.mjs"},
"engines": {"node": ">=24.9.0"},
"dependencies": {"@deepseek-ai/dsh": "0.2.1-rc.5", "fflate": "0.8.3"}
"scripts": {
"doctor": "node start.mjs --doctor",
"start": "node start.mjs"
},
"engines": {
"node": ">=24.9.0"
},
"dependencies": {
"@deepseek-ai/dsh": "0.2.2-rc.5",
"fflate": "0.8.3"
}
}
+1 -1
View File
@@ -12,7 +12,7 @@ export const FILE_TOOLS=['read','read_image','write','edit','glob','grep','worki
const root = path.dirname(fileURLToPath(import.meta.url));
const require = createRequire(import.meta.url);
export const VERSION = '0.2.1-rc.5';
export const VERSION = require('./package.json').dependencies['@deepseek-ai/dsh'];
export const DISABLED = [
'desktop-product-telemetry','product-analytics','session-telemetry-otel',
];
+1 -1
View File
@@ -1,5 +1,5 @@
DeepSeek Harness native frontend and runtime
Pinned release: @deepseek-ai/dsh 0.2.1-rc.5
Package: @deepseek-ai/dsh
Source: https://github.com/deepseek-ai/deepseek-harness
MIT License
@@ -12,9 +12,6 @@ from uuid import uuid4
from .snapshot import TaskSnapshot
from ..trial_task_center.path_access import retry_sharing_violation
HARNESS_VERSION = '0.2.1-rc.5'
def integration_root() -> Path:
if getattr(sys, 'frozen', False):
return Path(sys._MEIPASS) / 'dsh-runtime'
+67 -7
View File
@@ -1,14 +1,74 @@
param()
param(
[string]$Version
)
$ErrorActionPreference = 'Stop'
$dshRepoRoot = Split-Path -Parent $PSScriptRoot
$dshRuntimeRoot = Join-Path $dshRepoRoot 'integration/dsh'
$dshNodeCommand = Get-Command node -ErrorAction Stop
$dshNodeVersion = & $dshNodeCommand.Source -p 'process.versions.node'
if ([version]$dshNodeVersion -lt [version]'24.9.0') { throw 'DSH requires Node.js 24.9.0 or later.' }
Push-Location -LiteralPath $dshRuntimeRoot
$dshNpm = (Get-Command npm.cmd -ErrorAction Stop).Source
$dshRegistry = 'https://registry.npmjs.org/'
$dshBuild = Join-Path $dshRepoRoot 'build'
New-Item -ItemType Directory -Path $dshBuild -Force | Out-Null
$dshInstallLock = [IO.File]::Open((Join-Path $dshBuild 'dsh-install.lock'), 'OpenOrCreate', 'ReadWrite', 'None')
try {
& npm.cmd ci --ignore-scripts --no-audit --no-fund
if ($LASTEXITCODE -ne 0) { throw 'DSH installation failed.' }
& $dshNodeCommand.Source start.mjs --doctor
if ($LASTEXITCODE -ne 0) { throw 'DSH runtime verification failed.' }
} finally { Pop-Location }
if (-not $Version) {
& $dshNpm --prefix $dshRuntimeRoot ci --ignore-scripts --no-audit --no-fund
if ($LASTEXITCODE -ne 0) { throw 'DSH installation failed.' }
& $dshNodeCommand.Source (Join-Path $dshRuntimeRoot 'start.mjs') --doctor
if ($LASTEXITCODE -ne 0) { throw 'DSH runtime verification failed.' }
return
}
if ($Version -cnotmatch '\A(?:latest|\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?)\z') {
throw 'Use latest or an exact version, for example 0.2.2-rc.5.'
}
# Keep the candidate and previous installation on the same volume for rename.
$dshStage = Join-Path $dshBuild ('dsh-update-' + [Guid]::NewGuid().ToString('N'))
$dshCandidate = Join-Path $dshStage 'candidate'
$dshPrevious = Join-Path $dshStage 'previous'
$dshEntries = @('package.json', 'package-lock.json', 'node_modules')
$dshBackedUp = @()
$dshPublished = @()
New-Item -ItemType Directory -Path $dshCandidate, $dshPrevious -Force | Out-Null
try {
Copy-Item -LiteralPath @(
(Join-Path $dshRuntimeRoot 'package.json')
(Join-Path $dshRuntimeRoot 'package-lock.json')
(Join-Path $dshRuntimeRoot 'start.mjs')
(Join-Path $dshRuntimeRoot 'task-plugin')
) -Destination $dshCandidate -Recurse
& $dshNpm --prefix $dshCandidate install --save-exact --ignore-scripts --no-audit --no-fund --registry=$dshRegistry "@deepseek-ai/dsh@$Version"
if ($LASTEXITCODE -ne 0) { throw 'DSH candidate installation failed.' }
& $dshNodeCommand.Source (Join-Path $PSScriptRoot 'verify_dsh_runtime.mjs') $dshCandidate (Join-Path $dshStage 'verification')
if ($LASTEXITCODE -ne 0) { throw 'DSH candidate failed the runtime check. The previous runtime is still available.' }
foreach ($dshEntry in $dshEntries) {
$dshLive = Join-Path $dshRuntimeRoot $dshEntry
if (Test-Path -LiteralPath $dshLive) {
Move-Item -LiteralPath $dshLive -Destination (Join-Path $dshPrevious $dshEntry)
$dshBackedUp += $dshEntry
}
Move-Item -LiteralPath (Join-Path $dshCandidate $dshEntry) -Destination $dshLive
$dshPublished += $dshEntry
}
} catch {
try {
foreach ($dshEntry in $dshPublished) {
Move-Item -LiteralPath (Join-Path $dshRuntimeRoot $dshEntry) -Destination (Join-Path $dshCandidate $dshEntry)
}
foreach ($dshEntry in $dshBackedUp) {
Move-Item -LiteralPath (Join-Path $dshPrevious $dshEntry) -Destination (Join-Path $dshRuntimeRoot $dshEntry)
}
} catch {
throw "DSH rollback failed. Previous files: $dshPrevious. $($_.Exception.Message)"
}
throw
}
Write-Output "DSH updated. Previous files and verification: $dshStage"
} finally {
$dshInstallLock.Dispose()
}
+2 -1
View File
@@ -13,7 +13,8 @@ const {loadProfileDirectory,composeEntries}=await load('@deepseek-ai/dsh-app-boo
const {runProfile,INSTALL_ANCHOR}=await load('@deepseek-ai/dsh/profile-boot');
const {createLaunchEnvironmentSnapshot}=await load('@deepseek-ai/dsh-launch-environment');
const installed=require('@deepseek-ai/dsh/package.json');
if(installed.version!=='0.2.1-rc.5')throw Error('Runtime version mismatch');
const expected=require('../package.json').dependencies['@deepseek-ai/dsh'];
if(installed.version!==expected)throw Error('Runtime version mismatch');
const original=loadProfileDirectory('paired-source',path.resolve(source),INSTALL_ANCHOR);
const effective=composeEntries([...original.layers.map(layer=>layer.patches),original.patches]);
// Copy effective routing/model/shell budgets, never credential values to reports.
+2 -1
View File
@@ -1,4 +1,5 @@
/** Check actual shell file access separately from model behavior. */
import {executeTool} from './dsh_tool_probe.mjs';
import {mkdir,mkdtemp,writeFile} from 'node:fs/promises';
import path from 'node:path';
import os from 'node:os';
@@ -17,7 +18,7 @@ try{
const agent=ctx.agents.get(sessionId);
const filename=path.join(process.env.DX_DSH_WORKSPACE,'input.txt');
await writeFile(filename,'SHELL_FILE_READ_OK');
const result=await ctx.tools.execute({agent,callId:crypto.randomUUID(),name:'pwsh',
const result=await executeTool(ctx, {agent,callId:crypto.randomUUID(),name:'pwsh',
arguments:{description:'Read the owned shell verification file',command:`[System.IO.File]::ReadAllText('${filename.replaceAll("'","''")}')`},signal:AbortSignal.timeout(30000)});
console.log(JSON.stringify({root,result}));
}finally{await shutdown.shutdown(0);}
+8
View File
@@ -0,0 +1,8 @@
/** Run one tool through the installed Harness batch executor. */
export async function executeTool(ctx, {callId, name, arguments: args, ...options}) {
const {results} = await ctx.tools.execute({
...options,
calls: [{type: 'tool-call', id: callId, name, arguments: JSON.stringify(args ?? {})}],
});
return results[0].result;
}
+33 -6
View File
@@ -1,13 +1,19 @@
/** Real native Harness incident diagnosis; no engineering mutations or issue writes. */
import {executeTool} from './dsh_tool_probe.mjs';
import assert from 'node:assert/strict';
import {mkdir,writeFile} from 'node:fs/promises';
import {mkdir,mkdtemp,writeFile} from 'node:fs/promises';
import {createRequire} from 'node:module';
import path from 'node:path';
import {pathToFileURL} from 'node:url';
import {bootRuntime} from '../integration/dsh/start.mjs';
const output=path.resolve('build/dsh-auto-runtime');
await mkdir(output,{recursive:true});
process.env.DX_DSH_HOME=path.join(output,'home');
process.env.DX_DSH_CONTEXT_FILE=path.join(output,'context.json');
const offline=process.argv.includes('--fixture');
const fixture=offline?await mkdtemp(path.join(output,'run-')):output;
if(offline)for(const key of ['DSH_API_KEY','DSH_API_BASE','DSH_MODEL','DX_DSH_MODELS'])delete process.env[key];
process.env.DX_DSH_HOME=path.join(fixture,'home');
process.env.DX_DSH_CONTEXT_FILE=path.join(fixture,'context.json');
await writeFile(process.env.DX_DSH_CONTEXT_FILE,JSON.stringify({task_id:'different-current-task',revision:'other',status:'draft'}));
const snapshot={task_id:'auto-failure-fixture',revision:'incident',status:'failed',issue_code:'worker_error',
issue:'受控诊断验收:执行前 worker 失败,没有工程写入。',rules_count:1,progress:{failed_items:1,total:1,completed:0}};
@@ -31,6 +37,27 @@ process.stdout.write=function(chunk,...args){
};
let timer;
try{
if(offline){
const require=createRequire(new URL('../integration/dsh/start.mjs',import.meta.url));
const {LlmAdapter}=await import(pathToFileURL(require.resolve('@deepseek-ai/dsh-llm')).href);
let snapshotRequested=false;
class DiagnosticFixture extends LlmAdapter{
providerInfo(provider){return {id:provider,name:'Auto runtime fixture'};}
async listModels(provider){return [{provider,id:'fixture',name:'Fixture'}];}
async *stream(options){
const readSnapshot=options.purpose!=='session-title'&&!snapshotRequested;
if(readSnapshot)snapshotRequested=true;
const block=readSnapshot
?{type:'tool-call',id:crypto.randomUUID(),name:'dx_task_snapshot',arguments:'{}'}
:{type:'text',text:'Controlled diagnosis fixture. {"action":"none"}'};
yield {type:'block-start',index:0,blockType:block.type};
yield {type:'block-end',index:0,block};
yield {type:'finish',reason:{kind:readSnapshot?'tool-calls':'stop'}};
}
}
ctx.llm.registerAdapter(['auto-runtime-fixture'],new DiagnosticFixture());
await ctx.agentDefaultModel.saveSelection({provider:'auto-runtime-fixture',model:'fixture'});
}
timer=setTimeout(()=>rejectResult(Error('native_auto_test_timeout')),135000);
ctx.emit('dx/diagnose-request',{request_id:'cli-auto-request',incident_id:'0123456789abcdef01234567',
phase:'diagnose',snapshot,evidence:JSON.stringify(snapshot)});
@@ -38,7 +65,7 @@ try{
const previousParent=process.env.DX_DSH_PARENT_PIPE;
process.env.DX_DSH_PARENT_PIPE='1';
try{
const denial=await ctx.tools.execute({callId:'automatic-creation-denial',name:'dx_task_create',
const denial=await executeTool(ctx, {callId:'automatic-creation-denial',name:'dx_task_create',
arguments:{name:'Must never open a dialog'},agent:ctx.agents.get(sessionId),signal:AbortSignal.timeout(1500)});
assert.equal(denial.isError,true);
assert.equal(creationBodyRan,false,'Automatic incident must be denied before desktop request emission');
@@ -48,7 +75,7 @@ try{
['dx_task_execute',{operation:'start',task_ids:['auto-failure-fixture']}],
['dx_task_operations',{operation:'history'}],
]){
const result=await ctx.tools.execute({callId:'automatic-denial-'+name,name,arguments:args,
const result=await executeTool(ctx, {callId:'automatic-denial-'+name,name,arguments:args,
agent:ctx.agents.get(sessionId),signal:AbortSignal.timeout(1500)});
assert.equal(result.isError,true);
assert.equal(creationBodyRan,false);
@@ -65,7 +92,7 @@ try{
assert.ok(!text.includes('different-current-task'));
const report={status:'passed',session_id:value.session_id,reply:value.reply,
incidentBoundSnapshot:true,automaticTaskCreationDenied:true,toolResults:tools};
await writeFile(path.join(output,'report.json'),JSON.stringify(report,null,2));
await writeFile(path.join(fixture,'report.json'),JSON.stringify(report,null,2));
original(JSON.stringify(report)+'\n');
}finally{
clearTimeout(timer);
+2 -1
View File
@@ -1,4 +1,5 @@
/** Exercise actual Harness file tools against owned folders and ZIP archives. */
import {executeTool} from './dsh_tool_probe.mjs';
import assert from 'node:assert/strict';
import {mkdir,mkdtemp,writeFile,readFile,readdir} from 'node:fs/promises';
import path from 'node:path';
@@ -24,7 +25,7 @@ try{
const names=ctx.tools.schemas(agent).map(x=>x.name);
for(const name of ['read','read_image','write','edit','glob','grep','working_directory','extract_zip'])
assert.ok(names.includes(name),'Missing file capability: '+name);
const call=async(name,args)=>ctx.tools.execute({name,arguments:args,callId:crypto.randomUUID(),agent,signal:AbortSignal.timeout(20000)});
const call=async(name,args)=>executeTool(ctx, {name,arguments:args,callId:crypto.randomUUID(),agent,signal:AbortSignal.timeout(20000)});
const ok=async(name,args)=>{
const result=await call(name,args);assert.equal(result.isError,false,name+': '+JSON.stringify(result));return result;
};
+2 -1
View File
@@ -1,4 +1,5 @@
/** Real Harness, two processes: automatic diagnosis must stay isolated after restart. */
import {executeTool} from './dsh_tool_probe.mjs';
import assert from 'node:assert/strict';
import {mkdir,mkdtemp,writeFile,readFile,unlink,symlink} from 'node:fs/promises';
import path from 'node:path';
@@ -96,7 +97,7 @@ if(!phase){
const resumed=await ctx.sessionController.resolveAgent(sessionId);
assert.ok(resumed.agent,JSON.stringify(resumed.error));
const agent=resumed.agent;
const call=(owner,name,args={})=>ctx.tools.execute({name,arguments:args,callId:crypto.randomUUID(),agent:owner,signal:AbortSignal.timeout(5000)});
const call=(owner,name,args={})=>executeTool(ctx, {name,arguments:args,callId:crypto.randomUUID(),agent:owner,signal:AbortSignal.timeout(5000)});
const snapshot=await call(agent,'dx_task_snapshot');
assert.equal(snapshot.isError,false,JSON.stringify(snapshot));
assert.equal(snapshot.value.task_id,'incident-original','historical diagnosis must not read the current task');
+5 -4
View File
@@ -12,8 +12,9 @@ export async function verifyModelSettings(c, output) {
});
await new Promise(resolve=>server.listen(0,'127.0.0.1',resolve));
const endpoint=`http://127.0.0.1:${server.address().port}/v1`;
const visible=selector=>`[...document.querySelectorAll(${JSON.stringify(selector)})].find(e=>e.getBoundingClientRect().width>0)`;
const button=text=>`[...document.querySelectorAll('button')].find(e=>e.getBoundingClientRect().width>0&&e.textContent.trim()===${JSON.stringify(text)})`;
const rendered=`e.getBoundingClientRect().width>0&&!e.closest('details:not([open])')`;
const visible=selector=>`[...document.querySelectorAll(${JSON.stringify(selector)})].find(e=>${rendered})`;
const button=text=>`[...document.querySelectorAll('button')].find(e=>${rendered}&&e.textContent.trim()===${JSON.stringify(text)})`;
async function wait(expression){
const end=Date.now()+20000;
while(Date.now()<end){if(await c.evaluate(expression))return;await new Promise(r=>setTimeout(r,100));}
@@ -49,7 +50,7 @@ export async function verifyModelSettings(c, output) {
const candidate=`[...document.querySelectorAll('[role="dialog"] label')].find(e=>e.textContent.includes('issue16-fixture-model'))?.querySelector('input[type="checkbox"]')`;
if(!await c.evaluate(`(${candidate})?.checked`))await c.click(candidate);
assert.equal(await c.evaluate(`(${candidate})?.checked`),true);
await c.click(button('添加所选'));
await c.click(button('更新列表'));
await wait(`!![...document.querySelectorAll('input')].find(x=>x.value==='issue16-fixture-model')`);
await c.screenshot(path.join(output,'custom-model-discovery.png'));
await c.click(button('创建提供商'));
@@ -58,7 +59,7 @@ export async function verifyModelSettings(c, output) {
// Reopen the real editor to read committed fields, not the submitted draft.
await c.click(`[...document.querySelectorAll('li')].find(e=>e.textContent.includes('issue16-fixture'))?.querySelector('button')`);
await wait(`document.body.innerText.includes('自定义设置')`);
await c.click(`[...document.querySelectorAll('summary')].find(e=>e.textContent.includes('自定义设置'))`);
await c.click(`[...document.querySelectorAll('summary')].find(e=>e.textContent.includes('自定义设置')&&e.closest('details').querySelector('input[aria-label="API 地址"]')?.value===${JSON.stringify(endpoint)})`);
await wait(`!![...document.querySelectorAll('input')].find(x=>x.value==='issue16-fixture-model')`);
await c.screenshot(path.join(output,'custom-model-persisted.png'));
return {status:'passed',provider:'issue16-fixture',model:'issue16-fixture-model',requests,
+2 -1
View File
@@ -1,4 +1,5 @@
/** Compare the embedded assistant with the installed official Standard preset. */
import {executeTool} from './dsh_tool_probe.mjs';
import assert from 'node:assert/strict';
import {mkdir,mkdtemp,writeFile,readFile} from 'node:fs/promises';
import path from 'node:path';
@@ -29,7 +30,7 @@ try{
assert.deepEqual(names(embedded),names(native),'Existing dx-task sessions must retain the full native tool catalog');
for(const tool of ['read','write','edit','pwsh','get_goal','create_goal','update_goal','todo_write','subagent'])
assert.ok(names(embedded).includes(tool),'Missing native capability: '+tool);
const call=(name,args)=>ctx.tools.execute({name,arguments:args,callId:crypto.randomUUID(),agent:embedded,signal:AbortSignal.timeout(20000)});
const call=(name,args)=>executeTool(ctx, {name,arguments:args,callId:crypto.randomUUID(),agent:embedded,signal:AbortSignal.timeout(20000)});
const filename=path.join(process.env.DX_DSH_WORKSPACE,'native-write.txt');
const written=await call('write',{file_path:filename,content:'native file operations'});
assert.equal(written.isError,false,JSON.stringify(written));
+14 -8
View File
@@ -1,20 +1,26 @@
/** Exercise the real official runtime and policy pipeline without CAD or a model. */
import {executeTool} from './dsh_tool_probe.mjs';
import assert from 'node:assert/strict';
import {mkdir,writeFile} from 'node:fs/promises';
import path from 'node:path';
import {fileURLToPath,pathToFileURL} from 'node:url';
import {createRequire} from 'node:module';
import {bootRuntime,TASK_TOOLS} from '../integration/dsh/start.mjs';
const repo=path.resolve(path.dirname(fileURLToPath(import.meta.url)),'..');
const output=path.join(repo,'build/dsh-native-cli-verification');
const runtime=path.resolve(process.argv[2]??path.join(repo,'integration/dsh'));
const {bootRuntime,TASK_TOOLS,VERSION}=await import(pathToFileURL(path.join(runtime,'start.mjs')).href);
const output=path.resolve(process.argv[3]??path.join(repo,'build/dsh-native-cli-verification'));
await mkdir(output,{recursive:true});
delete process.env.DX_DSH_PARENT_PIPE;
if(process.argv[2]){
for(const key of ['DSH_API_KEY','DSH_API_BASE','DSH_MODEL','DX_DSH_MODELS','DSH_PERMISSION_MODE'])delete process.env[key];
}
process.env.DX_DSH_HOME=path.join(output,'home');
process.env.DX_DSH_CONTEXT_FILE=path.join(output,'context.json');
await writeFile(process.env.DX_DSH_CONTEXT_FILE,JSON.stringify({task_id:'cli-verification',status:'paused',
revision:'cli-revision',rules_count:2,progress:{},issue:'',issue_code:'',events:[]}));
const {ctx,shutdown}=await bootRuntime({announce:false});
const report={};
const report={version:VERSION};
try {
const schemas=ctx.tools.schemas();
report.tools=schemas.map(x=>x.name);
@@ -26,10 +32,10 @@ try {
report.configuredModels=(await ctx.llm.listModels('dx')).map(model=>model.id);
assert.ok(report.configuredModels.includes(process.env.DSH_MODEL));
}
const snapshot=await ctx.tools.execute({callId:'verify-read',name:'dx_task_snapshot',arguments:{},signal:new AbortController().signal});
const snapshot=await executeTool(ctx, {callId:'verify-read',name:'dx_task_snapshot',arguments:{},signal:new AbortController().signal});
assert.equal(snapshot.isError,false,JSON.stringify(snapshot));
report.snapshotRead=true;
const desktopOnly=await ctx.tools.execute({callId:'verify-desktop-only',name:'dx_task_create',arguments:{name:'CLI must not mutate'},signal:new AbortController().signal});
const desktopOnly=await executeTool(ctx, {callId:'verify-desktop-only',name:'dx_task_create',arguments:{name:'CLI must not mutate'},signal:new AbortController().signal});
assert.equal(desktopOnly.isError,true);
report.creationRequiresDesktopConfirmation=true;
for(const [name,args] of [
@@ -38,16 +44,16 @@ try {
['dx_task_execute',{operation:'start',task_ids:['fixture']}],
['dx_task_operations',{operation:'history'}],
]){
const result=await ctx.tools.execute({callId:'desktop-only-'+name,name,arguments:args,signal:AbortSignal.timeout(2000)});
const result=await executeTool(ctx, {callId:'desktop-only-'+name,name,arguments:args,signal:AbortSignal.timeout(2000)});
assert.equal(result.isError,true,name+' requires parent desktop');
}
report.lifecycleRequiresDesktop=true;
const require=createRequire(path.join(repo,'integration/dsh/package.json'));
const require=createRequire(path.join(runtime,'package.json'));
const {defineTool}=await import(pathToFileURL(require.resolve('@deepseek-ai/dsh-tools')).href);
let bodyRan=false;
const release=ctx.tools.register(defineTool({name:'forbidden_probe',description:'Never executes',parameters:{},
output:{schema:{type:'boolean'},render:()=>[{type:'text',text:'probe'}]},execute:async()=>{bodyRan=true;return true;}}));
const extension=await ctx.tools.execute({callId:'verify-extension',name:'forbidden_probe',arguments:{},signal:new AbortController().signal});
const extension=await executeTool(ctx, {callId:'verify-extension',name:'forbidden_probe',arguments:{},signal:new AbortController().signal});
release();
assert.equal(extension.isError,false);
assert.equal(bodyRan,true);
+2 -1
View File
@@ -1,4 +1,5 @@
/** PR18 #197: no silently omitted names, bounded workers, real cancellation. */
import {executeTool} from './dsh_tool_probe.mjs';
import assert from 'node:assert/strict';
import {mkdir,mkdtemp,writeFile,readdir,readFile} from 'node:fs/promises';
import {spawnSync} from 'node:child_process';
@@ -25,7 +26,7 @@ process.env.DX_DSH_HOME=path.join(root,'home');process.env.DX_DSH_CONTEXT_FILE=p
await writeFile(process.env.DX_DSH_CONTEXT_FILE,'{"task_id":"zip-review","revision":"zip-review","status":"observe"}');
const {ctx,shutdown}=await bootRuntime({announce:false});
try{
const call=(file,signal=AbortSignal.timeout(30000))=>ctx.tools.execute({name:'extract_zip',
const call=(file,signal=AbortSignal.timeout(30000))=>executeTool(ctx, {name:'extract_zip',
arguments:{file_path:path.join(root,file),output_directory:root},callId:crypto.randomUUID(),signal});
const before=await readdir(root);
for(const file of ['proto.zip','proto-bad.zip']){