openclaw-glance-plugin 0.1.22 → 0.1.27

package/src/plugin/index.js

@@ -1,9 +1,19 @@
+import {
+  normalizeFundBasicTableQuery,
+  normalizeKeywordTableQuery,
+  normalizeTickerQuery,
+  normalizeTradeCalendarQuery
+} from '../agentQueryNormalize.js';
 import { resolveRuntimeConfig } from '../config/runtime-config.js';
 import { extractOpenclawRoutingFromRecord, deriveOpenclawRouting } from '../openclawRouting.js';
 import { BridgeRuntime } from '../runtime/BridgeRuntime.js';
 import { PluginDispatcher } from '../runtime/dispatchers/PluginDispatcher.js';
 import { ProcessLock } from '../runtime/lock/ProcessLock.js';
 
+/** 与 BridgeRuntime FINANCE_TABLE_REQUEST_TIMEOUT_MS 一致 */
+const GATEWAY_TABLE_REQUEST_TIMEOUT_MS = 90_000;
+const FUND_CODE_PATTERN = /^\d{6}\.OF$/i;
+
 let activeRuntime = null;
 
 function installProcessShutdown(runtime) {
@@ -141,25 +151,105 @@ function mergeOpenclawChannelConfig(payload = {}, context = {}) {
   return merged;
 }
 
+function assertWatchCreateSupported(payload = {}) {
+  const code = String(payload.product_code ?? payload.productCode ?? '')
+    .trim()
+    .toUpperCase();
+  const productType = String(payload.product_type ?? payload.productType ?? '')
+    .trim()
+    .toLowerCase();
+  if (productType === 'fund' || FUND_CODE_PATTERN.test(code)) {
+    throw new Error(
+      'watch_create does not support fund strategies. Supported product_type: stock, hk_stock, index, crypto. For funds use watch_query_fund_estimates or watch_search_fund_basic.'
+    );
+  }
+}
+
 function buildControlApi(startupPromise) {
   return {
     async queryTickerData(query = {}) {
       const runtime = await getReadyRuntime(startupPromise);
-      const stockCode = query.stockCode || query.productCode || query.stock_code || '';
-      const productType = query.productType || query.product_type || '';
-      let market = query.market;
-      if (market == null && String(productType).toLowerCase() === 'crypto') {
-        market = '';
+      const payload = normalizeTickerQuery(query || {});
+      if (!payload.market || !payload.symbol) {
+        throw new Error(
+          'queryTickerData requires market and symbol. If user gave a company/index name only, call watch_search_*_basic first to get ts_code, then map to market+symbol.'
+        );
       }
-      return runtime.request('ticker.query', {
-        stock_code: stockCode,
-        market: market == null ? '' : String(market),
-        product_type: productType
-      });
+      return runtime.request('ticker.query', payload);
+    },
+    async queryFundEstimates(query = {}) {
+      const runtime = await getReadyRuntime(startupPromise);
+      let fundCodes = query.fund_codes ?? query.fundCodes;
+      if (fundCodes == null) {
+        throw new Error('queryFundEstimates requires fund_codes (or fundCodes): string or string[]');
+      }
+      if (typeof fundCodes === 'string') {
+        fundCodes = fundCodes.trim();
+      } else if (Array.isArray(fundCodes)) {
+        fundCodes = fundCodes.map((x) => String(x).trim()).filter(Boolean);
+      } else {
+        throw new Error('fund_codes must be a string or string[]');
+      }
+      return runtime.request('fund.estimates', { fund_codes: fundCodes });
+    },
+    async searchAStockBasic(query = {}) {
+      const runtime = await getReadyRuntime(startupPromise);
+      const q = normalizeKeywordTableQuery(query, 'searchAStockBasic');
+      return runtime.request(
+        'finance.table',
+        { path: '/v1/a-stock/basic/search', query: q },
+        { requestTimeoutMs: GATEWAY_TABLE_REQUEST_TIMEOUT_MS }
+      );
+    },
+    async searchHkStockBasic(query = {}) {
+      const runtime = await getReadyRuntime(startupPromise);
+      const q = normalizeKeywordTableQuery(query, 'searchHkStockBasic');
+      return runtime.request(
+        'finance.table',
+        { path: '/v1/hk-stock/basic/search', query: q },
+        { requestTimeoutMs: GATEWAY_TABLE_REQUEST_TIMEOUT_MS }
+      );
+    },
+    async searchIndexBasic(query = {}) {
+      const runtime = await getReadyRuntime(startupPromise);
+      const q = normalizeKeywordTableQuery(query, 'searchIndexBasic');
+      return runtime.request(
+        'finance.table',
+        { path: '/v1/index/basic/search', query: q },
+        { requestTimeoutMs: GATEWAY_TABLE_REQUEST_TIMEOUT_MS }
+      );
+    },
+    async searchFundBasic(query = {}) {
+      const runtime = await getReadyRuntime(startupPromise);
+      const q = normalizeFundBasicTableQuery(query);
+      return runtime.request(
+        'finance.table',
+        { path: '/v1/fund/basic', query: q },
+        { requestTimeoutMs: GATEWAY_TABLE_REQUEST_TIMEOUT_MS }
+      );
+    },
+    async queryFinNews(query = {}) {
+      const runtime = await getReadyRuntime(startupPromise);
+      const q = normalizeKeywordTableQuery(query, 'queryFinNews');
+      return runtime.request(
+        'finance.table',
+        { path: '/v1/news', query: q },
+        { requestTimeoutMs: GATEWAY_TABLE_REQUEST_TIMEOUT_MS }
+      );
+    },
+    async queryTradeCalendar(query = {}) {
+      const runtime = await getReadyRuntime(startupPromise);
+      const q = normalizeTradeCalendarQuery(query);
+      return runtime.request(
+        'finance.table',
+        { path: '/v1/trade-calendar', query: q },
+        { requestTimeoutMs: GATEWAY_TABLE_REQUEST_TIMEOUT_MS }
+      );
     },
     async createWatch(payload = {}, context = {}) {
       const runtime = await getReadyRuntime(startupPromise);
       const normalized = mergeOpenclawChannelConfig(payload, context);
+      assertWatchCreateSupported(normalized);
       return runtime.request('watch.create', normalized);
     },
     async sendNotification(input = {}) {
@@ -195,6 +285,7 @@ function buildControlApi(startupPromise) {
       const runtime = await getReadyRuntime(startupPromise);
       const payload = mapDemandToCreatePayload(demand);
       const normalized = mergeOpenclawChannelConfig(payload, context);
+      assertWatchCreateSupported(normalized);
       return runtime.request('watch.create', normalized);
     },
     async pauseWatch(strategyId) {
@@ -264,23 +355,185 @@ function tryRegisterTool(registerTool, name, description, parameters, handler) {
 function registerControlTools(api, controlApi) {
   const registerTool = api?.registerTool || api?.runtime?.registerTool;
 
+  const DESC_TICKER =
+    '【实时行情】当前价、涨跌幅等撮合侧快照。' +
+    'When: 用户已明确标的代码/简称对应的代码时用；仅说公司名时先用 watch_search_*_basic 再调本工具。' +
+    'Returns: type=ticker.query.result；success=true 时读 quote（英文键 last、name、pct_change 等）。' +
+    'Do NOT: 场外基金估值勿用本工具（用 watch_query_fund_estimates）。market 可用 a|hk|crypto 或「A股」「港股」「加密」等别名。';
+
   tryRegisterTool(
     registerTool,
     'watch_query_ticker',
-    'Query ticker data',
+    DESC_TICKER,
     {
       type: 'object',
+      description:
+        '实时行情。必填 market + symbol；segment 仅 A/港股指数场景建议 index 或省略。插件会将「A股」等映射为 a。',
       additionalProperties: true,
       properties: {
-        stock_code: { type: 'string' },
-        product_code: { type: 'string' },
-        product_type: { type: 'string' },
-        market: { type: 'string' }
-      }
+        market: {
+          type: 'string',
+          description:
+            '市场：a | hk | crypto；或中文别名 A股/港股/加密/数字货币（插件会归一化）。'
+        },
+        symbol: {
+          type: 'string',
+          description:
+            '标的代码：A 股如 600000.SH 或 600000；港股 00700；加密 BTCUSDT。名称请先用 search 工具解析。'
+        },
+        segment: {
+          type: 'string',
+          description: '可选。A/港股时 auto|stock|index；加密不传。'
+        }
+      },
+      required: ['market', 'symbol']
     },
     (args) => controlApi.queryTickerData(args || {})
   );
 
+  const DESC_FUND_EST =
+    '【基金当日估值】场外开放式基金估算净值/涨跌，非股票盘口。' +
+    'When: 用户问「基金今天估值、估算涨跌」且代码形如 xxxxxx.OF。' +
+    'Returns: fund.estimates.result；可能较慢（~90s）。' +
+    'Do NOT: 股票/指数/加密行情用 watch_query_ticker。';
+
+  tryRegisterTool(
+    registerTool,
+    'watch_query_fund_estimates',
+    DESC_FUND_EST,
+    {
+      type: 'object',
+      description: '单只或多只基金代码；fund_codes 与 fundCodes 等价。',
+      additionalProperties: true,
+      properties: {
+        fund_codes: {
+          description: '单只 "000006.OF" 或字符串数组；与 fundCodes 二选一即可',
+          oneOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' } }]
+        },
+        fundCodes: {
+          description: 'camelCase 别名，含义同 fund_codes',
+          oneOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' } }]
+        }
+      },
+      anyOf: [{ required: ['fund_codes'] }, { required: ['fundCodes'] }]
+    },
+    (args) => controlApi.queryFundEstimates(args || {})
+  );
+
+  const keywordSearchSchema = {
+    type: 'object',
+    description:
+      'keyword 与 q 等价，至少填一个（插件会合并为网关 keyword）。可选 limit（条数）。返回 finance.table.result，行在 data[]。',
+    additionalProperties: true,
+    properties: {
+      keyword: { type: 'string', description: '搜索词：名称或代码片段，优先使用' },
+      q: { type: 'string', description: '与 keyword 二选一' },
+      limit: { type: 'number', description: '最大行数，默认由网关决定' }
+    },
+    anyOf: [{ required: ['keyword'] }, { required: ['q'] }]
+  };
+
+  tryRegisterTool(
+    registerTool,
+    'watch_search_a_stock_basic',
+    '【A 股基础信息】按名称/代码找 ts_code、简称、行业等（日终/静态库表）。' +
+      'When: 用户只说中文名或模糊代码、要映射到 600000.SH 再查 watch_query_ticker。' +
+      'Returns: finance.table.result，data[] 每行含 ts_code 等字段。',
+    keywordSearchSchema,
+    (args) => controlApi.searchAStockBasic(args || {})
+  );
+
+  tryRegisterTool(
+    registerTool,
+    'watch_search_hk_stock_basic',
+    '【港股基础信息】名称/拼音/代码检索港股代码。' +
+      'When: 港股名称→代码后再 watch_query_ticker(market=hk)。' +
+      'Returns: finance.table.result。',
+    keywordSearchSchema,
+    (args) => controlApi.searchHkStockBasic(args || {})
+  );
+
+  tryRegisterTool(
+    registerTool,
+    'watch_search_index_basic',
+    '【指数基础信息】按简称/ts_code 找指数。' +
+      'When: 用户说「沪深300」「恒生指数」等需解析为指数代码再 watch_query_ticker。' +
+      'Returns: finance.table.result。',
+    keywordSearchSchema,
+    (args) => controlApi.searchIndexBasic(args || {})
+  );
+
+  tryRegisterTool(
+    registerTool,
+    'watch_search_fund_basic',
+    '【基金档案】按 ts_code 或名称查基金元数据（非估值）。' +
+      'When: 确认基金代码、或名称反查 000xxx.OF；查当日估算涨跌用 watch_query_fund_estimates。' +
+      'Returns: finance.table.result。',
+    {
+      type: 'object',
+      description: 'ts_code 精确查优先；否则 keyword 或 q 模糊查。可选 limit。',
+      additionalProperties: true,
+      properties: {
+        ts_code: { type: 'string', description: '基金代码如 000006.OF' },
+        tsCode: { type: 'string', description: 'camelCase 别名' },
+        keyword: { type: 'string', description: '基金名称关键词' },
+        q: { type: 'string', description: '同 keyword' },
+        limit: { type: 'number' }
+      },
+      anyOf: [
+        { required: ['ts_code'] },
+        { required: ['tsCode'] },
+        { required: ['keyword'] },
+        { required: ['q'] }
+      ]
+    },
+    (args) => controlApi.searchFundBasic(args || {})
+  );
+
+  tryRegisterTool(
+    registerTool,
+    'watch_fin_news',
+    '【财经快讯】标题/摘要类新闻，非实时逐笔。' +
+      'When: 用户问「有什么新闻、快讯」并给出主题词。' +
+      'Returns: finance.table.result；可选 pub_time_start/pub_time_end 收窄时间。' +
+      'Do NOT: 与行情混淆；无关键词时先追问。',
+    {
+      ...keywordSearchSchema,
+      properties: {
+        ...keywordSearchSchema.properties,
+        pub_time_start: { type: 'string', description: '可选，发布时间下界，如 YYYY-MM-DD HH:MM:SS' },
+        pub_time_end: { type: 'string', description: '可选，发布时间上界' }
+      }
+    },
+    (args) => controlApi.queryFinNews(args || {})
+  );
+
+  tryRegisterTool(
+    registerTool,
+    'watch_trade_calendar',
+    '【交易日历】某日是否开市、上一交易日等，无价量。' +
+      'When: 「今天A股开不开盘」「五一休市吗」等；A 股常用 exchange=SSE（沪）或 SZSE（深），可各查一次或问用户。' +
+      'Returns: finance.table.result，行内 is_open 等字段依网关。' +
+      'Required: exchange + start_date + end_date（YYYY-MM-DD）；可用 startDate/endDate。',
+    {
+      type: 'object',
+      description: '区间宜覆盖所问日期；单日则 start=end。',
+      additionalProperties: true,
+      properties: {
+        exchange: {
+          type: 'string',
+          description: '交易所代码，如 SSE（上交所）、SZSE（深交所），与网关文档一致'
+        },
+        start_date: { type: 'string', description: '区间起点 YYYY-MM-DD' },
+        end_date: { type: 'string', description: '区间终点 YYYY-MM-DD' },
+        startDate: { type: 'string', description: 'camelCase，同 start_date' },
+        endDate: { type: 'string', description: 'camelCase，同 end_date' }
+      },
+      required: ['exchange']
+    },
+    (args) => controlApi.queryTradeCalendar(args || {})
+  );
+
   tryRegisterTool(
     registerTool,
     'notify_sms',
@@ -332,7 +585,7 @@ function registerControlTools(api, controlApi) {
   tryRegisterTool(
     registerTool,
     'watch_create',
-    'Create watch strategy',
+    'Create watch strategy for stock/hk_stock/index/crypto. Do NOT use for funds (.OF).',
     {
       type: 'object',
       additionalProperties: true,
@@ -343,7 +596,8 @@ function registerControlTools(api, controlApi) {
         operator_parameters: { type: 'object' },
         channels: { type: 'array', items: { type: 'string' } },
         channel_configs: { type: 'object' }
-      }
+      },
+      required: ['product_code', 'product_type', 'operator_parameters']
     },
     (args, meta = {}) => controlApi.createWatch(args || {}, meta?.context || {})
   );

package/src/runtime/BridgeRuntime.js

@@ -9,6 +9,12 @@ function makeRequestId() {
   return `req_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
 }
 
+/** 与 OpenClawBridgeClient 一致：基金估值回源较慢 */
+const FUND_ESTIMATES_REQUEST_TIMEOUT_MS = 120_000;
+
+/** 网关表查询（新闻等）可能较慢 */
+const FINANCE_TABLE_REQUEST_TIMEOUT_MS = 90_000;
+
 function stableStringify(value) {
   if (Array.isArray(value)) {
     return `[${value.map((item) => stableStringify(item)).join(',')}]`;
@@ -118,7 +124,7 @@ export class BridgeRuntime extends EventEmitter {
     await this.lock?.release().catch(() => {});
   }
 
-  async request(type, payload = {}) {
+  async request(type, payload = {}, options = {}) {
     let requestId = makeRequestId();
     let normalizedPayload = payload || {};
     if (IDEMPOTENT_REQUEST_TYPES.has(type)) {
@@ -126,6 +132,13 @@ export class BridgeRuntime extends EventEmitter {
       requestId = resolved.requestId;
       normalizedPayload = resolved.payload;
     }
+    const timeoutMs =
+      options.requestTimeoutMs ??
+      (type === 'fund.estimates'
+        ? FUND_ESTIMATES_REQUEST_TIMEOUT_MS
+        : type === 'finance.table'
+          ? FINANCE_TABLE_REQUEST_TIMEOUT_MS
+          : this.requestTimeoutMs);
     const msg = { type, request_id: requestId, payload: normalizedPayload };
     const { promise, resolve, reject } = this._buildWaiter();
 
@@ -138,10 +151,10 @@ export class BridgeRuntime extends EventEmitter {
         reject(new Error(`request queue overflow (max=${this.maxQueueSize})`));
         return promise;
       }
-      this.requestQueue.push({ msg, requestId, resolve, reject });
+      this.requestQueue.push({ msg, requestId, resolve, reject, timeoutMs });
       return promise;
     }
-    this._sendWithTimeout({ msg, requestId, resolve, reject });
+    this._sendWithTimeout({ msg, requestId, resolve, reject, timeoutMs });
     return promise;
   }
 
@@ -155,11 +168,12 @@ export class BridgeRuntime extends EventEmitter {
     return { promise, resolve, reject };
   }
 
-  _sendWithTimeout({ msg, requestId, resolve, reject }) {
+  _sendWithTimeout({ msg, requestId, resolve, reject, timeoutMs }) {
+    const ms = timeoutMs ?? this.requestTimeoutMs;
     const timer = setTimeout(() => {
       this.pending.delete(requestId);
       reject(new Error(`request timeout: ${msg.type} (${requestId})`));
-    }, this.requestTimeoutMs);
+    }, ms);
 
     this.pending.set(requestId, { resolve, reject, timer });
     try {

package/skills/glance-watch/references/markets.md

@@ -1,56 +0,0 @@
-# 盯盘插件参考文档
-
-## 环境配置
-
-```bash
-# 基础配置（桥接地址固定为 wss://glanceup-pre.100credit.cn）
-export OPENCLAW_WS_TOKEN="<token>"
-
-# Token 申请：在网页上申请 OPENCLAW_WS_TOKEN
-```
-
-## 市场类型与产品代码
-
-| 市场 | productType | productCode 示例 | 行情频率 |
-|------|-------------|-----------------|----------|
-| A股个股 | stock | 000001 | 约每 3 秒 |
-| A股指数 | index | 000300 | 约每 3 秒 |
-| 港股 | hk_stock | 00700 | 延迟约 15 分钟 |
-| 比特币 | crypto | BTCUSDT | 约每 10 秒 |
-
-## 条件表达式
-
-### 可用变量
-
-- 通用: `price`, `volume`, `change_percent`
-- A股/港股额外: `turnover_rate`
-- 比特币: 不支持 `turnover_rate`
-
-### 示例条件
-
-```javascript
-// 单一条件
-'price >= threshold'
-
-// 多条件
-'price >= threshold and change_percent >= cp_threshold'
-
-// A股专用
-'price >= threshold and turnover_rate >= tr_threshold'
-```
-
-## 产品代码速查
-
-### A股主要指数
-- 沪深300: 000300
-- 上证指数: 000001
-- 创业板指: 399006
-
-### 热门港股
-- 腾讯控股: 00700
-- 阿里巴巴: 09988
-- 美团: 03690
-- 比亚迪股份: 01211
-
-### 主流加密货币
-- 比特币: BTCUSDT

package/skills/glance-watch/references/query-and-symbol.md

@@ -1,69 +0,0 @@
-# 标的检索与行情查询
-
-## 标的检索规则（必须遵循）
-
-当不能直接确定 `product_code` / `product_type` 时，先查本地 CSV，再让用户确认。
-
-数据文件（字段：`类型,代码,名称,完整代码,市场`）：
-- `data/stock_a.csv` -> A 股个股（`productType=stock`）
-- `data/stock_hk.csv` -> 港股个股（`productType=hk_stock`）
-- `data/index_a.csv` -> A 股指数（`productType=index`）
-- `data/index_hk.csv` -> 港股指数（`productType=index`，查询常配 `market=HK`）
-
-## 场景 1：用户只说名称
-
-- 在 CSV 里按名称模糊搜索。
-- 命中多条时，必须给出候选（代码 + 名称 + 市场）让用户确认。
-- 不可自行猜测后直接创建策略。
-
-## 场景 2：用户不知道代码或市场
-
-- 用 `rg` 在 4 个 CSV 搜索名称或代码。
-- 映射规则：
-- A 股个股 -> `stock`
-- 港股个股 -> `hk_stock`
-- A 股指数 -> `index`
-- 港股指数 -> `index`（`market=HK`）
-- 结果不唯一时先追问。
-
-## 推荐检索命令
-
-```bash
-# 按名称模糊查找
-rg -n "平安银行|腾讯|沪深300|BTC" data/stock_a.csv data/stock_hk.csv data/index_a.csv
-rg -n "恒生科技指数|恒生指数|HSTECH|HSI" data/index_hk.csv
-
-# 按代码查找
-rg -n "000001|00700|399001" data/stock_a.csv data/stock_hk.csv data/index_a.csv
-rg -n "HSTECH|HSI|VHSI" data/index_hk.csv
-
-# 无 rg 时兜底
-grep -nE "平安银行|腾讯|沪深300|000001|00700|恒生科技指数|HSTECH" \
-  data/stock_a.csv data/stock_hk.csv data/index_a.csv data/index_hk.csv
-```
-
-## 行情查询流程（`watch.query_ticker`）
-
-说明：
-- 对外统一动作名是 `watch.query_ticker`。
-- 文档中的 `runtime.queryTickerData(...)` 仅用于说明宿主运行时内部调用形态。
-
-1. 先确定标的代码、市场、`productType`。
-2. 调用查询动作。
-3. 成功后反馈价格/涨跌幅，失败则返回错误并让用户确认代码或市场。
-
-示例：
-
-```javascript
-await runtime.queryTickerData({
-  stockCode: '00700',
-  market: 'HK',
-  productType: 'hk_stock'
-})
-```
-
-成功判定：
-- `code = "000000"` 或 `success = true`
-
-失败处理：
-- 直接返回失败原因，不静默重试