pi-agent-flow 2.3.0 → 2.3.1
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/dist/batch/constants.d.ts +2 -2
- package/dist/batch/constants.d.ts.map +1 -1
- package/dist/batch/execute.d.ts +2 -2
- package/dist/batch/execute.d.ts.map +1 -1
- package/dist/batch/execute.js.map +1 -1
- package/dist/cli/ask-user.d.ts +40 -0
- package/dist/cli/ask-user.d.ts.map +1 -0
- package/dist/cli/ask-user.js +117 -0
- package/dist/cli/ask-user.js.map +1 -0
- package/dist/cli/batch-read.d.ts +1 -4
- package/dist/cli/batch-read.d.ts.map +1 -1
- package/dist/cli/batch-read.js +28 -219
- package/dist/cli/batch-read.js.map +1 -1
- package/dist/cli/batch.d.ts.map +1 -1
- package/dist/cli/batch.js +54 -178
- package/dist/cli/batch.js.map +1 -1
- package/dist/cli/exec/bash.d.ts +2 -6
- package/dist/cli/exec/bash.d.ts.map +1 -1
- package/dist/cli/exec/bash.js +2 -2
- package/dist/cli/exec/bash.js.map +1 -1
- package/dist/cli/exec/delete.d.ts +2 -6
- package/dist/cli/exec/delete.d.ts.map +1 -1
- package/dist/cli/exec/delete.js +2 -5
- package/dist/cli/exec/delete.js.map +1 -1
- package/dist/cli/exec/edit.d.ts +2 -6
- package/dist/cli/exec/edit.d.ts.map +1 -1
- package/dist/cli/exec/edit.js +2 -5
- package/dist/cli/exec/edit.js.map +1 -1
- package/dist/cli/exec/patch.d.ts +2 -6
- package/dist/cli/exec/patch.d.ts.map +1 -1
- package/dist/cli/exec/patch.js +2 -5
- package/dist/cli/exec/patch.js.map +1 -1
- package/dist/cli/exec/poll.d.ts +2 -7
- package/dist/cli/exec/poll.d.ts.map +1 -1
- package/dist/cli/exec/poll.js +2 -2
- package/dist/cli/exec/poll.js.map +1 -1
- package/dist/cli/exec/read.d.ts +6 -1
- package/dist/cli/exec/read.d.ts.map +1 -1
- package/dist/cli/exec/read.js +3 -3
- package/dist/cli/exec/read.js.map +1 -1
- package/dist/cli/exec/rg.d.ts +1 -1
- package/dist/cli/exec/rg.d.ts.map +1 -1
- package/dist/cli/exec/rg.js +7 -7
- package/dist/cli/exec/rg.js.map +1 -1
- package/dist/cli/exec/util.d.ts +9 -0
- package/dist/cli/exec/util.d.ts.map +1 -0
- package/dist/cli/exec/util.js +8 -0
- package/dist/cli/exec/util.js.map +1 -0
- package/dist/cli/exec/web.d.ts +2 -7
- package/dist/cli/exec/web.d.ts.map +1 -1
- package/dist/cli/exec/web.js +3 -2
- package/dist/cli/exec/web.js.map +1 -1
- package/dist/cli/exec/write.d.ts +2 -6
- package/dist/cli/exec/write.d.ts.map +1 -1
- package/dist/cli/exec/write.js +2 -5
- package/dist/cli/exec/write.js.map +1 -1
- package/dist/cli/flags/bash.d.ts.map +1 -1
- package/dist/cli/flags/bash.js +2 -1
- package/dist/cli/flags/bash.js.map +1 -1
- package/dist/cli/flags/delete.d.ts.map +1 -1
- package/dist/cli/flags/delete.js +3 -1
- package/dist/cli/flags/delete.js.map +1 -1
- package/dist/cli/flags/edit.d.ts.map +1 -1
- package/dist/cli/flags/edit.js +1 -0
- package/dist/cli/flags/edit.js.map +1 -1
- package/dist/cli/flags/patch.d.ts.map +1 -1
- package/dist/cli/flags/patch.js +1 -0
- package/dist/cli/flags/patch.js.map +1 -1
- package/dist/cli/flags/poll.d.ts.map +1 -1
- package/dist/cli/flags/poll.js +1 -0
- package/dist/cli/flags/poll.js.map +1 -1
- package/dist/cli/flags/read.d.ts.map +1 -1
- package/dist/cli/flags/read.js +1 -0
- package/dist/cli/flags/read.js.map +1 -1
- package/dist/cli/flags/rg.d.ts.map +1 -1
- package/dist/cli/flags/rg.js +1 -0
- package/dist/cli/flags/rg.js.map +1 -1
- package/dist/cli/flags/web.d.ts.map +1 -1
- package/dist/cli/flags/web.js +1 -0
- package/dist/cli/flags/web.js.map +1 -1
- package/dist/cli/flags/write.d.ts.map +1 -1
- package/dist/cli/flags/write.js +1 -0
- package/dist/cli/flags/write.js.map +1 -1
- package/dist/cli/flow.d.ts +2 -2
- package/dist/cli/flow.d.ts.map +1 -1
- package/dist/cli/flow.js +58 -218
- package/dist/cli/flow.js.map +1 -1
- package/dist/cli/help.d.ts +2 -0
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +11 -0
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/parse.js +2 -2
- package/dist/cli/parse.js.map +1 -1
- package/dist/cli/register.d.ts +8 -12
- package/dist/cli/register.d.ts.map +1 -1
- package/dist/cli/register.js +27 -50
- package/dist/cli/register.js.map +1 -1
- package/dist/cli/runner.d.ts +30 -0
- package/dist/cli/runner.d.ts.map +1 -0
- package/dist/cli/runner.js +102 -0
- package/dist/cli/runner.js.map +1 -0
- package/dist/cli/tokenize.js +1 -1
- package/dist/cli/tokenize.js.map +1 -1
- package/dist/flow/continuation.d.ts.map +1 -1
- package/dist/flow/continuation.js +26 -0
- package/dist/flow/continuation.js.map +1 -1
- package/dist/flow/process-lifecycle.d.ts.map +1 -1
- package/dist/flow/process-lifecycle.js +11 -3
- package/dist/flow/process-lifecycle.js.map +1 -1
- package/dist/flow/runner.d.ts.map +1 -1
- package/dist/flow/runner.js +36 -5
- package/dist/flow/runner.js.map +1 -1
- package/dist/flow/warp.d.ts.map +1 -1
- package/dist/flow/warp.js +16 -10
- package/dist/flow/warp.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -4
- package/dist/index.js.map +1 -1
- package/dist/steering/sliding-prompt.d.ts.map +1 -1
- package/dist/steering/sliding-prompt.js +2 -1
- package/dist/steering/sliding-prompt.js.map +1 -1
- package/dist/tools/ask-user.d.ts +10 -7
- package/dist/tools/ask-user.d.ts.map +1 -1
- package/dist/tools/ask-user.js +51 -62
- package/dist/tools/ask-user.js.map +1 -1
- package/dist/tools/trace.d.ts.map +1 -1
- package/dist/tools/trace.js +1 -1
- package/dist/tools/trace.js.map +1 -1
- package/dist/tools/web-ops.d.ts.map +1 -1
- package/dist/tools/web-ops.js +5 -1
- package/dist/tools/web-ops.js.map +1 -1
- package/package.json +3 -2
- package/dist/batch/index.d.ts +0 -11
- package/dist/batch/index.d.ts.map +0 -1
- package/dist/batch/index.js +0 -12
- package/dist/batch/index.js.map +0 -1
- package/dist/cli/exec/index.d.ts +0 -10
- package/dist/cli/exec/index.d.ts.map +0 -1
- package/dist/cli/exec/index.js +0 -10
- package/dist/cli/exec/index.js.map +0 -1
- package/dist/cli/flags/index.d.ts +0 -10
- package/dist/cli/flags/index.d.ts.map +0 -1
- package/dist/cli/flags/index.js +0 -10
- package/dist/cli/flags/index.js.map +0 -1
package/dist/cli/register.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* batch_read and
|
|
2
|
+
* batch_read, batch, and ask_user CLI tool factories.
|
|
3
3
|
*/
|
|
4
|
+
import { createAskUserCliTool } from "../tools/ask-user.js";
|
|
5
|
+
import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
|
|
4
6
|
import type { BatchTheme } from "../batch/constants.js";
|
|
5
7
|
import type { BashProcessTracker } from "../batch/batch-bash.js";
|
|
6
8
|
export declare function createBatchReadCliTool(): {
|
|
@@ -10,15 +12,13 @@ export declare function createBatchReadCliTool(): {
|
|
|
10
12
|
promptSnippet: string;
|
|
11
13
|
promptGuidelines: string[];
|
|
12
14
|
parameters: any;
|
|
13
|
-
execute(_toolCallId: string, input: unknown, signal: AbortSignal | undefined, _onUpdate: unknown, ctx: {
|
|
14
|
-
cwd: string;
|
|
15
|
-
}): Promise<{
|
|
15
|
+
execute(_toolCallId: string, input: unknown, signal: AbortSignal | undefined, _onUpdate: unknown, ctx: ExtensionContext): Promise<{
|
|
16
16
|
content: {
|
|
17
17
|
type: string;
|
|
18
18
|
text: string;
|
|
19
19
|
}[];
|
|
20
20
|
details: {
|
|
21
|
-
results:
|
|
21
|
+
results: any[];
|
|
22
22
|
};
|
|
23
23
|
isError: true | undefined;
|
|
24
24
|
} | {
|
|
@@ -42,18 +42,13 @@ export declare function createBatchCliTool(bashTracker?: BashProcessTracker, too
|
|
|
42
42
|
promptSnippet: string;
|
|
43
43
|
promptGuidelines: string[];
|
|
44
44
|
parameters: any;
|
|
45
|
-
execute(_toolCallId: string, input: unknown, signal: AbortSignal | undefined, _onUpdate: unknown, ctx: {
|
|
46
|
-
cwd: string;
|
|
47
|
-
sessionManager?: {
|
|
48
|
-
getSessionDir(): string;
|
|
49
|
-
};
|
|
50
|
-
}): Promise<{
|
|
45
|
+
execute(_toolCallId: string, input: unknown, signal: AbortSignal | undefined, _onUpdate: unknown, ctx: ExtensionContext): Promise<{
|
|
51
46
|
content: {
|
|
52
47
|
type: string;
|
|
53
48
|
text: string;
|
|
54
49
|
}[];
|
|
55
50
|
details: {
|
|
56
|
-
results:
|
|
51
|
+
results: any[];
|
|
57
52
|
};
|
|
58
53
|
isError: true | undefined;
|
|
59
54
|
} | {
|
|
@@ -70,4 +65,5 @@ export declare function createBatchCliTool(bashTracker?: BashProcessTracker, too
|
|
|
70
65
|
isPartial?: boolean;
|
|
71
66
|
}, theme: BatchTheme, args?: Record<string, unknown>) => any;
|
|
72
67
|
};
|
|
68
|
+
export { createAskUserCliTool };
|
|
73
69
|
//# sourceMappingURL=register.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../src/cli/register.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../src/cli/register.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAmFjE,wBAAgB,sBAAsB;;;;;;;yBA/CnB,MAAM,SACZ,OAAO,UACN,WAAW,GAAG,SAAS,aACpB,OAAO,OACb,gBAAgB;;;;;;;;;;;;;;;;;uBAqCJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,UAAU;2BACtC,GAAG,2BAA2B;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,SAAS,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EAerJ;AAED,wBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,kBAAkB,EAAE,YAAY,CAAC,EAAE,OAAO;;;;;;;yBA3DxE,MAAM,SACZ,OAAO,UACN,WAAW,GAAG,SAAS,aACpB,OAAO,OACb,gBAAgB;;;;;;;;;;;;;;;;;uBAqCJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,UAAU;2BACtC,GAAG,2BAA2B;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,SAAS,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EA8BrJ;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|
package/dist/cli/register.js
CHANGED
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* batch_read and
|
|
2
|
+
* batch_read, batch, and ask_user CLI tool factories.
|
|
3
3
|
*/
|
|
4
|
-
import {
|
|
5
|
-
import { runBatchCli, BatchCliParams, BATCH_CLI_DESCRIPTION, BATCH_CLI_SNIPPET, BATCH_CLI_GUIDELINES, } from "./batch.js";
|
|
4
|
+
import { createAskUserCliTool } from "../tools/ask-user.js";
|
|
6
5
|
import { CliError } from "./parse.js";
|
|
7
6
|
import { renderBatchReadResult, renderBatchReadCall } from "../batch/render.js";
|
|
8
|
-
|
|
7
|
+
import { runBatchReadCli, BatchReadCliParams, BATCH_READ_CLI_DESCRIPTION, BATCH_READ_CLI_SNIPPET, BATCH_READ_CLI_GUIDELINES, } from "./batch-read.js";
|
|
8
|
+
import { runBatchCli, BatchCliParams, BATCH_CLI_DESCRIPTION, BATCH_CLI_SNIPPET, BATCH_CLI_GUIDELINES, } from "./batch.js";
|
|
9
|
+
function createCliTool(config) {
|
|
9
10
|
return {
|
|
10
|
-
name:
|
|
11
|
-
label:
|
|
12
|
-
description:
|
|
13
|
-
promptSnippet:
|
|
14
|
-
promptGuidelines:
|
|
15
|
-
parameters:
|
|
11
|
+
name: config.name,
|
|
12
|
+
label: config.label,
|
|
13
|
+
description: config.description,
|
|
14
|
+
promptSnippet: config.promptSnippet,
|
|
15
|
+
promptGuidelines: config.promptGuidelines,
|
|
16
|
+
parameters: config.parameters,
|
|
16
17
|
async execute(_toolCallId, input, signal, _onUpdate, ctx) {
|
|
17
18
|
let cmd;
|
|
18
19
|
let cwd;
|
|
@@ -26,7 +27,7 @@ export function createBatchReadCliTool() {
|
|
|
26
27
|
cwd = ctx.cwd;
|
|
27
28
|
}
|
|
28
29
|
try {
|
|
29
|
-
const { text, results, hasError } = await
|
|
30
|
+
const { text, results, hasError } = await config.runner(cmd, cwd, signal, ctx);
|
|
30
31
|
return {
|
|
31
32
|
content: [{ type: "text", text }],
|
|
32
33
|
details: { results },
|
|
@@ -52,8 +53,19 @@ export function createBatchReadCliTool() {
|
|
|
52
53
|
renderResult: (result, { expanded, isPartial }, theme, args) => renderBatchReadResult(result, { expanded, isPartial: isPartial ?? false }, theme, args),
|
|
53
54
|
};
|
|
54
55
|
}
|
|
56
|
+
export function createBatchReadCliTool() {
|
|
57
|
+
return createCliTool({
|
|
58
|
+
name: "batch_read",
|
|
59
|
+
label: "batch_read",
|
|
60
|
+
description: BATCH_READ_CLI_DESCRIPTION,
|
|
61
|
+
promptSnippet: BATCH_READ_CLI_SNIPPET,
|
|
62
|
+
promptGuidelines: BATCH_READ_CLI_GUIDELINES,
|
|
63
|
+
parameters: BatchReadCliParams,
|
|
64
|
+
runner: (cmd, cwd, signal) => runBatchReadCli(cmd, cwd, signal),
|
|
65
|
+
});
|
|
66
|
+
}
|
|
55
67
|
export function createBatchCliTool(bashTracker, toolOptimize) {
|
|
56
|
-
return {
|
|
68
|
+
return createCliTool({
|
|
57
69
|
name: "batch",
|
|
58
70
|
label: "batch",
|
|
59
71
|
description: BATCH_CLI_DESCRIPTION,
|
|
@@ -63,43 +75,8 @@ export function createBatchCliTool(bashTracker, toolOptimize) {
|
|
|
63
75
|
...(toolOptimize ? ["Batch is your ONLY edit tool — no separate edit command."] : []),
|
|
64
76
|
],
|
|
65
77
|
parameters: BatchCliParams,
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
let cwd;
|
|
69
|
-
if (input && typeof input === "object") {
|
|
70
|
-
const args = input;
|
|
71
|
-
cmd = typeof args.cmd === "string" ? args.cmd : "";
|
|
72
|
-
cwd = typeof args.cwd === "string" ? args.cwd : ctx.cwd;
|
|
73
|
-
}
|
|
74
|
-
else {
|
|
75
|
-
cmd = "";
|
|
76
|
-
cwd = ctx.cwd;
|
|
77
|
-
}
|
|
78
|
-
try {
|
|
79
|
-
const { text, results, hasError } = await runBatchCli(cmd, cwd, bashTracker, ctx.sessionManager, signal);
|
|
80
|
-
return {
|
|
81
|
-
content: [{ type: "text", text }],
|
|
82
|
-
details: { results },
|
|
83
|
-
isError: hasError || undefined,
|
|
84
|
-
};
|
|
85
|
-
}
|
|
86
|
-
catch (err) {
|
|
87
|
-
if (err instanceof CliError) {
|
|
88
|
-
const hint = err.hint ? `\nHint: ${err.hint}` : "";
|
|
89
|
-
return {
|
|
90
|
-
isError: true,
|
|
91
|
-
content: [{ type: "text", text: `Error: ${err.message}${hint}` }],
|
|
92
|
-
};
|
|
93
|
-
}
|
|
94
|
-
const message = err instanceof Error ? err.message : String(err);
|
|
95
|
-
return {
|
|
96
|
-
isError: true,
|
|
97
|
-
content: [{ type: "text", text: `Error: ${message}` }],
|
|
98
|
-
};
|
|
99
|
-
}
|
|
100
|
-
},
|
|
101
|
-
renderCall: (args, theme) => renderBatchReadCall(args, theme),
|
|
102
|
-
renderResult: (result, { expanded, isPartial }, theme, args) => renderBatchReadResult(result, { expanded, isPartial: isPartial ?? false }, theme, args),
|
|
103
|
-
};
|
|
78
|
+
runner: (cmd, cwd, signal, ctx) => runBatchCli(cmd, cwd, bashTracker, ctx.sessionManager, signal),
|
|
79
|
+
});
|
|
104
80
|
}
|
|
81
|
+
export { createAskUserCliTool };
|
|
105
82
|
//# sourceMappingURL=register.js.map
|
package/dist/cli/register.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/cli/register.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,WAAW,EACX,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/cli/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Generic chain execution helper for bash-style CLI tools.
|
|
3
|
+
*/
|
|
4
|
+
import { type ChainOp } from "./chain.js";
|
|
5
|
+
import { type FlagSpec, type ParsedCommand } from "./parse.js";
|
|
6
|
+
import type { ExecResult } from "./exec/util.js";
|
|
7
|
+
import type { OpResult } from "../batch/constants.js";
|
|
8
|
+
export interface ChainConfig {
|
|
9
|
+
toolPrefix: string;
|
|
10
|
+
recognizedSubs: Set<string>;
|
|
11
|
+
getFlagSpec: (subcommand: string) => FlagSpec;
|
|
12
|
+
dispatch: (subcommand: string, parsed: ParsedCommand, cwd: string, signal?: AbortSignal, extra?: unknown) => Promise<ExecResult>;
|
|
13
|
+
helpText: string;
|
|
14
|
+
validSubcommandsTip: string;
|
|
15
|
+
preprocessLink?: (link: ChainOp) => {
|
|
16
|
+
cmd: string;
|
|
17
|
+
extra?: unknown;
|
|
18
|
+
};
|
|
19
|
+
fixedSubcommand?: string;
|
|
20
|
+
}
|
|
21
|
+
export declare function runChain(cmd: string, cwd: string, signal: AbortSignal | undefined, config: ChainConfig): Promise<{
|
|
22
|
+
text: string;
|
|
23
|
+
results: OpResult[];
|
|
24
|
+
hasError: boolean;
|
|
25
|
+
errors: Array<{
|
|
26
|
+
message: string;
|
|
27
|
+
hint?: string;
|
|
28
|
+
}>;
|
|
29
|
+
}>;
|
|
30
|
+
//# sourceMappingURL=runner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/cli/runner.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAc,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAA0B,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAEvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,QAAQ,CAAC;IAC9C,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACjI,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACrE,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CAgGtH"}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Generic chain execution helper for bash-style CLI tools.
|
|
3
|
+
*/
|
|
4
|
+
import { tokenize } from "./tokenize.js";
|
|
5
|
+
import { splitChain } from "./chain.js";
|
|
6
|
+
import { parseCommand, CliError } from "./parse.js";
|
|
7
|
+
import { formatChainedOutput } from "./format.js";
|
|
8
|
+
export async function runChain(cmd, cwd, signal, config) {
|
|
9
|
+
const trimmed = cmd.trim();
|
|
10
|
+
if (trimmed.length === 0) {
|
|
11
|
+
return { text: config.helpText, results: [], hasError: false, errors: [] };
|
|
12
|
+
}
|
|
13
|
+
const chain = splitChain(trimmed);
|
|
14
|
+
const ops = [];
|
|
15
|
+
let previousFailed = false;
|
|
16
|
+
const allResults = [];
|
|
17
|
+
const errors = [];
|
|
18
|
+
for (const link of chain) {
|
|
19
|
+
if (link.kind === "and" && previousFailed) {
|
|
20
|
+
ops.push({ cmd: link.cmd, output: "", skipped: true });
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
let output = "";
|
|
24
|
+
let failed = false;
|
|
25
|
+
let error;
|
|
26
|
+
let linkExtra = undefined;
|
|
27
|
+
try {
|
|
28
|
+
const processed = config.preprocessLink ? config.preprocessLink(link) : { cmd: link.cmd };
|
|
29
|
+
linkExtra = processed.extra;
|
|
30
|
+
const tokens = tokenize(processed.cmd);
|
|
31
|
+
// Remove leading tool keyword if present (the model may include it)
|
|
32
|
+
if (tokens[0] === config.toolPrefix) {
|
|
33
|
+
tokens.shift();
|
|
34
|
+
}
|
|
35
|
+
if (tokens.length === 0) {
|
|
36
|
+
output = config.helpText;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
const subcommand = config.fixedSubcommand ?? tokens[0];
|
|
40
|
+
if (subcommand === "help" || subcommand === "--help" || subcommand === "-h") {
|
|
41
|
+
output = config.helpText;
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
let parsed;
|
|
45
|
+
const shouldParse = config.fixedSubcommand || config.recognizedSubs.has(subcommand);
|
|
46
|
+
if (!shouldParse) {
|
|
47
|
+
// Defer to dispatch's default branch for a clear "Unknown subcommand" error.
|
|
48
|
+
parsed = { subcommand, flags: {}, positionals: tokens.slice(1) };
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
const flagSpec = config.getFlagSpec(subcommand);
|
|
52
|
+
const tokensToParse = config.fixedSubcommand ? [subcommand, ...tokens] : tokens;
|
|
53
|
+
try {
|
|
54
|
+
parsed = parseCommand(tokensToParse, flagSpec);
|
|
55
|
+
}
|
|
56
|
+
catch (err) {
|
|
57
|
+
if (err instanceof CliError && err.message.startsWith("Unknown flag")) {
|
|
58
|
+
const validFlags = Object.keys(flagSpec).map((n) => `--${n}`).join(", ");
|
|
59
|
+
throw new CliError(err.message, `\`${subcommand}\` supports: ${validFlags}. Run [cmd]: "help" for the man page.`);
|
|
60
|
+
}
|
|
61
|
+
throw err;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
if (parsed.flags.help === true) {
|
|
65
|
+
output = config.helpText;
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
const result = await config.dispatch(parsed.subcommand, parsed, cwd, signal, linkExtra);
|
|
69
|
+
output = result.output;
|
|
70
|
+
allResults.push(...result.results);
|
|
71
|
+
if (result.failed) {
|
|
72
|
+
failed = true;
|
|
73
|
+
error = `${result.error ?? "operation failed"}\nTIP: This is not a shell. Valid subcommands: ${config.validSubcommandsTip}. Run [cmd]: "help" for the man page.`;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
catch (err) {
|
|
80
|
+
failed = true;
|
|
81
|
+
if (err instanceof CliError) {
|
|
82
|
+
const baseError = err.hint ? `${err.message} (hint: ${err.hint})` : err.message;
|
|
83
|
+
error = `${baseError}\nTIP: This is not a shell. Valid subcommands: ${config.validSubcommandsTip}. Run [cmd]: "help" for the man page.`;
|
|
84
|
+
errors.push({ message: err.message, hint: err.hint });
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
error = `internal error: ${err instanceof Error ? err.message : String(err)}`;
|
|
88
|
+
errors.push({ message: err instanceof Error ? err.message : String(err) });
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
ops.push({ cmd: link.cmd, output, error, failed, skipped: false });
|
|
92
|
+
if (failed) {
|
|
93
|
+
previousFailed = true;
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
previousFailed = false;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
const hasError = ops.some((op) => op.error !== undefined || op.skipped || op.failed) || errors.length > 0;
|
|
100
|
+
return { text: formatChainedOutput(ops), results: allResults, hasError, errors };
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/cli/runner.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/tokenize.js
CHANGED
|
@@ -15,7 +15,7 @@ export function tokenize(input) {
|
|
|
15
15
|
const ch = input[i];
|
|
16
16
|
if (escapeNext) {
|
|
17
17
|
if (inDouble) {
|
|
18
|
-
// In double quotes, only \"
|
|
18
|
+
// In double quotes, only \" and \\ are special;
|
|
19
19
|
// everything else keeps the backslash literal.
|
|
20
20
|
if (ch === '"' || ch === '\\') {
|
|
21
21
|
current += ch;
|
package/dist/cli/tokenize.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenize.js","sourceRoot":"","sources":["../../src/cli/tokenize.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,UAAU,QAAQ,CAAC,KAAa;IACpC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAEpB,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,QAAQ,EAAE,CAAC;gBACb,
|
|
1
|
+
{"version":3,"file":"tokenize.js","sourceRoot":"","sources":["../../src/cli/tokenize.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,UAAU,QAAQ,CAAC,KAAa;IACpC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAEpB,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,QAAQ,EAAE,CAAC;gBACb,gDAAgD;gBAChD,+CAA+C;gBAC/C,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;oBAC9B,OAAO,IAAI,EAAE,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,IAAI,GAAG,EAAE,CAAC;gBACvB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YACD,UAAU,GAAG,KAAK,CAAC;YACnB,SAAS;QACX,CAAC;QAED,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7B,UAAU,GAAG,IAAI,CAAC;YAClB,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBACf,QAAQ,GAAG,KAAK,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBACf,QAAQ,GAAG,KAAK,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACf,QAAQ,GAAG,IAAI,CAAC;YAChB,SAAS;QACX,CAAC;QAED,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACf,QAAQ,GAAG,IAAI,CAAC;YAChB,SAAS;QACX,CAAC;QAED,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAC5D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrB,OAAO,GAAG,EAAE,CAAC;YACf,CAAC;YACD,SAAS;QACX,CAAC;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,IAAI,IAAI,CAAC;IAClB,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation.d.ts","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"continuation.d.ts","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,iCAAiC,CAAC;AA0DpG;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAK1D;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAKrC;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAwJxD"}
|
|
@@ -6,7 +6,26 @@ import { loopContinuationPromptTemplate, loopWakeupTemplate } from "./loop-templ
|
|
|
6
6
|
import { logWarn } from '../config/log.js';
|
|
7
7
|
import * as sessionRegistry from './session-registry.js';
|
|
8
8
|
const SPAWN_COOLDOWN_MS = 5000;
|
|
9
|
+
const MAX_MAP_ENTRIES = 50;
|
|
9
10
|
const _lastSpawnAt = new Map();
|
|
11
|
+
function pruneOldestEntries(map, maxEntries) {
|
|
12
|
+
while (map.size > maxEntries) {
|
|
13
|
+
let oldestKey;
|
|
14
|
+
let oldestValue = Infinity;
|
|
15
|
+
for (const [key, value] of map) {
|
|
16
|
+
if (value < oldestValue) {
|
|
17
|
+
oldestValue = value;
|
|
18
|
+
oldestKey = key;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (oldestKey) {
|
|
22
|
+
map.delete(oldestKey);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
10
29
|
/**
|
|
11
30
|
* Post-flow completion hold — gives the user time to read the result before
|
|
12
31
|
* the continuation system triggers the next flow.
|
|
@@ -42,6 +61,7 @@ let _wakeupInterval;
|
|
|
42
61
|
export function markFlowCompleted(sessionId) {
|
|
43
62
|
if (sessionId) {
|
|
44
63
|
_lastFlowCompleteAt.set(sessionId, Date.now());
|
|
64
|
+
pruneOldestEntries(_lastFlowCompleteAt, MAX_MAP_ENTRIES);
|
|
45
65
|
}
|
|
46
66
|
}
|
|
47
67
|
/**
|
|
@@ -58,6 +78,10 @@ export function setupContinuation(pi) {
|
|
|
58
78
|
pi.on("session_start", (_event, ctx) => {
|
|
59
79
|
sessionRegistry.register(ctx.cwd, ctx.sessionManager.getSessionId());
|
|
60
80
|
_lastTurnEndAt.set(ctx.sessionManager.getSessionId(), Date.now());
|
|
81
|
+
pruneOldestEntries(_lastTurnEndAt, MAX_MAP_ENTRIES);
|
|
82
|
+
});
|
|
83
|
+
pi.on("session_end", (_event, ctx) => {
|
|
84
|
+
sessionRegistry.unregister(ctx.cwd);
|
|
61
85
|
});
|
|
62
86
|
// Idle wake-up: periodically check if the user has been idle while a goal
|
|
63
87
|
// is active, and nudge the root state to keep making progress.
|
|
@@ -123,6 +147,7 @@ export function setupContinuation(pi) {
|
|
|
123
147
|
}
|
|
124
148
|
const goalSessionId = goal.sessionId ?? "none";
|
|
125
149
|
_lastTurnEndAt.set(goalSessionId, Date.now());
|
|
150
|
+
pruneOldestEntries(_lastTurnEndAt, MAX_MAP_ENTRIES);
|
|
126
151
|
// Cooldown: don't re-fire within 5 seconds of last spawn for THIS goal's session
|
|
127
152
|
const now = Date.now();
|
|
128
153
|
if (now - (_lastSpawnAt.get(goalSessionId) ?? 0) < SPAWN_COOLDOWN_MS)
|
|
@@ -134,6 +159,7 @@ export function setupContinuation(pi) {
|
|
|
134
159
|
if (lastFlowComplete !== undefined && now - lastFlowComplete < FLOW_COMPLETE_HOLD_MS)
|
|
135
160
|
return;
|
|
136
161
|
_lastSpawnAt.set(goalSessionId, now);
|
|
162
|
+
pruneOldestEntries(_lastSpawnAt, MAX_MAP_ENTRIES);
|
|
137
163
|
// Track token usage from turn
|
|
138
164
|
const messageText = typeof event.message.content === "string"
|
|
139
165
|
? event.message.content
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation.js","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAC;AAEzD,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,MAAM,qBAAqB,GAAG,IAAI,CAAC;AACnC,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;AAEtD;;;GAGG;AACH,MAAM,cAAc,GAClB,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;IAClE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE,CAAC;IAClD,CAAC,CAAC,OAAO,CAAC;AACd,MAAM,wBAAwB,GAAG,MAAM,CAAC;AACxC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;AACjD,IAAI,eAA2D,CAAC;AAEhE;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAkB;IAClD,IAAI,SAAS,EAAE,CAAC;QACd,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"continuation.js","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-lifecycle.d.ts","sourceRoot":"","sources":["../../src/flow/process-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG9D,eAAO,MAAM,SAAS,SAA+B,CAAC;AACtD,eAAO,MAAM,kBAAkB,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"process-lifecycle.d.ts","sourceRoot":"","sources":["../../src/flow/process-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG9D,eAAO,MAAM,SAAS,SAA+B,CAAC;AACtD,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAYvC,8DAA8D;AAC9D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAIlE;AAED,0DAA0D;AAC1D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAEtD;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CA6B9C;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,GACnF,IAAI,CAoCN"}
|
|
@@ -8,6 +8,8 @@ import { spawn } from "node:child_process";
|
|
|
8
8
|
import { logWarn } from "../config/log.js";
|
|
9
9
|
export const isWindows = process.platform === "win32";
|
|
10
10
|
export const SIGKILL_TIMEOUT_MS = 5000;
|
|
11
|
+
let _globalSigkillTimer;
|
|
12
|
+
let _shuttingDown = false;
|
|
11
13
|
// ---------------------------------------------------------------------------
|
|
12
14
|
// Global child process group tracking for signal propagation
|
|
13
15
|
// ---------------------------------------------------------------------------
|
|
@@ -28,8 +30,9 @@ export function unregisterChildGroup(pid) {
|
|
|
28
30
|
* Called on parent exit, SIGINT, SIGTERM, or pi-agent-flow:shutdown.
|
|
29
31
|
*/
|
|
30
32
|
export function terminateAllChildGroups() {
|
|
31
|
-
if (runningChildGroups.size === 0)
|
|
33
|
+
if (_shuttingDown || runningChildGroups.size === 0)
|
|
32
34
|
return;
|
|
35
|
+
_shuttingDown = true;
|
|
33
36
|
const pids = Array.from(runningChildGroups.keys());
|
|
34
37
|
for (const pid of pids) {
|
|
35
38
|
try {
|
|
@@ -45,7 +48,11 @@ export function terminateAllChildGroups() {
|
|
|
45
48
|
}
|
|
46
49
|
}
|
|
47
50
|
}
|
|
48
|
-
|
|
51
|
+
if (_globalSigkillTimer) {
|
|
52
|
+
clearTimeout(_globalSigkillTimer);
|
|
53
|
+
}
|
|
54
|
+
_globalSigkillTimer = setTimeout(() => {
|
|
55
|
+
_globalSigkillTimer = undefined;
|
|
49
56
|
for (const pid of pids) {
|
|
50
57
|
try {
|
|
51
58
|
process.kill(-pid, "SIGKILL");
|
|
@@ -61,8 +68,9 @@ export function terminateAllChildGroups() {
|
|
|
61
68
|
}
|
|
62
69
|
}
|
|
63
70
|
runningChildGroups.clear();
|
|
71
|
+
_shuttingDown = false;
|
|
64
72
|
}, SIGKILL_TIMEOUT_MS);
|
|
65
|
-
|
|
73
|
+
_globalSigkillTimer.unref();
|
|
66
74
|
}
|
|
67
75
|
/**
|
|
68
76
|
* Terminate a single child process with SIGTERM then SIGKILL fallback.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-lifecycle.js","sourceRoot":"","sources":["../../src/flow/process-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEvC,8EAA8E;AAC9E,6DAA6D;AAC7D,8EAA8E;AAE9E,8EAA8E;AAC9E,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA8C,CAAC;AAEjF,8DAA8D;AAC9D,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,IAAY;IAC3D,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC3B,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;AACF,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC/C,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB;IACtC,IAAI,kBAAkB,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"process-lifecycle.js","sourceRoot":"","sources":["../../src/flow/process-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEvC,IAAI,mBAA+C,CAAC;AACpD,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B,8EAA8E;AAC9E,6DAA6D;AAC7D,8EAA8E;AAE9E,8EAA8E;AAC9E,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA8C,CAAC;AAEjF,8DAA8D;AAC9D,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,IAAY;IAC3D,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC3B,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;AACF,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC/C,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB;IACtC,IAAI,aAAa,IAAI,kBAAkB,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO;IAC3D,aAAa,GAAG,IAAI,CAAC;IACrB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,uDAAuD,CAAC,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAAC,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBAAC,OAAO,CAAC,kDAAkD,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;YAAC,CAAC;QAC9H,CAAC;IACF,CAAC;IACD,IAAI,mBAAmB,EAAE,CAAC;QACzB,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACnC,CAAC;IACD,mBAAmB,GAAG,UAAU,CAAC,GAAG,EAAE;QACrC,mBAAmB,GAAG,SAAS,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC;gBACJ,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC/B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,OAAO,CAAC,uDAAuD,CAAC,EAAE,CAAC,CAAC;gBACpE,IAAI,CAAC;oBAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBAAC,CAAC;gBAAC,OAAO,EAAE,EAAE,CAAC;oBAAC,OAAO,CAAC,kDAAkD,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;gBAAC,CAAC;YAC9H,CAAC;QACF,CAAC;QACD,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC3B,aAAa,GAAG,KAAK,CAAC;IACvB,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACvB,mBAAmB,CAAC,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACpC,IAAkB,EAClB,OAAqF;IAErF,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,kBAAkB,CAAC;IAC3D,IAAI,OAAO,EAAE,QAAQ;QAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC1C,IAAI,SAAS,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;gBACxE,KAAK,EAAE,QAAQ;aACf,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,EAAE,CAAC;QAChB,CAAC;QACD,OAAO;IACR,CAAC;IACD,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtB,CAAC;SAAM,CAAC;QACP,IAAI,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,4DAA4D,CAAC,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,CAAC;IACF,CAAC;IACD,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;QACpC,IAAI,OAAO,EAAE,YAAY,EAAE,EAAE;YAAE,OAAO;QACtC,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACP,IAAI,CAAC;gBACJ,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACpC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,OAAO,CAAC,4DAA4D,CAAC,EAAE,CAAC,CAAC;gBACzE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtB,CAAC;QACF,CAAC;IACF,CAAC,EAAE,SAAS,CAAC,CAAC;IACd,YAAY,CAAC,KAAK,EAAE,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/flow/runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,aAAa,CAAC;AAG3D,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,WAAW,EAIhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAsB,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAKjF,OAAO,EAA8C,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAsB9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/flow/runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,aAAa,CAAC;AAG3D,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,WAAW,EAIhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAsB,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAKjF,OAAO,EAA8C,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAsB9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AA8ClE,KAAK,kBAAkB,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;AA6B1E,MAAM,WAAW,cAAc;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,WAAW,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,CAAC;IACtD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACpC;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,CAyhBzE;AAMD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAChD,KAAK,EAAE,GAAG,EAAE,EACZ,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAC7C,OAAO,CAAC,IAAI,EAAE,CAAC,CAgBjB"}
|