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

package/dist/capabilities/session/wizard.js

@@ -1,109 +1,89 @@
+/**
+ * 会话扩展 onboarding wizard(RFC docs/rfc/user-session-data-rfc.md §3.3,ADR-21 上架后重设)。
+ *
+ * 单一职责(2026-09-02 重设):**只做 Node 端两件事**——
+ *   ① 扩展文件从源落位到 `~/.gotry/extension`(幂等)
+ *   ② source/dest 静态预检 + manifest.key 校验(给 health-watch 前的快照)
+ *
+ * 浏览器商店安装是浏览器的事,dsh 渲染 verdict.installUrl 是 dsh UI 的事;
+ * gotry **不再**弹 GUI 面板(pbcopy/osascript/zenity/msg)、不再 open 浏览器、
+ * 不再写一墙文字 CLI 指引。任何"装到能用"的 UX 都由浏览器商店 + dsh UI 分担。
+ *
+ * 历史形态回顾:
+ * - 2026-08-30 初版:5 步编排 + 剪贴板 + GUI 面板 + 健康探活(全栈闭环初衷好,但越界管了浏览器)
+ * - 2026-09-02 上架后:缩为 2 步(ensure + watch precheck),纯 Node 职责
+ *
+ * 接口契约:
+ * - `runOnboardingWizard({ dryRun, extensionDir?, sourceDir? })` 返回 2 步 OnboardingResult
+ * - `defaultExtensionDir()` / `describeExtensionDir()` 留作公开工具
+ */
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 const DEFAULT_SOURCE_DIR_CANDIDATES = [
     join(process.cwd(), 'extension'),
     join(process.cwd(), 'dist', 'extension'),
-    join(process.cwd(), 'ts', '..', 'extension')
+    join(process.cwd(), 'ts', '..', 'extension'),
 ];
 function resolveExtensionSourceDir() {
-    for (const candidate of DEFAULT_SOURCE_DIR_CANDIDATES){
-        if (existsSync(join(candidate, 'manifest.json'))) return candidate;
+    for (const candidate of DEFAULT_SOURCE_DIR_CANDIDATES) {
+        if (existsSync(join(candidate, 'manifest.json')))
+            return candidate;
     }
     return DEFAULT_SOURCE_DIR_CANDIDATES[0];
 }
 export function defaultExtensionDir() {
     return join(homedir(), '.gotry', 'extension');
 }
+/** 落位扩展文件(幂等);缺源/源不全会 fail-soft,提示用户重跑 `gotry setup` */
 function ensureExtensionFiles(source, target, dryRun) {
-    if (dryRun) return {
-        step: 'ensure-extension-files',
-        status: 'skip',
-        summary: '[dry-run] skip 扩展落位'
-    };
+    if (dryRun)
+        return { step: 'ensure-extension-files', status: 'skip', summary: '[dry-run] skip 扩展落位' };
     try {
         if (!existsSync(source) || !existsSync(join(source, 'manifest.json'))) {
-            return {
-                step: 'ensure-extension-files',
-                status: 'fail',
-                summary: `源扩展目录缺失 manifest.json: ${source}(先跑 npx gotry setup 落位)`
-            };
+            return { step: 'ensure-extension-files', status: 'fail', summary: `源扩展目录缺失 manifest.json: ${source}(先跑 npx @danceiny/gotry setup 落位)` };
         }
-        mkdirSync(target, {
-            recursive: true
-        });
-        const required = [
-            'manifest.json',
-            'background.js',
-            'content-main.js',
-            'content-bridge.js'
-        ];
-        for (const f of required){
+        mkdirSync(target, { recursive: true });
+        const required = ['manifest.json', 'background.js', 'content-main.js', 'content-bridge.js'];
+        for (const f of required) {
             const src = join(source, f);
-            if (!existsSync(src)) return {
-                step: 'ensure-extension-files',
-                status: 'fail',
-                summary: `源扩展缺 ${f}(重新 npm install 或 gotry setup)`
-            };
+            if (!existsSync(src))
+                return { step: 'ensure-extension-files', status: 'fail', summary: `源扩展缺 ${f}(重新 npm install 或 gotry setup)` };
             copyFileSync(src, join(target, f));
         }
-        return {
-            step: 'ensure-extension-files',
-            status: 'ok',
-            summary: `扩展已落位 ${target}(manifest+3 文件)`
-        };
-    } catch (e) {
-        return {
-            step: 'ensure-extension-files',
-            status: 'fail',
-            summary: `扩展落位失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}`
-        };
+        return { step: 'ensure-extension-files', status: 'ok', summary: `扩展已落位 ${target}(manifest+3 文件)` };
+    }
+    catch (e) {
+        return { step: 'ensure-extension-files', status: 'fail', summary: `扩展落位失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}` };
     }
 }
+/** 静态预检:落位目录可见 + manifest.key 存在(扩展 ID 稳定)+ 源未新于 dest */
 async function watchExtensionReady(dryRun, sourceDir, extensionDir) {
-    if (dryRun) return {
-        step: 'watch-extension-ready',
-        status: 'skip',
-        summary: '[dry-run] skip health-watch precheck'
-    };
+    if (dryRun)
+        return { step: 'watch-extension-ready', status: 'skip', summary: '[dry-run] skip health-watch precheck' };
     if (!existsSync(extensionDir) || !existsSync(join(extensionDir, 'manifest.json'))) {
-        return {
-            step: 'watch-extension-ready',
-            status: 'fail',
-            summary: `落位缺失 manifest.json:${extensionDir}`
-        };
+        return { step: 'watch-extension-ready', status: 'fail', summary: `落位缺失 manifest.json:${extensionDir}` };
     }
     try {
         const srcStat = statSync(sourceDir);
         const dstStat = statSync(extensionDir);
         if (srcStat.mtimeMs > dstStat.mtimeMs) {
-            return {
-                step: 'watch-extension-ready',
-                status: 'fail',
-                summary: `扩展文件可能过期(源比落位新);重跑 npx gotry setup`
-            };
+            return { step: 'watch-extension-ready', status: 'fail', summary: `扩展文件可能过期(源比落位新);重跑 npx @danceiny/gotry setup` };
         }
         const manifest = JSON.parse(await (await import('node:fs/promises')).readFile(join(extensionDir, 'manifest.json'), 'utf8'));
         if (typeof manifest.key !== 'string' || manifest.key.length < 100) {
-            return {
-                step: 'watch-extension-ready',
-                status: 'fail',
-                summary: 'manifest.key 缺失或过短,扩展 ID 不能稳定'
-            };
+            return { step: 'watch-extension-ready', status: 'fail', summary: 'manifest.key 缺失或过短,扩展 ID 不能稳定' };
         }
-    } catch (e) {
-        return {
-            step: 'watch-extension-ready',
-            status: 'fail',
-            summary: `静态预检失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}`
-        };
     }
-    return {
-        step: 'watch-extension-ready',
-        status: 'ok',
-        summary: '扩展文件就绪(manifest.key 校验通过,后台轮询就绪态由 health-watch 接管)'
-    };
+    catch (e) {
+        return { step: 'watch-extension-ready', status: 'fail', summary: `静态预检失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}` };
+    }
+    return { step: 'watch-extension-ready', status: 'ok', summary: '扩展文件就绪(manifest.key 校验通过,后台轮询就绪态由 health-watch 接管)' };
 }
+/**
+ * 主入口(2 步):①扩展落位 ②watch precheck 静态预检。
+ * 真 health-watch 由 health-watch.ts 单独负责,不并入 wizard。
+ */
 export async function runOnboardingWizard(opts = {}) {
     const dryRun = opts.dryRun ?? false;
     const extensionDir = opts.extensionDir ?? defaultExtensionDir();
@@ -111,37 +91,27 @@ export async function runOnboardingWizard(opts = {}) {
     const steps = [];
     steps.push(ensureExtensionFiles(sourceDir, extensionDir, dryRun));
     steps.push(await watchExtensionReady(dryRun, sourceDir, extensionDir));
-    const ok = steps.every((s)=>s.status !== 'fail');
-    return {
-        ok,
-        steps,
-        extensionDir
-    };
+    const ok = steps.every((s) => s.status !== 'fail');
+    return { ok, steps, extensionDir };
 }
+/** stdout 人话化打印(给 bootstrap 子进程单行 JSON 输出之外的兜底形态) */
 export function printWizardResult(result, destination = process.stdout) {
-    const tag = (s)=>{
-        if (s.status === 'ok') return '✅';
-        if (s.status === 'skip') return '⏭ ';
+    const tag = (s) => {
+        if (s.status === 'ok')
+            return '✅';
+        if (s.status === 'skip')
+            return '⏭ ';
         return '❌';
     };
-    for (const s of result.steps){
+    for (const s of result.steps) {
         destination.write(`${tag(s)} ${s.step}: ${s.summary}\n`);
     }
     destination.write(`extensionDir=${result.extensionDir}; overall=${result.ok ? 'ok' : 'has-failures'}\n`);
 }
+/** 公开诊断探针(bootstrap 报告用) */
 export function describeExtensionDir(extensionDir) {
-    if (!existsSync(extensionDir)) return {
-        exists: false,
-        fileCount: 0,
-        hasManifest: false
-    };
+    if (!existsSync(extensionDir))
+        return { exists: false, fileCount: 0, hasManifest: false };
     const files = readdirSync(extensionDir);
-    return {
-        exists: true,
-        fileCount: files.length,
-        hasManifest: files.includes('manifest.json')
-    };
+    return { exists: true, fileCount: files.length, hasManifest: files.includes('manifest.json') };
 }
-
-
-//# sourceURL=ts/capabilities/session/wizard.ts

package/dist/capabilities/session-consent.js

@@ -1,46 +1,150 @@
+/**
+ * SessionConsent——账号会话授权闸(RFC 合规支柱④「用户明示授权 + 站点白名单 + 随时可关」进代码)。
+ *
+ * founder 口径(2026-08-29):「OTA 这些都是工具,不要区分什么主路径/降级路径;
+ * 这要用到用户的账号,所以必须跟用户确认(请求授权)。」
+ * 运行时原生审批卡语义是 allowed-once(逐调用批准)——首日落地后 founder 实测纠偏:
+ * 「每次都要弹,经常无法点击」→ 逐次弹卡把授权变成了骚扰。授权模型 v2:
+ *
+ *   - 每会话每站点**首次调用**弹审批卡;allowed-once 记入该 agent 的 granted 集,
+ *     会话内同站点后续调用直接放行(不再弹);
+ *   - rejected/cancelled 视为**会话内吊销**(denied 集):本会话不再弹卡、不再执行,
+ *     返回值明确告诉模型「改走其他工具,不要反复尝试」——防止反复开页骚扰用户;
+ *   - 审批通道缺席(unavailable,如 headless 一问一答)→ deny 且**不**记 denied
+ *     (通道回来后还能问一次);
+ *   - sessionAccess = 'ask'(默认)| 'allow'(用户已明示预授权,放行)| 'off'(随时可关);
+ *   - 授权状态存 Weak<agent>——会话结束即遗忘,绝不跨会话持久化(明示授权不默认延续)。
+ * 审计:批准/拒绝事件由 dsh ApprovalService 落 session log(approval/asked + decided),
+ * 本模块不重复建账。站点白名单 = ACCOUNT_TOOLS 注册表(新会话适配器接入时登记)。
+ *
+ * site 绑定(2026-09-10 #308):同一工具多个 kind(例如 gotry_session_search → flight/hotel/dida/train)
+ * 必须按与 execute 同源的 interpretArgs 选 site(包装 query 优先);授权与拒绝均按 site
+ * 分桶。缺省 kind 保持工具合同的 flight 默认值;unknown/malformed kind 失败关闭(deny,
+ * 不扩权),防止新站点未登记就放行。train 虽是 12306 公开查询面,仍经过本闸的 off/ask/allow。
+ */
+import { interpretArgs } from '../src/tool-packet.js';
+/**
+ * 工具级 site 表(无 kind 维度时使用):key=工具名,value=站点。
+ * 复合工具(同一名字下多 kind)在 SITE_FOR_KIND 中显式登记。
+ */
 export const ACCOUNT_TOOLS = {
-    gotry_session_search: 'ctrip-flight'
+    gotry_session_search: 'ctrip-flight',
 };
 const SITE_LABEL = {
-    'ctrip-flight': '携程机票'
+    'ctrip-flight': '携程机票',
+    'ctrip-hotel': '携程酒店',
+    'dida-portal': 'Dida 供应商门户',
+    'train-12306': '12306 余票(公开查询面)',
 };
+/**
+ * 复合工具 × kind → site(#308:site 绑定)。
+ * 仅对显式登记的 kind 放行,未知 kind → 失败关闭(防止未登记站点扩权)。
+ * 12306 公开查询面(kind=train)仍受本工具的会话授权总闸约束,不因公开查询而绕过 off/ask/allow。
+ */
+export const SITE_FOR_KIND = {
+    gotry_session_search: {
+        flight: 'ctrip-flight',
+        hotel: 'ctrip-hotel',
+        dida: 'dida-portal',
+        train: 'train-12306',
+    },
+};
+/** 会话检索工具支持的 kind;gate 与 execute 共用此选择结果。 */
+export const SESSION_SEARCH_KINDS = ['flight', 'hotel', 'train', 'dida'];
+/**
+ * Select the kind exactly as the session tool execute path does.
+ * `interpretArgs` is intentionally the only query-wrapper normalizer: a
+ * wrapped query wins over conflicting flat fields, and omitted kind keeps the
+ * documented flight default. Explicit malformed/unknown kinds fail closed.
+ */
+export function resolveSessionSearchKind(args) {
+    if (args === undefined)
+        return { ok: true, kind: 'flight' };
+    if (!args || typeof args !== 'object' || Array.isArray(args)) {
+        return { ok: false, reason: 'gotry_session_search 参数必须是对象;无法安全选择 kind,已失败关闭' };
+    }
+    const selected = interpretArgs(args);
+    if (!selected || typeof selected !== 'object' || Array.isArray(selected)) {
+        return { ok: false, reason: 'gotry_session_search 参数包装形态无效;无法安全选择 kind,已失败关闭' };
+    }
+    if (!Object.prototype.hasOwnProperty.call(selected, 'kind'))
+        return { ok: true, kind: 'flight' };
+    const kind = selected.kind;
+    if (typeof kind !== 'string' || kind.length === 0) {
+        return { ok: false, reason: 'gotry_session_search 收到 malformed kind;无法安全选择站点,已失败关闭' };
+    }
+    if (!SESSION_SEARCH_KINDS.includes(kind)) {
+        return { ok: false, reason: `gotry_session_search 收到未知 kind=${kind};只支持 ${SESSION_SEARCH_KINDS.join('/')},未知 kind 失败关闭` };
+    }
+    return { ok: true, kind: kind };
+}
+/**
+ * 解析 site(#308):对复合工具(缺省 kind=flight,未知/malformed kind → fail-closed);对未在
+ * SITE_FOR_KIND 登记的工具走原 ACCOUNT_TOOLS 表保持兼容。无 site → 放行(非账号面工具)。
+ */
+export function resolveSiteForExec(exec) {
+    const name = exec.name;
+    if (!name)
+        return null;
+    const map = SITE_FOR_KIND[name];
+    if (map) {
+        const selected = resolveSessionSearchKind(exec.arguments);
+        if (!selected.ok)
+            return { failClosed: true, reason: selected.reason };
+        const site = map[selected.kind];
+        if (!site)
+            return { failClosed: true, reason: `工具 ${name} 的 kind=${selected.kind} 未登记站点;失败关闭` };
+        return { site };
+    }
+    const site = ACCOUNT_TOOLS[name];
+    if (!site)
+        return null;
+    return { site };
+}
 function reasonFor(toolName, site) {
-    return `${toolName} 将使用你本人已登录的浏览器会话做「${SITE_LABEL[site] ?? site}」只读检索` + '(ReadGuard 物理只读:写请求网络层中止,agent 永不碰凭证与验证码);本次批准在你本会话内有效';
+    return `工具 ${toolName} 将使用你本人已登录的浏览器会话，在「${SITE_LABEL[site] ?? site}」进行只读检索`
+        + '（ReadGuard 物理只读：写请求在网络层即中止，agent 永不接触凭证与验证码）；'
+        + '本次批准仅在本会话内有效，会话结束即失效，不会跨会话延续。';
 }
+/**
+ * 账号会话授权闸:挂 dsh `tools/pre-execute` waterfall。
+ * 契约:
+ *   - 非账号面工具 → next() 放行(零开销);
+ *   - off → 拒绝(随时可关);
+ *   - 会话内已拒绝 → 拒绝且不弹卡(拒绝=本会话吊销;按 site 分桶,跨站不互授);
+ *   - 会话内已批准 / allow 预授权 → 放行;
+ *   - 复合工具未知/malformed kind → fail-closed deny(不扩权),缺省 kind=flight;
+ *   - 其余 → ApprovalService.request();allowed-once 按 site 入会话 granted;
+ *     rejected/cancelled 按 site 入会话 denied(本会话不在请求);
+ *     无审批通道 → deny(fail-closed,headless 无用户 = 无授权)。
+ */
 export function createConsentGate(opts) {
     const store = opts.store ?? new WeakMap();
-    const approvalOf = opts.approval ?? (()=>undefined);
-    return async (exec, next)=>{
-        const site = exec.name && ACCOUNT_TOOLS[exec.name];
-        if (!site) return next();
+    const approvalOf = opts.approval ?? (() => undefined);
+    return async (exec, next) => {
+        const resolved = resolveSiteForExec(exec);
+        if (!resolved)
+            return next();
+        if ('failClosed' in resolved)
+            return { kind: 'deny', reason: resolved.reason };
+        const { site } = resolved;
         if ((opts.access() ?? 'ask') === 'off') {
-            return {
-                kind: 'deny',
-                reason: `${exec.name} 已被配置关闭(sessionAccess=off);需要账号会话检索时由用户开启`
-            };
+            return { kind: 'deny', reason: `工具 ${exec.name} 已被配置关闭（sessionAccess=off）。如需重新启用账号会话检索，请到配置中重新开启 sessionAccess。` };
         }
-        const state = exec.agent && store.get(exec.agent) || undefined;
+        const state = (exec.agent && store.get(exec.agent)) || undefined;
         if (state?.denied.has(site)) {
-            return {
-                kind: 'deny',
-                reason: `你在本会话已拒绝过「${SITE_LABEL[site] ?? site}」的账号会话检索——本会话不再请求授权,请改走其他工具推进`
-            };
+            return { kind: 'deny', reason: `你已在本会话拒绝过「${SITE_LABEL[site] ?? site}」的账号会话检索。为避免反复打扰，本会话不再请求授权，请改用其他工具继续推进。` };
         }
-        if (state?.granted.has(site) || opts.access() === 'allow' && exec.agent) return next();
+        if (state?.granted.has(site) || (opts.access() === 'allow' && exec.agent))
+            return next();
         const approval = opts.approval?.();
-        if (!approval || !exec.agent) return {
-            kind: 'ask',
-            reason: reasonFor(exec.name ?? '', site)
-        };
+        if (!approval || !exec.agent)
+            return { kind: 'ask', reason: reasonFor(exec.name ?? '', site) };
         let outcome;
         try {
-            outcome = await approval.request({
-                agent: exec.agent,
-                toolName: exec.name ?? '',
-                callId: exec.callId,
-                reason: reasonFor(exec.name ?? '', site)
-            });
-        } catch  {
+            outcome = await approval.request({ agent: exec.agent, toolName: exec.name ?? '', callId: exec.callId, reason: reasonFor(exec.name ?? '', site) });
+        }
+        catch {
             outcome = 'unavailable';
         }
         if (outcome === 'allowed-once') {
@@ -49,34 +153,26 @@ export function createConsentGate(opts) {
         }
         if (outcome === 'rejected' || outcome === 'cancelled') {
             remember(store, exec.agent, site, 'deny');
-            return {
-                kind: 'deny',
-                reason: `你拒绝了 ${exec.name} 的账号会话授权(本会话内生效);不再重复请求,请改走其他工具推进`
-            };
+            return { kind: 'deny', reason: `你刚刚拒绝了工具 ${exec.name} 的账号会话授权（本次拒绝仅在本会话内生效）。为避免反复打扰，本会话不再重复请求授权，请改用其他工具继续推进。` };
         }
-        return {
-            kind: 'deny',
-            reason: `${exec.name} 需要你授权,但当前没有可用的审批通道(headless 一问一答无审批界面;请在 web 会话中使用账号会话检索)`
-        };
+        return { kind: 'deny', reason: `工具 ${exec.name} 需要你授权，但当前没有可用的审批通道。在 headless 一问一答场景下没有审批界面，请改用 web 会话来使用账号会话检索。` };
     };
 }
 function remember(store, agent, site, mode) {
-    const prev = store.get(agent) ?? {
-        granted: new Set(),
-        denied: new Set()
-    };
-    if (mode === 'grant') prev.granted.add(site);
-    else prev.denied.add(site);
+    const prev = store.get(agent) ?? { granted: new Set(), denied: new Set() };
+    if (mode === 'grant')
+        prev.granted.add(site);
+    else
+        prev.denied.add(site);
     store.set(agent, prev);
 }
+/** 从运行时上下文懒解析审批缝(与 dsh-tools serviceAsk 的 ctx.get('approval') 同一协议) */
 export function approvalFromContext(ctx) {
-    return ()=>{
+    return () => {
         const get = ctx.get;
-        if (typeof get !== 'function') return undefined;
+        if (typeof get !== 'function')
+            return undefined;
         const approval = get.call(ctx, 'approval');
         return approval && typeof approval.request === 'function' ? approval : undefined;
     };
 }
-
-
-//# sourceURL=ts/capabilities/session-consent.ts