@danceiny/gotry 0.0.1-rc.19 → 0.0.1-rc.20

package/dist/scripts/bootstrap-tests.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { execFileSync, spawnSync } from 'node:child_process';
-import { mkdtempSync, readFileSync } from 'node:fs';
+import { mkdirSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 const repoRoot = join(import.meta.dirname, '..', '..');
@@ -187,7 +187,33 @@ console.log('9. calendar 子命令(setup 状态面 on/off/status + doctor 三态
     assert.match(r.stderr, /gotry_doctor/, '摘要带对话内指路');
     assert.match(r.stderr, /扩展=缺/, '缺失项人话=缺(降级类=半可用)');
 }console.log('10. 启动一次性 doctor 摘要(--summary:stderr 一行/零写盘/恒 exit 0)OK');
-console.log('BOOTSTRAP TESTS: 10/10 OK(扩展就位 + 跳过开关 / wizard --dry-run / wizard 真实 / 扩展分发通道 / doctor 体检面 / calendar setup 状态面 / 显式跳过 + auto 跳过 + 单项跳过 / 启动摘要)');
+{
+    const sbHome = mkdtempSync(join(tmpdir(), 'gotry-sidebar-test-'));
+    const prevHome = process.env.HOME;
+    process.env.HOME = sbHome;
+    try {
+        const { setupSidebar } = await import(bootstrap);
+        const r = await setupSidebar(async ()=>{
+            const sbPkgDir = join(sbHome, '.dsh/profiles/web/node_modules/dsh-better-sidebar');
+            mkdirSync(sbPkgDir, {
+                recursive: true
+            });
+            writeFileSync(join(sbPkgDir, 'package.json'), JSON.stringify({
+                name: 'dsh-better-sidebar',
+                version: '0.18.0'
+            }));
+            return {
+                ok: false,
+                error: 'exit 1'
+            };
+        });
+        assert.equal(r.ok, true, '安装器 exit 非 0 但状态已落盘 → 按落盘判成功(不误报失败)');
+    } finally{
+        if (prevHome === undefined) delete process.env.HOME;
+        else process.env.HOME = prevHome;
+    }
+}console.log('11. setupSidebar 落盘状态复核(pnpm 忽略构建脚本 exit 1 不再误报)OK');
+console.log('BOOTSTRAP TESTS: 11/11 OK(扩展就位 + 跳过开关 / wizard --dry-run / wizard 真实 / 扩展分发通道 / doctor 体检面 / calendar setup 状态面 / 显式跳过 + auto 跳过 + 单项跳过 / 启动摘要 / sidebar 落盘状态复核)');
 
 
 //# sourceURL=ts/scripts/bootstrap-tests.ts

package/dist/scripts/doctor-tests.js

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { mkdtemp, mkdir, writeFile, rm, readFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
 import { runDoctorChecks, renderDoctorReportMd, nodeOk } from '../capabilities/doctor.js';
 import { apply } from '../src/index.js';
 const tmp = await mkdtemp(join(tmpdir(), 'gotry-doctor-test-'));
@@ -78,6 +78,60 @@ assert.match(md, /flyai\.open\.fliggy\.com 控制台申请正式 key/, 'prose
 assert.ok(!md.includes('`到 flyai'), 'prose 类 fix 不应整体包反引号');
 assert.match(md, /LLM key/, '让渡面(LLM key)照常入表');
 console.log('5. 报告渲染 OK');
+{
+    const hoist = await mkdtemp(join(tmpdir(), 'gotry-doctor-hoist-'));
+    const pkgRoot = join(hoist, 'node_modules', '@danceiny', 'gotry');
+    await mkdir(pkgRoot, {
+        recursive: true
+    });
+    await writeFile(join(pkgRoot, 'package.json'), JSON.stringify({
+        name: '@danceiny/gotry',
+        version: '0.0.1-test'
+    }), 'utf-8');
+    const stubPkg = async (dir, main)=>{
+        await mkdir(join(hoist, 'node_modules', dir, 'lib'), {
+            recursive: true
+        });
+        await writeFile(join(hoist, 'node_modules', dir, 'package.json'), JSON.stringify({
+            name: dir,
+            version: '0.0.0-test',
+            main
+        }), 'utf-8');
+        await writeFile(join(hoist, 'node_modules', dir, main), '// stub\n', 'utf-8');
+    };
+    await stubPkg('dsh-map-tools', 'lib/index.js');
+    await stubPkg('@deepseek-ai/dsh', 'lib/bin.js');
+    await stubPkg('@deepseek-ai/dsh-tool-ask-user', 'lib/index.js');
+    const rb = await runDoctorChecks({
+        repoRoot: pkgRoot,
+        homeDir: join(hoist, 'home-empty'),
+        env: {}
+    });
+    assert.equal(rb.items.find((i)=>i.id === 'map-tools').status, 'ok', '提升布局 map-tools 经包根解析链命中');
+    assert.equal(rb.items.find((i)=>i.id === 'ask-user').status, 'ok', '提升布局 ask-user 经 dsh 上下文解析链命中(误报修复)');
+    await rm(hoist, {
+        recursive: true,
+        force: true
+    });
+}console.log('5b. npm 提升布局解析链(map-tools/ask-user 误报修复)OK');
+{
+    const vend = await mkdtemp(join(tmpdir(), 'gotry-doctor-vendor-'));
+    const vendorEntry = join(vend, 'ts/dsh-runtime/vendor/dsh-map-tools/lib/index.js');
+    await mkdir(dirname(vendorEntry), {
+        recursive: true
+    });
+    await writeFile(vendorEntry, '// stub\n', 'utf-8');
+    const rc = await runDoctorChecks({
+        repoRoot: vend,
+        homeDir: join(vend, 'home-empty'),
+        env: {}
+    });
+    assert.equal(rc.items.find((i)=>i.id === 'map-tools').status, 'ok', 'vendor 副本命中(map-tools 随 tarball 分发)');
+    await rm(vend, {
+        recursive: true,
+        force: true
+    });
+}console.log('5c. 随包 vendor 布局(map-tools tarball 分发面)OK');
 const smokeRoot = await mkdtemp(join(tmpdir(), 'gotry-doctor-state-'));
 const registered = [];
 const ctx = {

package/dist/scripts/hbcli-tests.js

@@ -86,7 +86,44 @@ await writeFile(fallback, JSON.stringify({
     if (!argLine.includes('destination-name') || !argLine.includes('room-occupancies')) {
         throw new Error(`FAIL: v0.3.0 旗标未对齐,实际 ${argLine.slice(0, 200)}`);
     }
-    console.log('5. v0.3.0 旗标(--destination-name/--room-occupancies)对齐 OK');
+    const rd = await searchHotels({
+        destination: '普吉',
+        checkIn: '2026-09-18',
+        checkOut: '2026-09-20'
+    }, {
+        hbcliBin: echoBin
+    });
+    const dateLine = JSON.stringify(rd);
+    if (!dateLine.includes('check-in') || !dateLine.includes('2026-09-18') || !dateLine.includes('check-out')) {
+        throw new Error(`FAIL: 日期旗标未传上游,实际 ${dateLine.slice(0, 240)}`);
+    }
+    assert.ok(rd.summary.includes('入住 2026-09-18 → 退房 2026-09-20'), 'summary 应回显日期槽位');
+    console.log('5. 旗标对齐(--destination-name/--room-occupancies/--check-in/--check-out)OK');
+}{
+    const { writeFileSync, chmodSync } = await import('node:fs');
+    const listBin = join(tmp, 'hbcli-list');
+    writeFileSync(listBin, `#!/bin/sh
+cat <<'JSON'
+{"list":[{"id":461850557,"name":{"en":"Jumeirah Beach Hotel","zh":"朱美拉海滩酒店"},"star":5,"minPrice":{"amount":100,"currency":"USD"}}],"basic":{"sessionId":"s1"}}
+JSON
+`);
+    chmodSync(listBin, 0o755);
+    const rl = await searchHotels({
+        destination: '迪拜',
+        checkIn: '2026-09-18',
+        checkOut: '2026-09-20'
+    }, {
+        hbcliBin: listBin
+    });
+    assert.equal(rl.via, 'hbcli-realtime');
+    assert.ok(rl.summary.includes('实时 1 家'), 'summary 应带家数');
+    assert.ok(rl.summary.includes('id=461850557'), '数据行应带 hotelId(hotel-rates 入参来源)');
+    assert.ok(rl.summary.includes('朱美拉海滩酒店'), '数据行应带 zh 名称');
+    assert.ok(rl.summary.includes('5★'), '数据行应带星级');
+    assert.ok(rl.summary.includes('100 USD'), '数据行应带最低价');
+    assert.match(rl.summary, /\[实时API:hbcli@/, 'summary 应带证据链时间戳');
+    assert.ok(rl.hotels !== null, 'hotels 结构化产物保留(UI/程序消费)');
+    console.log(`5b. 实时 summary 数据行 OK:${rl.summary.split('\n')[1]}`);
 }const r4 = await searchHotels({
     destination: '普吉岛'
 }, {

package/dist/src/benchmark-agent-conformance.js

@@ -12,6 +12,13 @@ export const BENCHMARK_BRIDGE_RETRY_CALL_NOT_ALLOWED = 'BENCHMARK_BRIDGE_RETRY_C
 export const BENCHMARK_CONFORMANCE_STATE_UNAVAILABLE = 'BENCHMARK_CONFORMANCE_STATE_UNAVAILABLE';
 const IDENTIFIER = /^[A-Za-z][A-Za-z0-9_.-]*$/;
 const MAX_TERMINAL_BYTES = 1024 * 1024;
+const BENCHMARK_TOOL_RESULT_SCHEMA_VERSION = 'gotry_benchmark_tool_result_v1';
+const BENCHMARK_DOMAIN_RECOVERIES = new Set([
+    'none',
+    'retry_same',
+    'revise_arguments',
+    'choose_alternative'
+]);
 function plainObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -90,13 +97,23 @@ function bridgeResultStatus(data, callId) {
     try {
         const parsed = JSON.parse(text);
         if (!plainObject(parsed)) return undefined;
-        if (parsed.ok === true) return {
-            ok: true
+        const keys = Object.keys(parsed).sort().join(',');
+        if (parsed.ok === true && keys === 'ok,result' && (plainObject(parsed.result) || Array.isArray(parsed.result))) return {
+            kind: 'result'
         };
+        if (parsed.ok === true && keys === 'ok,outcome' && plainObject(parsed.outcome)) {
+            const outcomeKeys = Object.keys(parsed.outcome).sort().join(',');
+            if (outcomeKeys === 'code,recovery,schema_version,status' && parsed.outcome.schema_version === BENCHMARK_TOOL_RESULT_SCHEMA_VERSION && (parsed.outcome.status === 'miss' || parsed.outcome.status === 'error') && typeof parsed.outcome.code === 'string' && IDENTIFIER.test(parsed.outcome.code) && typeof parsed.outcome.recovery === 'string' && BENCHMARK_DOMAIN_RECOVERIES.has(parsed.outcome.recovery)) return {
+                kind: 'domain'
+            };
+            return undefined;
+        }
         if (parsed.ok === false && typeof parsed.error === 'string') {
+            const exactFailure = parsed.error === 'runner_failed' ? keys === 'error,ok' || keys === 'error,exit_code,ok,signal' && (parsed.exit_code === null || typeof parsed.exit_code === 'number' && Number.isInteger(parsed.exit_code)) && (parsed.signal === null || typeof parsed.signal === 'string') : parsed.error === 'invalid_arguments' ? keys === 'error,ok,reason' && typeof parsed.reason === 'string' : keys === 'error,ok';
+            if (!exactFailure) return undefined;
             const code = parsed.error === 'timed_out' ? BENCHMARK_BRIDGE_TIMED_OUT : parsed.error === 'runner_failed' ? BENCHMARK_BRIDGE_RUNNER_FAILED : parsed.error === 'spawn_failed' ? BENCHMARK_BRIDGE_SPAWN_FAILED : parsed.error === 'output_truncated' ? BENCHMARK_BRIDGE_OUTPUT_TRUNCATED : BENCHMARK_BRIDGE_CALL_FAILED;
             return {
-                ok: false,
+                kind: 'failure',
                 code
             };
         }
@@ -164,8 +181,11 @@ export function createBenchmarkAgentConformance(projection) {
                 const callId = event.data.message.source.callId;
                 if (typeof callId !== 'string' || !state.validCallIds.has(callId)) return;
                 const resultStatus = bridgeResultStatus(event.data, callId);
-                if (resultStatus?.ok === true) {
+                if (typeof event.data.step === 'number') state.lastBridgeResponseStep = event.data.step;
+                if (resultStatus?.kind === 'result') {
                     state.successfulResultStep = typeof event.data.step === 'number' ? event.data.step : state.successfulResultStep;
+                } else if (resultStatus?.kind === 'domain') {
+                    state.domainOutcomeStep = typeof event.data.step === 'number' ? event.data.step : state.domainOutcomeStep;
                 } else {
                     state.bridgeCallFailed = true;
                     state.bridgeFailureCode = resultStatus?.code ?? BENCHMARK_BRIDGE_CALL_FAILED;
@@ -194,13 +214,13 @@ export function createBenchmarkAgentConformance(projection) {
                     code: BENCHMARK_BRIDGE_RETRY_CALL_NOT_ALLOWED
                 };
             }
-            if (state.successfulResultStep === undefined) {
-                if (state.bridgeCallFailed) {
-                    return {
-                        kind: 'reject',
-                        code: state.bridgeFailureCode ?? BENCHMARK_BRIDGE_CALL_FAILED
-                    };
-                }
+            if (state.bridgeCallFailed && state.successfulResultStep === undefined) {
+                return {
+                    kind: 'reject',
+                    code: state.bridgeFailureCode ?? BENCHMARK_BRIDGE_CALL_FAILED
+                };
+            }
+            if (state.successfulResultStep === undefined && state.domainOutcomeStep === undefined) {
                 if (state.retryCount >= MAX_CONFORMANCE_RETRIES) {
                     return {
                         kind: 'reject',
@@ -215,7 +235,7 @@ export function createBenchmarkAgentConformance(projection) {
                 };
             }
             const terminal = state.lastAssistant;
-            const terminalIsValid = terminal !== undefined && !terminal.interrupted && terminal.step > state.successfulResultStep && parseBenchmarkTerminal(terminal.text, projection.terminal).ok;
+            const terminalIsValid = terminal !== undefined && !terminal.interrupted && terminal.step > state.lastBridgeResponseStep && parseBenchmarkTerminal(terminal.text, projection.terminal).ok;
             if (terminalIsValid) return {
                 kind: 'accept'
             };