mstro-app 0.4.51 → 0.5.0

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 (223) hide show
  1. package/README.md +10 -5
  2. package/bin/mstro.js +1 -1
  3. package/dist/server/cli/headless/claude-invoker-stall.d.ts.map +1 -1
  4. package/dist/server/cli/headless/claude-invoker-stall.js +7 -2
  5. package/dist/server/cli/headless/claude-invoker-stall.js.map +1 -1
  6. package/dist/server/cli/headless/claude-invoker.js +1 -1
  7. package/dist/server/cli/headless/claude-invoker.js.map +1 -1
  8. package/dist/server/cli/headless/runner.d.ts.map +1 -1
  9. package/dist/server/cli/headless/runner.js +63 -67
  10. package/dist/server/cli/headless/runner.js.map +1 -1
  11. package/dist/server/cli/headless/stall-assessor.d.ts.map +1 -1
  12. package/dist/server/cli/headless/stall-assessor.js +9 -4
  13. package/dist/server/cli/headless/stall-assessor.js.map +1 -1
  14. package/dist/server/cli/improvisation-history-store.d.ts +16 -0
  15. package/dist/server/cli/improvisation-history-store.d.ts.map +1 -0
  16. package/dist/server/cli/improvisation-history-store.js +52 -0
  17. package/dist/server/cli/improvisation-history-store.js.map +1 -0
  18. package/dist/server/cli/improvisation-movements.d.ts +31 -0
  19. package/dist/server/cli/improvisation-movements.d.ts.map +1 -0
  20. package/dist/server/cli/improvisation-movements.js +93 -0
  21. package/dist/server/cli/improvisation-movements.js.map +1 -0
  22. package/dist/server/cli/improvisation-output-queue.d.ts +13 -0
  23. package/dist/server/cli/improvisation-output-queue.d.ts.map +1 -0
  24. package/dist/server/cli/improvisation-output-queue.js +40 -0
  25. package/dist/server/cli/improvisation-output-queue.js.map +1 -0
  26. package/dist/server/cli/improvisation-retry.d.ts +21 -51
  27. package/dist/server/cli/improvisation-retry.d.ts.map +1 -1
  28. package/dist/server/cli/improvisation-retry.js +18 -433
  29. package/dist/server/cli/improvisation-retry.js.map +1 -1
  30. package/dist/server/cli/improvisation-session-manager.d.ts +10 -8
  31. package/dist/server/cli/improvisation-session-manager.d.ts.map +1 -1
  32. package/dist/server/cli/improvisation-session-manager.js +53 -148
  33. package/dist/server/cli/improvisation-session-manager.js.map +1 -1
  34. package/dist/server/cli/retry/retry-best-result.d.ts +4 -0
  35. package/dist/server/cli/retry/retry-best-result.d.ts.map +1 -0
  36. package/dist/server/cli/retry/retry-best-result.js +61 -0
  37. package/dist/server/cli/retry/retry-best-result.js.map +1 -0
  38. package/dist/server/cli/retry/retry-context-loss.d.ts +6 -0
  39. package/dist/server/cli/retry/retry-context-loss.d.ts.map +1 -0
  40. package/dist/server/cli/retry/retry-context-loss.js +68 -0
  41. package/dist/server/cli/retry/retry-context-loss.js.map +1 -0
  42. package/dist/server/cli/retry/retry-premature-completion.d.ts +5 -0
  43. package/dist/server/cli/retry/retry-premature-completion.d.ts.map +1 -0
  44. package/dist/server/cli/retry/retry-premature-completion.js +81 -0
  45. package/dist/server/cli/retry/retry-premature-completion.js.map +1 -0
  46. package/dist/server/cli/retry/retry-recovery-strategies.d.ts +13 -0
  47. package/dist/server/cli/retry/retry-recovery-strategies.d.ts.map +1 -0
  48. package/dist/server/cli/retry/retry-recovery-strategies.js +166 -0
  49. package/dist/server/cli/retry/retry-recovery-strategies.js.map +1 -0
  50. package/dist/server/cli/retry/retry-resume-strategy.d.ts +12 -0
  51. package/dist/server/cli/retry/retry-resume-strategy.d.ts.map +1 -0
  52. package/dist/server/cli/retry/retry-resume-strategy.js +22 -0
  53. package/dist/server/cli/retry/retry-resume-strategy.js.map +1 -0
  54. package/dist/server/cli/retry/retry-runner-factory.d.ts +11 -0
  55. package/dist/server/cli/retry/retry-runner-factory.d.ts.map +1 -0
  56. package/dist/server/cli/retry/retry-runner-factory.js +60 -0
  57. package/dist/server/cli/retry/retry-runner-factory.js.map +1 -0
  58. package/dist/server/cli/retry/retry-tool-results.d.ts +9 -0
  59. package/dist/server/cli/retry/retry-tool-results.d.ts.map +1 -0
  60. package/dist/server/cli/retry/retry-tool-results.js +24 -0
  61. package/dist/server/cli/retry/retry-tool-results.js.map +1 -0
  62. package/dist/server/cli/retry/retry-types.d.ts +30 -0
  63. package/dist/server/cli/retry/retry-types.d.ts.map +1 -0
  64. package/dist/server/cli/retry/retry-types.js +4 -0
  65. package/dist/server/cli/retry/retry-types.js.map +1 -0
  66. package/dist/server/index.js +21 -109
  67. package/dist/server/index.js.map +1 -1
  68. package/dist/server/server-setup.d.ts +16 -1
  69. package/dist/server/server-setup.d.ts.map +1 -1
  70. package/dist/server/server-setup.js +107 -0
  71. package/dist/server/server-setup.js.map +1 -1
  72. package/dist/server/services/plan/board-config.d.ts +21 -0
  73. package/dist/server/services/plan/board-config.d.ts.map +1 -0
  74. package/dist/server/services/plan/board-config.js +112 -0
  75. package/dist/server/services/plan/board-config.js.map +1 -0
  76. package/dist/server/services/plan/composer.d.ts +1 -1
  77. package/dist/server/services/plan/composer.d.ts.map +1 -1
  78. package/dist/server/services/plan/composer.js +7 -5
  79. package/dist/server/services/plan/composer.js.map +1 -1
  80. package/dist/server/services/plan/executor.d.ts +48 -48
  81. package/dist/server/services/plan/executor.d.ts.map +1 -1
  82. package/dist/server/services/plan/executor.js +157 -455
  83. package/dist/server/services/plan/executor.js.map +1 -1
  84. package/dist/server/services/plan/issue-loader.d.ts +16 -0
  85. package/dist/server/services/plan/issue-loader.d.ts.map +1 -0
  86. package/dist/server/services/plan/issue-loader.js +46 -0
  87. package/dist/server/services/plan/issue-loader.js.map +1 -0
  88. package/dist/server/services/plan/issue-writer.d.ts +34 -0
  89. package/dist/server/services/plan/issue-writer.d.ts.map +1 -0
  90. package/dist/server/services/plan/issue-writer.js +110 -0
  91. package/dist/server/services/plan/issue-writer.js.map +1 -0
  92. package/dist/server/services/plan/output-manager.d.ts.map +1 -1
  93. package/dist/server/services/plan/output-manager.js +2 -1
  94. package/dist/server/services/plan/output-manager.js.map +1 -1
  95. package/dist/server/services/plan/progress-log.d.ts +11 -0
  96. package/dist/server/services/plan/progress-log.d.ts.map +1 -0
  97. package/dist/server/services/plan/progress-log.js +81 -0
  98. package/dist/server/services/plan/progress-log.js.map +1 -0
  99. package/dist/server/services/plan/prompt-builder.d.ts.map +1 -1
  100. package/dist/server/services/plan/prompt-builder.js +48 -31
  101. package/dist/server/services/plan/prompt-builder.js.map +1 -1
  102. package/dist/server/services/plan/readiness-planner.d.ts +15 -0
  103. package/dist/server/services/plan/readiness-planner.d.ts.map +1 -0
  104. package/dist/server/services/plan/readiness-planner.js +41 -0
  105. package/dist/server/services/plan/readiness-planner.js.map +1 -0
  106. package/dist/server/services/plan/review-gate.d.ts +31 -0
  107. package/dist/server/services/plan/review-gate.d.ts.map +1 -1
  108. package/dist/server/services/plan/review-gate.js +52 -2
  109. package/dist/server/services/plan/review-gate.js.map +1 -1
  110. package/dist/server/services/platform.d.ts +56 -0
  111. package/dist/server/services/platform.d.ts.map +1 -1
  112. package/dist/server/services/platform.js +154 -52
  113. package/dist/server/services/platform.js.map +1 -1
  114. package/dist/server/services/websocket/file-download-handler.d.ts +17 -0
  115. package/dist/server/services/websocket/file-download-handler.d.ts.map +1 -0
  116. package/dist/server/services/websocket/file-download-handler.js +165 -0
  117. package/dist/server/services/websocket/file-download-handler.js.map +1 -0
  118. package/dist/server/services/websocket/git-branch-handlers.d.ts +1 -1
  119. package/dist/server/services/websocket/git-branch-handlers.d.ts.map +1 -1
  120. package/dist/server/services/websocket/git-branch-handlers.js +21 -1
  121. package/dist/server/services/websocket/git-branch-handlers.js.map +1 -1
  122. package/dist/server/services/websocket/git-handlers.js +1 -1
  123. package/dist/server/services/websocket/git-handlers.js.map +1 -1
  124. package/dist/server/services/websocket/git-worktree-handlers.d.ts +2 -0
  125. package/dist/server/services/websocket/git-worktree-handlers.d.ts.map +1 -1
  126. package/dist/server/services/websocket/git-worktree-handlers.js +30 -4
  127. package/dist/server/services/websocket/git-worktree-handlers.js.map +1 -1
  128. package/dist/server/services/websocket/handler-context.d.ts +15 -0
  129. package/dist/server/services/websocket/handler-context.d.ts.map +1 -1
  130. package/dist/server/services/websocket/handler.d.ts +7 -0
  131. package/dist/server/services/websocket/handler.d.ts.map +1 -1
  132. package/dist/server/services/websocket/handler.js +73 -11
  133. package/dist/server/services/websocket/handler.js.map +1 -1
  134. package/dist/server/services/websocket/msg-id-tracker.d.ts +21 -0
  135. package/dist/server/services/websocket/msg-id-tracker.d.ts.map +1 -0
  136. package/dist/server/services/websocket/msg-id-tracker.js +77 -0
  137. package/dist/server/services/websocket/msg-id-tracker.js.map +1 -0
  138. package/dist/server/services/websocket/quality-handlers.js +15 -3
  139. package/dist/server/services/websocket/quality-handlers.js.map +1 -1
  140. package/dist/server/services/websocket/quality-review-agent.js +2 -2
  141. package/dist/server/services/websocket/session-handlers.d.ts +48 -2
  142. package/dist/server/services/websocket/session-handlers.d.ts.map +1 -1
  143. package/dist/server/services/websocket/session-handlers.js +204 -65
  144. package/dist/server/services/websocket/session-handlers.js.map +1 -1
  145. package/dist/server/services/websocket/session-initialization.d.ts +2 -2
  146. package/dist/server/services/websocket/session-initialization.d.ts.map +1 -1
  147. package/dist/server/services/websocket/session-initialization.js +75 -17
  148. package/dist/server/services/websocket/session-initialization.js.map +1 -1
  149. package/dist/server/services/websocket/session-registry.d.ts +29 -1
  150. package/dist/server/services/websocket/session-registry.d.ts.map +1 -1
  151. package/dist/server/services/websocket/session-registry.js +53 -4
  152. package/dist/server/services/websocket/session-registry.js.map +1 -1
  153. package/dist/server/services/websocket/tab-broadcast.d.ts +24 -0
  154. package/dist/server/services/websocket/tab-broadcast.d.ts.map +1 -0
  155. package/dist/server/services/websocket/tab-broadcast.js +13 -0
  156. package/dist/server/services/websocket/tab-broadcast.js.map +1 -0
  157. package/dist/server/services/websocket/tab-event-buffer.d.ts +103 -0
  158. package/dist/server/services/websocket/tab-event-buffer.d.ts.map +1 -0
  159. package/dist/server/services/websocket/tab-event-buffer.js +107 -0
  160. package/dist/server/services/websocket/tab-event-buffer.js.map +1 -0
  161. package/dist/server/services/websocket/tab-event-replay.d.ts +20 -0
  162. package/dist/server/services/websocket/tab-event-replay.d.ts.map +1 -0
  163. package/dist/server/services/websocket/tab-event-replay.js +21 -0
  164. package/dist/server/services/websocket/tab-event-replay.js.map +1 -0
  165. package/dist/server/services/websocket/tab-handlers.d.ts +0 -1
  166. package/dist/server/services/websocket/tab-handlers.d.ts.map +1 -1
  167. package/dist/server/services/websocket/tab-handlers.js +2 -9
  168. package/dist/server/services/websocket/tab-handlers.js.map +1 -1
  169. package/dist/server/services/websocket/types.d.ts +15 -6
  170. package/dist/server/services/websocket/types.d.ts.map +1 -1
  171. package/dist/server/services/websocket/types.js +6 -4
  172. package/dist/server/services/websocket/types.js.map +1 -1
  173. package/package.json +1 -1
  174. package/server/README.md +1 -1
  175. package/server/cli/headless/claude-invoker-stall.ts +7 -2
  176. package/server/cli/headless/claude-invoker.ts +1 -1
  177. package/server/cli/headless/runner.ts +67 -72
  178. package/server/cli/headless/stall-assessor.ts +9 -4
  179. package/server/cli/headless/types.ts +1 -1
  180. package/server/cli/improvisation-history-store.ts +62 -0
  181. package/server/cli/improvisation-movements.ts +120 -0
  182. package/server/cli/improvisation-output-queue.ts +42 -0
  183. package/server/cli/improvisation-retry.ts +25 -600
  184. package/server/cli/improvisation-session-manager.ts +74 -160
  185. package/server/cli/retry/retry-best-result.ts +70 -0
  186. package/server/cli/retry/retry-context-loss.ts +87 -0
  187. package/server/cli/retry/retry-premature-completion.ts +113 -0
  188. package/server/cli/retry/retry-recovery-strategies.ts +247 -0
  189. package/server/cli/retry/retry-resume-strategy.ts +33 -0
  190. package/server/cli/retry/retry-runner-factory.ts +70 -0
  191. package/server/cli/retry/retry-tool-results.ts +31 -0
  192. package/server/cli/retry/retry-types.ts +32 -0
  193. package/server/index.ts +37 -123
  194. package/server/server-setup.ts +126 -1
  195. package/server/services/plan/agents/assess-stall.md +11 -4
  196. package/server/services/plan/board-config.ts +122 -0
  197. package/server/services/plan/composer.ts +7 -5
  198. package/server/services/plan/executor.ts +214 -467
  199. package/server/services/plan/issue-loader.ts +64 -0
  200. package/server/services/plan/issue-writer.ts +137 -0
  201. package/server/services/plan/output-manager.ts +2 -1
  202. package/server/services/plan/progress-log.ts +92 -0
  203. package/server/services/plan/prompt-builder.ts +73 -35
  204. package/server/services/plan/readiness-planner.ts +50 -0
  205. package/server/services/plan/review-gate.ts +102 -2
  206. package/server/services/platform.ts +163 -58
  207. package/server/services/websocket/file-download-handler.ts +191 -0
  208. package/server/services/websocket/git-branch-handlers.ts +28 -1
  209. package/server/services/websocket/git-handlers.ts +1 -1
  210. package/server/services/websocket/git-worktree-handlers.ts +31 -4
  211. package/server/services/websocket/handler-context.ts +15 -0
  212. package/server/services/websocket/handler.ts +76 -12
  213. package/server/services/websocket/msg-id-tracker.ts +84 -0
  214. package/server/services/websocket/quality-handlers.ts +16 -3
  215. package/server/services/websocket/quality-review-agent.ts +2 -2
  216. package/server/services/websocket/session-handlers.ts +213 -68
  217. package/server/services/websocket/session-initialization.ts +83 -19
  218. package/server/services/websocket/session-registry.ts +61 -4
  219. package/server/services/websocket/tab-broadcast.ts +38 -0
  220. package/server/services/websocket/tab-event-buffer.ts +159 -0
  221. package/server/services/websocket/tab-event-replay.ts +42 -0
  222. package/server/services/websocket/tab-handlers.ts +2 -9
  223. package/server/services/websocket/types.ts +17 -4
@@ -1,438 +1,23 @@
1
1
  // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
2
2
  // Licensed under the MIT License. See LICENSE file for details.
3
3
  /**
4
- * Retry and recovery logic for improvisation sessions.
5
- * Handles context loss, tool timeouts, signal crashes, and premature completion.
4
+ * Retry and recovery logic for improvisation sessions — barrel re-export.
5
+ *
6
+ * Implementation lives in focused modules under ./retry/:
7
+ * - retry-types.ts — RetryCallbacks, RetrySessionState
8
+ * - retry-resume-strategy.ts — whether/how to --resume
9
+ * - retry-runner-factory.ts — HeadlessRunner factory for a single iteration
10
+ * - retry-context-loss.ts — Path 1 + Path 2 context loss detection
11
+ * - retry-tool-results.ts — accumulate tool results across retries
12
+ * - retry-recovery-strategies.ts — context-loss, tool-timeout, signal-crash retries
13
+ * - retry-premature-completion.ts — detect + recover from unfinished end_turn
14
+ * - retry-best-result.ts — pick the best result across retries
6
15
  */
7
- import { AnalyticsEvents, trackEvent } from '../services/analytics.js';
8
- import { hlog } from './headless/headless-logger.js';
9
- import { HeadlessRunner } from './headless/index.js';
10
- import { extractFinalTextBlock, isResponseAbandoned } from './headless/retry-strategies.js';
11
- import { assessBestResult, assessContextLoss, assessPrematureCompletion } from './headless/stall-assessor.js';
12
- import { scoreRunResult } from './improvisation-types.js';
13
- import { buildContextRecoveryPrompt, buildFreshRecoveryPrompt, buildHistoricalContext, buildInterMovementRecoveryPrompt, buildResumeRetryPrompt, buildRetryPrompt, buildSignalCrashRecoveryPrompt, extractHistoricalToolResults, } from './prompt-builders.js';
14
- // ========== Resume Strategy ==========
15
- /** Determine whether to use --resume and which session ID */
16
- export function determineResumeStrategy(state, session) {
17
- if (state.freshRecoveryMode) {
18
- state.freshRecoveryMode = false;
19
- return { useResume: false, resumeSessionId: undefined };
20
- }
21
- if (state.contextRecoverySessionId) {
22
- const id = state.contextRecoverySessionId;
23
- state.contextRecoverySessionId = undefined;
24
- return { useResume: true, resumeSessionId: id };
25
- }
26
- if (state.retryNumber === 0) {
27
- return { useResume: !session.isFirstPrompt, resumeSessionId: session.claudeSessionId };
28
- }
29
- if (state.lastWatchdogCheckpoint?.inProgressTools.length === 0 && state.lastWatchdogCheckpoint.claudeSessionId) {
30
- return { useResume: true, resumeSessionId: state.lastWatchdogCheckpoint.claudeSessionId };
31
- }
32
- return { useResume: false, resumeSessionId: undefined };
33
- }
34
- // ========== Runner Creation ==========
35
- /** Create HeadlessRunner for one retry iteration */
36
- export function createExecutionRunner(state, session, callbacks, sequenceNumber, useResume, resumeSessionId, imageAttachments, workingDirOverride) {
37
- return new HeadlessRunner({
38
- workingDir: workingDirOverride || session.options.workingDir,
39
- tokenBudgetThreshold: session.options.tokenBudgetThreshold,
40
- maxSessions: session.options.maxSessions,
41
- verbose: session.options.verbose,
42
- noColor: session.options.noColor,
43
- model: session.options.model,
44
- effortLevel: session.options.effortLevel,
45
- improvisationMode: true,
46
- movementNumber: sequenceNumber,
47
- continueSession: useResume,
48
- claudeSessionId: resumeSessionId,
49
- outputCallback: (text) => {
50
- if (callbacks.isCancelled())
51
- return;
52
- callbacks.addEventLog({ type: 'output', data: { text, timestamp: Date.now() }, timestamp: Date.now() });
53
- callbacks.queueOutput(text);
54
- callbacks.flushOutputQueue();
55
- },
56
- thinkingCallback: (text) => {
57
- if (callbacks.isCancelled())
58
- return;
59
- callbacks.addEventLog({ type: 'thinking', data: { text }, timestamp: Date.now() });
60
- callbacks.emit('onThinking', text);
61
- callbacks.flushOutputQueue();
62
- },
63
- toolUseCallback: (event) => {
64
- if (callbacks.isCancelled())
65
- return;
66
- callbacks.addEventLog({ type: 'toolUse', data: { ...event, timestamp: Date.now() }, timestamp: Date.now() });
67
- callbacks.emit('onToolUse', event);
68
- callbacks.flushOutputQueue();
69
- },
70
- tokenUsageCallback: (usage) => {
71
- if (callbacks.isCancelled())
72
- return;
73
- callbacks.emit('onTokenUsage', usage);
74
- },
75
- directPrompt: state.currentPrompt,
76
- imageAttachments,
77
- promptContext: (state.retryNumber === 0 && session.isResumedSession && session.isFirstPrompt)
78
- ? { accumulatedKnowledge: buildHistoricalContext(session.history.movements), filesModified: [] }
79
- : undefined,
80
- onToolTimeout: (checkpoint) => {
81
- state.checkpointRef.value = checkpoint;
82
- },
83
- });
84
- }
85
- // ========== Context Loss Detection ==========
86
- /** Detect resume context loss (Path 1): session expired on --resume */
87
- export function detectResumeContextLoss(result, state, useResume, maxRetries, nativeTimeouts, verbose) {
88
- if (!useResume || state.checkpointRef.value || state.retryNumber >= maxRetries || nativeTimeouts > 0) {
89
- return;
90
- }
91
- if (!result.assistantResponse || result.assistantResponse.trim().length === 0) {
92
- state.contextLost = true;
93
- if (verbose)
94
- hlog('[CONTEXT-RECOVERY] Resume context loss: null/empty response');
95
- }
96
- else if (result.resumeBufferedOutput !== undefined) {
97
- state.contextLost = true;
98
- if (verbose)
99
- hlog('[CONTEXT-RECOVERY] Resume context loss: buffer never flushed (no thinking/tools)');
100
- }
101
- else if ((!result.toolUseHistory || result.toolUseHistory.length === 0) &&
102
- !result.thinkingOutput &&
103
- result.assistantResponse.length < 500) {
104
- state.contextLost = true;
105
- if (verbose)
106
- hlog('[CONTEXT-RECOVERY] Resume context loss: no tools, no thinking, short response');
107
- }
108
- }
109
- /** Detect native timeout context loss (Path 2): tool timeouts caused confusion */
110
- export async function detectNativeTimeoutContextLoss(result, state, maxRetries, nativeTimeouts, verbose) {
111
- if (state.contextLost)
112
- return;
113
- const succeededIds = new Set();
114
- const allIds = new Set();
115
- for (const t of result.toolUseHistory ?? []) {
116
- allIds.add(t.toolId);
117
- if (t.result !== undefined)
118
- succeededIds.add(t.toolId);
119
- }
120
- const toolsWithoutResult = [...allIds].filter(id => !succeededIds.has(id)).length;
121
- const effectiveTimeouts = Math.max(nativeTimeouts, toolsWithoutResult);
122
- if (effectiveTimeouts === 0 || !result.assistantResponse || state.checkpointRef.value || state.retryNumber >= maxRetries) {
123
- return;
124
- }
125
- const writeToolNames = new Set(['Edit', 'Write', 'MultiEdit', 'NotebookEdit']);
126
- const contextLossCtx = {
127
- assistantResponse: result.assistantResponse,
128
- effectiveTimeouts,
129
- nativeTimeoutCount: nativeTimeouts,
130
- successfulToolCalls: result.toolUseHistory?.filter(t => t.result !== undefined && !t.isError).length ?? 0,
131
- thinkingOutputLength: result.thinkingOutput?.length ?? 0,
132
- hasSuccessfulWrite: result.toolUseHistory?.some(t => writeToolNames.has(t.toolName) && t.result !== undefined && !t.isError) ?? false,
133
- };
134
- const claudeCmd = process.env.CLAUDE_COMMAND || 'claude';
135
- const verdict = await assessContextLoss(contextLossCtx, claudeCmd, verbose);
136
- state.contextLost = verdict.contextLost;
137
- if (verbose) {
138
- hlog(`[CONTEXT-RECOVERY] Haiku verdict: ${state.contextLost ? 'LOST' : 'OK'} — ${verdict.reason}`);
139
- }
140
- }
141
- // ========== Tool Result Accumulation ==========
142
- const MAX_ACCUMULATED_RESULTS = 50;
143
- /** Accumulate completed tool results from a run into the retry state */
144
- export function accumulateToolResults(result, state) {
145
- if (!result.toolUseHistory)
146
- return;
147
- for (const t of result.toolUseHistory) {
148
- if (t.result !== undefined) {
149
- state.accumulatedToolResults.push({
150
- toolName: t.toolName,
151
- toolId: t.toolId,
152
- toolInput: t.toolInput,
153
- result: t.result,
154
- isError: t.isError,
155
- duration: t.duration,
156
- });
157
- }
158
- }
159
- if (state.accumulatedToolResults.length > MAX_ACCUMULATED_RESULTS) {
160
- state.accumulatedToolResults = state.accumulatedToolResults.slice(-MAX_ACCUMULATED_RESULTS);
161
- }
162
- }
163
- // ========== Recovery Strategies ==========
164
- /** Handle inter-movement context loss recovery (resume session expired) */
165
- export function applyInterMovementRecovery(state, promptWithAttachments, history, callbacks) {
166
- const historicalResults = extractHistoricalToolResults(history);
167
- const allResults = [...historicalResults, ...state.accumulatedToolResults];
168
- callbacks.emit('onAutoRetry', {
169
- retryNumber: state.retryNumber,
170
- maxRetries: 3,
171
- toolName: 'InterMovementRecovery',
172
- completedCount: allResults.length,
173
- });
174
- callbacks.queueOutput(`\n[[MSTRO_CONTEXT_RECOVERY]] Session context expired — continuing with ${allResults.length} preserved results from prior work (retry ${state.retryNumber}/3).\n`);
175
- callbacks.flushOutputQueue();
176
- state.freshRecoveryMode = true;
177
- state.currentPrompt = buildInterMovementRecoveryPrompt(promptWithAttachments, allResults, history);
178
- }
179
- /** Handle native-timeout context loss recovery (tool timeouts caused confusion) */
180
- export function applyNativeTimeoutRecovery(result, state, promptWithAttachments, session, callbacks) {
181
- const completedCount = state.accumulatedToolResults.length;
182
- callbacks.emit('onAutoRetry', {
183
- retryNumber: state.retryNumber,
184
- maxRetries: 3,
185
- toolName: 'ContextRecovery',
186
- completedCount,
187
- });
188
- if (result.claudeSessionId && state.retryNumber === 1) {
189
- callbacks.queueOutput(`\n[[MSTRO_CONTEXT_RECOVERY]] Context loss detected — resuming session with ${completedCount} preserved results (retry ${state.retryNumber}/3).\n`);
190
- callbacks.flushOutputQueue();
191
- state.contextRecoverySessionId = result.claudeSessionId;
192
- session.claudeSessionId = result.claudeSessionId;
193
- state.currentPrompt = buildContextRecoveryPrompt(promptWithAttachments);
194
- }
195
- else {
196
- callbacks.queueOutput(`\n[[MSTRO_CONTEXT_RECOVERY]] Continuing with fresh context — ${completedCount} preserved results injected (retry ${state.retryNumber}/3).\n`);
197
- callbacks.flushOutputQueue();
198
- state.freshRecoveryMode = true;
199
- state.currentPrompt = buildFreshRecoveryPrompt(promptWithAttachments, state.accumulatedToolResults, state.timedOutTools);
200
- }
201
- }
202
- /** Check if context loss recovery should trigger. Returns true if loop should continue. */
203
- export function shouldRetryContextLoss(result, state, session, useResume, nativeTimeouts, maxRetries, promptWithAttachments, callbacks) {
204
- if (state.checkpointRef.value || state.retryNumber >= maxRetries || !state.contextLost) {
205
- return false;
206
- }
207
- accumulateToolResults(result, state);
208
- state.retryNumber++;
209
- const path = (useResume && nativeTimeouts === 0) ? 'InterMovementRecovery' : 'NativeTimeoutRecovery';
210
- state.retryLog.push({
211
- retryNumber: state.retryNumber,
212
- path,
213
- reason: `Context lost (${nativeTimeouts} timeouts, ${state.accumulatedToolResults.length} tools preserved)`,
214
- timestamp: Date.now(),
215
- });
216
- if (useResume && nativeTimeouts === 0) {
217
- applyInterMovementRecovery(state, promptWithAttachments, session.history.movements, callbacks);
218
- }
219
- else {
220
- applyNativeTimeoutRecovery(result, state, promptWithAttachments, session, callbacks);
221
- }
222
- return true;
223
- }
224
- /** Handle tool timeout checkpoint. Returns true if loop should continue. */
225
- export function applyToolTimeoutRetry(state, maxRetries, promptWithAttachments, callbacks, model, effortLevel) {
226
- if (!state.checkpointRef.value || state.retryNumber >= maxRetries) {
227
- return false;
228
- }
229
- const cp = state.checkpointRef.value;
230
- state.retryNumber++;
231
- state.timedOutTools.push({
232
- toolName: cp.hungTool.toolName,
233
- input: cp.hungTool.input ?? {},
234
- timeoutMs: cp.hungTool.timeoutMs,
235
- });
236
- const canResumeSession = cp.inProgressTools.length === 0 && !!cp.claudeSessionId;
237
- state.retryLog.push({
238
- retryNumber: state.retryNumber,
239
- path: 'ToolTimeout',
240
- reason: `${cp.hungTool.toolName} timed out after ${cp.hungTool.timeoutMs}ms, ${cp.completedTools.length} tools completed, ${canResumeSession ? 'resuming' : 'fresh start'}`,
241
- timestamp: Date.now(),
242
- });
243
- callbacks.emit('onAutoRetry', {
244
- retryNumber: state.retryNumber,
245
- maxRetries,
246
- toolName: cp.hungTool.toolName,
247
- url: cp.hungTool.url,
248
- completedCount: cp.completedTools.length,
249
- });
250
- trackEvent(AnalyticsEvents.IMPROVISE_AUTO_RETRY, {
251
- retry_number: state.retryNumber,
252
- hung_tool: cp.hungTool.toolName,
253
- hung_url: cp.hungTool.url?.slice(0, 200),
254
- completed_tools: cp.completedTools.length,
255
- elapsed_ms: cp.elapsedMs,
256
- resume_attempted: canResumeSession,
257
- model: model || 'default',
258
- effort_level: effortLevel || 'auto',
259
- });
260
- state.currentPrompt = canResumeSession
261
- ? buildResumeRetryPrompt(cp, state.timedOutTools)
262
- : buildRetryPrompt(cp, promptWithAttachments, state.timedOutTools);
263
- callbacks.queueOutput(`\n[[MSTRO_AUTO_RETRY]] Auto-retry ${state.retryNumber}/${maxRetries}: ${canResumeSession ? 'Resuming session' : 'Continuing'} with ${cp.completedTools.length} successful results, skipping failed ${cp.hungTool.toolName}.\n`);
264
- callbacks.flushOutputQueue();
265
- return true;
266
- }
267
- /** Detect and retry after a signal crash. Returns true if loop should continue. */
268
- export function shouldRetrySignalCrash(result, state, session, maxRetries, promptWithAttachments, callbacks) {
269
- const isSignalCrash = !!result.signalName;
270
- const exitCodeSignal = !result.completed && !result.signalName && result.error?.match(/exited with code (1[2-9]\d|[2-9]\d{2})/);
271
- if ((!isSignalCrash && !exitCodeSignal) || state.retryNumber >= maxRetries) {
272
- return false;
273
- }
274
- if (state.checkpointRef.value) {
275
- return false;
276
- }
277
- accumulateToolResults(result, state);
278
- state.retryNumber++;
279
- const completedCount = state.accumulatedToolResults.length;
280
- const signalInfo = result.signalName || 'unknown signal';
281
- const useResume = !!result.claudeSessionId && state.retryNumber === 1;
282
- state.retryLog.push({
283
- retryNumber: state.retryNumber,
284
- path: 'SignalCrash',
285
- reason: `Process killed (${signalInfo}), ${completedCount} tools preserved, ${useResume ? 'resuming' : 'fresh start'}`,
286
- timestamp: Date.now(),
287
- });
288
- callbacks.emit('onAutoRetry', {
289
- retryNumber: state.retryNumber,
290
- maxRetries,
291
- toolName: `SignalCrash(${signalInfo})`,
292
- completedCount,
293
- });
294
- trackEvent(AnalyticsEvents.IMPROVISE_AUTO_RETRY, {
295
- retry_number: state.retryNumber,
296
- hung_tool: `signal_crash:${signalInfo}`,
297
- completed_tools: completedCount,
298
- resume_attempted: useResume,
299
- });
300
- if (useResume) {
301
- callbacks.queueOutput(`\n[[MSTRO_SIGNAL_RECOVERY]] Process killed (${signalInfo}) — resuming session with ${completedCount} preserved results (retry ${state.retryNumber}/${maxRetries}).\n`);
302
- callbacks.flushOutputQueue();
303
- state.contextRecoverySessionId = result.claudeSessionId;
304
- session.claudeSessionId = result.claudeSessionId;
305
- state.currentPrompt = buildSignalCrashRecoveryPrompt(promptWithAttachments, true);
306
- }
307
- else {
308
- callbacks.queueOutput(`\n[[MSTRO_SIGNAL_RECOVERY]] Process killed (${signalInfo}) — restarting with ${completedCount} preserved results (retry ${state.retryNumber}/${maxRetries}).\n`);
309
- callbacks.flushOutputQueue();
310
- state.freshRecoveryMode = true;
311
- const allResults = [...extractHistoricalToolResults(session.history.movements), ...state.accumulatedToolResults];
312
- state.currentPrompt = buildSignalCrashRecoveryPrompt(promptWithAttachments, false, allResults);
313
- }
314
- return true;
315
- }
316
- // ========== Premature Completion ==========
317
- /** Guard checks for premature completion */
318
- function isPrematureCompletionCandidate(result, state, maxRetries) {
319
- if (!result.completed || result.signalName || state.retryNumber >= maxRetries)
320
- return false;
321
- if (state.checkpointRef.value || state.contextLost)
322
- return false;
323
- if (!result.claudeSessionId || !result.stopReason)
324
- return false;
325
- return result.stopReason === 'max_tokens' || result.stopReason === 'end_turn';
326
- }
327
- /** Use Haiku to assess whether an end_turn response is genuinely complete */
328
- async function assessEndTurnCompletion(result, verbose) {
329
- if (!result.assistantResponse)
330
- return false;
331
- const successfulToolCalls = result.toolUseHistory?.filter(t => t.result !== undefined && !t.isError).length ?? 0;
332
- const claudeCmd = process.env.CLAUDE_COMMAND || 'claude';
333
- const verdict = await assessPrematureCompletion({
334
- responseTail: extractFinalTextBlock(result.assistantResponse, 800),
335
- successfulToolCalls,
336
- hasThinking: !!result.thinkingOutput,
337
- responseLength: result.assistantResponse.length,
338
- }, claudeCmd, verbose);
339
- if (verbose) {
340
- hlog(`[PREMATURE-COMPLETION] Haiku verdict: ${verdict.isIncomplete ? 'INCOMPLETE' : 'COMPLETE'} — ${verdict.reason}`);
341
- }
342
- return verdict.isIncomplete;
343
- }
344
- /** Apply premature completion retry */
345
- function applyPrematureCompletionRetry(result, state, session, maxRetries, stopReason, isMaxTokens, callbacks) {
346
- state.retryNumber++;
347
- const reason = isMaxTokens ? 'Output limit reached' : 'Task appears unfinished (AI assessment)';
348
- state.retryLog.push({
349
- retryNumber: state.retryNumber,
350
- path: 'PrematureCompletion',
351
- reason,
352
- timestamp: Date.now(),
353
- });
354
- callbacks.emit('onAutoRetry', {
355
- retryNumber: state.retryNumber,
356
- maxRetries,
357
- toolName: `PrematureCompletion(${stopReason})`,
358
- completedCount: result.toolUseHistory?.length ?? 0,
359
- });
360
- trackEvent(AnalyticsEvents.IMPROVISE_AUTO_RETRY, {
361
- retry_number: state.retryNumber,
362
- hung_tool: `premature_completion:${stopReason}`,
363
- completed_tools: result.toolUseHistory?.length ?? 0,
364
- resume_attempted: true,
365
- });
366
- callbacks.queueOutput(`\n${reason} — resuming session (retry ${state.retryNumber}/${maxRetries}).\n`);
367
- callbacks.flushOutputQueue();
368
- state.contextRecoverySessionId = result.claudeSessionId;
369
- session.claudeSessionId = result.claudeSessionId;
370
- state.currentPrompt = 'continue';
371
- }
372
- /** Detect and retry premature completion. Returns true if loop should continue. */
373
- export async function shouldRetryPrematureCompletion(result, state, session, maxRetries, callbacks) {
374
- if (!isPrematureCompletionCandidate(result, state, maxRetries)) {
375
- return false;
376
- }
377
- const stopReason = result.stopReason;
378
- const isMaxTokens = stopReason === 'max_tokens';
379
- const abandoned = isResponseAbandoned(result);
380
- const isIncomplete = isMaxTokens || abandoned || await assessEndTurnCompletion(result, session.options.verbose);
381
- if (!isIncomplete)
382
- return false;
383
- applyPrematureCompletionRetry(result, state, session, maxRetries, stopReason, isMaxTokens, callbacks);
384
- return true;
385
- }
386
- // ========== Best Result Selection ==========
387
- /** Select the best result across retries using Haiku assessment */
388
- export async function selectBestResult(state, result, userPrompt, verbose) {
389
- if (!state.bestResult || state.bestResult === result || state.retryNumber === 0) {
390
- return result;
391
- }
392
- const claudeCmd = process.env.CLAUDE_COMMAND || 'claude';
393
- const bestToolCount = state.bestResult.toolUseHistory?.filter(t => t.result !== undefined && !t.isError).length ?? 0;
394
- const currentToolCount = result.toolUseHistory?.filter(t => t.result !== undefined && !t.isError).length ?? 0;
395
- try {
396
- const verdict = await assessBestResult({
397
- originalPrompt: userPrompt,
398
- resultA: {
399
- successfulToolCalls: bestToolCount,
400
- responseLength: state.bestResult.assistantResponse?.length ?? 0,
401
- hasThinking: !!state.bestResult.thinkingOutput,
402
- responseTail: (state.bestResult.assistantResponse ?? '').slice(-500),
403
- },
404
- resultB: {
405
- successfulToolCalls: currentToolCount,
406
- responseLength: result.assistantResponse?.length ?? 0,
407
- hasThinking: !!result.thinkingOutput,
408
- responseTail: (result.assistantResponse ?? '').slice(-500),
409
- },
410
- }, claudeCmd, verbose);
411
- if (verdict.winner === 'A') {
412
- if (verbose)
413
- hlog(`[BEST-RESULT] Haiku picked earlier attempt: ${verdict.reason}`);
414
- return mergeResultSessionId(state.bestResult, result.claudeSessionId);
415
- }
416
- if (verbose)
417
- hlog(`[BEST-RESULT] Haiku picked final attempt: ${verdict.reason}`);
418
- return result;
419
- }
420
- catch {
421
- return fallbackBestResult(state.bestResult, result, verbose);
422
- }
423
- }
424
- function mergeResultSessionId(result, sessionId) {
425
- if (sessionId)
426
- return { ...result, claudeSessionId: sessionId };
427
- return result;
428
- }
429
- function fallbackBestResult(bestResult, result, verbose) {
430
- if (scoreRunResult(bestResult) > scoreRunResult(result)) {
431
- if (verbose) {
432
- hlog(`[BEST-RESULT] Haiku unavailable, numeric fallback: earlier attempt (score ${scoreRunResult(bestResult)} vs ${scoreRunResult(result)})`);
433
- }
434
- return mergeResultSessionId(bestResult, result.claudeSessionId);
435
- }
436
- return result;
437
- }
16
+ export { selectBestResult } from './retry/retry-best-result.js';
17
+ export { detectNativeTimeoutContextLoss, detectResumeContextLoss } from './retry/retry-context-loss.js';
18
+ export { shouldRetryPrematureCompletion } from './retry/retry-premature-completion.js';
19
+ export { applyInterMovementRecovery, applyNativeTimeoutRecovery, applyToolTimeoutRetry, shouldRetryContextLoss, shouldRetrySignalCrash, } from './retry/retry-recovery-strategies.js';
20
+ export { determineResumeStrategy } from './retry/retry-resume-strategy.js';
21
+ export { createExecutionRunner } from './retry/retry-runner-factory.js';
22
+ export { accumulateToolResults } from './retry/retry-tool-results.js';
438
23
  //# sourceMappingURL=improvisation-retry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"improvisation-retry.js","sourceRoot":"","sources":["../../../server/cli/improvisation-retry.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,gEAAgE;AAEhE;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,yBAAyB,EAA2B,MAAM,8BAA8B,CAAC;AAGvI,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,sBAAsB,EACtB,gCAAgC,EAChC,sBAAsB,EACtB,gBAAgB,EAChB,8BAA8B,EAC9B,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAsB9B,wCAAwC;AAExC,6DAA6D;AAC7D,MAAM,UAAU,uBAAuB,CACrC,KAAqB,EACrB,OAA0B;IAE1B,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC5B,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAChC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,KAAK,CAAC,wBAAwB,EAAE,CAAC;QACnC,MAAM,EAAE,GAAG,KAAK,CAAC,wBAAwB,CAAC;QAC1C,KAAK,CAAC,wBAAwB,GAAG,SAAS,CAAC;QAC3C,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;IAClD,CAAC;IACD,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC;IACzF,CAAC;IACD,IAAI,KAAK,CAAC,sBAAsB,EAAE,eAAe,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,eAAe,EAAE,CAAC;QAC/G,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,sBAAsB,CAAC,eAAe,EAAE,CAAC;IAC5F,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC;AAC1D,CAAC;AAED,wCAAwC;AAExC,oDAAoD;AACpD,MAAM,UAAU,qBAAqB,CACnC,KAAqB,EACrB,OAA0B,EAC1B,SAAyB,EACzB,cAAsB,EACtB,SAAkB,EAClB,eAAmC,EACnC,gBAA8C,EAC9C,kBAA2B;IAE3B,OAAO,IAAI,cAAc,CAAC;QACxB,UAAU,EAAE,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU;QAC5D,oBAAoB,EAAE,OAAO,CAAC,OAAO,CAAC,oBAAoB;QAC1D,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;QACxC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;QAChC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;QAChC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK;QAC5B,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;QACxC,iBAAiB,EAAE,IAAI;QACvB,cAAc,EAAE,cAAc;QAC9B,eAAe,EAAE,SAAS;QAC1B,eAAe,EAAE,eAAe;QAChC,cAAc,EAAE,CAAC,IAAY,EAAE,EAAE;YAC/B,IAAI,SAAS,CAAC,WAAW,EAAE;gBAAE,OAAO;YACpC,SAAS,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACxG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC5B,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,CAAC;QACD,gBAAgB,EAAE,CAAC,IAAY,EAAE,EAAE;YACjC,IAAI,SAAS,CAAC,WAAW,EAAE;gBAAE,OAAO;YACpC,SAAS,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACnF,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACnC,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,CAAC;QACD,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE;YACzB,IAAI,SAAS,CAAC,WAAW,EAAE;gBAAE,OAAO;YACpC,SAAS,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC7G,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YACnC,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,CAAC;QACD,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC5B,IAAI,SAAS,CAAC,WAAW,EAAE;gBAAE,OAAO;YACpC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACxC,CAAC;QACD,YAAY,EAAE,KAAK,CAAC,aAAa;QACjC,gBAAgB;QAChB,aAAa,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;YAC3F,CAAC,CAAC,EAAE,oBAAoB,EAAE,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChG,CAAC,CAAC,SAAS;QACb,aAAa,EAAE,CAAC,UAA+B,EAAE,EAAE;YACjD,KAAK,CAAC,aAAa,CAAC,KAAK,GAAG,UAAU,CAAC;QACzC,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,+CAA+C;AAE/C,uEAAuE;AACvE,MAAM,UAAU,uBAAuB,CACrC,MAAyB,EACzB,KAAqB,EACrB,SAAkB,EAClB,UAAkB,EAClB,cAAsB,EACtB,OAAgB;IAEhB,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW,IAAI,UAAU,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACrG,OAAO;IACT,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9E,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QACzB,IAAI,OAAO;YAAE,IAAI,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;SAAM,IAAI,MAAM,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACrD,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QACzB,IAAI,OAAO;YAAE,IAAI,CAAC,kFAAkF,CAAC,CAAC;IACxG,CAAC;SAAM,IACL,CAAC,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC;QAC9D,CAAC,MAAM,CAAC,cAAc;QACtB,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,GAAG,EACrC,CAAC;QACD,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QACzB,IAAI,OAAO;YAAE,IAAI,CAAC,+EAA+E,CAAC,CAAC;IACrG,CAAC;AACH,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,MAAyB,EACzB,KAAqB,EACrB,UAAkB,EAClB,cAAsB,EACtB,OAAgB;IAEhB,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO;IAE9B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS;YAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,kBAAkB,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAClF,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAEvE,IAAI,iBAAiB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW,IAAI,UAAU,EAAE,CAAC;QACzH,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;IAC/E,MAAM,cAAc,GAAuB;QACzC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,iBAAiB;QACjB,kBAAkB,EAAE,cAAc;QAClC,mBAAmB,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC;QACzG,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;QACxD,kBAAkB,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,CAC7C,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,OAAO,CAC5E,IAAI,KAAK;KACX,CAAC;IAEF,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAC;IACzD,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC5E,KAAK,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACxC,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,CAAC,qCAAqC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrG,CAAC;AACH,CAAC;AAED,iDAAiD;AAEjD,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC,wEAAwE;AACxE,MAAM,UAAU,qBAAqB,CAAC,MAAyB,EAAE,KAAqB;IACpF,IAAI,CAAC,MAAM,CAAC,cAAc;QAAE,OAAO;IACnC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QACtC,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC3B,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,sBAAsB,CAAC,MAAM,GAAG,uBAAuB,EAAE,CAAC;QAClE,KAAK,CAAC,sBAAsB,GAAG,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,uBAAuB,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC;AAED,4CAA4C;AAE5C,2EAA2E;AAC3E,MAAM,UAAU,0BAA0B,CACxC,KAAqB,EACrB,qBAA6B,EAC7B,OAAyB,EACzB,SAAyB;IAEzB,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAE3E,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU,EAAE,CAAC;QACb,QAAQ,EAAE,uBAAuB;QACjC,cAAc,EAAE,UAAU,CAAC,MAAM;KAClC,CAAC,CAAC;IACH,SAAS,CAAC,WAAW,CACnB,0EAA0E,UAAU,CAAC,MAAM,6CAA6C,KAAK,CAAC,WAAW,QAAQ,CAClK,CAAC;IACF,SAAS,CAAC,gBAAgB,EAAE,CAAC;IAE7B,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAC/B,KAAK,CAAC,aAAa,GAAG,gCAAgC,CAAC,qBAAqB,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACrG,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,0BAA0B,CACxC,MAAyB,EACzB,KAAqB,EACrB,qBAA6B,EAC7B,OAA0B,EAC1B,SAAyB;IAEzB,MAAM,cAAc,GAAG,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC;IAE3D,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU,EAAE,CAAC;QACb,QAAQ,EAAE,iBAAiB;QAC3B,cAAc;KACf,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC;QACtD,SAAS,CAAC,WAAW,CACnB,8EAA8E,cAAc,6BAA6B,KAAK,CAAC,WAAW,QAAQ,CACnJ,CAAC;QACF,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC7B,KAAK,CAAC,wBAAwB,GAAG,MAAM,CAAC,eAAe,CAAC;QACxD,OAAO,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QACjD,KAAK,CAAC,aAAa,GAAG,0BAA0B,CAAC,qBAAqB,CAAC,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,SAAS,CAAC,WAAW,CACnB,gEAAgE,cAAc,sCAAsC,KAAK,CAAC,WAAW,QAAQ,CAC9I,CAAC;QACF,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC7B,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC/B,KAAK,CAAC,aAAa,GAAG,wBAAwB,CAAC,qBAAqB,EAAE,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IAC3H,CAAC;AACH,CAAC;AAED,2FAA2F;AAC3F,MAAM,UAAU,sBAAsB,CACpC,MAAyB,EACzB,KAAqB,EACrB,OAA0B,EAC1B,SAAkB,EAClB,cAAsB,EACtB,UAAkB,EAClB,qBAA6B,EAC7B,SAAyB;IAEzB,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACvF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACrC,KAAK,CAAC,WAAW,EAAE,CAAC;IACpB,MAAM,IAAI,GAAG,CAAC,SAAS,IAAI,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,uBAAuB,CAAC;IACrG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI;QACJ,MAAM,EAAE,iBAAiB,cAAc,cAAc,KAAK,CAAC,sBAAsB,CAAC,MAAM,mBAAmB;QAC3G,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC,CAAC;IACH,IAAI,SAAS,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACtC,0BAA0B,CAAC,KAAK,EAAE,qBAAqB,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACjG,CAAC;SAAM,CAAC;QACN,0BAA0B,CAAC,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACvF,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,qBAAqB,CACnC,KAAqB,EACrB,UAAkB,EAClB,qBAA6B,EAC7B,SAAyB,EACzB,KAAyB,EACzB,WAA+B;IAE/B,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW,IAAI,UAAU,EAAE,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAE,GAAwB,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IAC1D,KAAK,CAAC,WAAW,EAAE,CAAC;IAEpB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC;QACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ;QAC9B,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;QAC9B,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;KACjC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC;IACjF,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,oBAAoB,EAAE,CAAC,QAAQ,CAAC,SAAS,OAAO,EAAE,CAAC,cAAc,CAAC,MAAM,qBAAqB,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,EAAE;QAC3K,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC,CAAC;IACH,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU;QACV,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ;QAC9B,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG;QACpB,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM;KACzC,CAAC,CAAC;IAEH,UAAU,CAAC,eAAe,CAAC,oBAAoB,EAAE;QAC/C,YAAY,EAAE,KAAK,CAAC,WAAW;QAC/B,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ;QAC/B,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;QACxC,eAAe,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM;QACzC,UAAU,EAAE,EAAE,CAAC,SAAS;QACxB,gBAAgB,EAAE,gBAAgB;QAClC,KAAK,EAAE,KAAK,IAAI,SAAS;QACzB,YAAY,EAAE,WAAW,IAAI,MAAM;KACpC,CAAC,CAAC;IAEH,KAAK,CAAC,aAAa,GAAG,gBAAgB;QACpC,CAAC,CAAC,sBAAsB,CAAC,EAAE,EAAE,KAAK,CAAC,aAAa,CAAC;QACjD,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,qBAAqB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IAErE,SAAS,CAAC,WAAW,CACnB,qCAAqC,KAAK,CAAC,WAAW,IAAI,UAAU,KAAK,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,YAAY,SAAS,EAAE,CAAC,cAAc,CAAC,MAAM,wCAAwC,EAAE,CAAC,QAAQ,CAAC,QAAQ,KAAK,CAChO,CAAC;IACF,SAAS,CAAC,gBAAgB,EAAE,CAAC;IAE7B,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,sBAAsB,CACpC,MAAyB,EACzB,KAAqB,EACrB,OAA0B,EAC1B,UAAkB,EAClB,qBAA6B,EAC7B,SAAyB;IAEzB,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;IAC1C,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAChI,IAAI,CAAC,CAAC,aAAa,IAAI,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,WAAW,IAAI,UAAU,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACrC,KAAK,CAAC,WAAW,EAAE,CAAC;IAEpB,MAAM,cAAc,GAAG,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC;IAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,gBAAgB,CAAC;IACzD,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,CAAC;IAEtE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,mBAAmB,UAAU,MAAM,cAAc,qBAAqB,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,EAAE;QACtH,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC,CAAC;IAEH,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU;QACV,QAAQ,EAAE,eAAe,UAAU,GAAG;QACtC,cAAc;KACf,CAAC,CAAC;IAEH,UAAU,CAAC,eAAe,CAAC,oBAAoB,EAAE;QAC/C,YAAY,EAAE,KAAK,CAAC,WAAW;QAC/B,SAAS,EAAE,gBAAgB,UAAU,EAAE;QACvC,eAAe,EAAE,cAAc;QAC/B,gBAAgB,EAAE,SAAS;KAC5B,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,WAAW,CACnB,+CAA+C,UAAU,6BAA6B,cAAc,6BAA6B,KAAK,CAAC,WAAW,IAAI,UAAU,MAAM,CACvK,CAAC;QACF,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC7B,KAAK,CAAC,wBAAwB,GAAG,MAAM,CAAC,eAAe,CAAC;QACxD,OAAO,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QACjD,KAAK,CAAC,aAAa,GAAG,8BAA8B,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QACN,SAAS,CAAC,WAAW,CACnB,+CAA+C,UAAU,uBAAuB,cAAc,6BAA6B,KAAK,CAAC,WAAW,IAAI,UAAU,MAAM,CACjK,CAAC;QACF,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC7B,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC/B,MAAM,UAAU,GAAG,CAAC,GAAG,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACjH,KAAK,CAAC,aAAa,GAAG,8BAA8B,CAAC,qBAAqB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACjG,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,6CAA6C;AAE7C,4CAA4C;AAC5C,SAAS,8BAA8B,CACrC,MAAyB,EACzB,KAAqB,EACrB,UAAkB;IAElB,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC,WAAW,IAAI,UAAU;QAAE,OAAO,KAAK,CAAC;IAC5F,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC;IAChE,OAAO,MAAM,CAAC,UAAU,KAAK,YAAY,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC;AAChF,CAAC;AAED,6EAA6E;AAC7E,KAAK,UAAU,uBAAuB,CAAC,MAAyB,EAAE,OAAgB;IAChF,IAAI,CAAC,MAAM,CAAC,iBAAiB;QAAE,OAAO,KAAK,CAAC;IAE5C,MAAM,mBAAmB,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IACjH,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAC;IACzD,MAAM,OAAO,GAAG,MAAM,yBAAyB,CAAC;QAC9C,YAAY,EAAE,qBAAqB,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC;QAClE,mBAAmB;QACnB,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc;QACpC,cAAc,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM;KAChD,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAEvB,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,CAAC,yCAAyC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxH,CAAC;IACD,OAAO,OAAO,CAAC,YAAY,CAAC;AAC9B,CAAC;AAED,uCAAuC;AACvC,SAAS,6BAA6B,CACpC,MAAyB,EACzB,KAAqB,EACrB,OAA0B,EAC1B,UAAkB,EAClB,UAAkB,EAClB,WAAoB,EACpB,SAAyB;IAEzB,KAAK,CAAC,WAAW,EAAE,CAAC;IACpB,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,yCAAyC,CAAC;IAEhG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI,EAAE,qBAAqB;QAC3B,MAAM;QACN,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC,CAAC;IAEH,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU;QACV,QAAQ,EAAE,uBAAuB,UAAU,GAAG;QAC9C,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;KACnD,CAAC,CAAC;IAEH,UAAU,CAAC,eAAe,CAAC,oBAAoB,EAAE;QAC/C,YAAY,EAAE,KAAK,CAAC,WAAW;QAC/B,SAAS,EAAE,wBAAwB,UAAU,EAAE;QAC/C,eAAe,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;QACnD,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,SAAS,CAAC,WAAW,CACnB,KAAK,MAAM,8BAA8B,KAAK,CAAC,WAAW,IAAI,UAAU,MAAM,CAC/E,CAAC;IACF,SAAS,CAAC,gBAAgB,EAAE,CAAC;IAE7B,KAAK,CAAC,wBAAwB,GAAG,MAAM,CAAC,eAAe,CAAC;IACxD,OAAO,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;IACjD,KAAK,CAAC,aAAa,GAAG,UAAU,CAAC;AACnC,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,MAAyB,EACzB,KAAqB,EACrB,OAA0B,EAC1B,UAAkB,EAClB,SAAyB;IAEzB,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,UAAW,CAAC;IACtC,MAAM,WAAW,GAAG,UAAU,KAAK,YAAY,CAAC;IAChD,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,YAAY,GAAG,WAAW,IAAI,SAAS,IAAI,MAAM,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhH,IAAI,CAAC,YAAY;QAAE,OAAO,KAAK,CAAC;IAEhC,6BAA6B,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACtG,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8CAA8C;AAE9C,mEAAmE;AACnE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAqB,EACrB,MAAyB,EACzB,UAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,KAAK,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC;QAChF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAC;IACzD,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IACrH,MAAM,gBAAgB,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IAE9G,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC;YACrC,cAAc,EAAE,UAAU;YAC1B,OAAO,EAAE;gBACP,mBAAmB,EAAE,aAAa;gBAClC,cAAc,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,MAAM,IAAI,CAAC;gBAC/D,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc;gBAC9C,YAAY,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;aACrE;YACD,OAAO,EAAE;gBACP,mBAAmB,EAAE,gBAAgB;gBACrC,cAAc,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,IAAI,CAAC;gBACrD,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc;gBACpC,YAAY,EAAE,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;aAC3D;SACF,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAEvB,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC3B,IAAI,OAAO;gBAAE,IAAI,CAAC,+CAA+C,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACnF,OAAO,oBAAoB,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,OAAO;YAAE,IAAI,CAAC,6CAA6C,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACjF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,kBAAkB,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAyB,EAAE,SAA6B;IACpF,IAAI,SAAS;QAAE,OAAO,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC;IAChE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CAAC,UAA6B,EAAE,MAAyB,EAAE,OAAgB;IACpG,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;QACxD,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,6EAA6E,cAAc,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChJ,CAAC;QACD,OAAO,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"improvisation-retry.js","sourceRoot":"","sources":["../../../server/cli/improvisation-retry.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,gEAAgE;AAEhE;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxG,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC"}
@@ -3,6 +3,12 @@
3
3
  *
4
4
  * Optimized for fast, direct prompt execution in Improvise mode.
5
5
  * For complex multi-part prompts with parallel/sequential movements, use Compose tab instead.
6
+ *
7
+ * Delegates to focused helpers:
8
+ * - improvisation-output-queue.ts — buffered stdout flush loop
9
+ * - improvisation-history-store.ts — .mstro/history/*.json load/save
10
+ * - improvisation-movements.ts — pure movement-record builders
11
+ * - improvisation-retry.ts — retry decision tree + recovery strategies
6
12
  */
7
13
  import { EventEmitter } from 'node:events';
8
14
  import type { FileAttachment, ImprovisationOptions, MovementRecord, SessionHistory } from './improvisation-types.js';
@@ -15,8 +21,7 @@ export declare class ImprovisationSessionManager extends EventEmitter {
15
21
  private currentRunner;
16
22
  private options;
17
23
  private pendingApproval?;
18
- private outputQueue;
19
- private queueTimer;
24
+ private outputBuffer;
20
25
  private isFirstPrompt;
21
26
  private claudeSessionId;
22
27
  private isResumedSession;
@@ -28,9 +33,9 @@ export declare class ImprovisationSessionManager extends EventEmitter {
28
33
  private _cancelCompleteEmitted;
29
34
  private _currentUserPrompt;
30
35
  private _currentSequenceNumber;
36
+ private _hasPersistedToDisk;
31
37
  static resumeFromHistory(workingDir: string, historicalSessionId: string, overrides?: Partial<ImprovisationOptions>): ImprovisationSessionManager;
32
38
  constructor(options?: Partial<ImprovisationOptions>);
33
- private startQueueProcessor;
34
39
  private queueOutput;
35
40
  private flushOutputQueue;
36
41
  executePrompt(userPrompt: string, attachments?: FileAttachment[], options?: {
@@ -46,10 +51,10 @@ export declare class ImprovisationSessionManager extends EventEmitter {
46
51
  private executeRetryIteration;
47
52
  /** Evaluate all retry strategies. Returns true if the loop should continue. */
48
53
  private evaluateRetryStrategies;
54
+ private resetExecutionState;
49
55
  private handleCancelledExecution;
50
56
  private handleExecutionError;
51
57
  private captureSessionAndSurfaceErrors;
52
- private buildMovementRecord;
53
58
  private handleConflicts;
54
59
  private persistMovement;
55
60
  private emitMovementComplete;
@@ -57,13 +62,10 @@ export declare class ImprovisationSessionManager extends EventEmitter {
57
62
  private _autoContinuePending;
58
63
  private static readonly MAX_AUTO_CONTINUES;
59
64
  private maybeAutoContinue;
60
- private shouldAutoContinue;
61
65
  private scheduleAutoContinue;
62
- private loadHistory;
63
- private saveHistory;
66
+ private persistHistory;
64
67
  getHistory(): SessionHistory;
65
68
  cancel(): void;
66
- private destroyQueueTimer;
67
69
  destroy(): void;
68
70
  clearHistory(): void;
69
71
  requestApproval(plan: unknown): Promise<boolean>;
@@ -1 +1 @@
1
- {"version":3,"file":"improvisation-session-manager.d.ts","sourceRoot":"","sources":["../../../server/cli/improvisation-session-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"improvisation-session-manager.d.ts","sourceRoot":"","sources":["../../../server/cli/improvisation-session-manager.ts"],"names":[],"mappings":"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"}