@stigmer/cli 3.41.0 → 3.41.1-dev.20261003094357.g39d6aa748646
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/commands/config/context.js +3 -3
- package/commands/config/context.js.map +1 -1
- package/commands/resume.d.ts.map +1 -1
- package/commands/resume.js +12 -13
- package/commands/resume.js.map +1 -1
- package/commands/run.js +2 -2
- package/commands/run.js.map +1 -1
- package/config/config.d.ts +1 -1
- package/config/config.d.ts.map +1 -1
- package/config/keys.js +3 -3
- package/config/keys.js.map +1 -1
- package/config/resolve.d.ts +1 -1
- package/config/resolve.js +5 -5
- package/config/resolve.js.map +1 -1
- package/local/artifact.d.ts +28 -6
- package/local/artifact.d.ts.map +1 -1
- package/local/artifact.js +88 -13
- package/local/artifact.js.map +1 -1
- package/local/bootstrap.js +1 -1
- package/local/bootstrap.js.map +1 -1
- package/local/daemon/components.js +1 -1
- package/local/daemon/components.js.map +1 -1
- package/local/net/tcp.js +1 -1
- package/local/net/tcp.js.map +1 -1
- package/local/temporal/download.d.ts +12 -2
- package/local/temporal/download.d.ts.map +1 -1
- package/local/temporal/download.js +6 -2
- package/local/temporal/download.js.map +1 -1
- package/package.json +7 -7
- package/resources/run/prepare.d.ts +1 -1
- package/resources/run/prepare.js +4 -4
- package/resources/run/prepare.js.map +1 -1
- package/resources/run/resume.d.ts +0 -1
- package/resources/run/resume.d.ts.map +1 -1
- package/resources/run/resume.js +7 -4
- package/resources/run/resume.js.map +1 -1
- package/resources/run/workflow-stream.d.ts +9 -0
- package/resources/run/workflow-stream.d.ts.map +1 -1
- package/resources/run/workflow-stream.js +24 -4
- package/resources/run/workflow-stream.js.map +1 -1
- package/resources/stream/headless.d.ts +16 -0
- package/resources/stream/headless.d.ts.map +1 -1
- package/resources/stream/headless.js +33 -5
- package/resources/stream/headless.js.map +1 -1
- package/resources/usage.d.ts +2 -2
- package/resources/usage.d.ts.map +1 -1
- package/resources/usage.js +4 -4
- package/resources/usage.js.map +1 -1
- package/src/commands/config/context.ts +3 -3
- package/src/commands/resume.ts +11 -17
- package/src/commands/run.ts +2 -2
- package/src/config/config.ts +1 -1
- package/src/config/keys.ts +3 -3
- package/src/config/resolve.ts +5 -5
- package/src/local/artifact.ts +120 -15
- package/src/local/bootstrap.ts +1 -1
- package/src/local/daemon/components.ts +1 -1
- package/src/local/net/tcp.ts +1 -1
- package/src/local/temporal/download.ts +14 -4
- package/src/resources/run/prepare.ts +4 -4
- package/src/resources/run/resume.ts +7 -4
- package/src/resources/run/workflow-stream.ts +23 -3
- package/src/resources/stream/headless.ts +31 -4
- package/src/resources/usage.ts +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/local/daemon/components.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,EAAE;AACF,6EAA6E;AAC7E,kFAAkF;AAClF,gFAAgF;AAChF,4EAA4E;AAC5E,8EAA8E;AAC9E
|
|
1
|
+
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/local/daemon/components.ts"],"names":[],"mappings":"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"}
|
package/local/net/tcp.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// A single short-lived connection attempt tells us whether something is
|
|
5
5
|
// listening; waitForTcp loops that probe until a deadline, failing fast (with a
|
|
6
6
|
// log tail) if the process under watch exits first. This mirrors
|
|
7
|
-
// `test/
|
|
7
|
+
// `test/support/src/temporal.ts` so the CLI and the harnesses share
|
|
8
8
|
// one readiness model.
|
|
9
9
|
import { connect } from "node:net";
|
|
10
10
|
import { setTimeout as delay } from "node:timers/promises";
|
package/local/net/tcp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tcp.js","sourceRoot":"","sources":["../../src/local/net/tcp.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+BAA+B;AAC/B,EAAE;AACF,wEAAwE;AACxE,gFAAgF;AAChF,iEAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"tcp.js","sourceRoot":"","sources":["../../src/local/net/tcp.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+BAA+B;AAC/B,EAAE;AACF,wEAAwE;AACxE,gFAAgF;AAChF,iEAAiE;AACjE,oEAAoE;AACpE,uBAAuB;AAEvB,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE3D,6EAA6E;AAC7E,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,IAAI,GAAG,WAAW,EAAE,SAAS,GAAG,GAAG;IAC3E,OAAO,IAAI,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,MAAM,GAAG,CAAC,SAAkB,EAAQ,EAAE;YAC1C,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC,CAAC;QACF,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AAkBD,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAA0B;IACzD,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,WAAW,EAAE,SAAS,GAAG,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAG,QAAQ,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC;IACxH,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IAExC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,OAAO,EAAE,EAAE,CAAC;QACzB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,uCAAuC,IAAI,CAAC,IAAI,YAAY,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrH,CAAC;QACD,IAAI,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC;YAAE,OAAO;QAC1C,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,gCAAgC,SAAS,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACxF,CAAC;AAED,SAAS,IAAI,CAAC,MAAqB;IACjC,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;IACvB,OAAO,GAAG,CAAC,CAAC,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { type TarballInstall } from "../artifact.js";
|
|
1
2
|
export { extractTarEntry } from "../artifact.js";
|
|
3
|
+
export type { CacheMiss, TarballInstall } from "../artifact.js";
|
|
2
4
|
/**
|
|
3
5
|
* The Temporal CLI version every channel runs: `stigmer up`, the all-in-one
|
|
4
6
|
* image, and the CI lanes and developer machines that install it with
|
|
@@ -16,6 +18,11 @@ export interface TemporalDownloadTarget {
|
|
|
16
18
|
platform?: NodeJS.Platform;
|
|
17
19
|
/** Node arch (defaults to process.arch). */
|
|
18
20
|
arch?: string;
|
|
21
|
+
/**
|
|
22
|
+
* A directory that keeps the verified archive and its `checksums.txt` between
|
|
23
|
+
* installs, so a CI lane installs without the release host (`artifact.ts`).
|
|
24
|
+
*/
|
|
25
|
+
cacheDir?: string;
|
|
19
26
|
/** Override the fetch implementation (tests). */
|
|
20
27
|
fetchImpl?: typeof fetch;
|
|
21
28
|
/** Override the wait between download attempts (tests). */
|
|
@@ -25,8 +32,11 @@ export interface TemporalDownloadTarget {
|
|
|
25
32
|
export declare function temporalArchiveName(version: string, platform: NodeJS.Platform, arch: string): string;
|
|
26
33
|
/** The GitHub release download URL for one asset of a version. */
|
|
27
34
|
export declare function temporalReleaseAssetUrl(version: string, asset: string): string;
|
|
28
|
-
/**
|
|
29
|
-
|
|
35
|
+
/**
|
|
36
|
+
* Install the verified Temporal CLI binary to `binPath`, from `cacheDir` when it
|
|
37
|
+
* holds a matching copy, otherwise downloaded; says which.
|
|
38
|
+
*/
|
|
39
|
+
export declare function downloadTemporalCli(target: TemporalDownloadTarget): Promise<TarballInstall>;
|
|
30
40
|
/** True if a Temporal binary is already present at `binPath`. */
|
|
31
41
|
export declare function isTemporalInstalled(binPath: string): boolean;
|
|
32
42
|
//# sourceMappingURL=download.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/local/temporal/download.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/local/temporal/download.ts"],"names":[],"mappings":"AAcA,OAAO,EAAoD,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIvG,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhE;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,UAAU,CAAC;AAEhD,kFAAkF;AAClF,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAEvD,MAAM,WAAW,sBAAsB;IACrC,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,4CAA4C;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iDAAiD;IACjD,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,2DAA2D;IAC3D,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,oFAAoF;AACpF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpG;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9E;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAajG;AAED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE5D"}
|
|
@@ -31,15 +31,19 @@ export function temporalArchiveName(version, platform, arch) {
|
|
|
31
31
|
export function temporalReleaseAssetUrl(version, asset) {
|
|
32
32
|
return `https://github.com/temporalio/cli/releases/download/v${version}/${asset}`;
|
|
33
33
|
}
|
|
34
|
-
/**
|
|
34
|
+
/**
|
|
35
|
+
* Install the verified Temporal CLI binary to `binPath`, from `cacheDir` when it
|
|
36
|
+
* holds a matching copy, otherwise downloaded; says which.
|
|
37
|
+
*/
|
|
35
38
|
export async function downloadTemporalCli(target) {
|
|
36
39
|
const archive = temporalArchiveName(target.version, target.platform ?? process.platform, target.arch ?? process.arch);
|
|
37
|
-
|
|
40
|
+
return fetchTarballBinary({
|
|
38
41
|
url: temporalReleaseAssetUrl(target.version, archive),
|
|
39
42
|
checksumUrl: temporalReleaseAssetUrl(target.version, TEMPORAL_CHECKSUMS_FILE),
|
|
40
43
|
entryName: "temporal",
|
|
41
44
|
binPath: target.binPath,
|
|
42
45
|
label: "Temporal CLI",
|
|
46
|
+
cacheDir: target.cacheDir,
|
|
43
47
|
fetchImpl: target.fetchImpl,
|
|
44
48
|
sleep: target.sleep,
|
|
45
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../src/local/temporal/download.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,8EAA8E;AAC9E,8EAA8E;AAC9E,uEAAuE;AACvE,mDAAmD;AACnD,EAAE;AACF,wEAAwE;AACxE,gFAAgF;AAChF,6EAA6E;AAC7E,+EAA+E;AAC/E,+EAA+E;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../src/local/temporal/download.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,8EAA8E;AAC9E,8EAA8E;AAC9E,uEAAuE;AACvE,mDAAmD;AACnD,EAAE;AACF,wEAAwE;AACxE,gFAAgF;AAChF,6EAA6E;AAC7E,+EAA+E;AAC/E,+EAA+E;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAC;AAEvG,+EAA+E;AAC/E,sCAAsC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,OAAO,CAAC;AAEhD,kFAAkF;AAClF,MAAM,CAAC,MAAM,uBAAuB,GAAG,eAAe,CAAC;AAsBvD,oFAAoF;AACpF,MAAM,UAAU,mBAAmB,CAAC,OAAe,EAAE,QAAyB,EAAE,IAAY;IAC1F,OAAO,gBAAgB,OAAO,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;AAC5F,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,uBAAuB,CAAC,OAAe,EAAE,KAAa;IACpE,OAAO,wDAAwD,OAAO,IAAI,KAAK,EAAE,CAAC;AACpF,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAA8B;IACtE,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtH,OAAO,kBAAkB,CAAC;QACxB,GAAG,EAAE,uBAAuB,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;QACrD,WAAW,EAAE,uBAAuB,CAAC,MAAM,CAAC,OAAO,EAAE,uBAAuB,CAAC;QAC7E,SAAS,EAAE,UAAU;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,KAAK,EAAE,cAAc;QACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC,CAAC;AACL,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stigmer/cli",
|
|
3
|
-
"version": "3.41.
|
|
3
|
+
"version": "3.41.1-dev.20261003094357.g39d6aa748646",
|
|
4
4
|
"description": "Stigmer command-line interface — manage agents, workflows, MCP servers, skills, and executions from the terminal",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
@@ -35,12 +35,12 @@
|
|
|
35
35
|
"@connectrpc/connect": "^2.0.0",
|
|
36
36
|
"@connectrpc/connect-node": "^2.1.1",
|
|
37
37
|
"@modelcontextprotocol/sdk": "^1.26.0",
|
|
38
|
-
"@stigmer/ink": "3.41.
|
|
39
|
-
"@stigmer/mcp-server": "3.41.
|
|
40
|
-
"@stigmer/plugin-package": "3.41.
|
|
41
|
-
"@stigmer/protos": "3.41.
|
|
42
|
-
"@stigmer/sdk": "3.41.
|
|
43
|
-
"@stigmer/zip-structure": "3.41.
|
|
38
|
+
"@stigmer/ink": "3.41.1-dev.20261003094357.g39d6aa748646",
|
|
39
|
+
"@stigmer/mcp-server": "3.41.1-dev.20261003094357.g39d6aa748646",
|
|
40
|
+
"@stigmer/plugin-package": "3.41.1-dev.20261003094357.g39d6aa748646",
|
|
41
|
+
"@stigmer/protos": "3.41.1-dev.20261003094357.g39d6aa748646",
|
|
42
|
+
"@stigmer/sdk": "3.41.1-dev.20261003094357.g39d6aa748646",
|
|
43
|
+
"@stigmer/zip-structure": "3.41.1-dev.20261003094357.g39d6aa748646",
|
|
44
44
|
"commander": "^12.1.0",
|
|
45
45
|
"fflate": "^0.8.3",
|
|
46
46
|
"ink": "^7.0.0",
|
|
@@ -89,7 +89,7 @@ export interface PrepareAgentExecOptions {
|
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
91
91
|
* Validate flags and resolve all execution inputs. The `org` is used to inject
|
|
92
|
-
*
|
|
92
|
+
* STIGMER_ORG and the `client` to upload non-workspace attachments.
|
|
93
93
|
*/
|
|
94
94
|
export declare function prepareAgentExec(flags: AgentExecFlags, client: Stigmer, org: string, progress?: ProgressSink, options?: PrepareAgentExecOptions): Promise<PreparedRun>;
|
|
95
95
|
/**
|
package/resources/run/prepare.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// Order matters and mirrors Go: validate cheap flags first (mode, approve
|
|
5
5
|
// default), then parse workspaces, then merge env, then process attachments
|
|
6
6
|
// (the only step that hits the network). A failure short-circuits before any
|
|
7
|
-
// upload.
|
|
7
|
+
// upload. STIGMER_ORG is injected into the runtime env when absent so agents
|
|
8
8
|
// can address the caller's org without the user wiring it manually.
|
|
9
9
|
import { ApprovalAction } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
|
|
10
10
|
import { UsageError } from "../../errors/index.js";
|
|
@@ -13,7 +13,7 @@ import { loadAndMergeEnv } from "./env.js";
|
|
|
13
13
|
import { localWorkspaceRoots, parseWorkspaceEntries } from "./workspace.js";
|
|
14
14
|
/**
|
|
15
15
|
* Validate flags and resolve all execution inputs. The `org` is used to inject
|
|
16
|
-
*
|
|
16
|
+
* STIGMER_ORG and the `client` to upload non-workspace attachments.
|
|
17
17
|
*/
|
|
18
18
|
export async function prepareAgentExec(flags, client, org, progress, options) {
|
|
19
19
|
const defaultAction = parseApprovalAction(flags.approveDefault);
|
|
@@ -52,8 +52,8 @@ export async function prepareAgentExec(flags, client, org, progress, options) {
|
|
|
52
52
|
envFiles: flags.envFile,
|
|
53
53
|
secretFiles: flags.secretFile,
|
|
54
54
|
});
|
|
55
|
-
if (runtimeEnv.
|
|
56
|
-
runtimeEnv.
|
|
55
|
+
if (runtimeEnv.STIGMER_ORG === undefined && org !== "") {
|
|
56
|
+
runtimeEnv.STIGMER_ORG = { value: org, isSecret: false };
|
|
57
57
|
}
|
|
58
58
|
const { attachments, workspaceFileRefs } = await processAttachments(client.agentExecution, flags.attach, localWorkspaceRoots(workspaceEntries), progress);
|
|
59
59
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/resources/run/prepare.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,8EAA8E;AAC9E,EAAE;AACF,0EAA0E;AAC1E,4EAA4E;AAC5E,6EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/resources/run/prepare.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import { type RunOutputMode } from "./stream.js";
|
|
|
4
4
|
export interface OpenSessionDeps {
|
|
5
5
|
readonly client: BackendClient;
|
|
6
6
|
readonly sessionId: string;
|
|
7
|
-
readonly org: string;
|
|
8
7
|
/** Explicit --mode override; "" means infer from the latest execution. */
|
|
9
8
|
readonly mode: RunMode;
|
|
10
9
|
readonly outputMode: RunOutputMode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../src/resources/run/resume.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAcvE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,
|
|
1
|
+
{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../src/resources/run/resume.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAcvE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;CACpC;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAyCtE"}
|
package/resources/run/resume.js
CHANGED
|
@@ -25,6 +25,9 @@ const ACTIVE_PHASES = new Set([
|
|
|
25
25
|
export async function openSession(deps) {
|
|
26
26
|
const stigmer = deps.client.stigmer;
|
|
27
27
|
const session = await getSessionById(stigmer, deps.sessionId);
|
|
28
|
+
// Every turn in the session is filed under the session's own organization
|
|
29
|
+
// (stigmer/stigmer#1580), never the CLI's context organization.
|
|
30
|
+
const org = session.metadata?.org ?? "";
|
|
28
31
|
const entries = await listExecutionsBySession(stigmer, deps.sessionId);
|
|
29
32
|
if (entries.length === 0) {
|
|
30
33
|
process.stderr.write(`Session ${deps.sessionId} has no executions\n`);
|
|
@@ -47,7 +50,7 @@ export async function openSession(deps) {
|
|
|
47
50
|
client: stigmer,
|
|
48
51
|
sessionId: deps.sessionId,
|
|
49
52
|
executionId: latest.metadata?.id ?? "",
|
|
50
|
-
org
|
|
53
|
+
org,
|
|
51
54
|
mode: effectiveMode,
|
|
52
55
|
defaultAction: ApprovalAction.UNSPECIFIED,
|
|
53
56
|
outputMode: deps.outputMode,
|
|
@@ -55,17 +58,17 @@ export async function openSession(deps) {
|
|
|
55
58
|
});
|
|
56
59
|
return;
|
|
57
60
|
}
|
|
58
|
-
await replaySession(deps, entries, header);
|
|
61
|
+
await replaySession(deps, org, entries, header);
|
|
59
62
|
}
|
|
60
63
|
// Completed session: render the stored history. TTY → Ink (history + composer);
|
|
61
64
|
// headless → snapshot events through the matching renderer.
|
|
62
|
-
async function replaySession(deps, entries, header) {
|
|
65
|
+
async function replaySession(deps, org, entries, header) {
|
|
63
66
|
if (deps.outputMode === "inline" && isInkSupported(process.stdout)) {
|
|
64
67
|
const { runInkSession } = await import("../stream/ink.js");
|
|
65
68
|
await runInkSession({
|
|
66
69
|
client: deps.client.stigmer,
|
|
67
70
|
sessionId: deps.sessionId,
|
|
68
|
-
org
|
|
71
|
+
org,
|
|
69
72
|
mode: header.mode === "plan" ? "plan" : "agent",
|
|
70
73
|
});
|
|
71
74
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../src/resources/run/resume.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,uEAAuE;AACvE,iFAAiF;AACjF,+EAA+E;AAC/E,6EAA6E;AAC7E,+BAA+B;AAG/B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,8DAA8D,CAAC;AAE/H,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAA0B,cAAc,EAAE,MAAM,aAAa,CAAC;AAE1F,OAAO,EAAE,oBAAoB,EAAsB,MAAM,aAAa,CAAC;AAEvE,+EAA+E;AAC/E,8EAA8E;AAC9E,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAE/C,gFAAgF;AAChF,MAAM,aAAa,GAAgC,IAAI,GAAG,CAAC;IACzD,cAAc,CAAC,iBAAiB;IAChC,cAAc,CAAC,qBAAqB;IACpC,cAAc,CAAC,8BAA8B;IAC7C,cAAc,CAAC,gBAAgB;CAChC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../src/resources/run/resume.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,15 @@ export interface WorkflowStreamStreams {
|
|
|
20
20
|
* Stream a workflow execution to a terminal state, then print a summary. Returns
|
|
21
21
|
* the authoritative final execution (a final Get), mirroring the agent path's
|
|
22
22
|
* return for symmetry. Ctrl-C aborts the subscription cleanly.
|
|
23
|
+
*
|
|
24
|
+
* The subscription never outlives the stream, as on the agent path
|
|
25
|
+
* (resources/stream/headless.ts, #1522): after the terminal event the loop
|
|
26
|
+
* keeps reading, rendering nothing more, until the server ends the
|
|
27
|
+
* subscription, which it does on a terminal phase. Leaving the loop early
|
|
28
|
+
* leaves the HTTP/2 stream's remaining frames unread, so the stream is never
|
|
29
|
+
* destroyed and holds the process alive after the run has finished (#1625).
|
|
30
|
+
* A server that does not end it within SUBSCRIPTION_DRAIN_GRACE_MS is
|
|
31
|
+
* cancelled, and the subscription's own signal is aborted on every way out.
|
|
23
32
|
*/
|
|
24
33
|
export declare function streamWorkflowExecution(deps: WorkflowStreamDeps, streams?: WorkflowStreamStreams): Promise<WorkflowExecution>;
|
|
25
34
|
//# sourceMappingURL=workflow-stream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-stream.d.ts","sourceRoot":"","sources":["../../src/resources/run/workflow-stream.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAC9F,OAAO,KAAK,EAAE,iBAAiB,EAAgB,MAAM,gEAAgE,CAAC;AAOtH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"workflow-stream.d.ts","sourceRoot":"","sources":["../../src/resources/run/workflow-stream.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAC9F,OAAO,KAAK,EAAE,iBAAiB,EAAgB,MAAM,gEAAgE,CAAC;AAOtH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAU5C,sEAAsE;AACtE,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE9C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;IACnC,iGAAiG;IACjG,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;CACxC;AAED,4EAA4E;AAC5E,MAAM,WAAW,qBAAqB;IACpC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,kBAAkB,EACxB,OAAO,GAAE,qBAAwC,GAChD,OAAO,CAAC,iBAAiB,CAAC,CAmC5B"}
|
|
@@ -22,6 +22,7 @@ import { SubmitWorkflowApprovalInputSchema, SubscribeEventsRequestSchema, } from
|
|
|
22
22
|
import { shouldColorize, styler } from "../../output/style.js";
|
|
23
23
|
import { calculateDuration } from "../execution-format.js";
|
|
24
24
|
import { formatWorkflowPhase } from "../execution.js";
|
|
25
|
+
import { SUBSCRIPTION_DRAIN_GRACE_MS } from "../stream/headless.js";
|
|
25
26
|
import { APPROVAL_RETRY_BASE_DELAY_MS, APPROVAL_RETRY_MAX_ATTEMPTS, retryWithBackoff } from "../stream/submit.js";
|
|
26
27
|
import { toWorkflowEventView } from "../stream/workflow-event-view.js";
|
|
27
28
|
import { renderWorkflowEventPlaintext } from "../stream/workflow-render-plaintext.js";
|
|
@@ -30,27 +31,46 @@ import { workflowEventToNdjson } from "../stream/workflow-render-ndjson.js";
|
|
|
30
31
|
* Stream a workflow execution to a terminal state, then print a summary. Returns
|
|
31
32
|
* the authoritative final execution (a final Get), mirroring the agent path's
|
|
32
33
|
* return for symmetry. Ctrl-C aborts the subscription cleanly.
|
|
34
|
+
*
|
|
35
|
+
* The subscription never outlives the stream, as on the agent path
|
|
36
|
+
* (resources/stream/headless.ts, #1522): after the terminal event the loop
|
|
37
|
+
* keeps reading, rendering nothing more, until the server ends the
|
|
38
|
+
* subscription, which it does on a terminal phase. Leaving the loop early
|
|
39
|
+
* leaves the HTTP/2 stream's remaining frames unread, so the stream is never
|
|
40
|
+
* destroyed and holds the process alive after the run has finished (#1625).
|
|
41
|
+
* A server that does not end it within SUBSCRIPTION_DRAIN_GRACE_MS is
|
|
42
|
+
* cancelled, and the subscription's own signal is aborted on every way out.
|
|
33
43
|
*/
|
|
34
44
|
export async function streamWorkflowExecution(deps, streams = defaultStreams()) {
|
|
35
45
|
const controller = new AbortController();
|
|
36
46
|
const onSignal = () => controller.abort();
|
|
37
47
|
process.once("SIGINT", onSignal);
|
|
38
48
|
process.once("SIGTERM", onSignal);
|
|
49
|
+
const subscription = new AbortController();
|
|
39
50
|
const resolved = new Set();
|
|
51
|
+
let ended = false;
|
|
52
|
+
let grace;
|
|
40
53
|
try {
|
|
41
|
-
const stream = deps.client.workflowExecution.subscribeEvents(create(SubscribeEventsRequestSchema, { executionId: deps.executionId }), controller.signal);
|
|
54
|
+
const stream = deps.client.workflowExecution.subscribeEvents(create(SubscribeEventsRequestSchema, { executionId: deps.executionId }), AbortSignal.any([controller.signal, subscription.signal]));
|
|
42
55
|
for await (const event of stream) {
|
|
56
|
+
if (ended)
|
|
57
|
+
continue;
|
|
43
58
|
renderEvent(event, deps.outputMode, streams);
|
|
44
59
|
await maybeResolveApproval(event, deps, streams, resolved, controller.signal);
|
|
45
|
-
if (toWorkflowEventView(event).terminal)
|
|
46
|
-
|
|
60
|
+
if (toWorkflowEventView(event).terminal) {
|
|
61
|
+
ended = true;
|
|
62
|
+
grace = setTimeout(() => subscription.abort(), SUBSCRIPTION_DRAIN_GRACE_MS);
|
|
63
|
+
}
|
|
47
64
|
}
|
|
48
65
|
}
|
|
49
66
|
catch (error) {
|
|
50
|
-
|
|
67
|
+
// After the terminal event the only error is the grace period's own cancel.
|
|
68
|
+
if (!ended && !controller.signal.aborted)
|
|
51
69
|
throw error;
|
|
52
70
|
}
|
|
53
71
|
finally {
|
|
72
|
+
clearTimeout(grace);
|
|
73
|
+
subscription.abort();
|
|
54
74
|
process.removeListener("SIGINT", onSignal);
|
|
55
75
|
process.removeListener("SIGTERM", onSignal);
|
|
56
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-stream.js","sourceRoot":"","sources":["../../src/resources/run/workflow-stream.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,EAAE;AACF,iFAAiF;AACjF,gFAAgF;AAChF,2EAA2E;AAC3E,2EAA2E;AAC3E,+EAA+E;AAC/E,+EAA+E;AAC/E,2EAA2E;AAC3E,EAAE;AACF,iFAAiF;AACjF,kFAAkF;AAClF,iFAAiF;AACjF,iFAAiF;AACjF,iFAAiF;AACjF,iFAAiF;AACjF,uEAAuE;AAEvE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAE9F,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAErH,OAAO,EACL,iCAAiC,EACjC,4BAA4B,GAC7B,MAAM,+DAA+D,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAe,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAClH,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAoB5E
|
|
1
|
+
{"version":3,"file":"workflow-stream.js","sourceRoot":"","sources":["../../src/resources/run/workflow-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,11 @@ export interface HeadlessRenderer {
|
|
|
12
12
|
/** Choose the approval action for an emitted ApprovalNeededEvent (may warn). */
|
|
13
13
|
resolveApproval(event: ApprovalNeededEvent): ApprovalAction;
|
|
14
14
|
}
|
|
15
|
+
/**
|
|
16
|
+
* How long the driver keeps reading after the terminal snapshot, for the
|
|
17
|
+
* server to end the subscription, before it cancels the call itself.
|
|
18
|
+
*/
|
|
19
|
+
export declare const SUBSCRIPTION_DRAIN_GRACE_MS = 2000;
|
|
15
20
|
/** The terminal outcome of a headless stream. */
|
|
16
21
|
export interface HeadlessResult {
|
|
17
22
|
readonly phase: string;
|
|
@@ -31,6 +36,17 @@ export interface HeadlessStreamDeps {
|
|
|
31
36
|
* Drive the stream to a terminal phase and return the outcome. Aborting (Ctrl-C)
|
|
32
37
|
* resolves cleanly with an empty result; a dropped stream renders a stream_error
|
|
33
38
|
* and returns its message.
|
|
39
|
+
*
|
|
40
|
+
* The subscription never outlives the drive (#1522). After the terminal
|
|
41
|
+
* snapshot the driver keeps reading, ignoring what follows, until the server
|
|
42
|
+
* ends the subscription, which it does on a terminal phase: an HTTP/2 stream
|
|
43
|
+
* whose unread frames are left in its buffer is never destroyed, and an open
|
|
44
|
+
* stream holds the session, and with it the process, alive after the run has
|
|
45
|
+
* finished. Leaving the loop early, or aborting the call once the server has
|
|
46
|
+
* already closed its side, does not release it. A server that does not end the
|
|
47
|
+
* stream within SUBSCRIPTION_DRAIN_GRACE_MS is cancelled, and the subscription
|
|
48
|
+
* is subscribed with a signal of the driver's own (joined to the caller's),
|
|
49
|
+
* aborted on every way out.
|
|
34
50
|
*/
|
|
35
51
|
export declare function runHeadlessStream(deps: HeadlessStreamDeps): Promise<HeadlessResult>;
|
|
36
52
|
/** Re-export so command wiring can reference the enum without a deep import. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless.d.ts","sourceRoot":"","sources":["../../src/resources/stream/headless.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6DAA6D,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAE9F,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAQpE;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,gFAAgF;IAChF,eAAe,CAAC,KAAK,EAAE,mBAAmB,GAAG,cAAc,CAAC;CAC7D;AAED,iDAAiD;AACjD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,kDAAkD;AAClD,MAAM,WAAW,kBAAkB;IACjC,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,aAAa,CAAC,cAAc,CAAC,CAAC;IAC3E,0EAA0E;IAC1E,QAAQ,CAAC,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED
|
|
1
|
+
{"version":3,"file":"headless.d.ts","sourceRoot":"","sources":["../../src/resources/stream/headless.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6DAA6D,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAE9F,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAQpE;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,gFAAgF;IAChF,eAAe,CAAC,KAAK,EAAE,mBAAmB,GAAG,cAAc,CAAC;CAC7D;AAED;;;GAGG;AACH,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAEjD,iDAAiD;AACjD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,kDAAkD;AAClD,MAAM,WAAW,kBAAkB;IACjC,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,aAAa,CAAC,cAAc,CAAC,CAAC;IAC3E,0EAA0E;IAC1E,QAAQ,CAAC,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,CAwBzF;AAyCD,gFAAgF;AAChF,OAAO,EAAE,cAAc,EAAE,CAAC"}
|
|
@@ -10,28 +10,56 @@
|
|
|
10
10
|
import { ApprovalAction } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
|
|
11
11
|
import { SnapshotDiffer } from "./diff.js";
|
|
12
12
|
import { APPROVAL_RETRY_BASE_DELAY_MS, APPROVAL_RETRY_MAX_ATTEMPTS, classifyStreamError, retryWithBackoff, } from "./submit.js";
|
|
13
|
+
/**
|
|
14
|
+
* How long the driver keeps reading after the terminal snapshot, for the
|
|
15
|
+
* server to end the subscription, before it cancels the call itself.
|
|
16
|
+
*/
|
|
17
|
+
export const SUBSCRIPTION_DRAIN_GRACE_MS = 2_000;
|
|
13
18
|
/**
|
|
14
19
|
* Drive the stream to a terminal phase and return the outcome. Aborting (Ctrl-C)
|
|
15
20
|
* resolves cleanly with an empty result; a dropped stream renders a stream_error
|
|
16
21
|
* and returns its message.
|
|
22
|
+
*
|
|
23
|
+
* The subscription never outlives the drive (#1522). After the terminal
|
|
24
|
+
* snapshot the driver keeps reading, ignoring what follows, until the server
|
|
25
|
+
* ends the subscription, which it does on a terminal phase: an HTTP/2 stream
|
|
26
|
+
* whose unread frames are left in its buffer is never destroyed, and an open
|
|
27
|
+
* stream holds the session, and with it the process, alive after the run has
|
|
28
|
+
* finished. Leaving the loop early, or aborting the call once the server has
|
|
29
|
+
* already closed its side, does not release it. A server that does not end the
|
|
30
|
+
* stream within SUBSCRIPTION_DRAIN_GRACE_MS is cancelled, and the subscription
|
|
31
|
+
* is subscribed with a signal of the driver's own (joined to the caller's),
|
|
32
|
+
* aborted on every way out.
|
|
17
33
|
*/
|
|
18
34
|
export async function runHeadlessStream(deps) {
|
|
19
35
|
const differ = new SnapshotDiffer();
|
|
36
|
+
const subscription = new AbortController();
|
|
37
|
+
let outcome;
|
|
38
|
+
let grace;
|
|
20
39
|
try {
|
|
21
|
-
for await (const snapshot of deps.subscribe(deps.signal)) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
40
|
+
for await (const snapshot of deps.subscribe(AbortSignal.any([deps.signal, subscription.signal]))) {
|
|
41
|
+
if (outcome !== undefined)
|
|
42
|
+
continue;
|
|
43
|
+
outcome = await drainSnapshot(differ.next(snapshot), deps);
|
|
44
|
+
if (outcome !== undefined) {
|
|
45
|
+
grace = setTimeout(() => subscription.abort(), SUBSCRIPTION_DRAIN_GRACE_MS);
|
|
46
|
+
}
|
|
25
47
|
}
|
|
26
|
-
return { phase: "", error: "" };
|
|
48
|
+
return outcome ?? { phase: "", error: "" };
|
|
27
49
|
}
|
|
28
50
|
catch (err) {
|
|
51
|
+
if (outcome !== undefined)
|
|
52
|
+
return outcome;
|
|
29
53
|
if (deps.signal.aborted)
|
|
30
54
|
return { phase: "", error: "" };
|
|
31
55
|
const message = classifyStreamError(err, deps.sessionId);
|
|
32
56
|
deps.renderer.render({ kind: "streamError", error: message });
|
|
33
57
|
return { phase: "", error: message };
|
|
34
58
|
}
|
|
59
|
+
finally {
|
|
60
|
+
clearTimeout(grace);
|
|
61
|
+
subscription.abort();
|
|
62
|
+
}
|
|
35
63
|
}
|
|
36
64
|
// Render every event for one snapshot, resolving approvals as they appear.
|
|
37
65
|
// Returns the terminal result when a done/stream_error event is reached.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless.js","sourceRoot":"","sources":["../../src/resources/stream/headless.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,EAAE;AACF,0EAA0E;AAC1E,gFAAgF;AAChF,6EAA6E;AAC7E,8EAA8E;AAC9E,gFAAgF;AAChF,2EAA2E;AAC3E,0EAA0E;AAG1E,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"headless.js","sourceRoot":"","sources":["../../src/resources/stream/headless.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,EAAE;AACF,0EAA0E;AAC1E,gFAAgF;AAChF,6EAA6E;AAC7E,8EAA8E;AAC9E,gFAAgF;AAChF,2EAA2E;AAC3E,0EAA0E;AAG1E,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAcrB;;;GAGG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,CAAC;AAmBjD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAwB;IAC9D,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;IAC3C,IAAI,OAAmC,CAAC;IACxC,IAAI,KAAgD,CAAC;IACrD,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACjG,IAAI,OAAO,KAAK,SAAS;gBAAE,SAAS;YACpC,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3D,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,2BAA2B,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;QACD,OAAO,OAAO,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC;QAC1C,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IACvC,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,YAAY,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,yEAAyE;AACzE,KAAK,UAAU,aAAa,CAAC,MAAqB,EAAE,IAAwB;IAC1E,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE5B,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACpD,IAAI,OAAO,KAAK,SAAS;gBAAE,OAAO,OAAO,CAAC;QAC5C,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7E,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IAC7E,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,6EAA6E;AAC7E,6EAA6E;AAC7E,gFAAgF;AAChF,2EAA2E;AAC3E,KAAK,UAAU,gBAAgB,CAC7B,KAA0B,EAC1B,IAAwB;IAExB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,GAAG,EAAE,CAClG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAC9C,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACzD,IAAI,OAAO,GAAG,mCAAmC,2BAA2B,WAAW,CAAC;QACxF,IAAI,IAAI,CAAC,SAAS,KAAK,EAAE;YAAE,OAAO,IAAI,wCAAwC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/F,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IACvC,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,OAAO,EAAE,cAAc,EAAE,CAAC"}
|
package/resources/usage.d.ts
CHANGED
|
@@ -6,8 +6,8 @@ export interface DateRange {
|
|
|
6
6
|
readonly to: string;
|
|
7
7
|
}
|
|
8
8
|
export declare function getSessionUsageReport(client: Stigmer, sessionId: string): Promise<GetSessionUsageReportOutput>;
|
|
9
|
-
export declare function getAgentUsageReport(client: Stigmer, agentId: string,
|
|
10
|
-
export declare function getOrgUsageReport(client: Stigmer,
|
|
9
|
+
export declare function getAgentUsageReport(client: Stigmer, agentId: string, org: string, range: DateRange): Promise<GetAgentUsageReportOutput>;
|
|
10
|
+
export declare function getOrgUsageReport(client: Stigmer, org: string, range: DateRange): Promise<GetOrgUsageReportOutput>;
|
|
11
11
|
export declare function renderSessionUsage(report: GetSessionUsageReportOutput, format: OutputFormat): string;
|
|
12
12
|
export declare function renderAgentUsage(report: GetAgentUsageReportOutput, range: DateRange, format: OutputFormat): string;
|
|
13
13
|
export declare function renderOrgUsage(report: GetOrgUsageReportOutput, range: DateRange, format: OutputFormat): string;
|
package/resources/usage.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/resources/usage.ts"],"names":[],"mappings":"AAaA,OAAO,EAOL,KAAK,yBAAyB,EAC9B,KAAK,uBAAuB,EAC5B,KAAK,2BAA2B,EACjC,MAAM,4DAA4D,CAAC;AAEpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB;AAID,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAEpH;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,MAAM,EACf,
|
|
1
|
+
{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/resources/usage.ts"],"names":[],"mappings":"AAaA,OAAO,EAOL,KAAK,yBAAyB,EAC9B,KAAK,uBAAuB,EAC5B,KAAK,2BAA2B,EACjC,MAAM,4DAA4D,CAAC;AAEpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB;AAID,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAEpH;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,yBAAyB,CAAC,CAIpC;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,uBAAuB,CAAC,CAIlC;AAID,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,2BAA2B,EAAE,MAAM,EAAE,YAAY,GAAG,MAAM,CA6DpG;AAID,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,yBAAyB,EACjC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,YAAY,GACnB,MAAM,CA0CR;AAID,wBAAgB,cAAc,CAC5B,MAAM,EAAE,uBAAuB,EAC/B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,YAAY,GACnB,MAAM,CA2CR"}
|
package/resources/usage.js
CHANGED
|
@@ -16,11 +16,11 @@ import { renderProtoJson, renderProtoYaml, renderTable } from "../output/index.j
|
|
|
16
16
|
export async function getSessionUsageReport(client, sessionId) {
|
|
17
17
|
return client.agentExecution.getSessionUsageReport(create(GetSessionUsageReportInputSchema, { sessionId }));
|
|
18
18
|
}
|
|
19
|
-
export async function getAgentUsageReport(client, agentId,
|
|
20
|
-
return client.agentExecution.getAgentUsageReport(create(GetAgentUsageReportInputSchema, { agentId,
|
|
19
|
+
export async function getAgentUsageReport(client, agentId, org, range) {
|
|
20
|
+
return client.agentExecution.getAgentUsageReport(create(GetAgentUsageReportInputSchema, { agentId, org, fromDate: range.from, toDate: range.to }));
|
|
21
21
|
}
|
|
22
|
-
export async function getOrgUsageReport(client,
|
|
23
|
-
return client.agentExecution.getOrgUsageReport(create(GetOrgUsageReportInputSchema, {
|
|
22
|
+
export async function getOrgUsageReport(client, org, range) {
|
|
23
|
+
return client.agentExecution.getOrgUsageReport(create(GetOrgUsageReportInputSchema, { org, fromDate: range.from, toDate: range.to }));
|
|
24
24
|
}
|
|
25
25
|
// --- Render: session ---
|
|
26
26
|
export function renderSessionUsage(report, format) {
|