@haibun/core 3.1.3 → 3.3.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 (240) hide show
  1. package/build/currentVersion.d.ts +1 -1
  2. package/build/currentVersion.js +1 -1
  3. package/build/kireji/converter.d.ts +16 -1
  4. package/build/kireji/converter.d.ts.map +1 -1
  5. package/build/kireji/converter.js +19 -2
  6. package/build/kireji/converter.js.map +1 -1
  7. package/build/lib/EventLogger.d.ts +16 -10
  8. package/build/lib/EventLogger.d.ts.map +1 -1
  9. package/build/lib/EventLogger.js +54 -21
  10. package/build/lib/EventLogger.js.map +1 -1
  11. package/build/lib/astepper.d.ts +6 -0
  12. package/build/lib/astepper.d.ts.map +1 -1
  13. package/build/lib/astepper.js +1 -0
  14. package/build/lib/astepper.js.map +1 -1
  15. package/build/lib/base-prompt-manager.d.ts.map +1 -1
  16. package/build/lib/base-prompt-manager.js +2 -2
  17. package/build/lib/base-prompt-manager.js.map +1 -1
  18. package/build/lib/capture-locator.d.ts +1 -1
  19. package/build/lib/capture-locator.d.ts.map +1 -1
  20. package/build/lib/capture-locator.js +4 -2
  21. package/build/lib/capture-locator.js.map +1 -1
  22. package/build/lib/core/flow-runner.d.ts +5 -4
  23. package/build/lib/core/flow-runner.d.ts.map +1 -1
  24. package/build/lib/core/flow-runner.js +48 -15
  25. package/build/lib/core/flow-runner.js.map +1 -1
  26. package/build/lib/core-domains.d.ts +1 -1
  27. package/build/lib/core-domains.d.ts.map +1 -1
  28. package/build/lib/core-domains.js +1 -1
  29. package/build/lib/core-domains.js.map +1 -1
  30. package/build/lib/defs.d.ts +103 -200
  31. package/build/lib/defs.d.ts.map +1 -1
  32. package/build/lib/defs.js +4 -46
  33. package/build/lib/defs.js.map +1 -1
  34. package/build/lib/feature-variables.d.ts +2 -1
  35. package/build/lib/feature-variables.d.ts.map +1 -1
  36. package/build/lib/feature-variables.js +1 -2
  37. package/build/lib/feature-variables.js.map +1 -1
  38. package/build/lib/features.d.ts +5 -4
  39. package/build/lib/features.d.ts.map +1 -1
  40. package/build/lib/features.js +26 -16
  41. package/build/lib/features.js.map +1 -1
  42. package/build/lib/fixme.d.ts +1 -1
  43. package/build/lib/fixme.d.ts.map +1 -1
  44. package/build/lib/http-observations.d.ts +25 -0
  45. package/build/lib/http-observations.d.ts.map +1 -0
  46. package/build/lib/http-observations.js +40 -0
  47. package/build/lib/http-observations.js.map +1 -0
  48. package/build/lib/namedVars.d.ts +5 -1
  49. package/build/lib/namedVars.d.ts.map +1 -1
  50. package/build/lib/namedVars.js +11 -1
  51. package/build/lib/namedVars.js.map +1 -1
  52. package/build/lib/node-http-events.d.ts +16 -0
  53. package/build/lib/node-http-events.d.ts.map +1 -0
  54. package/build/lib/node-http-events.js +125 -0
  55. package/build/lib/node-http-events.js.map +1 -0
  56. package/build/lib/populateActionArgs.d.ts +2 -1
  57. package/build/lib/populateActionArgs.d.ts.map +1 -1
  58. package/build/lib/populateActionArgs.js.map +1 -1
  59. package/build/lib/resolver-features.d.ts +2 -1
  60. package/build/lib/resolver-features.d.ts.map +1 -1
  61. package/build/lib/resolver-features.js +2 -2
  62. package/build/lib/resolver-features.js.map +1 -1
  63. package/build/lib/step-trace.d.ts +10 -0
  64. package/build/lib/step-trace.d.ts.map +1 -0
  65. package/build/lib/step-trace.js +3 -0
  66. package/build/lib/step-trace.js.map +1 -0
  67. package/build/lib/stepper-registry.d.ts +28 -0
  68. package/build/lib/stepper-registry.d.ts.map +1 -0
  69. package/build/lib/stepper-registry.js +42 -0
  70. package/build/lib/stepper-registry.js.map +1 -0
  71. package/build/lib/test/SetTimeStepper.d.ts +2 -2
  72. package/build/lib/test/SetTimeStepper.d.ts.map +1 -1
  73. package/build/lib/test/SetTimeStepper.js +1 -1
  74. package/build/lib/test/SetTimeStepper.js.map +1 -1
  75. package/build/lib/test/TestSteps.d.ts +5 -3
  76. package/build/lib/test/TestSteps.d.ts.map +1 -1
  77. package/build/lib/test/TestStepsWithOptions.d.ts +3 -1
  78. package/build/lib/test/TestStepsWithOptions.d.ts.map +1 -1
  79. package/build/lib/test/TestStepsWithOptions.js +3 -5
  80. package/build/lib/test/TestStepsWithOptions.js.map +1 -1
  81. package/build/lib/test/lib.d.ts +4 -3
  82. package/build/lib/test/lib.d.ts.map +1 -1
  83. package/build/lib/test/lib.js +12 -12
  84. package/build/lib/test/lib.js.map +1 -1
  85. package/build/lib/test/resolvedTestFeatures.d.ts +5 -5
  86. package/build/lib/test/resolvedTestFeatures.js +1 -1
  87. package/build/lib/test/resolvedTestFeatures.js.map +1 -1
  88. package/build/lib/ttag.d.ts +2 -2
  89. package/build/lib/ttag.d.ts.map +1 -1
  90. package/build/lib/ttag.js +5 -5
  91. package/build/lib/ttag.js.map +1 -1
  92. package/build/lib/util/index.d.ts +20 -12
  93. package/build/lib/util/index.d.ts.map +1 -1
  94. package/build/lib/util/index.js +53 -17
  95. package/build/lib/util/index.js.map +1 -1
  96. package/build/lib/workspace-discovery.d.ts +37 -0
  97. package/build/lib/workspace-discovery.d.ts.map +1 -0
  98. package/build/lib/workspace-discovery.js +96 -0
  99. package/build/lib/workspace-discovery.js.map +1 -0
  100. package/build/monitor/index.d.ts +1 -10
  101. package/build/monitor/index.d.ts.map +1 -1
  102. package/build/monitor/index.js +1 -14
  103. package/build/monitor/index.js.map +1 -1
  104. package/build/phases/Executor.d.ts +3 -11
  105. package/build/phases/Executor.d.ts.map +1 -1
  106. package/build/phases/Executor.js +76 -169
  107. package/build/phases/Executor.js.map +1 -1
  108. package/build/phases/Resolver.d.ts +25 -1
  109. package/build/phases/Resolver.d.ts.map +1 -1
  110. package/build/phases/Resolver.js +88 -22
  111. package/build/phases/Resolver.js.map +1 -1
  112. package/build/phases/collector.d.ts +1 -0
  113. package/build/phases/collector.d.ts.map +1 -1
  114. package/build/phases/collector.js +7 -3
  115. package/build/phases/collector.js.map +1 -1
  116. package/build/runner.d.ts +3 -2
  117. package/build/runner.d.ts.map +1 -1
  118. package/build/runner.js +0 -1
  119. package/build/runner.js.map +1 -1
  120. package/build/schema/protocol.d.ts +1443 -0
  121. package/build/schema/protocol.d.ts.map +1 -0
  122. package/build/schema/protocol.js +429 -0
  123. package/build/schema/protocol.js.map +1 -0
  124. package/build/steps/activities-stepper.d.ts +24 -28
  125. package/build/steps/activities-stepper.d.ts.map +1 -1
  126. package/build/steps/activities-stepper.js +150 -162
  127. package/build/steps/activities-stepper.js.map +1 -1
  128. package/build/steps/conformance.d.ts +3 -1
  129. package/build/steps/conformance.d.ts.map +1 -1
  130. package/build/steps/conformance.js +1 -0
  131. package/build/steps/conformance.js.map +1 -1
  132. package/build/steps/console-monitor-stepper.d.ts +3 -6
  133. package/build/steps/console-monitor-stepper.d.ts.map +1 -1
  134. package/build/steps/console-monitor-stepper.js +23 -64
  135. package/build/steps/console-monitor-stepper.js.map +1 -1
  136. package/build/steps/debugger-stepper.d.ts +7 -4
  137. package/build/steps/debugger-stepper.d.ts.map +1 -1
  138. package/build/steps/debugger-stepper.js +36 -43
  139. package/build/steps/debugger-stepper.js.map +1 -1
  140. package/build/steps/haibun.d.ts +24 -16
  141. package/build/steps/haibun.d.ts.map +1 -1
  142. package/build/steps/haibun.js +68 -31
  143. package/build/steps/haibun.js.map +1 -1
  144. package/build/steps/lib/tts.d.ts +2 -3
  145. package/build/steps/lib/tts.d.ts.map +1 -1
  146. package/build/steps/lib/tts.js +4 -5
  147. package/build/steps/lib/tts.js.map +1 -1
  148. package/build/steps/logic-stepper.d.ts +14 -3
  149. package/build/steps/logic-stepper.d.ts.map +1 -1
  150. package/build/steps/logic-stepper.js +116 -17
  151. package/build/steps/logic-stepper.js.map +1 -1
  152. package/build/steps/narrator.d.ts +7 -5
  153. package/build/steps/narrator.d.ts.map +1 -1
  154. package/build/steps/narrator.js +30 -18
  155. package/build/steps/narrator.js.map +1 -1
  156. package/build/steps/parse.d.ts +5 -3
  157. package/build/steps/parse.d.ts.map +1 -1
  158. package/build/steps/parse.js +2 -1
  159. package/build/steps/parse.js.map +1 -1
  160. package/build/steps/variables-stepper.d.ts +285 -4
  161. package/build/steps/variables-stepper.d.ts.map +1 -1
  162. package/build/steps/variables-stepper.js +44 -50
  163. package/build/steps/variables-stepper.js.map +1 -1
  164. package/package.json +9 -16
  165. package/build/lib/Logger.d.ts +0 -48
  166. package/build/lib/Logger.d.ts.map +0 -1
  167. package/build/lib/Logger.js +0 -85
  168. package/build/lib/Logger.js.map +0 -1
  169. package/build/lib/TestLogger.d.ts +0 -12
  170. package/build/lib/TestLogger.d.ts.map +0 -1
  171. package/build/lib/TestLogger.js +0 -12
  172. package/build/lib/TestLogger.js.map +0 -1
  173. package/build/lib/Timer.d.ts +0 -7
  174. package/build/lib/Timer.d.ts.map +0 -1
  175. package/build/lib/Timer.js +0 -9
  176. package/build/lib/Timer.js.map +0 -1
  177. package/build/lib/core/protocol.d.ts +0 -58
  178. package/build/lib/core/protocol.d.ts.map +0 -1
  179. package/build/lib/core/protocol.js +0 -18
  180. package/build/lib/core/protocol.js.map +0 -1
  181. package/build/lib/event-bridge.d.ts +0 -42
  182. package/build/lib/event-bridge.d.ts.map +0 -1
  183. package/build/lib/event-bridge.js +0 -214
  184. package/build/lib/event-bridge.js.map +0 -1
  185. package/build/lib/interfaces/logger.d.ts +0 -123
  186. package/build/lib/interfaces/logger.d.ts.map +0 -1
  187. package/build/lib/interfaces/logger.js +0 -29
  188. package/build/lib/interfaces/logger.js.map +0 -1
  189. package/build/lib/util/variables.d.ts +0 -9
  190. package/build/lib/util/variables.d.ts.map +0 -1
  191. package/build/lib/util/variables.js +0 -40
  192. package/build/lib/util/variables.js.map +0 -1
  193. package/build/monitor/browser-stubs.d.ts +0 -12
  194. package/build/monitor/browser-stubs.d.ts.map +0 -1
  195. package/build/monitor/browser-stubs.js +0 -20
  196. package/build/monitor/browser-stubs.js.map +0 -1
  197. package/build/monitor/constants.d.ts +0 -9
  198. package/build/monitor/constants.d.ts.map +0 -1
  199. package/build/monitor/constants.js +0 -9
  200. package/build/monitor/constants.js.map +0 -1
  201. package/build/monitor/event-view.d.ts +0 -40
  202. package/build/monitor/event-view.d.ts.map +0 -1
  203. package/build/monitor/event-view.js +0 -104
  204. package/build/monitor/event-view.js.map +0 -1
  205. package/build/monitor/filters.d.ts +0 -17
  206. package/build/monitor/filters.d.ts.map +0 -1
  207. package/build/monitor/filters.js +0 -32
  208. package/build/monitor/filters.js.map +0 -1
  209. package/build/monitor/formatters.d.ts +0 -27
  210. package/build/monitor/formatters.d.ts.map +0 -1
  211. package/build/monitor/formatters.js +0 -89
  212. package/build/monitor/formatters.js.map +0 -1
  213. package/build/monitor/jit-serialization.d.ts +0 -9
  214. package/build/monitor/jit-serialization.d.ts.map +0 -1
  215. package/build/monitor/jit-serialization.js +0 -73
  216. package/build/monitor/jit-serialization.js.map +0 -1
  217. package/build/monitor/monitor-types.d.ts +0 -119
  218. package/build/monitor/monitor-types.d.ts.map +0 -1
  219. package/build/monitor/monitor-types.js +0 -43
  220. package/build/monitor/monitor-types.js.map +0 -1
  221. package/build/monitor/speculative-tracker.d.ts +0 -20
  222. package/build/monitor/speculative-tracker.d.ts.map +0 -1
  223. package/build/monitor/speculative-tracker.js +0 -38
  224. package/build/monitor/speculative-tracker.js.map +0 -1
  225. package/build/monitor/state.d.ts +0 -31
  226. package/build/monitor/state.d.ts.map +0 -1
  227. package/build/monitor/state.js +0 -110
  228. package/build/monitor/state.js.map +0 -1
  229. package/build/monitor/timer.d.ts +0 -11
  230. package/build/monitor/timer.d.ts.map +0 -1
  231. package/build/monitor/timer.js +0 -13
  232. package/build/monitor/timer.js.map +0 -1
  233. package/build/monitor/tree-builder.d.ts +0 -25
  234. package/build/monitor/tree-builder.d.ts.map +0 -1
  235. package/build/monitor/tree-builder.js +0 -36
  236. package/build/monitor/tree-builder.js.map +0 -1
  237. package/build/schema/events.d.ts +0 -426
  238. package/build/schema/events.d.ts.map +0 -1
  239. package/build/schema/events.js +0 -123
  240. package/build/schema/events.js.map +0 -1
@@ -1,2 +1,2 @@
1
- export declare const currentVersion = "3.1.3";
1
+ export declare const currentVersion = "3.3.0";
2
2
  //# sourceMappingURL=currentVersion.d.ts.map
@@ -1,2 +1,2 @@
1
- export const currentVersion = '3.1.3';
1
+ export const currentVersion = '3.3.0';
2
2
  //# sourceMappingURL=currentVersion.js.map
@@ -3,7 +3,22 @@ import { TActionExecutor } from './withAction.js';
3
3
  type TkirejiFeature = {
4
4
  [key: string]: (TActionExecutor<string> | string)[];
5
5
  };
6
- export declare const toBdd: (feature: TkirejiFeature) => string;
6
+ export type TBddWithLineMap = {
7
+ content: string;
8
+ lineMap: Map<number, number>;
9
+ };
10
+ /**
11
+ * Converts a Kireji feature object into a BDD formatted string.
12
+ * It iterates through the feature's steps, executing any functional steps to get their GWTA string,
13
+ * and mapping the resulting lines to the original step indices for source tracking.
14
+ */
15
+ export declare const toBdd: (feature: TkirejiFeature) => TBddWithLineMap;
16
+ /**
17
+ * Converts a BDD formatted string back into a Kireji feature object.
18
+ * This function parses the string to extract the feature name and steps,
19
+ * then uses the provided steppers to resolve each step prose back to a
20
+ * functional action with arguments.
21
+ */
7
22
  export declare const fromBdd: (bdd: string, steppers: AStepper[]) => Promise<TkirejiFeature>;
8
23
  export {};
9
24
  //# sourceMappingURL=converter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAI9E,KAAK,cAAc,GAAG;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC;CACrD,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,SAAS,cAAc,KAAG,MAmB/C,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,EAAE,UAAU,QAAQ,EAAE,KAAG,OAAO,CAAC,cAAc,CA+BjF,CAAA"}
1
+ {"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAI9E,KAAK,cAAc,GAAG;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,cAAc,KAAG,eA0B/C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,EAAE,UAAU,QAAQ,EAAE,KAAG,OAAO,CAAC,cAAc,CA+BjF,CAAA"}
@@ -1,11 +1,20 @@
1
1
  import { Resolver } from '../phases/Resolver.js';
2
2
  import { withAction } from './withAction.js';
3
+ /**
4
+ * Converts a Kireji feature object into a BDD formatted string.
5
+ * It iterates through the feature's steps, executing any functional steps to get their GWTA string,
6
+ * and mapping the resulting lines to the original step indices for source tracking.
7
+ */
3
8
  export const toBdd = (feature) => {
4
9
  let bddString = '';
10
+ const lineMap = new Map();
11
+ let currentLine = 1; // 1-indexed line number in output
5
12
  for (const featureName in feature) {
6
13
  bddString += `Feature: ${featureName}\n`;
14
+ currentLine++; // Feature line doesn't map to a step
7
15
  const steps = feature[featureName];
8
- for (const step of steps) {
16
+ for (let stepIdx = 0; stepIdx < steps.length; stepIdx++) {
17
+ const step = steps[stepIdx];
9
18
  // Handle both function executors and plain prose strings
10
19
  if (typeof step === 'string') {
11
20
  bddString += ` ${step}\n`;
@@ -14,10 +23,18 @@ export const toBdd = (feature) => {
14
23
  const { gwta } = step();
15
24
  bddString += ` ${gwta}\n`;
16
25
  }
26
+ lineMap.set(currentLine, stepIdx);
27
+ currentLine++;
17
28
  }
18
29
  }
19
- return bddString;
30
+ return { content: bddString, lineMap };
20
31
  };
32
+ /**
33
+ * Converts a BDD formatted string back into a Kireji feature object.
34
+ * This function parses the string to extract the feature name and steps,
35
+ * then uses the provided steppers to resolve each step prose back to a
36
+ * functional action with arguments.
37
+ */
21
38
  export const fromBdd = (bdd, steppers) => {
22
39
  const lines = bdd.split('\n');
23
40
  const featureName = lines[0].replace('Feature: ', '').trim();
@@ -1 +1 @@
1
- {"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAmC,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQ9E,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,OAAuB,EAAU,EAAE;IACvD,IAAI,SAAS,GAAG,EAAE,CAAC;IAEnB,KAAK,MAAM,WAAW,IAAI,OAAO,EAAE,CAAC;QAClC,SAAS,IAAI,YAAY,WAAW,IAAI,CAAC;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAEnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,yDAAyD;YACzD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC7B,SAAS,IAAI,KAAK,IAAI,IAAI,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;gBACxB,SAAS,IAAI,KAAK,IAAI,IAAI,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,QAAoB,EAA2B,EAAE;IAClF,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE1E,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAsD,CAAC,CAAC;IAE3H,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;QAC7C,MAAM,IAAI,GAA8B,EAAE,CAAC;QAC3C,IAAI,aAAa,EAAE,CAAC;YAClB,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;gBAChC,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACtC,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAqC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAClG,OAAO,KAAK,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;QACtC,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,WAAW,UAAU,mCAAmC,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,CAAC,WAAW,CAAC,EAAE,WAAW;KAC3B,CAAC,CAAC;AACL,CAAC,CAAA"}
1
+ {"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,16 @@
1
- import { THaibunEvent, TArtifactEvent } from '../schema/events.js';
1
+ import { THaibunEvent, TArtifactEvent, THaibunLogLevel } from '../schema/protocol.js';
2
2
  import { TFeatureStep } from './defs.js';
3
- export type { THaibunEvent } from '../schema/events.js';
4
- export { ImageArtifact, VideoArtifact, HtmlArtifact, SpeechArtifact, JsonArtifact, MermaidArtifact, HttpTraceArtifact, ResolvedFeaturesArtifact, FileArtifact, } from '../schema/events.js';
5
- export type { TArtifactEvent } from '../schema/events.js';
6
3
  export interface IEventLogger {
7
4
  suppressConsole?: boolean;
8
5
  setStepperCallback?(callback: (event: THaibunEvent) => void): void;
9
6
  emit(event: THaibunEvent): void;
10
- log(featureStep: TFeatureStep, level: 'info' | 'debug' | 'trace' | 'warn' | 'error', message: string, payload?: Record<string, unknown>): void;
11
- stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string): void;
12
- stepEnd(featureStep: TFeatureStep, stepperName: string, actionName: string, ok: boolean, error?: string): void;
7
+ log(featureStep: TFeatureStep, level: THaibunLogLevel, message: string, attributes?: Record<string, unknown>): void;
8
+ info(message: string, attributes?: Record<string, unknown>): void;
9
+ debug(message: string, attributes?: Record<string, unknown>): void;
10
+ warn(message: string, attributes?: Record<string, unknown>): void;
11
+ error(message: string, attributes?: Record<string, unknown>): void;
12
+ stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string, stepArgs?: Record<string, unknown>, stepValuesMap?: Record<string, unknown>): void;
13
+ stepEnd(featureStep: TFeatureStep, stepperName: string, actionName: string, ok: boolean, error?: string | Error, stepArgs?: Record<string, unknown> | unknown[], stepValuesMap?: Record<string, unknown>, topics?: Record<string, unknown>): void;
13
14
  artifact(featureStep: TFeatureStep, artifact: TArtifactEvent): void;
14
15
  }
15
16
  export declare class EventLogger implements IEventLogger {
@@ -18,9 +19,14 @@ export declare class EventLogger implements IEventLogger {
18
19
  constructor();
19
20
  setStepperCallback(callback: (event: THaibunEvent) => void): void;
20
21
  emit(event: THaibunEvent): void;
21
- log(featureStep: TFeatureStep, level: 'info' | 'debug' | 'trace' | 'warn' | 'error', message: string, payload?: Record<string, unknown>): void;
22
- stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string): void;
23
- stepEnd(featureStep: TFeatureStep, stepperName: string, actionName: string, ok: boolean, error?: string): void;
22
+ log(featureStep: TFeatureStep, level: THaibunLogLevel, message: string, attributes?: Record<string, unknown>): void;
23
+ info(message: string, attributes?: Record<string, unknown>): void;
24
+ debug(message: string, attributes?: Record<string, unknown>): void;
25
+ warn(message: string, attributes?: Record<string, unknown>): void;
26
+ error(message: string, attributes?: Record<string, unknown>): void;
27
+ private emitLog;
28
+ stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string, stepArgs?: Record<string, unknown>, stepValuesMap?: Record<string, unknown>): void;
29
+ stepEnd(featureStep: TFeatureStep, stepperName: string, actionName: string, ok: boolean, error?: string | Error, stepArgs?: Record<string, unknown> | unknown[], stepValuesMap?: Record<string, unknown>, topics?: Record<string, unknown>): void;
24
30
  /**
25
31
  * Emit an artifact event. The artifact should already be a valid TArtifactEvent
26
32
  * (parsed via the appropriate Zod schema like ImageArtifact.parse()).
@@ -1 +1 @@
1
- {"version":3,"file":"EventLogger.d.ts","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4B,cAAc,EAAwJ,MAAM,qBAAqB,CAAC;AACnP,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,OAAO,EACL,aAAa,EACb,aAAa,EACb,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,wBAAwB,EACxB,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,WAAW,YAAY;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI,CAAC;IACnE,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAChC,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC/I,SAAS,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACpF,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/G,QAAQ,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACrE;AAyBD,qBAAa,WAAY,YAAW,YAAY;IAC9C,OAAO,CAAC,eAAe,CAAC,CAAgC;IACjD,eAAe,EAAE,OAAO,CAAS;;IASxC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI;IAIjE,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAiB/B,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAW9I,SAAS,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAenF,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAgB9G;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI;CASpE"}
1
+ {"version":3,"file":"EventLogger.d.ts","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,5 @@
1
- import { LogEvent, LifecycleEvent } from '../schema/events.js';
1
+ import { LogEvent, LifecycleEvent } from '../schema/protocol.js';
2
2
  import { formatCurrentSeqPath } from './util/index.js';
3
- // Re-export artifact schemas for use by artifact producers
4
- export { ImageArtifact, VideoArtifact, HtmlArtifact, SpeechArtifact, JsonArtifact, MermaidArtifact, HttpTraceArtifact, ResolvedFeaturesArtifact, FileArtifact, } from '../schema/events.js';
5
3
  /**
6
4
  * Get caller info for the emitter field (e.g., "Executor:238")
7
5
  */
@@ -10,18 +8,18 @@ function getEmitter() {
10
8
  if (!stack || stack.length < 5)
11
9
  return 'unknown';
12
10
  // Find the first non-EventLogger caller
13
- for (let i = 3; i < Math.min(stack.length, 8); i++) {
11
+ for (let i = 3; i < Math.min(stack.length, 10); i++) {
14
12
  const line = stack[i];
15
- if (line.includes('EventLogger'))
13
+ if (line.includes('EventLogger') || line.includes('emitLog'))
16
14
  continue;
17
- const match = line.match(/at\s+(?:\w+\.)?(\w+)\s+.*:(\d+):\d+/);
15
+ // Capture function, path, line, col
16
+ // Example: at Executor.doFeatureStep (/home/.../Executor.ts:287:11)
17
+ const match = line.match(/at\s+(?:(\S+)\s+)?\(?(.+?):(\d+):(\d+)\)?$/);
18
18
  if (match) {
19
- return `${match[1]}:${match[2]}`;
20
- }
21
- // Handle "at file:..." pattern
22
- const fileMatch = line.match(/\/([^/]+)\.(?:ts|js):(\d+):\d+/);
23
- if (fileMatch) {
24
- return `${fileMatch[1]}:${fileMatch[2]}`;
19
+ const [, func, path, row] = match;
20
+ const shortFunc = func ? func.split('.').pop() : 'at';
21
+ const file = path.split('/').pop()?.replace(/\.[^/.]+$/, '');
22
+ return `${file}.${shortFunc}:${row}`;
25
23
  }
26
24
  }
27
25
  return 'unknown';
@@ -54,43 +52,78 @@ export class EventLogger {
54
52
  console.log(JSON.stringify(eventWithEmitter));
55
53
  }
56
54
  }
57
- log(featureStep, level, message, payload) {
55
+ log(featureStep, level, message, attributes) {
58
56
  this.emit(LogEvent.parse({
59
57
  id: formatCurrentSeqPath(featureStep.seqPath),
60
58
  timestamp: Date.now(),
61
59
  kind: 'log',
62
60
  level,
63
61
  message,
64
- payload
62
+ attributes
63
+ }));
64
+ }
65
+ // Convenience methods for logging without a featureStep (for cycles, helpers, etc.)
66
+ info(message, attributes) {
67
+ this.emitLog('info', message, attributes);
68
+ }
69
+ debug(message, attributes) {
70
+ this.emitLog('debug', message, attributes);
71
+ }
72
+ warn(message, attributes) {
73
+ this.emitLog('warn', message, attributes);
74
+ }
75
+ error(message, attributes) {
76
+ this.emitLog('error', message, attributes);
77
+ }
78
+ emitLog(level, message, attributes) {
79
+ this.emit(LogEvent.parse({
80
+ id: `log.${Date.now()}`,
81
+ timestamp: Date.now(),
82
+ kind: 'log',
83
+ level,
84
+ message,
85
+ attributes
65
86
  }));
66
87
  }
67
- stepStart(featureStep, stepperName, actionName) {
88
+ stepStart(featureStep, stepperName, actionName, stepArgs, stepValuesMap) {
68
89
  this.emit(LifecycleEvent.parse({
69
90
  id: formatCurrentSeqPath(featureStep.seqPath),
70
91
  timestamp: Date.now(),
71
92
  kind: 'lifecycle',
72
93
  type: 'step',
73
94
  stage: 'start',
74
- label: featureStep.in,
95
+ in: featureStep.in,
96
+ lineNumber: featureStep.source.lineNumber,
97
+ featurePath: featureStep.source.path,
75
98
  status: 'running',
99
+ level: featureStep.isSubStep ? 'trace' : 'info',
76
100
  intent: featureStep.intent ? { mode: featureStep.intent.mode } : undefined,
77
101
  stepperName,
78
- actionName
102
+ actionName,
103
+ stepArgs,
104
+ stepValuesMap
79
105
  }));
80
106
  }
81
- stepEnd(featureStep, stepperName, actionName, ok, error) {
107
+ stepEnd(featureStep, stepperName, actionName, ok, error, stepArgs, stepValuesMap, topics) {
108
+ const errorMessage = error instanceof Error ? error.message : error;
82
109
  this.emit(LifecycleEvent.parse({
83
110
  id: formatCurrentSeqPath(featureStep.seqPath),
84
111
  timestamp: Date.now(),
85
112
  kind: 'lifecycle',
86
113
  type: 'step',
87
114
  stage: 'end',
88
- label: featureStep.in,
115
+ in: featureStep.in,
116
+ lineNumber: featureStep.source.lineNumber,
117
+ featurePath: featureStep.source.path,
89
118
  status: ok ? 'completed' : 'failed',
90
- error,
119
+ level: featureStep.isSubStep ? 'trace' : 'info',
120
+ error: errorMessage,
91
121
  intent: featureStep.intent ? { mode: featureStep.intent.mode } : undefined,
92
122
  stepperName,
93
- actionName
123
+ actionName,
124
+ stepArgs: stepArgs, // Match Zod union type
125
+ stepValuesMap,
126
+ topics
94
127
  }));
95
128
  }
96
129
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"EventLogger.js","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EventLogger.js","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"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"}
@@ -9,11 +9,17 @@ export declare const StepperKinds: {
9
9
  };
10
10
  export type TStepperKind = keyof typeof StepperKinds;
11
11
  export declare abstract class AStepper {
12
+ description?: string;
12
13
  world?: TWorld;
13
14
  kind?: TStepperKind;
14
15
  setWorld(world: TWorld, _steppers: AStepper[]): Promise<void>;
15
16
  abstract steps: TStepperSteps;
16
17
  getWorld(): TWorld;
18
+ /**
19
+ * Called by Resolver before resolving each feature.
20
+ * Steppers can override to clear feature-scoped steps that shouldn't leak between features.
21
+ */
22
+ startFeatureResolution?(_path: string): void;
17
23
  }
18
24
  export type TStepperSteps = {
19
25
  [key: string]: TStepperStep;
@@ -1 +1 @@
1
- {"version":3,"file":"astepper.d.ts","sourceRoot":"","sources":["../../src/lib/astepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC5G,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,eAAO,MAAM,YAAY;;;;;;CAMf,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,MAAM,OAAO,YAAY,CAAC;AAErD,8BAAsB,QAAQ;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,YAAY,CAAC;IAEd,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE;IAMnD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ;CAOR;AACD,MAAM,MAAM,aAAa,GAAG;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;CAC5B,CAAC;AACF,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE;QACT,CAAC,IAAI,EAAE,MAAM,GAAG;YACf,QAAQ,CAAC,EAAE,OAAO,CAAC;YAEnB,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,YAAY,KAAK;gBAAE,UAAU,CAAC,EAAE,MAAM,CAAC;gBAAC,GAAG,CAAC,EAAE,aAAa,CAAC;gBAAC,MAAM,CAAC,EAAE,SAAS,CAAC;aAAE,CAAC;SACrH,CAAC;KACF,CAAC;CACF;AAED,MAAM,WAAW,UAAU;IAC1B,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC1B"}
1
+ {"version":3,"file":"astepper.d.ts","sourceRoot":"","sources":["../../src/lib/astepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC5G,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,eAAO,MAAM,YAAY;;;;;;CAMf,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,MAAM,OAAO,YAAY,CAAC;AAErD,8BAAsB,QAAQ;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,YAAY,CAAC;IAEd,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE;IAMnD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ;IAQR;;;OAGG;IACH,sBAAsB,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAC5C;AACD,MAAM,MAAM,aAAa,GAAG;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;CAC5B,CAAC;AACF,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE;QACT,CAAC,IAAI,EAAE,MAAM,GAAG;YACf,QAAQ,CAAC,EAAE,OAAO,CAAC;YAEnB,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,YAAY,KAAK;gBAAE,UAAU,CAAC,EAAE,MAAM,CAAC;gBAAC,GAAG,CAAC,EAAE,aAAa,CAAC;gBAAC,MAAM,CAAC,EAAE,SAAS,CAAC;aAAE,CAAC;SACrH,CAAC;KACF,CAAC;CACF;AAED,MAAM,WAAW,UAAU;IAC1B,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC1B"}
@@ -7,6 +7,7 @@ export const StepperKinds = {
7
7
  TEST: 'TEST',
8
8
  };
9
9
  export class AStepper {
10
+ description;
10
11
  world;
11
12
  kind;
12
13
  async setWorld(world, _steppers) {
@@ -1 +1 @@
1
- {"version":3,"file":"astepper.js","sourceRoot":"","sources":["../../src/lib/astepper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC3B,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;CACH,CAAC;AAIX,MAAM,OAAgB,QAAQ;IAC7B,KAAK,CAAU;IACf,IAAI,CAAgB;IAEpB,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,SAAqB;QAClD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,yDAAyD;QACzD,KAAK,SAAS,CAAC;QACf,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,QAAQ;QACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,yBAAyB,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CACD"}
1
+ {"version":3,"file":"astepper.js","sourceRoot":"","sources":["../../src/lib/astepper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC3B,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;CACH,CAAC;AAIX,MAAM,OAAgB,QAAQ;IAC7B,WAAW,CAAU;IACrB,KAAK,CAAU;IACf,IAAI,CAAgB;IAEpB,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,SAAqB;QAClD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,yDAAyD;QACzD,KAAK,SAAS,CAAC;QACf,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,QAAQ;QACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,yBAAyB,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CAOD"}
@@ -1 +1 @@
1
- {"version":3,"file":"base-prompt-manager.d.ts","sourceRoot":"","sources":["../../src/lib/base-prompt-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEpE,8BAAsB,iBAAkB,YAAW,SAAS;IACxD,SAAS,CAAC,kBAAkB;iBAA8B,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI;gBAAU,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI;iBAAW,OAAO;oBAAc,MAAM;OAAM;IAE1K,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IACpD,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAExC,qBAAqB;iBAL8B,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI;gBAAU,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI;iBAAW,OAAO;oBAAc,MAAM;;IAS9J,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAUvD,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;IAM1C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CAKtC"}
1
+ {"version":3,"file":"base-prompt-manager.d.ts","sourceRoot":"","sources":["../../src/lib/base-prompt-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEpE,8BAAsB,iBAAkB,YAAW,SAAS;IACxD,SAAS,CAAC,kBAAkB;iBAA8B,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI;gBAAU,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI;iBAAW,OAAO;oBAAc,MAAM;OAAM;IAE1K,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IACpD,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAExC,qBAAqB;iBAL8B,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI;gBAAU,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI;iBAAW,OAAO;oBAAc,MAAM;;IASpK,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAUjD,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;IAM1C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CAKtC"}
@@ -3,9 +3,9 @@ export class BasePromptManager {
3
3
  getOutstandingPrompts() {
4
4
  return this.outstandingPrompts;
5
5
  }
6
- async prompt(prompt) {
6
+ prompt(prompt) {
7
7
  if (this.outstandingPrompts.has(prompt.id)) {
8
- return undefined;
8
+ return Promise.resolve(undefined);
9
9
  }
10
10
  this.showPrompt(prompt);
11
11
  return new Promise((resolve, reject) => {
@@ -1 +1 @@
1
- {"version":3,"file":"base-prompt-manager.js","sourceRoot":"","sources":["../../src/lib/base-prompt-manager.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,iBAAiB;IACzB,kBAAkB,GAAG,IAAI,GAAG,EAAmI,CAAC;IAKnK,qBAAqB;QACxB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAe;QACxB,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;YACzC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,EAAU,EAAE,KAAsB;QACtC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,EAAU,EAAE,OAAgB;QAC/B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;CACJ"}
1
+ {"version":3,"file":"base-prompt-manager.js","sourceRoot":"","sources":["../../src/lib/base-prompt-manager.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,iBAAiB;IACzB,kBAAkB,GAAG,IAAI,GAAG,EAAmI,CAAC;IAKnK,qBAAqB;QACxB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,MAAe;QAClB,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;YACzC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,EAAU,EAAE,KAAsB;QACtC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,EAAU,EAAE,OAAgB;QAC/B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { TBaseOptions } from "./defs.js";
1
+ import { TBaseOptions } from './defs.js';
2
2
  import { TTag } from "./ttag.js";
3
3
  export declare const captureLocator: (options: TBaseOptions, tag: TTag, ...where: (string | undefined)[]) => string;
4
4
  //# sourceMappingURL=capture-locator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"capture-locator.d.ts","sourceRoot":"","sources":["../../src/lib/capture-locator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAyB,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,eAAO,MAAM,cAAc,GAAI,SAAS,YAAY,EAAE,KAAK,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WAKhG,CAAA"}
1
+ {"version":3,"file":"capture-locator.d.ts","sourceRoot":"","sources":["../../src/lib/capture-locator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC,eAAO,MAAM,cAAc,GAAI,SAAS,YAAY,EAAE,KAAK,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WAMhG,CAAA"}
@@ -1,8 +1,10 @@
1
1
  import { join } from "path";
2
- import { CAPTURE, DEFAULT_DEST } from "./defs.js";
2
+ import { CAPTURE, DEFAULT_DEST } from '../schema/protocol.js';
3
3
  import { containerHostPath } from "./util/actualURI.js";
4
+ import { slugify } from "./util/index.js";
4
5
  export const captureLocator = (options, tag, ...where) => {
5
- const location = join(...[CAPTURE, options.DEST || DEFAULT_DEST, tag.key, `seq-${tag.sequence}`, `featn-${tag.featureNum}`].concat(where.filter((w) => w !== undefined)));
6
+ const featn = `featn-${tag.featureNum}${tag.featureName ? `-${slugify(tag.featureName)}` : ''}`;
7
+ const location = join(...[CAPTURE, options.DEST || DEFAULT_DEST, tag.key, featn].concat(where.filter((w) => w !== undefined)));
6
8
  const base = containerHostPath || '.';
7
9
  const loc = [base, location].join('/');
8
10
  return loc;
@@ -1 +1 @@
1
- {"version":3,"file":"capture-locator.js","sourceRoot":"","sources":["../../src/lib/capture-locator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAgB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAqB,EAAE,GAAS,EAAE,GAAG,KAA6B,EAAE,EAAE;IACpG,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,IAAI,YAAY,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1K,MAAM,IAAI,GAAG,iBAAiB,IAAI,GAAG,CAAC;IACtC,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,OAAO,GAAG,CAAC;AACZ,CAAC,CAAA"}
1
+ {"version":3,"file":"capture-locator.js","sourceRoot":"","sources":["../../src/lib/capture-locator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAqB,EAAE,GAAS,EAAE,GAAG,KAA6B,EAAE,EAAE;IACpG,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAChG,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,IAAI,YAAY,EAAE,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC;IAC/H,MAAM,IAAI,GAAG,iBAAiB,IAAI,GAAG,CAAC;IACtC,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,OAAO,GAAG,CAAC;AACZ,CAAC,CAAA"}
@@ -1,18 +1,19 @@
1
- import { TWorld, TFeatureStep, TSeqPath } from '../defs.js';
1
+ import { TWorld, TFeatureStep, TStepInput } from '../defs.js';
2
+ import { TSeqPath } from '../../schema/protocol.js';
2
3
  import { AStepper } from '../astepper.js';
3
- import { ExecutionIntent, FlowSignal } from './protocol.js';
4
+ import { ExecutionIntent, FlowSignal } from '../../schema/protocol.js';
4
5
  export declare class FlowRunner {
5
6
  private world;
6
7
  private steppers;
7
8
  private resolver;
8
9
  constructor(world: TWorld, steppers: AStepper[]);
9
- runStatement(statement: string, options?: {
10
+ runStatement(statement: string | TStepInput, options?: {
10
11
  args?: Record<string, string>;
11
12
  intent?: ExecutionIntent;
12
13
  parentStep?: TFeatureStep;
13
14
  seqPath?: TSeqPath;
14
15
  }): Promise<FlowSignal>;
15
- runStatements(statements: string[], options?: {
16
+ runStatements(statements: (string | TStepInput)[], options?: {
16
17
  args?: Record<string, string>;
17
18
  intent?: ExecutionIntent;
18
19
  parentStep?: TFeatureStep;
@@ -1 +1 @@
1
- {"version":3,"file":"flow-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/core/flow-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAsB,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE5D,qBAAa,UAAU;IAGV,OAAO,CAAC,KAAK;IAAU,OAAO,CAAC,QAAQ;IAFnD,OAAO,CAAC,QAAQ,CAAW;gBAEP,KAAK,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE;IAIzD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,YAAY,CAAC;QAAC,OAAO,CAAC,EAAE,QAAQ,CAAA;KAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAkE9K,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,YAAY,CAAA;KAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAY9J,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,YAAY,CAAA;KAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAgDjI"}
1
+ {"version":3,"file":"flow-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/core/flow-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAsB,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEvE,qBAAa,UAAU;IAGV,OAAO,CAAC,KAAK;IAAU,OAAO,CAAC,QAAQ;IAFnD,OAAO,CAAC,QAAQ,CAAW;gBAEP,KAAK,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE;IAIzD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,EAAE,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,YAAY,CAAC;QAAC,OAAO,CAAC,EAAE,QAAQ,CAAA;KAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAiG3L,aAAa,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,UAAU,CAAC,EAAE,EAAE,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,YAAY,CAAA;KAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAY7K,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,YAAY,CAAA;KAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAiDjI"}
@@ -11,39 +11,72 @@ export class FlowRunner {
11
11
  }
12
12
  async runStatement(statement, options = {}) {
13
13
  const { intent = { mode: 'authoritative' } } = options;
14
+ const stmtText = typeof statement === 'string' ? statement : statement.in;
14
15
  // Merge parent runtimeArgs with current args (current takes precedence)
15
16
  // This enables nested quantifiers: outer vars are visible to inner statements
16
17
  const allArgs = { ...options.parentStep?.runtimeArgs, ...options.args };
17
18
  // Interpolate {varName} patterns using merged args
18
- let statementWithArgs = statement;
19
+ let statementWithArgs = stmtText;
19
20
  if (Object.keys(allArgs).length > 0) {
20
21
  for (const [key, value] of Object.entries(allArgs)) {
21
22
  statementWithArgs = statementWithArgs.replace(new RegExp(`\\{${key}\\}`, 'g'), value);
22
23
  }
23
24
  }
25
+ // Resolve the action first - this gives us access to step metadata including source
24
26
  let action;
25
27
  try {
26
28
  action = this.resolver.findSingleStepAction(statementWithArgs);
27
29
  }
28
30
  catch (e) {
29
31
  if (intent.mode === 'speculative') {
30
- return { kind: 'fail', message: e.message };
32
+ return { kind: 'fail', message: e instanceof Error ? e.message : String(e) };
31
33
  }
32
34
  throw e;
33
35
  }
36
+ // Derive source path: prefer resolved step's source, then parentStep, then input statement
37
+ const step = action.step;
38
+ let resolvedPath;
39
+ let resolvedLineNumber;
40
+ if (step?.source?.path) {
41
+ // Step definition has its own source (e.g., activity, waypoint)
42
+ resolvedPath = step.source.path;
43
+ resolvedLineNumber = step.source.lineNumber;
44
+ }
45
+ else if (options.parentStep?.source?.path) {
46
+ // Fall back to parent step's source (e.g., quantifier calling nested statement)
47
+ resolvedPath = options.parentStep.source.path;
48
+ resolvedLineNumber = options.parentStep.source.lineNumber;
49
+ }
50
+ else if (typeof statement !== 'string' && statement.source?.path) {
51
+ // Use input statement's source if provided
52
+ resolvedPath = statement.source.path;
53
+ resolvedLineNumber = statement.source.lineNumber;
54
+ }
55
+ else if (this.world.runtime.currentFeaturePath) {
56
+ // Fall back to current feature path (e.g., debugger executing ad-hoc statements)
57
+ resolvedPath = this.world.runtime.currentFeaturePath;
58
+ }
59
+ else {
60
+ // No source available - use placeholder for dynamic/ad-hoc statements (debugger, REPL, etc.)
61
+ resolvedPath = '<dynamic>';
62
+ }
63
+ // Compute seqPath for this statement
34
64
  let seqPath = options.seqPath;
35
65
  if (!seqPath) {
36
66
  if (options.parentStep) {
37
67
  seqPath = incSeqPath(this.world.runtime.stepResults, [...options.parentStep.seqPath, 1], 1);
38
68
  }
39
69
  else {
40
- throw new Error(`runStatement requires seqPath or parentStep. Statement: ${statement}`);
70
+ throw new Error(`runStatement requires seqPath or parentStep. Statement: ${stmtText}`);
41
71
  }
42
72
  }
43
73
  // Merge parent args with current args (current takes precedence)
44
74
  const mergedArgs = { ...options.parentStep?.runtimeArgs, ...options.args };
45
75
  const featureStep = {
46
- path: options.parentStep?.path || this.world.runtime.feature || 'unknown',
76
+ source: {
77
+ path: resolvedPath,
78
+ lineNumber: resolvedLineNumber,
79
+ },
47
80
  in: statementWithArgs,
48
81
  seqPath,
49
82
  action,
@@ -57,16 +90,16 @@ export class FlowRunner {
57
90
  }
58
91
  catch (e) {
59
92
  if (intent.mode === 'speculative') {
60
- return { kind: 'fail', message: e.message };
93
+ return { kind: 'fail', message: e instanceof Error ? e.message : String(e) };
61
94
  }
62
95
  throw e;
63
96
  }
64
97
  if (result.ok) {
65
- return { kind: 'ok', payload: result.stepActionResult };
98
+ return { kind: 'ok', topics: result.stepActionResult };
66
99
  }
67
100
  else {
68
101
  const msg = result.stepActionResult.message;
69
- return { kind: 'fail', message: msg, payload: result.stepActionResult };
102
+ return { kind: 'fail', message: msg, topics: result.stepActionResult };
70
103
  }
71
104
  }
72
105
  async runStatements(statements, options = {}) {
@@ -78,7 +111,7 @@ export class FlowRunner {
78
111
  }
79
112
  lastResult = result;
80
113
  }
81
- return { kind: 'ok', payload: lastResult?.payload };
114
+ return { kind: 'ok', topics: lastResult?.topics };
82
115
  }
83
116
  async runSteps(steps, options = {}) {
84
117
  const { intent = { mode: 'authoritative' }, parentStep } = options;
@@ -104,10 +137,14 @@ export class FlowRunner {
104
137
  }
105
138
  catch (e) {
106
139
  if (intent.mode === 'speculative') {
107
- return { kind: 'fail', message: e.message };
140
+ return { kind: 'fail', message: e instanceof Error ? e.message : String(e) };
108
141
  }
109
142
  throw e;
110
143
  }
144
+ if (!result.ok) {
145
+ const msg = result.stepActionResult.message;
146
+ return { kind: 'fail', message: msg, topics: result.stepActionResult };
147
+ }
111
148
  // If not using cycles (which doFeatureStep defaults to WITH_CYCLES), we might need to push results.
112
149
  // But doFeatureStep pushes results if WITH_CYCLES.
113
150
  // If we are in speculative mode, doFeatureStep might still push results if we don't change execMode.
@@ -116,13 +153,9 @@ export class FlowRunner {
116
153
  // If we want to avoid polluting stepResults in speculative mode, we might need to adjust FeatureExecutor or pass a flag.
117
154
  // But for now, to ensure incSeqPath works, we NEED results in stepResults.
118
155
  // So we accept that speculative steps might be in stepResults (which is probably fine for debugging).
119
- if (!result.ok) {
120
- const msg = result.stepActionResult.message;
121
- return { kind: 'fail', message: msg, payload: result.stepActionResult };
122
- }
123
- lastResult = { kind: 'ok', payload: result.stepActionResult };
156
+ lastResult = { kind: 'ok', topics: result.stepActionResult };
124
157
  }
125
- return { kind: 'ok', payload: lastResult?.payload };
158
+ return { kind: 'ok', topics: lastResult?.topics };
126
159
  }
127
160
  }
128
161
  //# sourceMappingURL=flow-runner.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"flow-runner.js","sourceRoot":"","sources":["../../../src/lib/core/flow-runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"flow-runner.js","sourceRoot":"","sources":["../../../src/lib/core/flow-runner.ts"],"names":[],"mappings":"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"}