zen-gitsync 2.17.20 → 2.17.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (139) hide show
  1. package/README.md +22 -14
  2. package/package.json +9 -1
  3. package/scripts/release.js +214 -82
  4. package/src/ui/public/assets/AgentEngineSelector-DR3r5eQE.css +1 -0
  5. package/src/ui/public/assets/AgentEngineSelector-Dtvp5u3j.js +1 -0
  6. package/src/ui/public/assets/AgentView-BzfjNz7k.js +1 -0
  7. package/src/ui/public/assets/AgentView-DnN-vCMi.css +1 -0
  8. package/src/ui/public/assets/{AppVersionBadge-DDYQqoy7.css → AppVersionBadge--5If494j.css} +1 -1
  9. package/src/ui/public/assets/AppVersionBadge-DAAnAFNp.js +2 -0
  10. package/src/ui/public/assets/{BranchSelector-F4ibldMN.css → BranchSelector-BTCMYwG0.css} +1 -1
  11. package/src/ui/public/assets/BranchSelector-C20zVkp_.js +1 -0
  12. package/src/ui/public/assets/CommitForm-C-cL8_vz.css +1 -0
  13. package/src/ui/public/assets/CommitForm-COc-NwA8.js +6 -0
  14. package/src/ui/public/assets/CommonDialog-B7r-EaIr.js +1 -0
  15. package/src/ui/public/assets/CommonDialog-Bzi5ISqT.css +1 -0
  16. package/src/ui/public/assets/EditorView-CWCzo4aE.js +1 -0
  17. package/src/ui/public/assets/EditorView-DnMiWg3T.css +1 -0
  18. package/src/ui/public/assets/FileDiffViewer-7HZ_CW13.js +14 -0
  19. package/src/ui/public/assets/FileDiffViewer-B6zy6NiA.css +1 -0
  20. package/src/ui/public/assets/FlowExecutionViewer-B5kh7VxS.css +1 -0
  21. package/src/ui/public/assets/FlowExecutionViewer-YKYhtKmd.js +1 -0
  22. package/src/ui/public/assets/FlowOrchestrationWorkspace-Bg5pSrGY.js +21 -0
  23. package/src/ui/public/assets/FlowOrchestrationWorkspace-CM2_9TW3.css +1 -0
  24. package/src/ui/public/assets/IconButton-CyEyp9_D.js +1 -0
  25. package/src/ui/public/assets/IconButton-W2X09OKH.css +1 -0
  26. package/src/ui/public/assets/LogList-B0YcWT9U.js +7 -0
  27. package/src/ui/public/assets/LogList-C7q0Y4J_.css +1 -0
  28. package/src/ui/public/assets/MindmapView-C4xg3TwX.css +1 -0
  29. package/src/ui/public/assets/MindmapView-CJI789Gz.js +1 -0
  30. package/src/ui/public/assets/MonitorView-BWOQfPtI.css +1 -0
  31. package/src/ui/public/assets/MonitorView-DVrInkz0.js +1 -0
  32. package/src/ui/public/assets/ProjectStartupButton-BGrtaPiJ.js +1 -0
  33. package/src/ui/public/assets/ProjectStartupButton-VoQqFee4.css +1 -0
  34. package/src/ui/public/assets/RecentDirectoriesChat-BsM5qfRX.js +1 -0
  35. package/src/ui/public/assets/RecentDirectoriesChat-vHT8jMxW.css +1 -0
  36. package/src/ui/public/assets/RemoteManagerDialog-BSOph2h2.css +1 -0
  37. package/src/ui/public/assets/RemoteManagerDialog-fGsXehZF.js +1 -0
  38. package/src/ui/public/assets/RemoteRepoCard-CG9WPcA_.css +1 -0
  39. package/src/ui/public/assets/RemoteRepoCard-CYXYYtM8.js +1 -0
  40. package/src/ui/public/assets/SourceMapView-BNyHS4uU.js +3 -0
  41. package/src/ui/public/assets/SourceMapView-CO_BZJKu.css +1 -0
  42. package/src/ui/public/assets/{SvgIcon-CDNsk4-Q.css → SvgIcon-BQ6bR7l0.css} +1 -1
  43. package/src/ui/public/assets/SvgIcon-Cgmy9qD6.js +1 -0
  44. package/src/ui/public/assets/TemplateManager-DUPI3yBg.js +1 -0
  45. package/src/ui/public/assets/TemplateManager-DiM3vrbf.css +1 -0
  46. package/src/ui/public/assets/UserInputNode-DUbPMxsr.js +1 -0
  47. package/src/ui/public/assets/UserInputNode-d-oRXM_J.css +1 -0
  48. package/src/ui/public/assets/WorkbenchView-AbJMHSJy.js +6 -0
  49. package/src/ui/public/assets/WorkbenchView-D8wqeEiu.css +1 -0
  50. package/src/ui/public/assets/{_plugin-vue_export-helper-o8uPiAjs.js → _plugin-vue_export-helper-DBFEfstn.js} +5 -5
  51. package/src/ui/public/assets/{agentConversations-BmOPFH_t.js → agentConversations-CuFU_pdW.js} +1 -1
  52. package/src/ui/public/assets/configStore-6xFSX9E5.js +1 -0
  53. package/src/ui/public/assets/element-plus-Bx3j6vzG.js +28 -0
  54. package/src/ui/public/assets/{flow-mindmap-C22NSZc1.js → flow-mindmap-OPE_D4da.js} +34 -34
  55. package/src/ui/public/assets/{gitStore-BI_ujQ9r.js → gitStore-BoFStoL3.js} +1 -1
  56. package/src/ui/public/assets/index-BVkLqLHo.js +29 -0
  57. package/src/ui/public/assets/index-DVJITdth.css +1 -0
  58. package/src/ui/public/assets/office-docx-B0sJQnr-.js +31 -0
  59. package/src/ui/public/assets/{office-excel-BOjWK-1x.js → office-excel-DMRySOdK.js} +1 -1
  60. package/src/ui/public/assets/office-pptx-Do2blxao.js +60 -0
  61. package/src/ui/public/assets/previewSandbox-BzitUMhT.js +9 -0
  62. package/src/ui/public/assets/{previewSandbox-PYnM6Paz.css → previewSandbox-SqNQvuHv.css} +1 -1
  63. package/src/ui/public/assets/socket-io-TBtw0msS.js +1 -0
  64. package/src/ui/public/assets/{toolsStore-DgqU92bI.js → toolsStore-B49mCaQ_.js} +1 -1
  65. package/src/ui/public/assets/{useThemeObserver-CiUpR4zj.js → useThemeObserver-DYxFoHh1.js} +1 -1
  66. package/src/ui/public/assets/{vendor-CPpc-p6F.js → vendor-CyWsJd6S.js} +45 -52
  67. package/src/ui/public/assets/vue-flow-fVVGZspa.js +39 -0
  68. package/src/ui/public/index.html +24 -24
  69. package/src/ui/server/index.js +8 -0
  70. package/src/ui/server/routes/config.js +4 -1
  71. package/src/ui/server/routes/workbench/index.js +165 -7
  72. package/src/ui/server/routes/workbench/jobActivity.js +254 -0
  73. package/src/ui/server/routes/workbench/jobActivity.test.js +270 -0
  74. package/src/ui/server/routes/workbench/jobStore.js +141 -48
  75. package/src/ui/server/routes/workbench/jobStore.test.js +139 -2
  76. package/src/ui/server/routes/workbench/liveJobs.js +229 -0
  77. package/src/ui/server/routes/workbench/liveJobs.test.js +215 -0
  78. package/src/ui/server/routes/workbench/orchestratorStore.js +164 -2
  79. package/src/ui/server/routes/workbench/orchestratorStore.progressReport.test.js +177 -0
  80. package/src/ui/server/routes/workbench/progressReport.js +300 -0
  81. package/src/ui/server/routes/workbench/progressReport.test.js +375 -0
  82. package/src/ui/server/routes/workbench/projectRegistry.js +28 -2
  83. package/src/ui/server/routes/workbench/projectRegistry.test.js +72 -0
  84. package/src/ui/server/routes/workbench/shared.js +28 -0
  85. package/src/ui/server/routes/workbench/taskRunner.js +17 -0
  86. package/src/utils/selfUpdatePolicy.js +123 -0
  87. package/src/utils/selfUpdatePolicy.test.js +204 -0
  88. package/src/ui/public/assets/AgentEngineSelector-DIn2efUS.js +0 -2
  89. package/src/ui/public/assets/AgentEngineSelector-DUf0TfaU.css +0 -1
  90. package/src/ui/public/assets/AgentView-CS-sFe-x.js +0 -10
  91. package/src/ui/public/assets/AgentView-CWCc_b0o.css +0 -1
  92. package/src/ui/public/assets/AppVersionBadge-CeHsanRP.js +0 -2
  93. package/src/ui/public/assets/BranchSelector-CxEoHp2q.js +0 -1
  94. package/src/ui/public/assets/CommitForm-4kI2csgs.css +0 -1
  95. package/src/ui/public/assets/CommitForm-DOfYuDqr.js +0 -6
  96. package/src/ui/public/assets/CommonDialog-CZ5McwHT.js +0 -1
  97. package/src/ui/public/assets/CommonDialog-w6EmBEXv.css +0 -1
  98. package/src/ui/public/assets/EditorView-BZjWMYYl.css +0 -1
  99. package/src/ui/public/assets/EditorView-BxRrHGUj.js +0 -31
  100. package/src/ui/public/assets/FileDiffViewer-CKcSkMAd.js +0 -15
  101. package/src/ui/public/assets/FileDiffViewer-n5ea9qMe.css +0 -1
  102. package/src/ui/public/assets/FlowExecutionViewer-DShoSVO7.js +0 -1
  103. package/src/ui/public/assets/FlowExecutionViewer-jNHI5zdm.css +0 -1
  104. package/src/ui/public/assets/FlowOrchestrationWorkspace-BkPZZ0-D.js +0 -21
  105. package/src/ui/public/assets/FlowOrchestrationWorkspace-DwuSSxJ1.css +0 -1
  106. package/src/ui/public/assets/IconButton-D-maDWg7.js +0 -1
  107. package/src/ui/public/assets/IconButton-RlXqKOeu.css +0 -1
  108. package/src/ui/public/assets/LogList-Bv5ZqdMf.js +0 -7
  109. package/src/ui/public/assets/LogList-XspUhx-C.css +0 -1
  110. package/src/ui/public/assets/MindmapView-C27U_5_C.js +0 -2
  111. package/src/ui/public/assets/MindmapView-Diq2Cu4O.css +0 -1
  112. package/src/ui/public/assets/MonitorView-BudY0fTU.js +0 -1
  113. package/src/ui/public/assets/MonitorView-DwUwJXnY.css +0 -1
  114. package/src/ui/public/assets/ProjectStartupButton-CB8IOg1E.css +0 -1
  115. package/src/ui/public/assets/ProjectStartupButton-YJPcfS3t.js +0 -1
  116. package/src/ui/public/assets/RecentDirectoriesChat-Bqd_4eU5.js +0 -1
  117. package/src/ui/public/assets/RecentDirectoriesChat-CZD_IC5M.css +0 -1
  118. package/src/ui/public/assets/RemoteManagerDialog-BUNLKNem.js +0 -4
  119. package/src/ui/public/assets/RemoteManagerDialog-D4WphMtO.css +0 -1
  120. package/src/ui/public/assets/RemoteRepoCard-Bq1oLUnZ.js +0 -7
  121. package/src/ui/public/assets/RemoteRepoCard-o01IrbVz.css +0 -1
  122. package/src/ui/public/assets/SourceMapView-BCrE4CvT.js +0 -3
  123. package/src/ui/public/assets/SourceMapView-CfDydtsu.css +0 -1
  124. package/src/ui/public/assets/SvgIcon-z4ExzvGR.js +0 -1
  125. package/src/ui/public/assets/TemplateManager-BSq-dNvW.js +0 -1
  126. package/src/ui/public/assets/TemplateManager-DO7EPfj8.css +0 -1
  127. package/src/ui/public/assets/UserInputNode-BzbaR9lE.js +0 -1
  128. package/src/ui/public/assets/UserInputNode-DDNSarag.css +0 -1
  129. package/src/ui/public/assets/WorkbenchView-BJ7lMt3C.js +0 -70
  130. package/src/ui/public/assets/WorkbenchView-DGIn0UR4.css +0 -1
  131. package/src/ui/public/assets/configStore-DrMJDegh.js +0 -1
  132. package/src/ui/public/assets/element-plus-AaVXaSqv.js +0 -48
  133. package/src/ui/public/assets/index-Cp5WtCfY.css +0 -1
  134. package/src/ui/public/assets/index-D_Pwvey4.js +0 -130
  135. package/src/ui/public/assets/office-docx-CJ6JSCs6.js +0 -32
  136. package/src/ui/public/assets/office-pptx-CF43ZwXE.js +0 -74
  137. package/src/ui/public/assets/previewSandbox-B16xvZLS.js +0 -9
  138. package/src/ui/public/assets/socket-io-BFqQXqAp.js +0 -1
  139. package/src/ui/public/assets/vue-flow-DwYB6Myr.js +0 -39
@@ -10,38 +10,38 @@
10
10
  <meta name="theme-color" content="#141820" media="(prefers-color-scheme: dark)" />
11
11
  <title>Zen GitSync</title>
12
12
  <!-- 字体改为自托管(@font-face 见 src/main.css),不再依赖 Google Fonts 外链 -->
13
- <script type="module" crossorigin src="/assets/index-D_Pwvey4.js"></script>
13
+ <script type="module" crossorigin src="/assets/index-BVkLqLHo.js"></script>
14
14
  <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-C0FnF6B9.js">
15
- <link rel="modulepreload" crossorigin href="/assets/element-plus-AaVXaSqv.js">
15
+ <link rel="modulepreload" crossorigin href="/assets/element-plus-Bx3j6vzG.js">
16
16
  <link rel="modulepreload" crossorigin href="/assets/monaco-DkJuNcCr.js">
17
- <link rel="modulepreload" crossorigin href="/assets/vendor-CPpc-p6F.js">
18
- <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-o8uPiAjs.js">
19
- <link rel="modulepreload" crossorigin href="/assets/SvgIcon-z4ExzvGR.js">
20
- <link rel="modulepreload" crossorigin href="/assets/IconButton-D-maDWg7.js">
21
- <link rel="modulepreload" crossorigin href="/assets/configStore-DrMJDegh.js">
22
- <link rel="modulepreload" crossorigin href="/assets/socket-io-BFqQXqAp.js">
23
- <link rel="modulepreload" crossorigin href="/assets/gitStore-BI_ujQ9r.js">
17
+ <link rel="modulepreload" crossorigin href="/assets/vendor-CyWsJd6S.js">
18
+ <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-DBFEfstn.js">
19
+ <link rel="modulepreload" crossorigin href="/assets/SvgIcon-Cgmy9qD6.js">
20
+ <link rel="modulepreload" crossorigin href="/assets/IconButton-CyEyp9_D.js">
21
+ <link rel="modulepreload" crossorigin href="/assets/configStore-6xFSX9E5.js">
22
+ <link rel="modulepreload" crossorigin href="/assets/socket-io-TBtw0msS.js">
23
+ <link rel="modulepreload" crossorigin href="/assets/gitStore-BoFStoL3.js">
24
24
  <link rel="modulepreload" crossorigin href="/assets/fileIcon-B5p5pGN9.js">
25
- <link rel="modulepreload" crossorigin href="/assets/flow-mindmap-C22NSZc1.js">
26
- <link rel="modulepreload" crossorigin href="/assets/previewSandbox-B16xvZLS.js">
27
- <link rel="modulepreload" crossorigin href="/assets/useThemeObserver-CiUpR4zj.js">
28
- <link rel="modulepreload" crossorigin href="/assets/CommonDialog-CZ5McwHT.js">
29
- <link rel="modulepreload" crossorigin href="/assets/FileDiffViewer-CKcSkMAd.js">
30
- <link rel="modulepreload" crossorigin href="/assets/toolsStore-DgqU92bI.js">
31
- <link rel="modulepreload" crossorigin href="/assets/TemplateManager-BSq-dNvW.js">
32
- <link rel="modulepreload" crossorigin href="/assets/vue-flow-DwYB6Myr.js">
25
+ <link rel="modulepreload" crossorigin href="/assets/flow-mindmap-OPE_D4da.js">
26
+ <link rel="modulepreload" crossorigin href="/assets/previewSandbox-BzitUMhT.js">
27
+ <link rel="modulepreload" crossorigin href="/assets/useThemeObserver-DYxFoHh1.js">
28
+ <link rel="modulepreload" crossorigin href="/assets/CommonDialog-B7r-EaIr.js">
29
+ <link rel="modulepreload" crossorigin href="/assets/FileDiffViewer-7HZ_CW13.js">
30
+ <link rel="modulepreload" crossorigin href="/assets/toolsStore-B49mCaQ_.js">
31
+ <link rel="modulepreload" crossorigin href="/assets/TemplateManager-DUPI3yBg.js">
32
+ <link rel="modulepreload" crossorigin href="/assets/vue-flow-fVVGZspa.js">
33
33
  <link rel="stylesheet" crossorigin href="/assets/element-plus-Qexo5hiM.css">
34
34
  <link rel="stylesheet" crossorigin href="/assets/monaco-B2lPvkrc.css">
35
35
  <link rel="stylesheet" crossorigin href="/assets/vendor-BzMymUBi.css">
36
- <link rel="stylesheet" crossorigin href="/assets/SvgIcon-CDNsk4-Q.css">
37
- <link rel="stylesheet" crossorigin href="/assets/IconButton-RlXqKOeu.css">
36
+ <link rel="stylesheet" crossorigin href="/assets/SvgIcon-BQ6bR7l0.css">
37
+ <link rel="stylesheet" crossorigin href="/assets/IconButton-W2X09OKH.css">
38
38
  <link rel="stylesheet" crossorigin href="/assets/flow-mindmap-BMpmHdqh.css">
39
- <link rel="stylesheet" crossorigin href="/assets/previewSandbox-PYnM6Paz.css">
40
- <link rel="stylesheet" crossorigin href="/assets/CommonDialog-w6EmBEXv.css">
41
- <link rel="stylesheet" crossorigin href="/assets/FileDiffViewer-n5ea9qMe.css">
42
- <link rel="stylesheet" crossorigin href="/assets/TemplateManager-DO7EPfj8.css">
39
+ <link rel="stylesheet" crossorigin href="/assets/previewSandbox-SqNQvuHv.css">
40
+ <link rel="stylesheet" crossorigin href="/assets/CommonDialog-Bzi5ISqT.css">
41
+ <link rel="stylesheet" crossorigin href="/assets/FileDiffViewer-B6zy6NiA.css">
42
+ <link rel="stylesheet" crossorigin href="/assets/TemplateManager-DiM3vrbf.css">
43
43
  <link rel="stylesheet" crossorigin href="/assets/vue-flow-CavUTEzp.css">
44
- <link rel="stylesheet" crossorigin href="/assets/index-Cp5WtCfY.css">
44
+ <link rel="stylesheet" crossorigin href="/assets/index-DVJITdth.css">
45
45
  </head>
46
46
  <body>
47
47
  <div id="app"></div>
@@ -697,6 +697,14 @@ async function startUIServer(noOpen = false, savePort = false) {
697
697
  // 2) 清心跳 + 反注册实例
698
698
  try { clearInterval(heartbeatTimer); } catch (_) {}
699
699
  try { await instanceRegistry.unregister(process.pid); } catch (_) {}
700
+ // 2b) 清掉自己那份「运行中 job」广播文件(live-jobs/<pid>.json)。
701
+ // 不清也不会留下幽灵「进行中」——别的实例读的时候发现 owner pid 没了会跳过并
702
+ // 顺手删掉,这里只是让 Ctrl+C 这种常见路径当场干净。动态 import:模块早就在
703
+ // 路由注册时加载过了,这里只是拿它的函数,不会往入口的静态 import 图里加东西。
704
+ try {
705
+ const { clearOwnLiveJobsFile } = await import('./routes/workbench/jobStore.js');
706
+ await clearOwnLiveJobsFile();
707
+ } catch (_) {}
700
708
  console.log(chalk.gray(`[shutdown] 收到 ${signal},已清理本实例`));
701
709
  // 3) 给 OS 100ms 刷盘日志
702
710
  setTimeout(() => process.exit(0), 100);
@@ -1047,10 +1047,13 @@ export function registerConfigRoutes({
1047
1047
  if (!rawConfig.ui.aiDiffSummaryByProject || typeof rawConfig.ui.aiDiffSummaryByProject !== 'object' || Array.isArray(rawConfig.ui.aiDiffSummaryByProject)) {
1048
1048
  rawConfig.ui.aiDiffSummaryByProject = {}
1049
1049
  }
1050
+ if (!rawConfig.ui.editorWorkspaceByProject || typeof rawConfig.ui.editorWorkspaceByProject !== 'object' || Array.isArray(rawConfig.ui.editorWorkspaceByProject)) {
1051
+ rawConfig.ui.editorWorkspaceByProject = {}
1052
+ }
1050
1053
 
1051
1054
  // 浅合并顶层 ui 字段(支持嵌套对象整体替换,如 commandConsole)
1052
1055
  for (const key of Object.keys(partial)) {
1053
- if (key === 'layoutsByProject' || key === 'aiDiffSummaryByProject') {
1056
+ if (key === 'layoutsByProject' || key === 'aiDiffSummaryByProject' || key === 'editorWorkspaceByProject') {
1054
1057
  // 深合并 map:保留其它项目条目
1055
1058
  const incoming = partial[key]
1056
1059
  if (incoming && typeof incoming === 'object' && !Array.isArray(incoming)) {
@@ -83,8 +83,8 @@ import {
83
83
  bus,
84
84
  cancelledJobs,
85
85
  serializeJob,
86
- scheduleJobsSave,
87
86
  flushJobsSaveNow,
87
+ clearOwnLiveJobsFile,
88
88
  readJobsConfig,
89
89
  writeJobsConfig,
90
90
  enforceRetention,
@@ -120,7 +120,15 @@ import {
120
120
  setProjectPrompt,
121
121
  buildActivityFeed,
122
122
  buildRunningAgents,
123
+ setReportIntervalMs,
124
+ claimReportSlot,
125
+ readReports,
126
+ appendReport,
123
127
  } from './orchestratorStore.js';
128
+ import {
129
+ buildRunningFacts,
130
+ generateProgressReport,
131
+ } from './progressReport.js';
124
132
 
125
133
  /**
126
134
  * 「任务结束 → 刷快照」的监听器。存成模块级的,是为了在重复装配路由时
@@ -129,6 +137,12 @@ import {
129
137
  */
130
138
  let jobSettledHandler = null;
131
139
 
140
+ /** 自动进度报告的定时器。同上:重复装配路由时先清掉上一个 */
141
+ let reportTimer = null;
142
+
143
+ /** 自动报告的检查粒度。它**不等于**报告间隔 —— 见 tickProgressReport 的注释 */
144
+ const REPORT_TICK_MS = 30 * 1000;
145
+
132
146
  /**
133
147
  * 注册所有 workbench 路由(共 45 个端点)。
134
148
  * @param {Object} deps
@@ -897,16 +911,17 @@ ${subSummaries.map((s, i) => `\n### [${i + 1}] ${s.name} (${s.root})\n${s.summar
897
911
  app.get('/api/workbench/jobs/:id', asyncRoute(async (req, res) => {
898
912
  // 优先查内存(含活跃)
899
913
  const live = jobs.get(req.params.id);
914
+ const tasksData = await readJson(TASKS_FILE, { tasks: [] });
915
+ const taskMap = new Map((tasksData.tasks || []).map(t => [t.id, t]));
900
916
  if (live) {
901
- const tasksData = await readJson(TASKS_FILE, { tasks: [] });
902
- const taskMap = new Map((tasksData.tasks || []).map(t => [t.id, t]));
903
917
  return res.json({ success: true, job: serializeJob(live, taskMap) });
904
918
  }
905
- // 退回文件
906
- const data = await readJson(JOBS_FILE, { version: 1, jobs: [] });
907
- const j = (data.jobs || []).find(x => x.id === req.params.id);
919
+ // 退回「磁盘历史 ∪ 别的实例正在跑」的合并表 —— 光读 jobs.json 会让
920
+ // "看板上明明在转的那条"点开变成 404(运行中的记录不在历史档案里)。
921
+ await refreshJobsFromDisk();
922
+ const j = mergedJobs().get(req.params.id);
908
923
  if (!j) throw new HttpError(404, 'job 不存在');
909
- res.json({ success: true, job: j });
924
+ res.json({ success: true, job: serializeJob(j, taskMap) });
910
925
  }));
911
926
 
912
927
  app.delete('/api/workbench/jobs/:id', asyncRoute(async (req, res) => {
@@ -1204,11 +1219,154 @@ ${subSummaries.map((s, i) => `\n### [${i + 1}] ${s.name} (${s.root})\n${s.summar
1204
1219
  // 设置弹窗打开时也不必再单独取一次(单条上限 8000 字,体积可控)
1205
1220
  defaultPrompt: state.defaultPrompt,
1206
1221
  projectPrompts: state.projectPrompts,
1222
+ // 进度报告的**配置**(一个数字 + 一个时间戳)跟着轮询走,报告的**正文**走
1223
+ // /orchestrator/reports:报告历史一份几 KB,20 份就是几十 KB,
1224
+ // 塞进这个 5s 轮询的接口纯属浪费(与 /tasks/:id/detail 不进 /projects 同一个理由)。
1225
+ reportIntervalMs: state.reportIntervalMs,
1226
+ lastReportAt: state.lastReportAt,
1207
1227
  activity: buildActivityFeed({ jobs: jobsSnap, tasks, instructions: state.instructions }),
1208
1228
  running: buildRunningAgents({ jobs: jobsSnap, tasks }),
1209
1229
  });
1210
1230
  }));
1211
1231
 
1232
+ // ════════════════════════════════════════════════════════════════════════
1233
+ // §19.5 进度报告(右栏「进度报告」面板)
1234
+ //
1235
+ // 面板上那一段"现在跑到哪一步了"由模型写,但**什么时候写、写几次**由这一层管:
1236
+ // · 手动「立即报告」→ POST /orchestrator/report,永远可用;
1237
+ // · 自动报告 → 下面的定时器,间隔来自用户设置(0 = 关)。
1238
+ // 两份历史都存在 orchestrator-reports.json,读取走 /orchestrator/reports。
1239
+ // ════════════════════════════════════════════════════════════════════════
1240
+
1241
+ /**
1242
+ * 报告要用到的两份东西:默认模型 + 界面语言。
1243
+ * 一次 config 读出来 —— 分两次读会读到"两个瞬间"(改设置的同时正好在报告)。
1244
+ */
1245
+ async function readReportContext() {
1246
+ const out = { model: null, locale: '' };
1247
+ if (!configManager || typeof configManager.readRawConfigFile !== 'function') return out;
1248
+ try {
1249
+ const raw = await configManager.readRawConfigFile();
1250
+ const models = Array.isArray(raw && raw.models) ? raw.models : [];
1251
+ out.model = models.find(m => m && m.isDefault) || models[0] || null;
1252
+ out.locale = typeof (raw && raw.locale) === 'string' ? raw.locale : '';
1253
+ } catch (err) {
1254
+ logger.warn('[workbench] 读取模型配置失败,本次报告只记事实:', (err && err.message) || err);
1255
+ }
1256
+ return out;
1257
+ }
1258
+
1259
+ /** 当前在跑的 job 拼成报告事实。先刷磁盘那一半,别的实例跑的任务也要算进来 */
1260
+ async function collectRunningFacts() {
1261
+ const data = await readJson(TASKS_FILE, { tasks: [] });
1262
+ await refreshJobsFromDisk();
1263
+ return buildRunningFacts({ jobs: Array.from(mergedJobs().values()), tasks: data.tasks || [] });
1264
+ }
1265
+
1266
+ /**
1267
+ * 生成并落盘一份进度报告。
1268
+ *
1269
+ * @param {'auto'|'manual'} trigger
1270
+ * @param {{ locale?: string, intervalMs?: number }} [opts]
1271
+ * locale 缺省时用配置里的界面语言;intervalMs 只在 auto 时用(抢占名额)
1272
+ * @returns {Promise<object|null>} null = 这次不该报(没任务在跑 / 名额已被占)
1273
+ */
1274
+ async function runProgressReport(trigger, { locale = '', intervalMs = 0 } = {}) {
1275
+ const facts = await collectRunningFacts();
1276
+
1277
+ // 没有任务在跑就**不生成报告**,自动与手动一视同仁。
1278
+ // · 自动:一条"什么都没发生"每 10 分钟占一格,只会把真正有用的挤出历史(上限 20 条);
1279
+ // · 手动:用户点这一下是想知道"现在跑到哪一步了",而此刻确实没有东西在跑 ——
1280
+ // 前端弹一句"当前没有正在执行的任务"(useOrchestrator.generateReport)比往历史里
1281
+ // 塞一条空记录有用:空记录回头翻的时候零信息量,还会把有用的挤出去。
1282
+ // (用户 2026-09-29 报的问题:历史里 4 条"当时没有任务在执行"两两重复,
1283
+ // 点一下「立即报告」就多两条 —— 空报告本机几十毫秒返回,前端的防抖拦不住第二次点击。)
1284
+ // 返回 null 是"这次不该报"的正常结果,不是错误。
1285
+ if (!facts.length) return null;
1286
+ if (trigger === 'auto' && !(await claimReportSlot(intervalMs))) return null;
1287
+
1288
+ const ctx = await readReportContext();
1289
+ const report = await generateProgressReport({
1290
+ facts,
1291
+ locale: locale || ctx.locale,
1292
+ trigger,
1293
+ model: ctx.model,
1294
+ });
1295
+ const saved = await appendReport(report);
1296
+ publish('orchestrator:report', { id: saved.id, at: saved.at, trigger: saved.trigger });
1297
+ return saved;
1298
+ }
1299
+
1300
+ /**
1301
+ * 同一时刻只跑一次生成。
1302
+ * 「立即报告」连点两下、或手动与自动撞在一起时,第二次应该**等第一份**,
1303
+ * 而不是再打一次模型换回一份几乎一样的报告。
1304
+ */
1305
+ let reportInFlight = null;
1306
+ function runProgressReportOnce(trigger, opts) {
1307
+ if (reportInFlight) return reportInFlight;
1308
+ reportInFlight = runProgressReport(trigger, opts).finally(() => { reportInFlight = null; });
1309
+ return reportInFlight;
1310
+ }
1311
+
1312
+ /** 取报告历史(新的在前)。面板打开时取一次、之后每次生成后取一次 */
1313
+ app.get('/api/workbench/orchestrator/reports', asyncRoute(async (_req, res) => {
1314
+ res.json({ success: true, reports: await readReports() });
1315
+ }));
1316
+
1317
+ /**
1318
+ * 手动生成一份报告。body: { locale? }
1319
+ *
1320
+ * 与自动报告共用同一条链路,只在两处不同:
1321
+ * · 不占用自动报告的间隔名额(否则用户点一下「立即报告」,下一次自动报告被推迟一整个间隔);
1322
+ * · 间隔窗口内**内容一样**的第二份不重复落盘(连点两下只留一份,见 appendReport)。
1323
+ *
1324
+ * 没有任务在跑时同样返回 `report: null` —— 这时前端弹一句"当前没有正在执行的任务",
1325
+ * 而不是往历史里记一条空报告(理由见 runProgressReport)。
1326
+ */
1327
+ app.post('/api/workbench/orchestrator/report', asyncRoute(async (req, res) => {
1328
+ const locale = typeof req.body?.locale === 'string' ? req.body.locale : '';
1329
+ const report = await runProgressReportOnce('manual', { locale });
1330
+ res.json({ success: true, report });
1331
+ }));
1332
+
1333
+ /**
1334
+ * 改自动报告间隔。body: { intervalMs }
1335
+ * 取值由 shared.js 的白名单卡死(0 / 5 / 10 / 15 / 30 / 60 分钟),非法值回落默认 ——
1336
+ * 这个数字直接决定每多久烧一次额度,不能让请求体里的任意值进来。
1337
+ */
1338
+ app.post('/api/workbench/orchestrator/report-interval', asyncRoute(async (req, res) => {
1339
+ const reportIntervalMs = await setReportIntervalMs(req.body?.intervalMs);
1340
+ publish('orchestrator:report-interval', { reportIntervalMs });
1341
+ res.json({ success: true, reportIntervalMs });
1342
+ }));
1343
+
1344
+ /**
1345
+ * 自动报告定时器。
1346
+ *
1347
+ * 30s 一跳,但每一跳**只是判断该不该报**:读 orchestrator.json 拿间隔 + 看内存里
1348
+ * 有没有在跑的 job。真正花额度的那一步被三重条件挡住 —— 开关打开、有任务在跑、
1349
+ * 距上次报告满一个间隔。所以"10 分钟报一次"的实际误差不超过 30s,
1350
+ * 而不是每 30 秒打一次模型。
1351
+ *
1352
+ * 为什么放服务端而不是前端定时器:报告是给**离开键盘的人**看的,
1353
+ * 前端定时器在标签页隐藏/关掉后就不跑了,而那正是最需要它的时刻。
1354
+ */
1355
+ async function tickProgressReport() {
1356
+ const state = await readOrchestrator();
1357
+ if (!state.reportIntervalMs) return;
1358
+ await runProgressReportOnce('auto', { intervalMs: state.reportIntervalMs });
1359
+ }
1360
+
1361
+ if (reportTimer) { clearInterval(reportTimer); reportTimer = null; }
1362
+ reportTimer = setInterval(() => {
1363
+ tickProgressReport().catch(err => {
1364
+ logger.warn('[workbench] 自动进度报告失败:', (err && err.message) || err);
1365
+ });
1366
+ }, REPORT_TICK_MS);
1367
+ // 定时器不该把进程吊着不退出
1368
+ reportTimer.unref?.();
1369
+
1212
1370
  app.post('/api/workbench/orchestrator/state', asyncRoute(async (req, res) => {
1213
1371
  const active = req.body?.active;
1214
1372
  if (typeof active !== 'boolean') throw new HttpError(400, 'active 必须是布尔值');
@@ -0,0 +1,254 @@
1
+ // Copyright 2026 xz333221
2
+ //
3
+ // Licensed under the Apache License, Version 2.0 (the "License");
4
+ // you may not use this file except in compliance with the License.
5
+ // You may obtain a copy of the License at
6
+ //
7
+ // http://www.apache.org/licenses/LICENSE-2.0
8
+ //
9
+ // Unless required by applicable law or agreed to in writing, software
10
+ // distributed under the License is distributed on an "AS IS" BASIS,
11
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ // See the License for the specific language governing permissions and
13
+ // limitations under the License.
14
+ //
15
+ // 「这一轮执行现在跑到哪了」—— 从执行记录里抽出可读事实的**唯一实现**。
16
+ //
17
+ // 2026-09-29 从 progressReport.js 拆出来。同一批事实现在有两个消费者:
18
+ // 1. 进度报告(progressReport.buildRunningFacts → 喂给主 Agent 写汇报);
19
+ // 2. 看板「进行中」卡片(projectRegistry.decorateTaskForBoard → 直接给人看)。
20
+ // 留在 progressReport.js 里会让 projectRegistry 反向依赖报告模块,而报告模块本来就依赖
21
+ // projectRegistry(用它的 projectName)—— 拆成独立模块比引一条循环依赖省事得多:
22
+ // 这几段文本本来就只跟 job 有关,跟"报告"无关。
23
+ //
24
+ // 两处口径必须逐字一致:同一件事在报告里写「最近思考:…」、在卡片上换了另一句话,
25
+ // 用户看到的是**同一条任务的两个说法**,只会以为自己看错了。
26
+
27
+ /** 一句话的最大长度(最近思考 / 最近输出都走它) */
28
+ export const MAX_LINE_CHARS = 160;
29
+ /** 最近一次工具调用的参数摘要长度 */
30
+ export const MAX_TOOL_CHARS = 100;
31
+ export const MAX_TOOL_NAME_CHARS = 60;
32
+ /** 工具名分布串的长度上限(`Bash×14 · Read×5 · Edit`) */
33
+ export const MAX_MIX_CHARS = 160;
34
+
35
+ /** 工具分布只看最近这么多次调用:整轮上千次的话,早先的模式早就被淹没了 */
36
+ export const TOOL_MIX_WINDOW = 20;
37
+ /**
38
+ * 静默多久才算"值得写进事实"(毫秒)。
39
+ * 低于这个数的"刚刚还在产出"不是事实、只是噪声 —— 写进 prompt 会挤掉有用的话,
40
+ * 显示在卡片上会让每一条都挂个"静默 2 秒"。
41
+ */
42
+ export const SILENT_NOTABLE_MS = 60 * 1000;
43
+
44
+ /** 输出里的最后一行有效文本 —— 模型最近说的一句话,比第一行更能说明"现在在干嘛" */
45
+ export function tailLine(output) {
46
+ const text = typeof output === 'string' ? output : '';
47
+ if (!text) return '';
48
+ const lines = text.split('\n');
49
+ for (let i = lines.length - 1; i >= 0; i--) {
50
+ const line = lines[i].replace(/\s+/g, ' ').trim();
51
+ if (line) return line.slice(0, MAX_LINE_CHARS);
52
+ }
53
+ return '';
54
+ }
55
+
56
+ /**
57
+ * 「最后回复」摘录最多多少字。
58
+ *
59
+ * 100 是按"卡片上放得下多少"倒推的:卡片宽 200–500px、字号 var(--font-size-xs),
60
+ * 一行约 25–35 个汉字、卡片最多显示 3 行(.kb-card__reply 的 line-clamp),
61
+ * 于是 2000px 宽的窗口(本机实测)刚好整段显示得完;窗口更窄时尾部会被 CSS 截掉
62
+ * 几个字(`…` 是诚实的标记,完整摘录在悬停提示里)。
63
+ *
64
+ * 这个数**不能再小**:截断的是头部,而模型收尾那句反问(「要 push 吗?」)常常落在
65
+ * 倒数第 80–100 字之间 —— 给 80 字就会把它整句丢掉,反而是这个功能最不该丢的东西。
66
+ * 也不能再大:多出来的部分只会被 CSS 从尾巴切掉,白白把有用的开头挤出去。
67
+ */
68
+ export const MAX_REPLY_CHARS = 100;
69
+
70
+ /**
71
+ * 摘录前先切的尾部窗口。
72
+ *
73
+ * 为什么要先切窗口再分行:单条 job 的 output 上限是 100MB(taskRunner 的 MAX_OUTPUT),
74
+ * 而看板是 5s 轮询一次、每次都要给几十张卡片算这个字段 —— 对着整份输出 split 一遍是
75
+ * 白白烧 CPU(切片是 O(1) 的 SlicedString,split 不是)。4000 字符足够覆盖一整段收尾。
76
+ */
77
+ export const REPLY_WINDOW_CHARS = 4000;
78
+
79
+ /** 纯装饰行(表格分隔线 / 水平线),留着只是噪声 */
80
+ const DECOR_LINE = /^\s*[|:\-\s=]+\s*$/;
81
+ /** Markdown 表格行(`| 项 | 结果 |`):压成一行文字后只剩一堆竖线,整行丢掉 */
82
+ const TABLE_LINE = /^\s*\|.*\|\s*$/;
83
+ /** 行首的标题 / 列表 / 引用标记 —— 压平成一句话之后它们不再是结构,只是噪声 */
84
+ const LINE_MARKER = /^\s*(?:#{1,6}\s+|[-*+]\s+|>\s*)/;
85
+ /** 行内强调与行内代码的标记。**不**去掉 `_`:它会命中 snake_case 的标识符 */
86
+ const INLINE_MARKER = /\*\*|`/g;
87
+
88
+ /**
89
+ * 从执行输出里摘出「最后说了什么」—— 看板「已完成」卡片上那一行。
90
+ *
91
+ * 与 tailLine 的分工:tailLine 是**正在跑**时用的,只要最新那一句("它现在在干嘛");
92
+ * 这里是**跑完之后**用的,要一小段("它最后交代了什么")。后者才是"这任务是不是真完了"
93
+ * 的证据 —— 模型经常在收尾时反问一句「要 push 吗?」,只看标题的话,用户根本不知道
94
+ * 这条已经完成的任务其实在等他一句话。
95
+ *
96
+ * 三条规矩:
97
+ * 1. 只取**尾部**:一段回复的重点在收尾,不在开头;
98
+ * 2. 丢掉表格行、行首标记、`**`/反引号,压平成一句话(卡片上没有富文本,留着只是噪声);
99
+ * 3. 真截断过才在前面加 `…`(没截就不加,`…` 是"这句话从中间开始"的诚实标记)。
100
+ */
101
+ export function tailExcerpt(output, { maxChars = MAX_REPLY_CHARS, windowChars = REPLY_WINDOW_CHARS } = {}) {
102
+ const raw = typeof output === 'string' ? output : '';
103
+ if (!raw) return '';
104
+
105
+ // 窗口起点多半落在半句话中间:从窗口内的第一个换行之后开始取,摘录才不会以半句开头。
106
+ // 窗口内一个换行都没有(单行超长输出)时只能整段用,此时下面的截断会补上 `…`。
107
+ // 没切窗口(输出本来就短)时不动第一行 —— 那是完整的一句,不是半截。
108
+ const cutWindow = raw.length > windowChars;
109
+ const windowed = cutWindow ? raw.slice(-windowChars) : raw;
110
+ const body = cutWindow ? windowed.slice(windowed.indexOf('\n') + 1) : windowed;
111
+
112
+ const flat = body
113
+ .split('\n')
114
+ .filter(line => !DECOR_LINE.test(line) && !TABLE_LINE.test(line))
115
+ .map(line => line.replace(LINE_MARKER, '').replace(INLINE_MARKER, '').replace(/\s+/g, ' ').trim())
116
+ .filter(Boolean)
117
+ .join(' ');
118
+
119
+ if (!flat) return '';
120
+ // 从尾部取:上面已经说明过为什么宁丢开头不丢结尾
121
+ return flat.length > maxChars ? `…${flat.slice(-maxChars).trim()}` : flat;
122
+ }
123
+
124
+ /**
125
+ * 最近一次工具调用的一句话描述(如 `Edit src/ui/client/src/App.vue`)。
126
+ * 从后往前找:数组里最后一条未必带 name(老数据 / 半截记录),跳过它们而不是返回空。
127
+ */
128
+ export function describeLastTool(toolCalls) {
129
+ const list = Array.isArray(toolCalls) ? toolCalls : [];
130
+ for (let i = list.length - 1; i >= 0; i--) {
131
+ const call = list[i];
132
+ if (!call || !call.name) continue;
133
+ const name = String(call.name).slice(0, MAX_TOOL_NAME_CHARS);
134
+ const raw = typeof call.argsPreview === 'string' && call.argsPreview
135
+ ? call.argsPreview
136
+ : (typeof call.arguments === 'string' ? call.arguments : '');
137
+ const args = String(raw || '').replace(/\s+/g, ' ').trim().slice(0, MAX_TOOL_CHARS);
138
+ return args ? `${name} ${args}` : name;
139
+ }
140
+ return '';
141
+ }
142
+
143
+ /**
144
+ * 最近 N 次工具调用的名字分布(`Bash×14 · Read×5`,从多到少)。
145
+ *
146
+ * 为什么需要它:只给"最近一次调用"时,看不出 119 次里有 118 次在干同一件事 ——
147
+ * 于是只能写"无法判断是在改代码还是反复读文件"。名字为空的老记录 / 半截记录跳过,
148
+ * 但不占窗口名额(否则一串空名字会把整段分布挤没)。
149
+ */
150
+ export function describeToolMix(toolCalls) {
151
+ const list = Array.isArray(toolCalls) ? toolCalls : [];
152
+ const counts = new Map();
153
+ let seen = 0;
154
+ for (let i = list.length - 1; i >= 0 && seen < TOOL_MIX_WINDOW; i--) {
155
+ const call = list[i];
156
+ if (!call || !call.name) continue;
157
+ seen++;
158
+ const name = String(call.name).slice(0, MAX_TOOL_NAME_CHARS);
159
+ counts.set(name, (counts.get(name) || 0) + 1);
160
+ }
161
+ if (!counts.size) return '';
162
+ return [...counts.entries()]
163
+ .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))
164
+ .map(([name, n]) => (n > 1 ? `${name}×${n}` : name))
165
+ .join(' · ')
166
+ .slice(0, MAX_MIX_CHARS);
167
+ }
168
+
169
+ /**
170
+ * 距最后一次产出(正文 / 思考 / 工具调用)多久。
171
+ * 没有 `lastActivityAt`(老记录、别实例上的旧版进程)或还没到阈值 → null,
172
+ * 调用方据此决定"这条不显示",而不是显示一个假的 0。
173
+ */
174
+ export function silentMsOf(job, now) {
175
+ const last = Date.parse((job && job.lastActivityAt) || '');
176
+ if (!Number.isFinite(last)) return null;
177
+ const ms = Math.max(0, now - last);
178
+ return ms >= SILENT_NOTABLE_MS ? ms : null;
179
+ }
180
+
181
+ /** job 是否算"正在跑"(看板卡片只在此时显示活动摘要) */
182
+ export function isLiveJob(job) {
183
+ return !!job && (job.status === 'running' || job.status === 'pending');
184
+ }
185
+
186
+ /**
187
+ * 单条 job → 卡片 / 报告可用的活动摘要。非 running/pending 返回 null(调用方据此不显示)。
188
+ *
189
+ * 时间戳用**毫秒时长**(elapsedMs / silentMs)而不是 ISO:
190
+ * 前端两个视图都拿 formatDurationMs 格式化,跨实例读来的记录也一样能算出时长。
191
+ *
192
+ * @param {object} job 执行记录(内存里的原始对象,或 projectJob 投影)
193
+ * @param {number} now 参照时刻,便于单测
194
+ */
195
+ export function buildLiveActivity(job, now = Date.now()) {
196
+ if (!isLiveJob(job)) return null;
197
+ const started = Date.parse(job.startedAt || '');
198
+ return {
199
+ jobId: job.id || '',
200
+ status: job.status,
201
+ /** 本轮执行器(claude | opencode | codex)。老记录没有这个字段 → 空串 */
202
+ agent: typeof job.agent === 'string' ? job.agent : '',
203
+ startedAt: job.startedAt || null,
204
+ elapsedMs: Number.isFinite(started) ? Math.max(0, now - started) : 0,
205
+ /** 见 taskRunner 的 MAX_TOOL_CALLS:超上限的调用不再入数组,所以这是"至少这么多次" */
206
+ toolCallCount: Array.isArray(job.toolCalls) ? job.toolCalls.length : 0,
207
+ lastTool: describeLastTool(job.toolCalls),
208
+ toolMix: describeToolMix(job.toolCalls),
209
+ /** 最近一段思考。多数任务一句正文都不写,它是"它在干嘛"最直接的证据 */
210
+ lastThought: tailLine(job.thinking),
211
+ /** 最新的回复(正文最后一行),空串 = 这轮还没写过正文 */
212
+ lastLine: tailLine(job.output),
213
+ silentMs: silentMsOf(job, now),
214
+ };
215
+ }
216
+
217
+ /** 最近一次产出的时刻,取不到时回落到启动时刻 */
218
+ function activityTimestamp(job) {
219
+ return Date.parse(job.lastActivityAt || '') || Date.parse(job.startedAt || '') || 0;
220
+ }
221
+
222
+ /**
223
+ * 一个任务可能同时有好几条 job 在跑(并行的子任务 / 连点两次执行),
224
+ * 卡片只放得下一条 —— 挑**最近有动静的**那条:用户问"现在在干嘛"时,
225
+ * 刚吐过字的那个才是答案,跑得最久的那个未必。
226
+ *
227
+ * 时间戳打平时按原顺序取末条(与 latestJob 同口径)。
228
+ *
229
+ * @returns {object|null} buildLiveActivity 的结果;没有在跑的 job 时 null
230
+ */
231
+ export function pickLiveActivity(jobsForTask, now = Date.now()) {
232
+ const list = Array.isArray(jobsForTask) ? jobsForTask : [];
233
+ let best = null;
234
+ let bestAt = -Infinity;
235
+ for (const j of list) {
236
+ if (!isLiveJob(j)) continue;
237
+ const at = activityTimestamp(j);
238
+ if (at >= bestAt) {
239
+ best = j;
240
+ bestAt = at;
241
+ }
242
+ }
243
+ return best ? buildLiveActivity(best, now) : null;
244
+ }
245
+
246
+ export const __testables = {
247
+ tailLine,
248
+ tailExcerpt,
249
+ describeLastTool,
250
+ describeToolMix,
251
+ silentMsOf,
252
+ buildLiveActivity,
253
+ pickLiveActivity,
254
+ };