@danceiny/gotry 0.0.1-rc.21 → 0.0.1-rc.24

package/dist/scripts/dsh-http-proxy-sse-proof.js

@@ -0,0 +1,90 @@
+/**
+ * dsh-http-proxy 本地 SSE + 中毒 HTTP 代理反例(issue #268):启动回环 SSE 服务器和
+ * 统计命中次数的中毒代理,用公共 installProxyFromEnvironment API 安装代理策略,
+ * 将 HTTP(S)_PROXY 指向中毒代理。在 127.0.0.1 上获取 SSE 端点,断言负载成功且
+ * 中毒命中计数保持为零;同时断言 proxyRouteFor(loopback) 是直接的,非回环 URL
+ * 被分类为代理,且 proxyEnvironmentForChild() 携带回环 NO_PROXY 以及 Node 24 下的
+ * NODE_USE_ENV_PROXY。始终 await 返回的 disposer 并在 finally 中关闭两个服务器;
+ * 证明全局路由返回到先前的直接状态。
+ *
+ * 运行:cd ts && npx tsx scripts/dsh-http-proxy-sse-proof.ts
+ */
+import assert from 'node:assert/strict';
+import http from 'node:http';
+import { installProxyFromEnvironment, proxyRouteFor, proxyEnvironmentForChild } from '@deepseek-ai/dsh-http-proxy';
+// 1. 回环 SSE 服务器。
+const sseServer = http.createServer((req, res) => {
+    res.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        Connection: 'keep-alive',
+    });
+    res.write('data: hello-sse\n\n');
+    res.end();
+});
+await new Promise((resolve) => sseServer.listen(0, '127.0.0.1', resolve));
+const sseAddr = sseServer.address();
+assert.ok(sseAddr !== null && typeof sseAddr === 'object', 'SSE 服务器必须已绑定地址');
+const ssePort = sseAddr.port;
+const sseUrl = `http://127.0.0.1:${ssePort}/`;
+// 2. 中毒代理:统计命中次数,返回 502。
+let poisonHits = 0;
+const poisonServer = http.createServer((req, res) => {
+    poisonHits++;
+    res.writeHead(502);
+    res.end('poisoned');
+});
+await new Promise((resolve) => poisonServer.listen(0, '127.0.0.1', resolve));
+const poisonAddr = poisonServer.address();
+assert.ok(poisonAddr !== null && typeof poisonAddr === 'object', '中毒代理必须已绑定地址');
+const poisonPort = poisonAddr.port;
+let disposer;
+try {
+    // 3. 用公共 installProxyFromEnvironment API 安装代理策略,指向中毒代理。
+    const envMap = new Map([
+        ['HTTP_PROXY', `http://127.0.0.1:${poisonPort}`],
+        ['HTTPS_PROXY', `http://127.0.0.1:${poisonPort}`],
+    ]);
+    const envLookup = {
+        get(name) {
+            const v = envMap.get(name) ?? envMap.get(name.toLowerCase());
+            return v !== undefined ? { value: v } : undefined;
+        },
+    };
+    disposer = await installProxyFromEnvironment(envLookup, () => { });
+    // 4. proxyRouteFor(loopback) 是直接的;非回环 URL 被分类为代理。
+    const loopbackRoute = proxyRouteFor(new URL(sseUrl));
+    assert.equal(loopbackRoute.proxied, false, '回环 URL 必须路由为直接(proxyRouteFor)');
+    const externalRoute = proxyRouteFor(new URL('http://example.com/'));
+    assert.equal(externalRoute.proxied, true, '非回环 URL 必须被分类为代理(proxyRouteFor)');
+    // 5. proxyEnvironmentForChild() 携带回环 NO_PROXY 以及 Node 24 下的 NODE_USE_ENV_PROXY。
+    const childEnv = proxyEnvironmentForChild();
+    assert.equal(childEnv.NODE_USE_ENV_PROXY, '1', 'proxyEnvironmentForChild 必须携带 NODE_USE_ENV_PROXY=1(Node 24)');
+    assert.ok(typeof childEnv.NO_PROXY === 'string' && childEnv.NO_PROXY.includes('127.0.0.1'), `proxyEnvironmentForChild NO_PROXY 必须包含 127.0.0.1(当前 ${JSON.stringify(childEnv.NO_PROXY)})`);
+    // 6. 在 127.0.0.1 上获取 SSE 端点:负载成功且中毒命中计数保持为零。
+    const resp = await fetch(sseUrl);
+    assert.equal(resp.status, 200, `SSE fetch 必须成功(status=${resp.status})`);
+    const body = await resp.text();
+    assert.ok(body.includes('hello-sse'), `SSE 负载必须包含 hello-sse(当前 ${JSON.stringify(body)})`);
+    assert.equal(poisonHits, 0, `中毒代理命中计数必须为零(当前 ${poisonHits})——回环绕过代理`);
+}
+finally {
+    // 7. 始终 await 返回的 disposer 并在 finally 中 await 关闭两个服务器(包括失败路径)。
+    //    不依赖未 await 的 server.close() 让进程退出——显式 await 完成资源清理。
+    try {
+        if (disposer)
+            await disposer();
+    }
+    finally {
+        await Promise.all([
+            new Promise((resolve, reject) => sseServer.close((err) => (err ? reject(err) : resolve()))),
+            new Promise((resolve, reject) => poisonServer.close((err) => (err ? reject(err) : resolve()))),
+        ]);
+    }
+}
+// 8. 证明全局路由返回到先前的直接状态。
+const externalAfter = proxyRouteFor(new URL('http://example.com/'));
+assert.equal(externalAfter.proxied, false, 'disposer 后全局路由必须返回直接状态');
+console.log(`HTTP PROXY SSE PROOF: loopback SSE fetch=200 payload-has-hello-sse=true poison-hits=0, ` +
+    `loopback route=direct external route=proxied, NODE_USE_ENV_PROXY=1 NO_PROXY has 127.0.0.1, ` +
+    `routing restored to direct after dispose`);

package/dist/scripts/dsh-runtime-closure-tests.js

@@ -1,225 +1,182 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { parsePnpmDshLock, parsePnpmRootDshImporter, REQUIRED_DSH_RUNTIME_PACKAGE_COUNT, validateDshRuntimeClosure, validatePnpmRootDshImporter } from './dsh-runtime-closure.js';
-const VERSION = '0.1.2-alpha.3';
+import { parsePnpmDshLock, parsePnpmRootDshImporter, REQUIRED_DSH_RUNTIME_PACKAGE_COUNT, validateDshRuntimeClosure, validatePnpmRootDshImporter, } from './dsh-runtime-closure.js';
+const VERSION = '0.1.5-rc.1';
 function validInput() {
     return {
         dependencies: {
             '@deepseek-ai/dsh': VERSION,
-            '@deepseek-ai/dsh-session-title': VERSION
+            '@deepseek-ai/dsh-session-title': VERSION,
         },
         lockPackages: {
-            'node_modules/@deepseek-ai/dsh': {
-                version: VERSION
-            },
-            'node_modules/@deepseek-ai/dsh-session-title': {
-                version: VERSION
-            }
+            'node_modules/@deepseek-ai/dsh': { version: VERSION },
+            'node_modules/@deepseek-ai/dsh-session-title': { version: VERSION },
         },
-        runtimeVersion: VERSION
+        runtimeVersion: VERSION,
     };
 }
-test('accepts an exact coherent DSH prerelease closure', ()=>{
+test('accepts an exact coherent DSH prerelease closure', () => {
     assert.deepEqual(validateDshRuntimeClosure(validInput()), {
-        names: [
-            '@deepseek-ai/dsh',
-            '@deepseek-ai/dsh-session-title'
-        ],
-        version: VERSION
+        names: ['@deepseek-ai/dsh', '@deepseek-ai/dsh-session-title'],
+        version: VERSION,
     });
 });
-test('rejects a lock package missing from the published direct dependencies', ()=>{
+test('rejects a lock package missing from the published direct dependencies', () => {
     const input = validInput();
-    input.dependencies = {
-        '@deepseek-ai/dsh': VERSION
-    };
-    assert.throws(()=>validateDshRuntimeClosure(input), /DSH closure 未精确声明/);
+    input.dependencies = { '@deepseek-ai/dsh': VERSION };
+    assert.throws(() => validateDshRuntimeClosure(input), /DSH closure 未精确声明/);
 });
-test('rejects an extra ranged DSH dependency absent from the tested lock closure', ()=>{
+test('rejects an extra ranged DSH dependency absent from the tested lock closure', () => {
     const input = validInput();
-    input.dependencies['@deepseek-ai/dsh-web'] = '^0.1.2-alpha.3';
-    assert.throws(()=>validateDshRuntimeClosure(input), /DSH manifest 与 lock 集合不一致/);
+    input.dependencies['@deepseek-ai/dsh-web'] = '^0.1.5-rc.1';
+    assert.throws(() => validateDshRuntimeClosure(input), /DSH manifest 与 lock 集合不一致/);
 });
-test('rejects a nested DSH package from another prerelease', ()=>{
+test('rejects a nested DSH package from another prerelease', () => {
     const input = validInput();
     input.lockPackages['node_modules/@deepseek-ai/dsh/node_modules/@deepseek-ai/dsh-session-title'] = {
-        version: '0.1.2-alpha.4'
+        version: '0.1.5-alpha.2',
     };
-    assert.throws(()=>validateDshRuntimeClosure(input), /DSH lock 版本漂移/);
+    assert.throws(() => validateDshRuntimeClosure(input), /DSH lock 版本漂移/);
 });
-test('rejects drift from the runtime spawn guard version', ()=>{
+test('rejects drift from the runtime spawn guard version', () => {
     const input = validInput();
-    input.runtimeVersion = '0.1.2-alpha.4';
-    assert.throws(()=>validateDshRuntimeClosure(input), /DSH runtime guard 版本漂移/);
+    input.runtimeVersion = '0.1.5-alpha.2';
+    assert.throws(() => validateDshRuntimeClosure(input), /DSH runtime guard 版本漂移/);
 });
-test('parses each pnpm DSH resolution once across packages and snapshots', ()=>{
+test('parses each pnpm DSH resolution once across packages and snapshots', () => {
     const lock = `
 packages:
-  '@deepseek-ai/dsh@0.1.2-alpha.3': {}
-  '@deepseek-ai/dsh-session@0.1.2-alpha.3': {}
+  '@deepseek-ai/dsh@0.1.5-rc.1': {}
+  '@deepseek-ai/dsh-session@0.1.5-rc.1': {}
 snapshots:
-  '@deepseek-ai/dsh@0.1.2-alpha.3': {}
+  '@deepseek-ai/dsh@0.1.5-rc.1': {}
 `;
     assert.deepEqual(parsePnpmDshLock(lock), {
-        'node_modules/@deepseek-ai/dsh': {
-            version: VERSION
-        },
-        'node_modules/@deepseek-ai/dsh-session': {
-            version: VERSION
-        }
+        'node_modules/@deepseek-ai/dsh': { version: VERSION },
+        'node_modules/@deepseek-ai/dsh-session': { version: VERSION },
     });
 });
-test('preserves two pnpm resolutions of the same DSH package for mixed-version rejection', ()=>{
+test('preserves two pnpm resolutions of the same DSH package for mixed-version rejection', () => {
     const lock = `
 packages:
-  '@deepseek-ai/dsh@0.1.2-alpha.3': {}
-  '@deepseek-ai/dsh-session@0.1.2-alpha.3': {}
-  '@deepseek-ai/dsh-session@0.1.2-alpha.4': {}
+  '@deepseek-ai/dsh@0.1.5-rc.1': {}
+  '@deepseek-ai/dsh-session@0.1.5-rc.1': {}
+  '@deepseek-ai/dsh-session@0.1.5-alpha.2': {}
 `;
     const parsed = parsePnpmDshLock(lock);
     assert.equal(Object.keys(parsed).length, 3);
-    assert.throws(()=>validateDshRuntimeClosure({
-            dependencies: {
-                '@deepseek-ai/dsh': VERSION,
-                '@deepseek-ai/dsh-session': VERSION
-            },
-            lockPackages: parsed,
-            runtimeVersion: VERSION
-        }), /DSH lock 版本漂移/);
-});
-test('parses only the root pnpm importer DSH entries', ()=>{
+    assert.throws(() => validateDshRuntimeClosure({
+        dependencies: {
+            '@deepseek-ai/dsh': VERSION,
+            '@deepseek-ai/dsh-session': VERSION,
+        },
+        lockPackages: parsed,
+        runtimeVersion: VERSION,
+    }), /DSH lock 版本漂移/);
+});
+test('parses only the root pnpm importer DSH entries', () => {
     const lock = `
 lockfileVersion: '9.0'
 importers:
   .:
     dependencies:
       '@deepseek-ai/dsh':
-        specifier: 0.1.2-alpha.3
-        version: 0.1.2-alpha.3(peer@1.0.0)
+        specifier: 0.1.5-rc.1
+        version: 0.1.5-rc.1(peer@1.0.0)
       '@deepseek-ai/dsh-session':
-        specifier: 0.1.2-alpha.3
-        version: 0.1.2-alpha.3
+        specifier: 0.1.5-rc.1
+        version: 0.1.5-rc.1
   ts:
     dependencies:
       '@deepseek-ai/dsh-web':
-        specifier: 0.1.2-alpha.4
-        version: 0.1.2-alpha.4
+        specifier: 0.1.5-alpha.2
+        version: 0.1.5-alpha.2
 packages: {}
 `;
     assert.deepEqual(parsePnpmRootDshImporter(lock), {
-        '@deepseek-ai/dsh': {
-            specifier: VERSION,
-            resolvedVersion: VERSION
-        },
-        '@deepseek-ai/dsh-session': {
-            specifier: VERSION,
-            resolvedVersion: VERSION
-        }
+        '@deepseek-ai/dsh': { specifier: VERSION, resolvedVersion: VERSION },
+        '@deepseek-ai/dsh-session': { specifier: VERSION, resolvedVersion: VERSION },
     });
 });
-test('rejects a pnpm root importer missing a published DSH dependency', ()=>{
-    assert.throws(()=>validatePnpmRootDshImporter({
-            dependencies: validInput().dependencies,
-            importerEntries: {
-                '@deepseek-ai/dsh': {
-                    specifier: VERSION,
-                    resolvedVersion: VERSION
-                }
-            },
-            runtimeVersion: VERSION
-        }), /pnpm root importer 与 manifest 集合不一致/);
-});
-test('rejects a ranged DSH specifier in the pnpm root importer', ()=>{
-    assert.throws(()=>validatePnpmRootDshImporter({
-            dependencies: validInput().dependencies,
-            importerEntries: {
-                '@deepseek-ai/dsh': {
-                    specifier: VERSION,
-                    resolvedVersion: VERSION
-                },
-                '@deepseek-ai/dsh-session-title': {
-                    specifier: '^0.1.2-alpha.3',
-                    resolvedVersion: VERSION
-                }
-            },
-            runtimeVersion: VERSION
-        }), /pnpm root importer 未精确锁定/);
-});
-test('rejects a drifted resolved DSH version in the pnpm root importer', ()=>{
-    assert.throws(()=>validatePnpmRootDshImporter({
-            dependencies: validInput().dependencies,
-            importerEntries: {
-                '@deepseek-ai/dsh': {
-                    specifier: VERSION,
-                    resolvedVersion: '0.1.2-alpha.4'
-                },
-                '@deepseek-ai/dsh-session-title': {
-                    specifier: VERSION,
-                    resolvedVersion: VERSION
-                }
-            },
-            runtimeVersion: VERSION
-        }), /pnpm root importer resolved 版本漂移/);
-});
-test('rejects a missing resolved DSH version in the pnpm root importer', ()=>{
+test('rejects a pnpm root importer missing a published DSH dependency', () => {
+    assert.throws(() => validatePnpmRootDshImporter({
+        dependencies: validInput().dependencies,
+        importerEntries: {
+            '@deepseek-ai/dsh': { specifier: VERSION, resolvedVersion: VERSION },
+        },
+        runtimeVersion: VERSION,
+    }), /pnpm root importer 与 manifest 集合不一致/);
+});
+test('rejects a ranged DSH specifier in the pnpm root importer', () => {
+    assert.throws(() => validatePnpmRootDshImporter({
+        dependencies: validInput().dependencies,
+        importerEntries: {
+            '@deepseek-ai/dsh': { specifier: VERSION, resolvedVersion: VERSION },
+            '@deepseek-ai/dsh-session-title': { specifier: '^0.1.5-rc.1', resolvedVersion: VERSION },
+        },
+        runtimeVersion: VERSION,
+    }), /pnpm root importer 未精确锁定/);
+});
+test('rejects a drifted resolved DSH version in the pnpm root importer', () => {
+    assert.throws(() => validatePnpmRootDshImporter({
+        dependencies: validInput().dependencies,
+        importerEntries: {
+            '@deepseek-ai/dsh': { specifier: VERSION, resolvedVersion: '0.1.5-alpha.2' },
+            '@deepseek-ai/dsh-session-title': { specifier: VERSION, resolvedVersion: VERSION },
+        },
+        runtimeVersion: VERSION,
+    }), /pnpm root importer resolved 版本漂移/);
+});
+test('rejects a missing resolved DSH version in the pnpm root importer', () => {
     const lock = `
 importers:
   .:
     dependencies:
       '@deepseek-ai/dsh':
-        specifier: 0.1.2-alpha.3
+        specifier: 0.1.5-rc.1
 `;
-    assert.throws(()=>parsePnpmRootDshImporter(lock), /pnpm root importer version 不可用/);
+    assert.throws(() => parsePnpmRootDshImporter(lock), /pnpm root importer version 不可用/);
 });
-test('rejects duplicate resolved DSH versions in the pnpm root importer', ()=>{
+test('rejects duplicate resolved DSH versions in the pnpm root importer', () => {
     const lock = `
 importers:
   .:
     dependencies:
       '@deepseek-ai/dsh':
-        specifier: 0.1.2-alpha.3
-        version: 0.1.2-alpha.3
-        version: 0.1.2-alpha.4
+        specifier: 0.1.5-rc.1
+        version: 0.1.5-rc.1
+        version: 0.1.5-alpha.2
 `;
-    assert.throws(()=>parsePnpmRootDshImporter(lock), /pnpm root importer version 不可用/);
-});
-test('rejects a coherent closure below the required package count', ()=>{
-    assert.throws(()=>validateDshRuntimeClosure({
-            ...validInput(),
-            expectedPackageCount: REQUIRED_DSH_RUNTIME_PACKAGE_COUNT
-        }), /DSH closure 包数量不符/);
-});
-test('rejects a coherent root importer below the required package count', ()=>{
-    assert.throws(()=>validatePnpmRootDshImporter({
-            dependencies: validInput().dependencies,
-            importerEntries: {
-                '@deepseek-ai/dsh': {
-                    specifier: VERSION,
-                    resolvedVersion: VERSION
-                },
-                '@deepseek-ai/dsh-session-title': {
-                    specifier: VERSION,
-                    resolvedVersion: VERSION
-                }
-            },
-            runtimeVersion: VERSION,
-            expectedPackageCount: REQUIRED_DSH_RUNTIME_PACKAGE_COUNT
-        }), /pnpm root importer 包数量不符/);
-});
-test('rejects duplicate DSH entries in the pnpm root importer', ()=>{
+    assert.throws(() => parsePnpmRootDshImporter(lock), /pnpm root importer version 不可用/);
+});
+test('rejects a coherent closure below the required package count', () => {
+    assert.throws(() => validateDshRuntimeClosure({
+        ...validInput(),
+        expectedPackageCount: REQUIRED_DSH_RUNTIME_PACKAGE_COUNT,
+    }), /DSH closure 包数量不符/);
+});
+test('rejects a coherent root importer below the required package count', () => {
+    assert.throws(() => validatePnpmRootDshImporter({
+        dependencies: validInput().dependencies,
+        importerEntries: {
+            '@deepseek-ai/dsh': { specifier: VERSION, resolvedVersion: VERSION },
+            '@deepseek-ai/dsh-session-title': { specifier: VERSION, resolvedVersion: VERSION },
+        },
+        runtimeVersion: VERSION,
+        expectedPackageCount: REQUIRED_DSH_RUNTIME_PACKAGE_COUNT,
+    }), /pnpm root importer 包数量不符/);
+});
+test('rejects duplicate DSH entries in the pnpm root importer', () => {
     const lock = `
 importers:
   .:
     dependencies:
       '@deepseek-ai/dsh':
-        specifier: 0.1.2-alpha.3
-        version: 0.1.2-alpha.3
+        specifier: 0.1.5-rc.1
+        version: 0.1.5-rc.1
       '@deepseek-ai/dsh':
-        specifier: 0.1.2-alpha.3
-        version: 0.1.2-alpha.3
+        specifier: 0.1.5-rc.1
+        version: 0.1.5-rc.1
 `;
-    assert.throws(()=>parsePnpmRootDshImporter(lock), /pnpm root importer DSH 依赖重复/);
+    assert.throws(() => parsePnpmRootDshImporter(lock), /pnpm root importer DSH 依赖重复/);
 });
-
-
-//# sourceURL=ts/scripts/dsh-runtime-closure-tests.ts

package/dist/scripts/dsh-runtime-closure.js

@@ -1,4 +1,4 @@
-export const REQUIRED_DSH_RUNTIME_PACKAGE_COUNT = 216;
+export const REQUIRED_DSH_RUNTIME_PACKAGE_COUNT = 232;
 function yamlScalar(value) {
     const trimmed = value.trim().replace(/\s+#.*$/, '');
     const quoted = trimmed.match(/^(['"])(.*)\1$/);
@@ -12,55 +12,79 @@ function resolvedPnpmVersion(value) {
 }
 export function parsePnpmRootDshImporter(text) {
     const lines = text.split(/\r?\n/);
-    const importers = lines.map((line, index)=>line === 'importers:' ? index : -1).filter((index)=>index >= 0);
-    if (importers.length !== 1) throw new Error('pnpm lock importers 区块不可用');
+    const importers = lines
+        .map((line, index) => line === 'importers:' ? index : -1)
+        .filter((index) => index >= 0);
+    if (importers.length !== 1)
+        throw new Error('pnpm lock importers 区块不可用');
     const importersStart = importers[0];
-    const importersEnd = lines.findIndex((line, index)=>index > importersStart && line.trim() !== '' && indentation(line) === 0);
-    const rootCandidates = lines.map((line, index)=>index > importersStart && (importersEnd < 0 || index < importersEnd) && /^ {2}(?:\.|'\.'|"\."):\s*$/.test(line) ? index : -1).filter((index)=>index >= 0);
-    if (rootCandidates.length !== 1) throw new Error('pnpm root importer 不唯一');
+    const importersEnd = lines.findIndex((line, index) => index > importersStart && line.trim() !== '' && indentation(line) === 0);
+    const rootCandidates = lines
+        .map((line, index) => index > importersStart && (importersEnd < 0 || index < importersEnd)
+        && /^ {2}(?:\.|'\.'|"\."):\s*$/.test(line) ? index : -1)
+        .filter((index) => index >= 0);
+    if (rootCandidates.length !== 1)
+        throw new Error('pnpm root importer 不唯一');
     const rootStart = rootCandidates[0];
-    const rootEndRelative = lines.slice(rootStart + 1, importersEnd < 0 ? lines.length : importersEnd).findIndex((line)=>line.trim() !== '' && indentation(line) <= 2);
-    const rootEnd = rootEndRelative < 0 ? importersEnd < 0 ? lines.length : importersEnd : rootStart + 1 + rootEndRelative;
-    const dependencyBlocks = lines.map((line, index)=>index > rootStart && index < rootEnd && /^ {4}dependencies:\s*$/.test(line) ? index : -1).filter((index)=>index >= 0);
-    if (dependencyBlocks.length !== 1) throw new Error('pnpm root importer dependencies 区块不可用');
+    const rootEndRelative = lines.slice(rootStart + 1, importersEnd < 0 ? lines.length : importersEnd)
+        .findIndex((line) => line.trim() !== '' && indentation(line) <= 2);
+    const rootEnd = rootEndRelative < 0
+        ? (importersEnd < 0 ? lines.length : importersEnd)
+        : rootStart + 1 + rootEndRelative;
+    const dependencyBlocks = lines
+        .map((line, index) => index > rootStart && index < rootEnd && /^ {4}dependencies:\s*$/.test(line) ? index : -1)
+        .filter((index) => index >= 0);
+    if (dependencyBlocks.length !== 1)
+        throw new Error('pnpm root importer dependencies 区块不可用');
     const dependenciesStart = dependencyBlocks[0];
-    const dependenciesEndRelative = lines.slice(dependenciesStart + 1, rootEnd).findIndex((line)=>line.trim() !== '' && indentation(line) <= 4);
+    const dependenciesEndRelative = lines.slice(dependenciesStart + 1, rootEnd)
+        .findIndex((line) => line.trim() !== '' && indentation(line) <= 4);
     const dependenciesEnd = dependenciesEndRelative < 0 ? rootEnd : dependenciesStart + 1 + dependenciesEndRelative;
-    const entries = lines.map((line, index)=>{
-        if (index <= dependenciesStart || index >= dependenciesEnd) return null;
+    const entries = lines
+        .map((line, index) => {
+        if (index <= dependenciesStart || index >= dependenciesEnd)
+            return null;
         const match = line.match(/^ {6}(['"]?)([^'":\s]+)\1:\s*$/);
-        return match ? {
-            index,
-            name: match[2]
-        } : null;
-    }).filter((entry)=>entry !== null);
+        return match ? { index, name: match[2] } : null;
+    })
+        .filter((entry) => entry !== null);
     const importerEntries = {};
-    for(let entryIndex = 0; entryIndex < entries.length; entryIndex += 1){
+    for (let entryIndex = 0; entryIndex < entries.length; entryIndex += 1) {
         const entry = entries[entryIndex];
-        if (entry.name !== '@deepseek-ai/dsh' && !entry.name.startsWith('@deepseek-ai/dsh-')) continue;
-        if (Object.hasOwn(importerEntries, entry.name)) throw new Error(`pnpm root importer DSH 依赖重复:${entry.name}`);
+        if (entry.name !== '@deepseek-ai/dsh' && !entry.name.startsWith('@deepseek-ai/dsh-'))
+            continue;
+        if (Object.hasOwn(importerEntries, entry.name))
+            throw new Error(`pnpm root importer DSH 依赖重复:${entry.name}`);
         const end = entries[entryIndex + 1]?.index ?? dependenciesEnd;
         const block = lines.slice(entry.index + 1, end);
-        const specifiers = block.map((line)=>line.match(/^ {8}specifier:\s*(.+)$/)?.[1]).filter((value)=>value !== undefined);
-        if (specifiers.length !== 1) throw new Error(`pnpm root importer specifier 不可用:${entry.name}`);
-        const versions = block.map((line)=>line.match(/^ {8}version:\s*(.+)$/)?.[1]).filter((value)=>value !== undefined);
-        if (versions.length !== 1) throw new Error(`pnpm root importer version 不可用:${entry.name}`);
+        const specifiers = block
+            .map((line) => line.match(/^ {8}specifier:\s*(.+)$/)?.[1])
+            .filter((value) => value !== undefined);
+        if (specifiers.length !== 1)
+            throw new Error(`pnpm root importer specifier 不可用:${entry.name}`);
+        const versions = block
+            .map((line) => line.match(/^ {8}version:\s*(.+)$/)?.[1])
+            .filter((value) => value !== undefined);
+        if (versions.length !== 1)
+            throw new Error(`pnpm root importer version 不可用:${entry.name}`);
         importerEntries[entry.name] = {
             specifier: yamlScalar(specifiers[0]),
-            resolvedVersion: resolvedPnpmVersion(versions[0])
+            resolvedVersion: resolvedPnpmVersion(versions[0]),
         };
     }
     return importerEntries;
 }
 export function validatePnpmRootDshImporter(input) {
-    const manifestNames = Object.keys(input.dependencies).filter((name)=>name === '@deepseek-ai/dsh' || name.startsWith('@deepseek-ai/dsh-')).sort();
+    const manifestNames = Object.keys(input.dependencies)
+        .filter((name) => name === '@deepseek-ai/dsh' || name.startsWith('@deepseek-ai/dsh-'))
+        .sort();
     const importerNames = Object.keys(input.importerEntries).sort();
-    const missing = manifestNames.filter((name)=>!importerNames.includes(name));
-    const extra = importerNames.filter((name)=>!manifestNames.includes(name));
+    const missing = manifestNames.filter((name) => !importerNames.includes(name));
+    const extra = importerNames.filter((name) => !manifestNames.includes(name));
     if (missing.length > 0 || extra.length > 0) {
         throw new Error(`pnpm root importer 与 manifest 集合不一致:missing=${missing.join(',') || '-'};extra=${extra.join(',') || '-'}`);
     }
-    for (const name of importerNames){
+    for (const name of importerNames) {
         const importerEntry = input.importerEntries[name];
         if (input.dependencies[name] !== input.runtimeVersion || importerEntry.specifier !== input.runtimeVersion) {
             throw new Error(`pnpm root importer 未精确锁定:${name}@${input.runtimeVersion}`);
@@ -72,28 +96,24 @@ export function validatePnpmRootDshImporter(input) {
     if (input.expectedPackageCount !== undefined && importerNames.length !== input.expectedPackageCount) {
         throw new Error(`pnpm root importer 包数量不符:${importerNames.length}(expected ${input.expectedPackageCount})`);
     }
-    return {
-        names: importerNames,
-        version: input.runtimeVersion
-    };
+    return { names: importerNames, version: input.runtimeVersion };
 }
 export function parsePnpmDshLock(text) {
     const packages = {};
     const seen = new Set();
     const variants = new Map();
     const entry = /^\s{2}['"]?(\@deepseek-ai\/dsh(?:-[^@'":\s]+)?)@([^'":\s(]+)(?:\([^'"]*\))?['"]?:/gm;
-    for (const match of text.matchAll(entry)){
+    for (const match of text.matchAll(entry)) {
         const name = match[1];
         const version = match[2];
         const identity = `${name}@${version}`;
-        if (seen.has(identity)) continue;
+        if (seen.has(identity))
+            continue;
         seen.add(identity);
         const variant = variants.get(name) ?? 0;
         variants.set(name, variant + 1);
         const prefix = variant === 0 ? '' : `.pnpm-variant-${variant}/node_modules/`;
-        packages[`node_modules/${prefix}${name}`] = {
-            version
-        };
+        packages[`node_modules/${prefix}${name}`] = { version };
     }
     return packages;
 }
@@ -105,34 +125,32 @@ export function validateDshRuntimeClosure(input) {
     if (dshVersion !== input.runtimeVersion) {
         throw new Error(`DSH runtime guard 版本漂移:${input.runtimeVersion}(manifest ${dshVersion})`);
     }
-    const dshNodes = Object.entries(input.lockPackages).flatMap(([path, metadata])=>{
+    const dshNodes = Object.entries(input.lockPackages)
+        .flatMap(([path, metadata]) => {
         const match = path.match(/(?:^|\/)node_modules\/(\@deepseek-ai\/dsh(?:-[^/]+)?)$/);
-        return match ? [
-            {
-                name: match[1],
-                version: metadata.version
-            }
-        ] : [];
-    }).sort((left, right)=>left.name.localeCompare(right.name));
-    if (dshNodes.length === 0) throw new Error('package-lock 未解析到 DSH runtime closure');
-    for (const dependency of dshNodes){
+        return match ? [{ name: match[1], version: metadata.version }] : [];
+    })
+        .sort((left, right) => left.name.localeCompare(right.name));
+    if (dshNodes.length === 0)
+        throw new Error('package-lock 未解析到 DSH runtime closure');
+    for (const dependency of dshNodes) {
         if (dependency.version !== dshVersion) {
             throw new Error(`DSH lock 版本漂移:${dependency.name}@${dependency.version ?? 'missing'}(expected ${dshVersion})`);
         }
     }
-    const lockNames = [
-        ...new Set(dshNodes.map((dependency)=>dependency.name))
-    ].sort();
-    const manifestNames = Object.keys(input.dependencies).filter((name)=>name === '@deepseek-ai/dsh' || name.startsWith('@deepseek-ai/dsh-')).sort();
-    const missing = lockNames.filter((name)=>!manifestNames.includes(name));
-    const extra = manifestNames.filter((name)=>!lockNames.includes(name));
+    const lockNames = [...new Set(dshNodes.map((dependency) => dependency.name))].sort();
+    const manifestNames = Object.keys(input.dependencies)
+        .filter((name) => name === '@deepseek-ai/dsh' || name.startsWith('@deepseek-ai/dsh-'))
+        .sort();
+    const missing = lockNames.filter((name) => !manifestNames.includes(name));
+    const extra = manifestNames.filter((name) => !lockNames.includes(name));
     if (missing.length > 0) {
         throw new Error(`DSH closure 未精确声明:${missing[0]}@${dshVersion}`);
     }
     if (extra.length > 0) {
         throw new Error(`DSH manifest 与 lock 集合不一致:missing=${missing.join(',') || '-'};extra=${extra.join(',') || '-'}`);
     }
-    for (const name of manifestNames){
+    for (const name of manifestNames) {
         if (input.dependencies[name] !== dshVersion) {
             throw new Error(`DSH closure 未精确声明:${name}@${dshVersion}`);
         }
@@ -140,11 +158,5 @@ export function validateDshRuntimeClosure(input) {
     if (input.expectedPackageCount !== undefined && lockNames.length !== input.expectedPackageCount) {
         throw new Error(`DSH closure 包数量不符:${lockNames.length}(expected ${input.expectedPackageCount})`);
     }
-    return {
-        names: lockNames,
-        version: dshVersion
-    };
+    return { names: lockNames, version: dshVersion };
 }
-
-
-//# sourceURL=ts/scripts/dsh-runtime-closure.ts