@rcrsr/claude-code-runner 0.12.1 → 0.14.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.
- package/README.md +7 -4
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +3 -0
- package/dist/cli/args.js.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/output/colors.d.ts.map +1 -1
- package/dist/output/colors.js +4 -1
- package/dist/output/colors.js.map +1 -1
- package/dist/output/formatter.d.ts.map +1 -1
- package/dist/output/formatter.js +5 -2
- package/dist/output/formatter.js.map +1 -1
- package/dist/process/pty.d.ts +3 -0
- package/dist/process/pty.d.ts.map +1 -1
- package/dist/process/pty.js +30 -4
- package/dist/process/pty.js.map +1 -1
- package/dist/rill/context.d.ts +12 -1
- package/dist/rill/context.d.ts.map +1 -1
- package/dist/rill/context.js +119 -32
- package/dist/rill/context.js.map +1 -1
- package/dist/rill/runner.d.ts +2 -0
- package/dist/rill/runner.d.ts.map +1 -1
- package/dist/rill/runner.js +88 -19
- package/dist/rill/runner.js.map +1 -1
- package/dist/templates/command.d.ts +1 -0
- package/dist/templates/command.d.ts.map +1 -1
- package/dist/templates/command.js +3 -0
- package/dist/templates/command.js.map +1 -1
- package/dist/types/runner.d.ts +5 -0
- package/dist/types/runner.d.ts.map +1 -1
- package/dist/types/runner.js +3 -1
- package/dist/types/runner.js.map +1 -1
- package/dist/utils/constants.d.ts +4 -0
- package/dist/utils/constants.d.ts.map +1 -1
- package/dist/utils/constants.js +4 -0
- package/dist/utils/constants.js.map +1 -1
- package/package.json +8 -8
package/dist/rill/context.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Claude Code Runner - Rill Runtime Context
|
|
3
3
|
* Provides prompt, command, and utility functions for orchestrating Claude workflows
|
|
4
4
|
*/
|
|
5
|
-
import { createRuntimeContext, } from '@rcrsr/rill';
|
|
5
|
+
import { createRuntimeContext, rillTypeToTypeValue, } from '@rcrsr/rill';
|
|
6
6
|
import * as fs from 'fs';
|
|
7
7
|
import { printRunner, stripAnsi } from '../output/colors.js';
|
|
8
8
|
import { loadCommandTemplate as loadCommandTemplateFile, parseGenericFrontmatter, } from '../templates/command.js';
|
|
@@ -23,24 +23,41 @@ export function createRunnerContext(options) {
|
|
|
23
23
|
* Usage: ccr::prompt("analyze this code", "haiku")
|
|
24
24
|
*/
|
|
25
25
|
'ccr::prompt': {
|
|
26
|
-
|
|
26
|
+
annotations: {
|
|
27
|
+
description: 'Execute a prompt with Claude and return output',
|
|
28
|
+
},
|
|
29
|
+
returnType: rillTypeToTypeValue({ type: 'string' }),
|
|
27
30
|
params: [
|
|
28
31
|
{
|
|
29
32
|
name: 'text',
|
|
30
|
-
type: 'string',
|
|
31
|
-
|
|
33
|
+
type: { type: 'string' },
|
|
34
|
+
defaultValue: undefined,
|
|
35
|
+
annotations: { description: 'Prompt text to send to Claude' },
|
|
32
36
|
},
|
|
33
37
|
{
|
|
34
38
|
name: 'model',
|
|
35
|
-
type: 'string',
|
|
39
|
+
type: { type: 'string' },
|
|
36
40
|
defaultValue: '',
|
|
37
|
-
description: 'Model override (sonnet, opus, haiku)',
|
|
41
|
+
annotations: { description: 'Model override (sonnet, opus, haiku)' },
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
name: 'timeout',
|
|
45
|
+
type: { type: 'number' },
|
|
46
|
+
defaultValue: 0,
|
|
47
|
+
annotations: {
|
|
48
|
+
description: 'Inactivity timeout in minutes (0 = use default)',
|
|
49
|
+
},
|
|
38
50
|
},
|
|
39
51
|
],
|
|
40
52
|
fn: async (args) => {
|
|
41
53
|
const text = args[0];
|
|
42
54
|
const model = args[1] || defaultModel;
|
|
43
|
-
const
|
|
55
|
+
const timeoutMin = args[2];
|
|
56
|
+
const result = await executeClause(text, model, {
|
|
57
|
+
method: 'ccr::prompt',
|
|
58
|
+
model: model ?? undefined,
|
|
59
|
+
...(timeoutMin > 0 && { timeoutMs: timeoutMin * 60_000 }),
|
|
60
|
+
});
|
|
44
61
|
return result.output;
|
|
45
62
|
},
|
|
46
63
|
},
|
|
@@ -49,22 +66,42 @@ export function createRunnerContext(options) {
|
|
|
49
66
|
* Usage: ccr::command("create-spec", ["arg1", "arg2"])
|
|
50
67
|
*/
|
|
51
68
|
'ccr::command': {
|
|
52
|
-
description: 'Execute a command template by name',
|
|
69
|
+
annotations: { description: 'Execute a command template by name' },
|
|
70
|
+
returnType: rillTypeToTypeValue({ type: 'string' }),
|
|
53
71
|
params: [
|
|
54
|
-
{
|
|
72
|
+
{
|
|
73
|
+
name: 'name',
|
|
74
|
+
type: { type: 'string' },
|
|
75
|
+
defaultValue: undefined,
|
|
76
|
+
annotations: { description: 'Command template name' },
|
|
77
|
+
},
|
|
55
78
|
{
|
|
56
79
|
name: 'args',
|
|
57
|
-
type: 'list',
|
|
80
|
+
type: { type: 'list' },
|
|
58
81
|
defaultValue: [],
|
|
59
|
-
description: 'Arguments to pass to template',
|
|
82
|
+
annotations: { description: 'Arguments to pass to template' },
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
name: 'timeout',
|
|
86
|
+
type: { type: 'number' },
|
|
87
|
+
defaultValue: 0,
|
|
88
|
+
annotations: {
|
|
89
|
+
description: 'Inactivity timeout in minutes (0 = use default)',
|
|
90
|
+
},
|
|
60
91
|
},
|
|
61
92
|
],
|
|
62
93
|
fn: async (args, ctx) => {
|
|
63
94
|
const name = args[0];
|
|
64
95
|
const cmdArgs = args[1].map((a) => formatRillValue(a ?? null));
|
|
96
|
+
const timeoutMin = args[2];
|
|
65
97
|
const template = loadCommandTemplateFile(name, cmdArgs, commandsDir.replace('/.claude/commands', ''));
|
|
66
98
|
const model = template.frontmatter.model ?? defaultModel;
|
|
67
|
-
const result = await executeClause(template.prompt, model
|
|
99
|
+
const result = await executeClause(template.prompt, model, {
|
|
100
|
+
method: 'ccr::command',
|
|
101
|
+
name,
|
|
102
|
+
model: model ?? undefined,
|
|
103
|
+
...(timeoutMin > 0 && { timeoutMs: timeoutMin * 60_000 }),
|
|
104
|
+
});
|
|
68
105
|
ctx.pipeValue = result.output;
|
|
69
106
|
return result.output;
|
|
70
107
|
},
|
|
@@ -74,25 +111,43 @@ export function createRunnerContext(options) {
|
|
|
74
111
|
* Usage: ccr::skill("commit", ["--amend"])
|
|
75
112
|
*/
|
|
76
113
|
'ccr::skill': {
|
|
77
|
-
|
|
114
|
+
annotations: {
|
|
115
|
+
description: 'Execute a Claude Code skill (slash command)',
|
|
116
|
+
},
|
|
117
|
+
returnType: rillTypeToTypeValue({ type: 'string' }),
|
|
78
118
|
params: [
|
|
79
119
|
{
|
|
80
120
|
name: 'name',
|
|
81
|
-
type: 'string',
|
|
82
|
-
|
|
121
|
+
type: { type: 'string' },
|
|
122
|
+
defaultValue: undefined,
|
|
123
|
+
annotations: { description: 'Skill name (without leading /)' },
|
|
83
124
|
},
|
|
84
125
|
{
|
|
85
126
|
name: 'args',
|
|
86
|
-
type: 'list',
|
|
127
|
+
type: { type: 'list' },
|
|
87
128
|
defaultValue: [],
|
|
88
|
-
description: 'Arguments to pass to skill',
|
|
129
|
+
annotations: { description: 'Arguments to pass to skill' },
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
name: 'timeout',
|
|
133
|
+
type: { type: 'number' },
|
|
134
|
+
defaultValue: 0,
|
|
135
|
+
annotations: {
|
|
136
|
+
description: 'Inactivity timeout in minutes (0 = use default)',
|
|
137
|
+
},
|
|
89
138
|
},
|
|
90
139
|
],
|
|
91
140
|
fn: async (args, ctx) => {
|
|
92
141
|
const name = args[0];
|
|
93
142
|
const skillArgs = args[1].map((a) => formatRillValue(a ?? null));
|
|
143
|
+
const timeoutMin = args[2];
|
|
94
144
|
const promptText = skillArgs.length > 0 ? `/${name} ${skillArgs.join(' ')}` : `/${name}`;
|
|
95
|
-
const result = await executeClause(promptText, defaultModel
|
|
145
|
+
const result = await executeClause(promptText, defaultModel, {
|
|
146
|
+
method: 'ccr::skill',
|
|
147
|
+
name,
|
|
148
|
+
model: defaultModel ?? undefined,
|
|
149
|
+
...(timeoutMin > 0 && { timeoutMs: timeoutMin * 60_000 }),
|
|
150
|
+
});
|
|
96
151
|
ctx.pipeValue = result.output;
|
|
97
152
|
return result.output;
|
|
98
153
|
},
|
|
@@ -102,9 +157,15 @@ export function createRunnerContext(options) {
|
|
|
102
157
|
* Usage: ccr::file_exists("path/to/file") -> boolean
|
|
103
158
|
*/
|
|
104
159
|
'ccr::file_exists': {
|
|
105
|
-
description: 'Check if a file exists at the given path',
|
|
160
|
+
annotations: { description: 'Check if a file exists at the given path' },
|
|
161
|
+
returnType: rillTypeToTypeValue({ type: 'bool' }),
|
|
106
162
|
params: [
|
|
107
|
-
{
|
|
163
|
+
{
|
|
164
|
+
name: 'path',
|
|
165
|
+
type: { type: 'string' },
|
|
166
|
+
defaultValue: undefined,
|
|
167
|
+
annotations: { description: 'File path to check' },
|
|
168
|
+
},
|
|
108
169
|
],
|
|
109
170
|
fn: (args) => fs.existsSync(args[0]),
|
|
110
171
|
},
|
|
@@ -113,8 +174,16 @@ export function createRunnerContext(options) {
|
|
|
113
174
|
* Usage: ccr::state("Processing file 3/10")
|
|
114
175
|
*/
|
|
115
176
|
'ccr::state': {
|
|
116
|
-
description: 'Set script status line text',
|
|
117
|
-
|
|
177
|
+
annotations: { description: 'Set script status line text' },
|
|
178
|
+
returnType: rillTypeToTypeValue({ type: 'dict' }),
|
|
179
|
+
params: [
|
|
180
|
+
{
|
|
181
|
+
name: 'text',
|
|
182
|
+
type: { type: 'string' },
|
|
183
|
+
defaultValue: undefined,
|
|
184
|
+
annotations: {},
|
|
185
|
+
},
|
|
186
|
+
],
|
|
118
187
|
fn: (args) => {
|
|
119
188
|
let text = args[0];
|
|
120
189
|
// Strip ANSI escape sequences
|
|
@@ -137,12 +206,14 @@ export function createRunnerContext(options) {
|
|
|
137
206
|
* Returns empty dict if no result found (Rill doesn't support null)
|
|
138
207
|
*/
|
|
139
208
|
'ccr::get_result': {
|
|
140
|
-
description: 'Extract ccr:result XML tag from text',
|
|
209
|
+
annotations: { description: 'Extract ccr:result XML tag from text' },
|
|
210
|
+
returnType: rillTypeToTypeValue({ type: 'dict' }),
|
|
141
211
|
params: [
|
|
142
212
|
{
|
|
143
213
|
name: 'text',
|
|
144
|
-
type: 'string',
|
|
145
|
-
|
|
214
|
+
type: { type: 'string' },
|
|
215
|
+
defaultValue: undefined,
|
|
216
|
+
annotations: { description: 'Text containing ccr:result tag' },
|
|
146
217
|
},
|
|
147
218
|
],
|
|
148
219
|
fn: (args) => {
|
|
@@ -185,12 +256,14 @@ export function createRunnerContext(options) {
|
|
|
185
256
|
* Usage: ccr::has_result(text) -> boolean
|
|
186
257
|
*/
|
|
187
258
|
'ccr::has_result': {
|
|
188
|
-
description: 'Check if text contains a ccr:result tag',
|
|
259
|
+
annotations: { description: 'Check if text contains a ccr:result tag' },
|
|
260
|
+
returnType: rillTypeToTypeValue({ type: 'bool' }),
|
|
189
261
|
params: [
|
|
190
262
|
{
|
|
191
263
|
name: 'text',
|
|
192
|
-
type: 'string',
|
|
193
|
-
|
|
264
|
+
type: { type: 'string' },
|
|
265
|
+
defaultValue: undefined,
|
|
266
|
+
annotations: { description: 'Text to search for ccr:result tag' },
|
|
194
267
|
},
|
|
195
268
|
],
|
|
196
269
|
fn: (args) => {
|
|
@@ -204,9 +277,15 @@ export function createRunnerContext(options) {
|
|
|
204
277
|
* Usage: ccr::has_frontmatter(path) -> boolean
|
|
205
278
|
*/
|
|
206
279
|
'ccr::has_frontmatter': {
|
|
207
|
-
description: 'Check if a file has YAML frontmatter',
|
|
280
|
+
annotations: { description: 'Check if a file has YAML frontmatter' },
|
|
281
|
+
returnType: rillTypeToTypeValue({ type: 'bool' }),
|
|
208
282
|
params: [
|
|
209
|
-
{
|
|
283
|
+
{
|
|
284
|
+
name: 'path',
|
|
285
|
+
type: { type: 'string' },
|
|
286
|
+
defaultValue: undefined,
|
|
287
|
+
annotations: { description: 'File path to check' },
|
|
288
|
+
},
|
|
210
289
|
],
|
|
211
290
|
fn: (args) => {
|
|
212
291
|
const filePath = args[0];
|
|
@@ -223,9 +302,17 @@ export function createRunnerContext(options) {
|
|
|
223
302
|
* Usage: ccr::get_frontmatter("path/to/file.md")
|
|
224
303
|
*/
|
|
225
304
|
'ccr::get_frontmatter': {
|
|
226
|
-
|
|
305
|
+
annotations: {
|
|
306
|
+
description: 'Parse and return YAML frontmatter from a file',
|
|
307
|
+
},
|
|
308
|
+
returnType: rillTypeToTypeValue({ type: 'dict' }),
|
|
227
309
|
params: [
|
|
228
|
-
{
|
|
310
|
+
{
|
|
311
|
+
name: 'path',
|
|
312
|
+
type: { type: 'string' },
|
|
313
|
+
defaultValue: undefined,
|
|
314
|
+
annotations: { description: 'File path to parse' },
|
|
315
|
+
},
|
|
229
316
|
],
|
|
230
317
|
fn: (args) => {
|
|
231
318
|
const filePath = args[0];
|
package/dist/rill/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/rill/context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,oBAAoB,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/rill/context.ts"],"names":[],"mappings":"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"}
|
package/dist/rill/runner.d.ts
CHANGED
|
@@ -39,6 +39,8 @@ export interface RillArgDef {
|
|
|
39
39
|
export interface RillScriptMeta {
|
|
40
40
|
/** Model from frontmatter */
|
|
41
41
|
model?: string | undefined;
|
|
42
|
+
/** Effort from frontmatter */
|
|
43
|
+
effort?: string | undefined;
|
|
42
44
|
/** Description from frontmatter */
|
|
43
45
|
description?: string | undefined;
|
|
44
46
|
/** Named argument definitions */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/rill/runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAsBH,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/rill/runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAsBH,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAavD,MAAM,WAAW,iBAAiB;IAChC,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,uBAAuB;IACvB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,2BAA2B;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,wBAAwB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,aAAa;IAC5B,gDAAgD;IAChD,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,kDAAkD;AAClD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;CACtD;AAED,MAAM,WAAW,cAAc;IAC7B,6BAA6B;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,8BAA8B;IAC9B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,iCAAiC;IACjC,IAAI,CAAC,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;CACjC;AAwDD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,cAAc,CAAC;CACtB,CA0BA;AAMD;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,aAAa,CAAC,CAwUxB;AAMD;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEtD"}
|
package/dist/rill/runner.js
CHANGED
|
@@ -10,8 +10,9 @@ import { bindFormatterState, clearStatusLine, colors, printRunner, renderStatusL
|
|
|
10
10
|
import { finalizeStepStats } from '../output/formatter.js';
|
|
11
11
|
import { spawnClaude } from '../process/pty.js';
|
|
12
12
|
import { parseFrontmatter } from '../templates/command.js';
|
|
13
|
+
import { STATUS_TIMER_INTERVAL_MS } from '../utils/constants.js';
|
|
13
14
|
import { formatRillValue } from '../utils/formatting.js';
|
|
14
|
-
import { createRunnerContext } from './context.js';
|
|
15
|
+
import { createRunnerContext, } from './context.js';
|
|
15
16
|
// ============================================================
|
|
16
17
|
// SCRIPT LOADING
|
|
17
18
|
// ============================================================
|
|
@@ -80,6 +81,7 @@ export function loadRillScript(scriptFile) {
|
|
|
80
81
|
source: content, // Pass full content - Rill handles frontmatter
|
|
81
82
|
meta: {
|
|
82
83
|
model: frontmatter.model,
|
|
84
|
+
effort: frontmatter.effort,
|
|
83
85
|
description: frontmatter.description,
|
|
84
86
|
args: argsDefs,
|
|
85
87
|
},
|
|
@@ -95,8 +97,9 @@ export async function runRillScript(options) {
|
|
|
95
97
|
const { scriptFile, args, config, logger, formatterState, cwd, runId } = options;
|
|
96
98
|
// Load and parse script
|
|
97
99
|
const { source, meta } = loadRillScript(scriptFile);
|
|
98
|
-
// Use frontmatter model if no CLI override
|
|
100
|
+
// Use frontmatter model/effort if no CLI override
|
|
99
101
|
const effectiveModel = config.model ?? meta.model ?? null;
|
|
102
|
+
const effectiveEffort = config.effort ?? meta.effort ?? null;
|
|
100
103
|
// Map CLI args to named variables based on frontmatter definition
|
|
101
104
|
const namedArgs = {};
|
|
102
105
|
if (meta.args) {
|
|
@@ -131,7 +134,7 @@ export async function runRillScript(options) {
|
|
|
131
134
|
stepNum: 0,
|
|
132
135
|
};
|
|
133
136
|
// Create Claude executor that uses the existing infrastructure
|
|
134
|
-
const executeClause = async (prompt, model) => {
|
|
137
|
+
const executeClause = async (prompt, model, invocation) => {
|
|
135
138
|
state.stepNum++;
|
|
136
139
|
formatterState.currentStep = state.stepNum;
|
|
137
140
|
formatterState.stepStartTime = Date.now();
|
|
@@ -154,12 +157,39 @@ export async function runRillScript(options) {
|
|
|
154
157
|
formatterState,
|
|
155
158
|
parallelThresholdMs: config.parallelThresholdMs,
|
|
156
159
|
model: model ?? effectiveModel,
|
|
160
|
+
effort: effectiveEffort,
|
|
161
|
+
inactivityTimeoutMs: invocation?.timeoutMs ?? config.inactivityTimeoutMs,
|
|
157
162
|
});
|
|
158
163
|
// Finalize step stats (merge into runStats for final summary)
|
|
159
164
|
const stepDurationMs = formatterState.stepStartTime
|
|
160
165
|
? Date.now() - formatterState.stepStartTime
|
|
161
166
|
: 0;
|
|
162
167
|
finalizeStepStats(formatterState, stepDurationMs);
|
|
168
|
+
if (result.timedOut) {
|
|
169
|
+
// Build timeout result tag with invocation details (exclude internal timeoutMs)
|
|
170
|
+
const { timeoutMs: _, ...reportFields } = invocation ?? {
|
|
171
|
+
method: 'ccr::prompt',
|
|
172
|
+
};
|
|
173
|
+
const escapeXml = (s) => s
|
|
174
|
+
.replace(/&/g, '&')
|
|
175
|
+
.replace(/</g, '<')
|
|
176
|
+
.replace(/>/g, '>')
|
|
177
|
+
.replace(/"/g, '"')
|
|
178
|
+
.replace(/'/g, ''');
|
|
179
|
+
const attrsStr = Object.entries(reportFields)
|
|
180
|
+
.filter(([, v]) => v !== undefined)
|
|
181
|
+
.map(([k, v]) => `${k}="${escapeXml(String(v))}"`)
|
|
182
|
+
.join(' ');
|
|
183
|
+
const timeoutTag = `<ccr:result type="timeout"${attrsStr ? ` ${attrsStr}` : ''}/>`;
|
|
184
|
+
const effectiveTimeoutMs = invocation?.timeoutMs ?? config.inactivityTimeoutMs;
|
|
185
|
+
logger.logEvent({
|
|
186
|
+
event: 'step_timeout',
|
|
187
|
+
step: state.stepNum,
|
|
188
|
+
...reportFields,
|
|
189
|
+
});
|
|
190
|
+
printRunner(`${colors.red}Step ${state.stepNum} timed out (no output for ${Math.round(effectiveTimeoutMs / 60_000)}m)${colors.reset}`);
|
|
191
|
+
return { output: timeoutTag, exitCode: 1 };
|
|
192
|
+
}
|
|
163
193
|
// Log completion
|
|
164
194
|
logger.logEvent({
|
|
165
195
|
event: 'step_complete',
|
|
@@ -179,6 +209,14 @@ export async function runRillScript(options) {
|
|
|
179
209
|
logger.log(`[LOG] ${text}`);
|
|
180
210
|
},
|
|
181
211
|
};
|
|
212
|
+
// Interval handle for periodic status line re-renders
|
|
213
|
+
let statusInterval = null;
|
|
214
|
+
const clearStatusInterval = () => {
|
|
215
|
+
if (statusInterval !== null) {
|
|
216
|
+
clearInterval(statusInterval);
|
|
217
|
+
statusInterval = null;
|
|
218
|
+
}
|
|
219
|
+
};
|
|
182
220
|
// State change callback for ccr::state host function
|
|
183
221
|
const onStateChange = (text) => {
|
|
184
222
|
// Update formatter state
|
|
@@ -190,8 +228,18 @@ export async function runRillScript(options) {
|
|
|
190
228
|
// Render or clear status line
|
|
191
229
|
if (text !== null) {
|
|
192
230
|
renderStatusLine(statusDisplayText(formatterState) ?? text, process.stderr);
|
|
231
|
+
// Start interval to keep the elapsed timer ticking
|
|
232
|
+
statusInterval ??= setInterval(() => {
|
|
233
|
+
if (formatterState.currentStatusText !== null) {
|
|
234
|
+
renderStatusLine(statusDisplayText(formatterState), process.stderr);
|
|
235
|
+
}
|
|
236
|
+
}, STATUS_TIMER_INTERVAL_MS);
|
|
193
237
|
}
|
|
194
238
|
else {
|
|
239
|
+
if (statusInterval !== null) {
|
|
240
|
+
clearInterval(statusInterval);
|
|
241
|
+
statusInterval = null;
|
|
242
|
+
}
|
|
195
243
|
clearStatusLine(process.stderr);
|
|
196
244
|
}
|
|
197
245
|
};
|
|
@@ -205,19 +253,34 @@ export async function runRillScript(options) {
|
|
|
205
253
|
if (config.verbosity !== 'quiet') {
|
|
206
254
|
process.stderr.on('resize', handleResize);
|
|
207
255
|
}
|
|
208
|
-
// Create Rill runtime context
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
256
|
+
// Create Rill runtime context — wrap in try/catch so setup errors include the script filename
|
|
257
|
+
let ctx;
|
|
258
|
+
try {
|
|
259
|
+
ctx = createRunnerContext({
|
|
260
|
+
executeClause,
|
|
261
|
+
namedArgs,
|
|
262
|
+
rawArgs: args,
|
|
263
|
+
env: process.env,
|
|
264
|
+
commandsDir: '.claude/commands',
|
|
265
|
+
defaultModel: effectiveModel ?? undefined,
|
|
266
|
+
callbacks,
|
|
267
|
+
onStateChange,
|
|
268
|
+
});
|
|
269
|
+
// Bind formatter state so terminalLog re-renders the status line
|
|
270
|
+
bindFormatterState(formatterState);
|
|
271
|
+
}
|
|
272
|
+
catch (setupError) {
|
|
273
|
+
// Clean up before re-throwing
|
|
274
|
+
unbindFormatterState();
|
|
275
|
+
if (config.verbosity !== 'quiet') {
|
|
276
|
+
process.stderr.off('resize', handleResize);
|
|
277
|
+
clearStatusInterval();
|
|
278
|
+
}
|
|
279
|
+
const msg = setupError instanceof Error ? setupError.message : String(setupError);
|
|
280
|
+
throw new Error(`Script setup failed for ${scriptFile}: ${msg}`, {
|
|
281
|
+
cause: setupError,
|
|
282
|
+
});
|
|
283
|
+
}
|
|
221
284
|
// Parse and execute the script
|
|
222
285
|
try {
|
|
223
286
|
logger.logEvent({ event: 'rill_script_start', runId, file: scriptFile });
|
|
@@ -225,8 +288,8 @@ export async function runRillScript(options) {
|
|
|
225
288
|
const ast = parse(source);
|
|
226
289
|
const result = await execute(ast, ctx);
|
|
227
290
|
// Update last output from final result
|
|
228
|
-
if (result.
|
|
229
|
-
state.lastOutput = formatRillValue(result.
|
|
291
|
+
if (result.result !== null) {
|
|
292
|
+
state.lastOutput = formatRillValue(result.result);
|
|
230
293
|
}
|
|
231
294
|
logger.logEvent({
|
|
232
295
|
event: 'rill_script_complete',
|
|
@@ -237,6 +300,7 @@ export async function runRillScript(options) {
|
|
|
237
300
|
unbindFormatterState();
|
|
238
301
|
if (config.verbosity !== 'quiet') {
|
|
239
302
|
process.stderr.off('resize', handleResize);
|
|
303
|
+
clearStatusInterval();
|
|
240
304
|
clearStatusLine(process.stderr);
|
|
241
305
|
}
|
|
242
306
|
return {
|
|
@@ -253,6 +317,7 @@ export async function runRillScript(options) {
|
|
|
253
317
|
// Handle specific Rill error types
|
|
254
318
|
if (error instanceof AbortError) {
|
|
255
319
|
if (config.verbosity !== 'quiet') {
|
|
320
|
+
clearStatusInterval();
|
|
256
321
|
clearStatusLine(process.stderr);
|
|
257
322
|
}
|
|
258
323
|
printRunner(`${colors.yellow}Script cancelled${colors.reset}`);
|
|
@@ -264,6 +329,7 @@ export async function runRillScript(options) {
|
|
|
264
329
|
}
|
|
265
330
|
if (error instanceof TimeoutError) {
|
|
266
331
|
if (config.verbosity !== 'quiet') {
|
|
332
|
+
clearStatusInterval();
|
|
267
333
|
clearStatusLine(process.stderr);
|
|
268
334
|
}
|
|
269
335
|
const msg = `Timeout: ${error.message}`;
|
|
@@ -273,6 +339,7 @@ export async function runRillScript(options) {
|
|
|
273
339
|
}
|
|
274
340
|
if (error instanceof ParseError) {
|
|
275
341
|
if (config.verbosity !== 'quiet') {
|
|
342
|
+
clearStatusInterval();
|
|
276
343
|
clearStatusLine(process.stderr);
|
|
277
344
|
}
|
|
278
345
|
const location = error.location
|
|
@@ -285,6 +352,7 @@ export async function runRillScript(options) {
|
|
|
285
352
|
}
|
|
286
353
|
if (error instanceof RuntimeError) {
|
|
287
354
|
if (config.verbosity !== 'quiet') {
|
|
355
|
+
clearStatusInterval();
|
|
288
356
|
clearStatusLine(process.stderr);
|
|
289
357
|
}
|
|
290
358
|
const location = error.location
|
|
@@ -301,10 +369,11 @@ export async function runRillScript(options) {
|
|
|
301
369
|
}
|
|
302
370
|
// Generic error fallback
|
|
303
371
|
if (config.verbosity !== 'quiet') {
|
|
372
|
+
clearStatusInterval();
|
|
304
373
|
clearStatusLine(process.stderr);
|
|
305
374
|
}
|
|
306
375
|
const msg = error instanceof Error ? error.message : String(error);
|
|
307
|
-
printRunner(`${colors.red}Script error
|
|
376
|
+
printRunner(`${colors.red}Script error${colors.reset} [${scriptFile}]: ${msg}`);
|
|
308
377
|
logger.logEvent({ event: 'rill_script_error', runId, error: msg });
|
|
309
378
|
return { success: false, lastOutput: state.lastOutput };
|
|
310
379
|
}
|
package/dist/rill/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/rill/runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EACL,UAAU,EACV,OAAO,EACP,KAAK,EACL,UAAU,EACV,YAAY,EACZ,YAAY,GACb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,MAAM,EACN,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAuB,MAAM,wBAAwB,CAAC;AAEhF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAwB,MAAM,cAAc,CAAC;AA+CzE,+DAA+D;AAC/D,iBAAiB;AACjB,+DAA+D;AAE/D;;;GAGG;AACH,SAAS,mBAAmB,CAAC,OAAe;IAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,IAAI,GAAiB,EAAE,CAAC;IAC9B,gEAAgE;IAChE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI;YAAE,SAAS;QAEpB,8CAA8C;QAC9C,MAAM,KAAK,GAAG,oDAAoD,CAAC,IAAI,CACrE,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;QACzC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;YAAE,SAAS;QAE7B,MAAM,GAAG,GAAe;YACtB,IAAI;YACJ,IAAI,EAAE,IAAoC;YAC1C,QAAQ,EAAE,UAAU,KAAK,SAAS;SACnC,CAAC;QAEF,sBAAsB;QACtB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtB,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC3B,GAAG,CAAC,YAAY,GAAG,OAAO,KAAK,MAAM,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,oCAAoC;gBACpC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,UAAkB;IAI/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAErD,yDAAyD;IACzD,iEAAiE;IACjE,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAElD,mCAAmC;IACnC,IAAI,QAAkC,CAAC;IACvC,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;QACrB,QAAQ,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,OAAO;QACL,MAAM,EAAE,OAAO,EAAE,+CAA+C;QAChE,IAAI,EAAE;YACJ,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC;AAED,+DAA+D;AAC/D,SAAS;AACT,+DAA+D;AAE/D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA0B;IAE1B,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,GACpE,OAAO,CAAC;IAEV,wBAAwB;IACxB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAEpD,2CAA2C;IAC3C,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC;IAE1D,kEAAkE;IAClE,MAAM,SAAS,GAA8C,EAAE,CAAC;IAChE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,CAAC,MAAM;gBAAE,SAAS;YAEtB,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,yCAAyC;gBACzC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7B,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5C,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAClC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,KAAK,MAAM,CAAC;gBAC/C,CAAC;qBAAM,CAAC;oBACN,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;gBACpC,CAAC;YACH,CAAC;iBAAM,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC7C,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;YAC/C,CAAC;iBAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,MAAM,KAAK,GAAG;QACZ,UAAU,EAAE,EAAE;QACd,OAAO,EAAE,CAAC;KACX,CAAC;IAEF,+DAA+D;IAC/D,MAAM,aAAa,GAAG,KAAK,EACzB,MAAc,EACd,KAAc,EACY,EAAE;QAC5B,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,cAAc,CAAC,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;QAC3C,cAAc,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE1C,iBAAiB;QACjB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACvD,MAAM,CAAC,QAAQ,CAAC;YACd,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO;YACnB,MAAM,EAAE,OAAO;SAChB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,WAAW,CAAC,gBAAgB,KAAK,CAAC,OAAO,MAAM,OAAO,GAAG,CAAC,CAAC;QAC7D,CAAC;QAED,0CAA0C;QAC1C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,MAAM;YACN,GAAG;YACH,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,MAAM;YACN,cAAc;YACd,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,KAAK,EAAE,KAAK,IAAI,cAAc;SAC/B,CAAC,CAAC;QAEH,8DAA8D;QAC9D,MAAM,cAAc,GAAG,cAAc,CAAC,aAAa;YACjD,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC,aAAa;YAC3C,CAAC,CAAC,CAAC,CAAC;QACN,iBAAiB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAElD,iBAAiB;QACjB,MAAM,CAAC,QAAQ,CAAC;YACd,KAAK,EAAE,eAAe;YACtB,IAAI,EAAE,KAAK,CAAC,OAAO;YACnB,IAAI,EAAE,MAAM,CAAC,QAAQ;SACtB,CAAC,CAAC;QAEH,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,UAAU;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC;IACJ,CAAC,CAAC;IAEF,mBAAmB;IACnB,MAAM,SAAS,GAA8B;QAC3C,KAAK,EAAE,CAAC,KAAgB,EAAE,EAAE;YAC1B,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YACpC,WAAW,CAAC,IAAI,CAAC,CAAC;YAClB,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9B,CAAC;KACF,CAAC;IAEF,qDAAqD;IACrD,MAAM,aAAa,GAAG,CAAC,IAAmB,EAAQ,EAAE;QAClD,yBAAyB;QACzB,cAAc,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAExC,+BAA+B;QAC/B,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,OAAO;QACT,CAAC;QAED,8BAA8B;QAC9B,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,gBAAgB,CACd,iBAAiB,CAAC,cAAc,CAAC,IAAI,IAAI,EACzC,OAAO,CAAC,MAAM,CACf,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;IACH,CAAC,CAAC;IAEF,wEAAwE;IACxE,MAAM,YAAY,GAAG,GAAS,EAAE;QAC9B,IAAI,cAAc,CAAC,iBAAiB,KAAK,IAAI,EAAE,CAAC;YAC9C,gBAAgB,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC;IAEF,8CAA8C;IAC9C,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,8BAA8B;IAC9B,MAAM,GAAG,GAAG,mBAAmB,CAAC;QAC9B,aAAa;QACb,SAAS;QACT,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,OAAO,CAAC,GAA6B;QAC1C,WAAW,EAAE,kBAAkB;QAC/B,YAAY,EAAE,cAAc,IAAI,SAAS;QACzC,SAAS;QACT,aAAa;KACd,CAAC,CAAC;IAEH,iEAAiE;IACjE,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAEnC,+BAA+B;IAC/B,IAAI,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAEzE,gEAAgE;QAChE,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAEvC,uCAAuC;QACvC,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAC1B,KAAK,CAAC,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,CAAC,QAAQ,CAAC;YACd,KAAK,EAAE,sBAAsB;YAC7B,KAAK;YACL,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,sDAAsD;QACtD,oBAAoB,EAAE,CAAC;QACvB,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAC3C,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,KAAK,CAAC,UAAU;SAC7B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gEAAgE;QAChE,oBAAoB,EAAE,CAAC;QACvB,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC7C,CAAC;QAED,mCAAmC;QACnC,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;YAChC,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;gBACjC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;YACD,WAAW,CAAC,GAAG,MAAM,CAAC,MAAM,mBAAmB,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/D,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3D,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC;QACJ,CAAC;QAED,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAClC,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;gBACjC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;YACD,MAAM,GAAG,GAAG,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC;YACxC,WAAW,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAClD,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YACrE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;QAC1D,CAAC;QAED,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;YAChC,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;gBACjC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ;gBAC7B,CAAC,CAAC,OAAO,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACrE,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,GAAG,GAAG,cAAc,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC1D,WAAW,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAClD,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YACzE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;QAC1D,CAAC;QAED,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAClC,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;gBACjC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ;gBAC7B,CAAC,CAAC,OAAO,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACrE,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,GAAG,GAAG,gBAAgB,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5D,WAAW,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAClD,MAAM,CAAC,QAAQ,CAAC;gBACd,KAAK,EAAE,2BAA2B;gBAClC,KAAK;gBACL,KAAK,EAAE,GAAG;aACX,CAAC,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;QAC1D,CAAC;QAED,yBAAyB;QACzB,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnE,WAAW,CAAC,GAAG,MAAM,CAAC,GAAG,gBAAgB,MAAM,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACnE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;IAC1D,CAAC;AACH,CAAC;AAED,+DAA+D;AAC/D,YAAY;AACZ,+DAA+D;AAE/D;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/rill/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/templates/command.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAUD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,mBAAmB,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC;CAClC;AAGD,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAErD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG;IACxD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;CACd,CA0BA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG;IACjD,WAAW,EAAE,mBAAmB,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd,
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/templates/command.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAUD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,mBAAmB,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC;CAClC;AAGD,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAErD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG;IACxD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;CACd,CA0BA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG;IACjD,WAAW,EAAE,mBAAmB,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd,CA0CA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD;AA0DD;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,GAAG,GAAE,MAAsB,GAC1B,eAAe,CAQjB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EAAE,EACnB,GAAG,GAAE,MAAsB,GAC1B,eAAe,CAGjB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAAE,GACnB,cAAc,CAchB"}
|