@zltquant/zlt-mcp 0.6.1-beta.4 → 0.6.1-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zltquant/zlt-mcp",
-  "version": "0.6.1-beta.4",
+  "version": "0.6.1-beta.5",
   "description": "智量通 ZLT Quant MCP server（Windows x64；量化策略创建与本地回测）",
   "bin": {
     "zlt-mcp": "./zlt-mcp-proxy.bundle.cjs"

package/zlt-mcp-proxy.bundle.cjs

@@ -23782,22 +23782,22 @@ function applyBacktestPollingGuard(tool, args, result, states, contexts, activeR
     if (!isRecord2(parsed) || !isRecord2(parsed.Data)) return result;
     const data = parsed.Data;
     const status = Number(data.status);
-    if (status !== 1) {
-      states.delete(runId);
-      if (status === 0) activeRunIds.add(runId);
-      else activeRunIds.delete(runId);
-      return status === 0 ? withRunningCadence(parsed, data) : result;
-    }
-    activeRunIds.add(runId);
-    const suppliedCodePath = typeof args.codePath === "string" ? args.codePath.trim() : "";
     const context = contexts.get(runId);
+    const suppliedCodePath = typeof args.codePath === "string" ? args.codePath.trim() : "";
     const publicAttemptFence = parseBacktestAttemptFence(args.attemptFence);
-    const dataPrep = buildDataPrepInfo(
+    const dataPrep = status === 0 || status === 1 ? buildDataPrepInfo(
       context?.codePath || suppliedCodePath,
       data,
       context?.resultBaseline ?? publicAttemptFence?.resultBaseline ?? parseRunResultIdentity(args.__resultBaseline),
       context?.attemptStartedAtMs ?? publicAttemptFence?.attemptStartedAtMs ?? finitePositiveNumber(args.__attemptStartedAtMs)
-    );
+    ) : void 0;
+    if (status !== 1) {
+      states.delete(runId);
+      if (status === 0) activeRunIds.add(runId);
+      else activeRunIds.delete(runId);
+      return status === 0 ? withRunningCadence(parsed, { ...data, ...dataPrep }) : result;
+    }
+    activeRunIds.add(runId);
     const signature = JSON.stringify([
       data.status,
       data.phase,
@@ -23805,13 +23805,14 @@ function applyBacktestPollingGuard(tool, args, result, states, contexts, activeR
       data.downloadedBytes,
       data.downloadedFiles,
       dataPrep?.download_status,
+      dataPrep?.download_progress,
       dataPrep?.download_message,
       dataPrep?.download_update_time
     ]);
     const previous = states.get(runId);
     const unchangedCount = previous?.signature === signature ? previous.unchangedCount + 1 : 1;
     states.set(runId, { signature, unchangedCount });
-    if (unchangedCount < 3) return withRunningCadence(parsed, data);
+    if (unchangedCount < 3) return withRunningCadence(parsed, { ...data, ...dataPrep });
     const minutesSinceUpdate = typeof dataPrep?.dataPrepMinutesSinceUpdate === "number" ? dataPrep.dataPrepMinutesSinceUpdate : null;
     if (minutesSinceUpdate !== null && minutesSinceUpdate < STALE_DATA_PREP_MINUTES) {
       return {
@@ -24597,6 +24598,12 @@ function frozenBacktestResult(parsed, data) {
 function backtestWaitLane(runId, session, codePath, resultBaseline, attemptStartedAtMs) {
   let frozenCount = 0;
   let lastSignature = "";
+  const waitStartedAt = Date.now();
+  let lastSubstantiveSignature = "";
+  let lastSubstantiveChangeAt = waitStartedAt;
+  let lastMessageAt = waitStartedAt;
+  let message = "";
+  let elapsedSeconds = 0;
   const stateArgs = {
     runId,
     ...codePath ? { codePath } : {},
@@ -24641,7 +24648,7 @@ function backtestWaitLane(runId, session, codePath, resultBaseline, attemptStart
             result: shapeToolResult(BACKTEST_WAIT_POLL_IDENTITY, stateArgs, base, session)
           };
         }
-        const signature = JSON.stringify([
+        const substantiveFields = [
           data.status,
           data.phase,
           data.progress,
@@ -24650,7 +24657,11 @@ function backtestWaitLane(runId, session, codePath, resultBaseline, attemptStart
           data.error_code,
           data.error_msg,
           currentAttemptResult ? runResult?.download_status : void 0,
-          currentAttemptResult && typeof runResult?.download_message === "string" ? runResult.download_message : void 0,
+          currentAttemptResult ? runResult?.download_progress : void 0,
+          currentAttemptResult && typeof runResult?.download_message === "string" ? runResult.download_message : void 0
+        ];
+        const signature = JSON.stringify([
+          ...substantiveFields,
           currentAttemptResult && typeof runResult?.download_update_time === "string" ? runResult.download_update_time : void 0
         ]);
         frozenCount = signature === lastSignature ? frozenCount + 1 : 0;
@@ -24661,8 +24672,31 @@ function backtestWaitLane(runId, session, codePath, resultBaseline, attemptStart
             frozenBacktestResult(parsed, data)
           ) };
         }
-        const progress = typeof data.progress === "number" && Number.isFinite(data.progress) ? data.progress : 0;
-        return { verdict: "wait", progress };
+        const now = Date.now();
+        const substantiveSignature = JSON.stringify(substantiveFields);
+        const changed = substantiveSignature !== lastSubstantiveSignature;
+        if (changed) {
+          lastSubstantiveChangeAt = now;
+          lastSubstantiveSignature = substantiveSignature;
+        }
+        elapsedSeconds = Math.max(elapsedSeconds, Math.floor((now - waitStartedAt) / 1e3));
+        if (changed || !message || now - lastMessageAt >= 3e4) {
+          const prep = currentAttemptResult ? runResult : null;
+          const prepProgress = typeof prep?.download_progress === "number" && Number.isFinite(prep.download_progress) ? prep.download_progress : void 0;
+          const prepActive = prep?.download_status !== void 0 && Number(prep.download_status) === 1;
+          const detail = [
+            status === 0 ? "\u56DE\u6D4B\u51C6\u5907\u4E2D" : "\u56DE\u6D4B\u8FD0\u884C\u4E2D",
+            prepActive ? `\u6570\u636E\u51C6\u5907\u72B6\u6001 ${String(prep.download_status)}` : "",
+            prepActive && prepProgress !== void 0 ? `\u6570\u636E\u51C6\u5907\u5F53\u524D\u6B65\u9AA4 ${prepProgress}%\uFF08\u4E0D\u662F\u56DE\u6D4B\u603B\u8FDB\u5EA6\uFF09` : "",
+            prepActive && typeof prep?.download_message === "string" ? prep.download_message : "",
+            prepActive && typeof prep?.download_update_time === "string" ? `\u6570\u636E\u51C6\u5907\u66F4\u65B0\u65F6\u95F4 ${prep.download_update_time}` : "",
+            typeof data.progress === "number" && Number.isFinite(data.progress) ? `\u56DE\u6D4B\u72B6\u6001\u8FDB\u5EA6 ${data.progress}%` : ""
+          ].filter(Boolean).join("\uFF0C");
+          const unchangedSeconds = Math.max(0, Math.floor((now - lastSubstantiveChangeAt) / 1e3));
+          message = `\u56DE\u6D4B\u7B49\u5F85\uFF08\u5DF2\u7B49\u5F85 ${elapsedSeconds}\u79D2\uFF09\uFF1A${detail}` + (unchangedSeconds >= 30 ? `\uFF1B\u5B9E\u8D28\u8FDB\u5EA6\u5DF2 ${unchangedSeconds}\u79D2\u672A\u53D8\u5316\uFF0C\u4E0D\u7B49\u4E8E\u5931\u8D25\uFF0C\u7EE7\u7EED\u7B49\u5F85\u7EC8\u6001` : "");
+          lastMessageAt = now;
+        }
+        return { verdict: "wait", progress: elapsedSeconds, details: { message } };
       } catch {
         return { verdict: "return", result: unreadableBacktestStateError(runId) };
       }
@@ -24702,7 +24736,8 @@ async function runWaitLoop(lane, client, timeout, session, control) {
     const tick = lane.tick(base);
     if (tick.verdict === "return") return tick.result;
     try {
-      control.heartbeat?.(tick.progress);
+      if (tick.details) control.heartbeat?.(tick.progress, tick.details);
+      else control.heartbeat?.(tick.progress);
     } catch {
     }
     if (control.abortSignal?.aborted) return waitError(10047, "\u5DF2\u53D6\u6D88\u7B49\u5F85\u3002");
@@ -24873,6 +24908,7 @@ function buildDataPrepInfo(codePath, data, resultBaseline, attemptStartedAtMs) {
   const runResult = resultFile.data;
   const info = {};
   if (runResult.download_status !== void 0) info.download_status = runResult.download_status;
+  if (runResult.download_progress !== void 0) info.download_progress = runResult.download_progress;
   if (typeof runResult.download_message === "string") info.download_message = runResult.download_message;
   if (typeof runResult.download_update_time === "string") {
     info.download_update_time = runResult.download_update_time;
@@ -27651,6 +27687,9 @@ Timeout or cancellation leaves the install outcome unknown; inspect before retry
 Backtests: create-and-run/re-backtest keep the same MCP consumer until mcp-wait
 returns a terminal state or requires action (such as no-progress). The JSON keeps
 launch identity/configuration plus authoritative wait state. No detached keeper.
+Progress messages distinguish data preparation from strategy execution and report
+elapsed time and unchanged observations. Unchanged progress is not proof of failure.
+Read redirected stderr during background waits; do not restart on a progress warning.
 If isTerminal=true, finalize that run directly; do not wait again. The total timeout
 covers launch plus wait. Interrupted waits print backtest runId/codePath/attemptFence
 for recovery; the runtime may stop when the host closes. Never restart automatically.
@@ -27851,6 +27890,9 @@ function compactCliReceipt(tool, result, resultFile) {
       "isTerminal",
       "evidenceSource",
       "failureCause",
+      "retryableByAgent",
+      "requiresUserAction",
+      "waitStopped",
       "nextAction",
       "recommendedAction",
       "error_code",