@db-lyon/flowkit 0.12.0 → 0.13.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.
@@ -0,0 +1 @@
1
+ {"root":["../src/index.ts","../src/logger.ts","../src/references.ts","../src/config/deep-merge.ts","../src/config/index.ts","../src/config/loader.ts","../src/config/schema.ts","../src/dag/index.ts","../src/dag/resolver.ts","../src/flow/index.ts","../src/flow/runner.ts","../src/task/agent-prompt-task.ts","../src/task/agent-task.ts","../src/task/base-task.ts","../src/task/concurrency.ts","../src/task/index.ts","../src/task/json-schema.ts","../src/task/llm-provider.ts","../src/task/llm-runner.ts","../src/task/redact.ts","../src/task/registry.ts","../src/task/shell-task.ts","../src/task/shell-termination.ts","../src/task/task-resolution.ts","../src/task/token-ledger.ts"],"version":"5.9.3"}
@@ -0,0 +1,39 @@
1
+ /**
2
+ * Reference resolution for flow option values.
3
+ *
4
+ * Option values may contain `${<namespace>.<path>}` references:
5
+ *
6
+ * ${steps.<id>.<path>} → value from a previously completed step
7
+ * ${error.<path>} → error info, only inside on_failure / finally hooks
8
+ * ${<ns>.<path>} → value from a host-supplied namespace in `namespaces`
9
+ * (e.g. ${project.package.namespace}, ${org.username},
10
+ * ${env.HOME}) — the resolver is namespace-extensible,
11
+ * symmetric with the pluggable `conditionEvaluator`.
12
+ *
13
+ * For `steps`, `<id>` is a step number ("3") or a task name ("level.place_actor");
14
+ * task names match the most recently completed step with that name, longest-prefix
15
+ * wins. A reference filling the entire string yields the raw value (preserving
16
+ * object/array/number types); embedded references are stringified. A reference to
17
+ * an UNREGISTERED namespace is left untouched (so non-reference `${...}` survives).
18
+ */
19
+ export interface ReferenceableStep {
20
+ stepNumber: number;
21
+ name: string;
22
+ result?: {
23
+ data?: unknown;
24
+ };
25
+ }
26
+ export interface ReferenceContext {
27
+ steps: ReferenceableStep[];
28
+ /** Present inside on_failure / finally hooks. */
29
+ error?: {
30
+ message: string;
31
+ name: string;
32
+ stack?: string;
33
+ step?: string;
34
+ };
35
+ /** Host-supplied reference namespaces, e.g. { project, org, env }. */
36
+ namespaces?: Record<string, unknown>;
37
+ }
38
+ export declare function resolveReferences<T>(value: T, ctx: ReferenceContext): T;
39
+ //# sourceMappingURL=references.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../../src/flow/references.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,iDAAiD;IACjD,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAQD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,gBAAgB,GAAG,CAAC,CAcvE"}
@@ -0,0 +1,102 @@
1
+ /**
2
+ * Reference resolution for flow option values.
3
+ *
4
+ * Option values may contain `${<namespace>.<path>}` references:
5
+ *
6
+ * ${steps.<id>.<path>} → value from a previously completed step
7
+ * ${error.<path>} → error info, only inside on_failure / finally hooks
8
+ * ${<ns>.<path>} → value from a host-supplied namespace in `namespaces`
9
+ * (e.g. ${project.package.namespace}, ${org.username},
10
+ * ${env.HOME}) — the resolver is namespace-extensible,
11
+ * symmetric with the pluggable `conditionEvaluator`.
12
+ *
13
+ * For `steps`, `<id>` is a step number ("3") or a task name ("level.place_actor");
14
+ * task names match the most recently completed step with that name, longest-prefix
15
+ * wins. A reference filling the entire string yields the raw value (preserving
16
+ * object/array/number types); embedded references are stringified. A reference to
17
+ * an UNREGISTERED namespace is left untouched (so non-reference `${...}` survives).
18
+ */
19
+ /** Returned by resolveRef when the namespace is unregistered — leave the text literal. */
20
+ const LITERAL = Symbol('literal');
21
+ const WHOLE_VALUE = /^\$\{(\w+)\.([^}]+)\}$/;
22
+ const EMBEDDED = /\$\{(\w+)\.([^}]+)\}/g;
23
+ export function resolveReferences(value, ctx) {
24
+ if (value == null)
25
+ return value;
26
+ if (typeof value === 'string')
27
+ return resolveString(value, ctx);
28
+ if (Array.isArray(value)) {
29
+ return value.map((v) => resolveReferences(v, ctx));
30
+ }
31
+ if (typeof value === 'object') {
32
+ const out = {};
33
+ for (const [k, v] of Object.entries(value)) {
34
+ out[k] = resolveReferences(v, ctx);
35
+ }
36
+ return out;
37
+ }
38
+ return value;
39
+ }
40
+ function resolveString(str, ctx) {
41
+ const whole = str.match(WHOLE_VALUE);
42
+ if (whole) {
43
+ const v = resolveRef(whole[1], whole[2], ctx);
44
+ return v === LITERAL ? str : v;
45
+ }
46
+ if (!str.includes('${'))
47
+ return str;
48
+ return str.replace(EMBEDDED, (match, ns, ref) => {
49
+ const v = resolveRef(ns, ref, ctx);
50
+ if (v === LITERAL)
51
+ return match; // unregistered namespace — leave untouched
52
+ if (v == null)
53
+ return '';
54
+ if (typeof v === 'object')
55
+ return JSON.stringify(v);
56
+ return String(v);
57
+ });
58
+ }
59
+ function resolveRef(namespace, ref, ctx) {
60
+ if (namespace === 'error') {
61
+ if (!ctx.error) {
62
+ throw new Error(`\${error.${ref}} referenced outside on_failure/finally — error context not available`);
63
+ }
64
+ return getPath(ctx.error, ref.split('.'));
65
+ }
66
+ if (namespace === 'steps') {
67
+ const segments = ref.split('.');
68
+ for (let i = segments.length; i >= 1; i--) {
69
+ const idCandidate = segments.slice(0, i).join('.');
70
+ const match = findStep(idCandidate, ctx.steps);
71
+ if (match)
72
+ return getPath(match.result?.data, segments.slice(i));
73
+ }
74
+ throw new Error(`Unresolvable step reference: \${steps.${ref}} — no completed step matches "${segments[0]}"`);
75
+ }
76
+ // Host-supplied namespace (project / org / env / ...). Missing path → undefined.
77
+ if (ctx.namespaces && namespace in ctx.namespaces) {
78
+ return getPath(ctx.namespaces[namespace], ref.split('.'));
79
+ }
80
+ // Unregistered namespace — not a reference we own; leave it literal.
81
+ return LITERAL;
82
+ }
83
+ function findStep(id, steps) {
84
+ if (/^\d+$/.test(id)) {
85
+ return steps.find((s) => String(s.stepNumber) === id);
86
+ }
87
+ for (let i = steps.length - 1; i >= 0; i--) {
88
+ if (steps[i].name === id)
89
+ return steps[i];
90
+ }
91
+ return undefined;
92
+ }
93
+ function getPath(obj, segments) {
94
+ let cur = obj;
95
+ for (const seg of segments) {
96
+ if (cur == null || typeof cur !== 'object')
97
+ return undefined;
98
+ cur = cur[seg];
99
+ }
100
+ return cur;
101
+ }
102
+ //# sourceMappingURL=references.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"references.js","sourceRoot":"","sources":["../../src/flow/references.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,iDAAiD;IACjD,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAQD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,gBAAgB,GAAG,CAAC,CAcvE"}
1
+ {"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,iDAAiD;IACjD,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAQD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,gBAAgB,GAAG,CAAC,CAmBvE"}
@@ -31,6 +31,12 @@ export function resolveReferences(value, ctx) {
31
31
  return value.map((v) => resolveReferences(v, ctx));
32
32
  }
33
33
  if (typeof value === 'object') {
34
+ // Configuration is represented by plain objects. Preserve runtime values
35
+ // (AbortSignal, Date, class instances, etc.) by identity: recursively
36
+ // copying them can discard non-enumerable state and methods.
37
+ const prototype = Object.getPrototypeOf(value);
38
+ if (prototype !== Object.prototype && prototype !== null)
39
+ return value;
34
40
  const out = {};
35
41
  for (const [k, v] of Object.entries(value)) {
36
42
  out[k] = resolveReferences(v, ctx);
@@ -1 +1 @@
1
- {"version":3,"file":"references.js","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"references.js","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAgBH,0FAA0F;AAC1F,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAElC,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAC7C,MAAM,QAAQ,GAAG,uBAAuB,CAAC;AAEzC,MAAM,UAAU,iBAAiB,CAAI,KAAQ,EAAE,GAAqB;IAClE,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAChC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,aAAa,CAAC,KAAK,EAAE,GAAG,CAAM,CAAC;IACrE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAiB,CAAC;IACrE,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,yEAAyE;QACzE,sEAAsE;QACtE,6DAA6D;QAC7D,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QACvE,MAAM,GAAG,GAA4B,EAAE,CAAC;QACxC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACtE,GAAG,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,GAAQ,CAAC;IAClB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,GAAqB;IACvD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACrC,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,GAAG,CAAC,CAAC;QAChD,OAAO,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IAEpC,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAU,EAAE,GAAW,EAAE,EAAE;QAC9D,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,OAAO;YAAE,OAAO,KAAK,CAAC,CAAC,2CAA2C;QAC5E,IAAI,CAAC,IAAI,IAAI;YAAE,OAAO,EAAE,CAAC;QACzB,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,SAAiB,EAAE,GAAW,EAAE,GAAqB;IACvE,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,YAAY,GAAG,uEAAuE,CACvF,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChC,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,KAAK;gBAAE,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,IAAI,KAAK,CACb,yCAAyC,GAAG,kCAAkC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAC7F,CAAC;IACJ,CAAC;IAED,iFAAiF;IACjF,IAAI,GAAG,CAAC,UAAU,IAAI,SAAS,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QAClD,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,qEAAqE;IACrE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CAAC,EAAU,EAAE,KAA0B;IACtD,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;IACxD,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,OAAO,CAAC,GAAY,EAAE,QAAkB;IAC/C,IAAI,GAAG,GAAY,GAAG,CAAC;IACvB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,GAAG,IAAI,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QAC7D,GAAG,GAAI,GAA+B,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
@@ -3,6 +3,8 @@ export interface ShellTaskOptions {
3
3
  command: string;
4
4
  cwd?: string;
5
5
  timeout?: number;
6
+ /** Cancels this individual shell invocation when aborted. */
7
+ signal?: AbortSignal;
6
8
  }
7
9
  /**
8
10
  * Task that executes a shell command.
@@ -1 +1 @@
1
- {"version":3,"file":"shell-task.d.ts","sourceRoot":"","sources":["../../src/task/shell-task.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,SAAU,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IACvD,IAAI,QAAQ,WAEX;IAED,SAAS,CAAC,QAAQ,IAAI,IAAI;IAMpB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;CA8GrC"}
1
+ {"version":3,"file":"shell-task.d.ts","sourceRoot":"","sources":["../../src/task/shell-task.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAQ3D,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAWD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,SAAU,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IACvD,IAAI,QAAQ,WAEX;IAED,SAAS,CAAC,QAAQ,IAAI,IAAI;IASpB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;CA6PrC"}
@@ -1,5 +1,13 @@
1
1
  import { spawn } from 'node:child_process';
2
2
  import { BaseTask } from './base-task.js';
3
+ import { beginShellTermination, POSIX_SIGTERM_GRACE_MS, terminationGraceMs, } from './shell-termination.js';
4
+ /** Stable internal error text returned when a shell invocation is cancelled. */
5
+ const SHELL_TASK_CANCELLED_MESSAGE = 'Shell command cancelled';
6
+ function isAbortSignal(value) {
7
+ // A structural check can admit a lookalike whose addEventListener throws
8
+ // after spawn, recreating the detached-child leak this validation prevents.
9
+ return value instanceof AbortSignal;
10
+ }
3
11
  /**
4
12
  * Task that executes a shell command.
5
13
  *
@@ -30,9 +38,21 @@ export class ShellTask extends BaseTask {
30
38
  if (!this.options.command || typeof this.options.command !== 'string') {
31
39
  throw new Error('ShellTask requires a "command" option');
32
40
  }
41
+ if (this.options.signal !== undefined && !isAbortSignal(this.options.signal)) {
42
+ throw new Error('ShellTask "signal" must be an AbortSignal');
43
+ }
33
44
  }
34
45
  async execute() {
35
- const { command, cwd, timeout = 300_000 } = this.options;
46
+ const { command, cwd, timeout = 300_000, signal } = this.options;
47
+ // Do this before creating the Promise (and, importantly, before spawn) so
48
+ // an already-cancelled run cannot launch a process at all.
49
+ if (signal?.aborted) {
50
+ return {
51
+ success: false,
52
+ error: new Error(SHELL_TASK_CANCELLED_MESSAGE),
53
+ data: { exitCode: null, signal: null, stderr: '', stdout: '' },
54
+ };
55
+ }
36
56
  return new Promise((resolve) => {
37
57
  // Cross-platform: route through the platform shell so command strings
38
58
  // like "npm run build" or "echo $HOME && ls" work the same way they
@@ -41,12 +61,36 @@ export class ShellTask extends BaseTask {
41
61
  cwd,
42
62
  shell: true,
43
63
  stdio: ['ignore', 'pipe', 'pipe'],
64
+ // A signal-bearing POSIX invocation gets its own process group so its
65
+ // shell and ordinary descendants can be terminated together. Keep the
66
+ // legacy spawn behavior unchanged when no signal was supplied.
67
+ ...(signal && process.platform !== 'win32' ? { detached: true } : {}),
44
68
  });
45
69
  let stdoutBuf = '';
46
70
  let stderrBuf = '';
47
71
  let stdoutTail = '';
48
72
  let stderrTail = '';
49
- let timedOut = false;
73
+ let terminalCause = 'running';
74
+ let settled = false;
75
+ let abortListenerRegistered = false;
76
+ let timeoutTimer;
77
+ let terminationTimer;
78
+ let escalationTimer;
79
+ let terminator;
80
+ let terminationEscalated = false;
81
+ let pendingTerminalClose;
82
+ const onStdoutData = (chunk) => {
83
+ stdoutBuf += chunk;
84
+ emitLines(chunk, 'stdout', (line) => {
85
+ this.logger.info({ stream: 'stdout' }, line);
86
+ });
87
+ };
88
+ const onStderrData = (chunk) => {
89
+ stderrBuf += chunk;
90
+ emitLines(chunk, 'stderr', (line) => {
91
+ this.logger.warn({ stream: 'stderr' }, line);
92
+ });
93
+ };
50
94
  const emitLines = (chunk, tailRef, emit) => {
51
95
  // Maintain a small tail buffer so we never emit a partial line.
52
96
  // Each newline we see flushes everything before it as one line;
@@ -65,65 +109,167 @@ export class ShellTask extends BaseTask {
65
109
  };
66
110
  child.stdout?.setEncoding('utf-8');
67
111
  child.stderr?.setEncoding('utf-8');
68
- child.stdout?.on('data', (chunk) => {
69
- stdoutBuf += chunk;
70
- emitLines(chunk, 'stdout', (line) => {
71
- this.logger.info({ stream: 'stdout' }, line);
72
- });
73
- });
74
- child.stderr?.on('data', (chunk) => {
75
- stderrBuf += chunk;
76
- emitLines(chunk, 'stderr', (line) => {
77
- this.logger.warn({ stream: 'stderr' }, line);
78
- });
79
- });
80
- const timer = setTimeout(() => {
81
- timedOut = true;
82
- // SIGKILL on Windows is mapped to TerminateProcess by libuv.
83
- child.kill('SIGKILL');
84
- }, timeout);
112
+ child.stdout?.on('data', onStdoutData);
113
+ child.stderr?.on('data', onStderrData);
85
114
  const flushTails = () => {
86
115
  if (stdoutTail.length > 0) {
87
116
  this.logger.info({ stream: 'stdout' }, stdoutTail);
88
- stdoutBuf += stdoutTail;
89
117
  stdoutTail = '';
90
118
  }
91
119
  if (stderrTail.length > 0) {
92
120
  this.logger.warn({ stream: 'stderr' }, stderrTail);
93
- stderrBuf += stderrTail;
94
121
  stderrTail = '';
95
122
  }
96
123
  };
97
- child.on('error', (err) => {
98
- clearTimeout(timer);
124
+ const removeAbortListener = () => {
125
+ if (!abortListenerRegistered)
126
+ return;
127
+ abortListenerRegistered = false;
128
+ signal?.removeEventListener('abort', onAbort);
129
+ };
130
+ const cleanup = () => {
131
+ if (timeoutTimer)
132
+ clearTimeout(timeoutTimer);
133
+ if (terminationTimer)
134
+ clearTimeout(terminationTimer);
135
+ if (escalationTimer)
136
+ clearTimeout(escalationTimer);
137
+ removeAbortListener();
138
+ // A bounded fallback may settle before a misbehaving child closes.
139
+ // Stop capturing output then, while retaining the child error handler
140
+ // until Node finishes closing it.
141
+ child.stdout?.removeListener('data', onStdoutData);
142
+ child.stderr?.removeListener('data', onStderrData);
143
+ terminator?.dispose();
144
+ };
145
+ const resultData = (exitCode, exitSignal, includeSignal = true) => {
99
146
  flushTails();
100
- resolve({
147
+ return {
148
+ exitCode,
149
+ ...(includeSignal ? { signal: exitSignal } : {}),
150
+ stderr: stderrBuf.trimEnd(),
151
+ stdout: stdoutBuf.trimEnd(),
152
+ };
153
+ };
154
+ const settle = (result) => {
155
+ if (settled)
156
+ return;
157
+ settled = true;
158
+ cleanup();
159
+ resolve(result);
160
+ };
161
+ const settleTerminal = (exitCode, exitSignal) => {
162
+ const data = resultData(exitCode, exitSignal);
163
+ settle({
164
+ success: false,
165
+ error: new Error(terminalCause === 'cancelled'
166
+ ? SHELL_TASK_CANCELLED_MESSAGE
167
+ : `Shell command timed out after ${timeout}ms`),
168
+ data,
169
+ });
170
+ };
171
+ const requestTermination = (cause) => {
172
+ if (settled || terminalCause !== 'running')
173
+ return;
174
+ terminalCause = cause;
175
+ if (timeoutTimer)
176
+ clearTimeout(timeoutTimer);
177
+ removeAbortListener();
178
+ // Preserve the legacy no-signal timeout path exactly: kill the shell
179
+ // and wait for close. The bounded cancellation contract applies only
180
+ // when a caller supplied an AbortSignal.
181
+ if (cause === 'timedOut' && !signal) {
182
+ try {
183
+ child.kill('SIGKILL');
184
+ }
185
+ catch {
186
+ // The existing error/close handlers retain responsibility for the
187
+ // final task result.
188
+ }
189
+ return;
190
+ }
191
+ try {
192
+ terminator = beginShellTermination(child);
193
+ terminator.onTreeKillComplete(() => {
194
+ if (!pendingTerminalClose || settled || terminalCause === 'running')
195
+ return;
196
+ const pending = pendingTerminalClose;
197
+ pendingTerminalClose = undefined;
198
+ settleTerminal(pending.exitCode, pending.exitSignal);
199
+ });
200
+ if (terminator.platform !== 'win32') {
201
+ escalationTimer = setTimeout(() => {
202
+ terminationEscalated = true;
203
+ terminator?.escalate();
204
+ if (pendingTerminalClose) {
205
+ const pending = pendingTerminalClose;
206
+ pendingTerminalClose = undefined;
207
+ settleTerminal(pending.exitCode, pending.exitSignal);
208
+ }
209
+ }, POSIX_SIGTERM_GRACE_MS);
210
+ }
211
+ terminationTimer = setTimeout(() => {
212
+ terminator?.release();
213
+ settleTerminal(null, null);
214
+ }, terminationGraceMs(terminator.platform));
215
+ }
216
+ catch {
217
+ // `close` or the bounded fallback below will settle the terminal
218
+ // result; a kill race must not escape as an unhandled exception.
219
+ }
220
+ };
221
+ const onAbort = () => requestTermination('cancelled');
222
+ timeoutTimer = setTimeout(() => requestTermination('timedOut'), timeout);
223
+ signal?.addEventListener('abort', onAbort, { once: true });
224
+ abortListenerRegistered = Boolean(signal);
225
+ child.on('error', (err) => {
226
+ if (terminalCause !== 'running') {
227
+ // Preserve the legacy no-signal timeout result if the kill itself
228
+ // errors and no `close` follows. Without this, a timeout could leave
229
+ // the task pending indefinitely; the original error and data shape
230
+ // remain intact for compatibility.
231
+ if (terminalCause === 'timedOut' && !signal) {
232
+ settle({
233
+ success: false,
234
+ error: err instanceof Error ? err : new Error(String(err)),
235
+ data: resultData(null, null, false),
236
+ });
237
+ }
238
+ return;
239
+ }
240
+ settle({
101
241
  success: false,
102
242
  error: err instanceof Error ? err : new Error(String(err)),
103
- data: { exitCode: null, stderr: stderrBuf.trimEnd(), stdout: stdoutBuf.trimEnd() },
243
+ data: resultData(null, null, Boolean(signal)),
104
244
  });
105
245
  });
106
- child.on('close', (code, signal) => {
107
- clearTimeout(timer);
108
- flushTails();
109
- const trimmedOut = stdoutBuf.trimEnd();
110
- const trimmedErr = stderrBuf.trimEnd();
111
- if (timedOut) {
112
- resolve({
113
- success: false,
114
- error: new Error(`Shell command timed out after ${timeout}ms`),
115
- data: { exitCode: code, signal, stderr: trimmedErr, stdout: trimmedOut },
116
- });
246
+ child.on('close', (code, exitSignal) => {
247
+ if (settled)
248
+ return;
249
+ if (terminalCause !== 'running') {
250
+ const waitsForPosixEscalation = terminator !== undefined &&
251
+ terminator.platform !== 'win32' &&
252
+ !terminationEscalated;
253
+ const waitsForWindowsTree = terminator?.platform === 'win32' && !terminator.isTreeKillComplete();
254
+ if (waitsForPosixEscalation || waitsForWindowsTree) {
255
+ // A root shell may close before its descendants are finished.
256
+ // Keep the POSIX escalation or Windows taskkill operation owned
257
+ // until it finishes or reaches the bounded terminal deadline.
258
+ pendingTerminalClose = { exitCode: code, exitSignal };
259
+ return;
260
+ }
261
+ settleTerminal(code, exitSignal);
117
262
  return;
118
263
  }
264
+ const data = resultData(code, exitSignal);
119
265
  if (code === 0) {
120
- resolve({ success: true, data: { output: trimmedOut } });
266
+ settle({ success: true, data: { output: data.stdout } });
121
267
  return;
122
268
  }
123
- resolve({
269
+ settle({
124
270
  success: false,
125
- error: new Error(`Shell command failed (exit ${code}): ${(trimmedErr || trimmedOut).trimEnd()}`),
126
- data: { exitCode: code, signal, stderr: trimmedErr, stdout: trimmedOut },
271
+ error: new Error(`Shell command failed (exit ${code}): ${(data.stderr || data.stdout).trimEnd()}`),
272
+ data,
127
273
  });
128
274
  });
129
275
  });
@@ -1 +1 @@
1
- {"version":3,"file":"shell-task.js","sourceRoot":"","sources":["../../src/task/shell-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAmB,MAAM,gBAAgB,CAAC;AAQ3D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,OAAO,SAAU,SAAQ,QAA0B;IACvD,IAAI,QAAQ;QACV,OAAO,SAAS,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzC,CAAC;IAES,QAAQ;QAChB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACtE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEzD,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,EAAE;YACzC,sEAAsE;YACtE,oEAAoE;YACpE,sBAAsB;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE;gBAC3B,GAAG;gBACH,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;aAClC,CAAC,CAAC;YAEH,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI,UAAU,GAAG,EAAE,CAAC;YACpB,IAAI,UAAU,GAAG,EAAE,CAAC;YACpB,IAAI,QAAQ,GAAG,KAAK,CAAC;YAErB,MAAM,SAAS,GAAG,CAChB,KAAa,EACb,OAA4B,EAC5B,IAA4B,EAC5B,EAAE;gBACF,gEAAgE;gBAChE,gEAAgE;gBAChE,gDAAgD;gBAChD,MAAM,QAAQ,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;gBAC1E,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACtC,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;gBACpC,IAAI,OAAO,KAAK,QAAQ;oBAAE,UAAU,GAAG,SAAS,CAAC;;oBAC5C,UAAU,GAAG,SAAS,CAAC;gBAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;wBAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC,CAAC;YAEF,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;YACnC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;YAEnC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBACzC,SAAS,IAAI,KAAK,CAAC;gBACnB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;oBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBACzC,SAAS,IAAI,KAAK,CAAC;gBACnB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;oBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,QAAQ,GAAG,IAAI,CAAC;gBAChB,6DAA6D;gBAC7D,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxB,CAAC,EAAE,OAAO,CAAC,CAAC;YAEZ,MAAM,UAAU,GAAG,GAAG,EAAE;gBACtB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,UAAU,CAAC,CAAC;oBACnD,SAAS,IAAI,UAAU,CAAC;oBACxB,UAAU,GAAG,EAAE,CAAC;gBAClB,CAAC;gBACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,UAAU,CAAC,CAAC;oBACnD,SAAS,IAAI,UAAU,CAAC;oBACxB,UAAU,GAAG,EAAE,CAAC;gBAClB,CAAC;YACH,CAAC,CAAC;YAEF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,UAAU,EAAE,CAAC;gBACb,OAAO,CAAC;oBACN,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAC1D,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE;iBACnF,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBACjC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,UAAU,EAAE,CAAC;gBACb,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;gBACvC,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;gBACvC,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,CAAC;wBACN,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,IAAI,KAAK,CAAC,iCAAiC,OAAO,IAAI,CAAC;wBAC9D,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE;qBACzE,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;gBACD,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;oBACzD,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC;oBACN,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,IAAI,KAAK,CACd,8BAA8B,IAAI,MAAM,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC,OAAO,EAAE,EAAE,CAC/E;oBACD,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE;iBACzE,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"shell-task.js","sourceRoot":"","sources":["../../src/task/shell-task.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,34 @@
1
+ import { type ChildProcess, type SpawnOptions } from 'node:child_process';
2
+ export declare const POSIX_SIGTERM_GRACE_MS = 250;
3
+ export declare const POSIX_TERMINATION_GRACE_MS = 1000;
4
+ export declare const WINDOWS_TERMINATION_GRACE_MS = 3000;
5
+ type SpawnProcess = (command: string, args: readonly string[], options: SpawnOptions) => ChildProcess;
6
+ export interface ShellTerminationDependencies {
7
+ platform?: NodeJS.Platform;
8
+ spawnProcess?: SpawnProcess;
9
+ killProcessGroup?: (pid: number, signal: NodeJS.Signals) => void;
10
+ }
11
+ export interface ShellTerminationHandle {
12
+ readonly platform: NodeJS.Platform;
13
+ /** Whether the Windows tree helper has finished or failed. */
14
+ isTreeKillComplete(): boolean;
15
+ /** Notify ShellTask when it is safe to combine tree and root completion. */
16
+ onTreeKillComplete(listener: () => void): void;
17
+ /** Escalate a cooperative POSIX stop, or force the Windows root/helper. */
18
+ escalate(): void;
19
+ /** Release handles after the bounded terminal deadline. */
20
+ release(): void;
21
+ /** Stop helper ownership after the shell has closed normally. */
22
+ dispose(): void;
23
+ }
24
+ export declare function terminationGraceMs(platform: NodeJS.Platform): number;
25
+ /**
26
+ * Start termination for one shell invocation.
27
+ *
28
+ * This module is deliberately internal. Passing the platform and process
29
+ * functions as dependencies makes the policy testable on every CI platform
30
+ * without changing ShellTask's public API or relying on global mutable state.
31
+ */
32
+ export declare function beginShellTermination(child: ChildProcess, dependencies?: ShellTerminationDependencies): ShellTerminationHandle;
33
+ export {};
34
+ //# sourceMappingURL=shell-termination.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shell-termination.d.ts","sourceRoot":"","sources":["../../src/task/shell-termination.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEjF,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAC1C,eAAO,MAAM,0BAA0B,OAAQ,CAAC;AAChD,eAAO,MAAM,4BAA4B,OAAQ,CAAC;AAElD,KAAK,YAAY,GAAG,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,YAAY,KAClB,YAAY,CAAC;AAElB,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IACnC,8DAA8D;IAC9D,kBAAkB,IAAI,OAAO,CAAC;IAC9B,4EAA4E;IAC5E,kBAAkB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC/C,2EAA2E;IAC3E,QAAQ,IAAI,IAAI,CAAC;IACjB,2DAA2D;IAC3D,OAAO,IAAI,IAAI,CAAC;IAChB,iEAAiE;IACjE,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,CAEpE;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,YAAY,GAAE,4BAAiC,GAC9C,sBAAsB,CAyJxB"}