@vforsh/argus 0.5.1 → 0.5.2
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/.tsbuildinfo +1 -1
- package/dist/argus.js +186 -39
- package/dist/cli/register/recordCommands.d.ts.map +1 -1
- package/dist/cli/register/recordCommands.js +6 -3
- package/dist/cli/register/recordCommands.js.map +1 -1
- package/dist/cli/register/snapshotCommands.js +1 -1
- package/dist/cli/register/snapshotCommands.js.map +1 -1
- package/dist/cli/register/traceCommands.d.ts.map +1 -1
- package/dist/cli/register/traceCommands.js +6 -3
- package/dist/cli/register/traceCommands.js.map +1 -1
- package/dist/commands/domKeydown.d.ts.map +1 -1
- package/dist/commands/domKeydown.js +7 -2
- package/dist/commands/domKeydown.js.map +1 -1
- package/dist/commands/page.js +2 -2
- package/dist/commands/page.js.map +1 -1
- package/dist/commands/record.d.ts.map +1 -1
- package/dist/commands/record.js +3 -2
- package/dist/commands/record.js.map +1 -1
- package/dist/commands/screenshot.d.ts.map +1 -1
- package/dist/commands/screenshot.js +2 -1
- package/dist/commands/screenshot.js.map +1 -1
- package/dist/commands/trace.d.ts.map +1 -1
- package/dist/commands/trace.js +3 -2
- package/dist/commands/trace.js.map +1 -1
- package/dist/eval/evalClient.d.ts +9 -1
- package/dist/eval/evalClient.d.ts.map +1 -1
- package/dist/eval/evalClient.js +31 -8
- package/dist/eval/evalClient.js.map +1 -1
- package/dist/skill/argus/SKILL.md +6 -0
- package/dist/skill/argus/reference/CAPTURE.md +6 -0
- package/dist/skill/argus/reference/EVAL.md +2 -0
- package/dist/skill/argus/reference/INSPECT.md +6 -0
- package/dist/utils/paths.d.ts +12 -0
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +15 -0
- package/dist/utils/paths.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domKeydown.js","sourceRoot":"","sources":["../../src/commands/domKeydown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAiBrE,MAAM,uBAAuB,GAAG,CAAC,KAAyB,EAAsB,EAAE;IACjF,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,CAAA;IAChC,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;AAC3C,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,OAA0B,EAAsB,EAAE;IAC/E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAA;IAEnC,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QACtC,IAAI,IAAI,EAAE,CAAC;YACV,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACpB,CAAC;IACF,CAAC;IAED,IAAI,OAAO,CAAC,KAAK;QAAE,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACzC,IAAI,OAAO,CAAC,IAAI;QAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,OAAO,CAAC,GAAG;QAAE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACrC,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG;QAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAEtD,OAAO,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACxE,CAAC,CAAA;AAED,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAwC;IACxF,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACjC,MAAM,GAAG,GAAG,uBAAuB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAChD,MAAM,IAAI,GAAG,uBAAuB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAElD,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAA;YAC/C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAO,IAAI,CAAA;QACZ,CAAC;QAED,OAAO;YACN,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACL,GAAG;gBACH,IAAI;gBACJ,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC;aACxC;YACD,SAAS,EAAE,MAAM;SACjB,CAAA;IACF,CAAC;IACD,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;QAC9C,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,CAAC,UAAU,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"domKeydown.js","sourceRoot":"","sources":["../../src/commands/domKeydown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAiBrE,MAAM,uBAAuB,GAAG,CAAC,KAAyB,EAAsB,EAAE;IACjF,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,CAAA;IAChC,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;AAC3C,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,OAA0B,EAAsB,EAAE;IAC/E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAA;IAEnC,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QACtC,IAAI,IAAI,EAAE,CAAC;YACV,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACpB,CAAC;IACF,CAAC;IAED,IAAI,OAAO,CAAC,KAAK;QAAE,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACzC,IAAI,OAAO,CAAC,IAAI;QAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,OAAO,CAAC,GAAG;QAAE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACrC,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG;QAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAEtD,OAAO,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACxE,CAAC,CAAA;AAED,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAwC;IACxF,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACjC,MAAM,GAAG,GAAG,uBAAuB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAChD,MAAM,IAAI,GAAG,uBAAuB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAElD,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAA;YAC/C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAO,IAAI,CAAA;QACZ,CAAC;QAED,OAAO;YACN,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACL,GAAG;gBACH,IAAI;gBACJ,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC;aACxC;YACD,SAAS,EAAE,MAAM;SACjB,CAAA;IACF,CAAC;IACD,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;QAC9C,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,CAAC,UAAU,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACjF,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,UAAU,CAAC,uBAAuB,QAAQ,CAAC,GAAG,UAAU,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAA;QACjF,CAAC;QACD,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,sGAAsG;YACtG,MAAM,CAAC,UAAU,CAAC,mGAAmG,CAAC,CAAA;QACvH,CAAC;IACF,CAAC;CACD,CAAC,CAAA"}
|
package/dist/commands/page.js
CHANGED
|
@@ -4,7 +4,7 @@ import { selectTargetFromCandidates } from '../cdp/selectTarget.js';
|
|
|
4
4
|
import { fetchJson } from '../httpClient.js';
|
|
5
5
|
import { createOutput } from '../output/io.js';
|
|
6
6
|
import { formatError } from '../cli/parse.js';
|
|
7
|
-
import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
7
|
+
import { formatWatcherTransportError, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
8
8
|
import { loadChromeTargets } from './chrome/shared.js';
|
|
9
9
|
const parseParamPair = (value) => {
|
|
10
10
|
const eqIdx = value.indexOf('=');
|
|
@@ -103,7 +103,7 @@ const resolveAttachedTarget = async (options, output) => {
|
|
|
103
103
|
status = await fetchJson(statusUrl, { timeoutMs: 2_000 });
|
|
104
104
|
}
|
|
105
105
|
catch (error) {
|
|
106
|
-
output.writeWarn(
|
|
106
|
+
output.writeWarn(formatWatcherTransportError(resolved.watcher, error));
|
|
107
107
|
process.exitCode = 1;
|
|
108
108
|
return null;
|
|
109
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/commands/page.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAe,MAAM,iBAAiB,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/commands/page.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../src/commands/record.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAA2D,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../src/commands/record.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAA2D,MAAM,oBAAoB,CAAA;AAWjI,MAAM,MAAM,aAAa,GAAG;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,eAAO,MAAM,SAAS,iFAKpB,CAAA;AAEF,eAAO,MAAM,cAAc,sFAOzB,CAAA;AAEF,eAAO,MAAM,aAAa,qFAKxB,CAAA;AA6HF,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAW/F,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG;IAAE,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAgB1G,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,IAM5E,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG;IAAE,KAAK,CAAC,EAAE,YAAY,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAWxG,CAAA;AAED,eAAO,MAAM,4BAA4B,GAAI,SAAS,MAAM,GAAG,SAAS,KAAG,YAAY,GAAG,SAKzF,CAAA;AAED,eAAO,MAAM,8BAA8B,GAAI,SAAS,MAAM,GAAG,SAAS,EAAE,QAAQ,YAAY,KAAG,MAAM,GAAG,IAQ3G,CAAA"}
|
package/dist/commands/record.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { RECORD_FORMATS } from '@vforsh/argus-core';
|
|
3
3
|
import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
|
|
4
|
+
import { resolveArtifactOutFile } from '../utils/paths.js';
|
|
4
5
|
import { parseDurationMs } from '@vforsh/argus-core';
|
|
5
6
|
const RECORD_STOP_TIMEOUT_MS = 60_000;
|
|
6
7
|
const RECORD_START_TIMEOUT_MS = 30_000;
|
|
@@ -67,7 +68,7 @@ const buildRecordStopPlan = (options, output) => {
|
|
|
67
68
|
method: 'POST',
|
|
68
69
|
body: {
|
|
69
70
|
recordId: normalizeString(options.recordId),
|
|
70
|
-
outFile: options.out,
|
|
71
|
+
outFile: resolveArtifactOutFile(options.out),
|
|
71
72
|
},
|
|
72
73
|
timeoutMs: RECORD_STOP_TIMEOUT_MS,
|
|
73
74
|
};
|
|
@@ -91,7 +92,7 @@ const buildRecordBody = (options, output) => {
|
|
|
91
92
|
return null;
|
|
92
93
|
}
|
|
93
94
|
return {
|
|
94
|
-
outFile: options.out,
|
|
95
|
+
outFile: resolveArtifactOutFile(options.out),
|
|
95
96
|
selector,
|
|
96
97
|
clip,
|
|
97
98
|
fps,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record.js","sourceRoot":"","sources":["../../src/commands/record.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"record.js","sourceRoot":"","sources":["../../src/commands/record.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAA2B,MAAM,gCAAgC,CAAA;AAE9F,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,MAAM,sBAAsB,GAAG,MAAM,CAAA;AACrC,MAAM,uBAAuB,GAAG,MAAM,CAAA;AACtC,MAAM,uBAAuB,GAAG,MAAM,CAAA;AAoBtC,MAAM,CAAC,MAAM,SAAS,GAAG,oBAAoB,CAAgC;IAC5E,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC;IACnE,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrC,MAAM,CAAC,UAAU,CAAC,oBAAoB,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,UAAU,YAAY,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACpI,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAA0C;IAC3F,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC;IACxE,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrC,MAAM,CAAC,UAAU,CAAC,sBAAsB,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5D,MAAM,CAAC,UAAU,CAAC,YAAY,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAA;QACrD,MAAM,CAAC,UAAU,CAAC,WAAW,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACjD,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAwC;IACxF,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC;IACvE,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrC,MAAM,CAAC,UAAU,CAAC,oBAAoB,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,UAAU,YAAY,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACpI,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,MAAc,EAA6B,EAAE;IAC7F,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAChE,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC7C,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,MAAM;QACd,IAAI,EAAE;YACL,GAAG,IAAI;YACP,UAAU;SACV;QACD,SAAS,EAAE,UAAU,GAAG,uBAAuB;KAC/C,CAAA;AACF,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,OAA2B,EAAE,MAAc,EAA6B,EAAE;IACvG,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC7C,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,MAAM;QACd,IAAI;QACJ,SAAS,EAAE,uBAAuB;KAClC,CAAA;AACF,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAC,OAA0B,EAAE,MAAc,EAA6B,EAAE;IACrG,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACtD,IAAI,WAAW,EAAE,CAAC;QACjB,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QAC3C,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC3C,OAAO,EAAE,sBAAsB,CAAC,OAAO,CAAC,GAAG,CAAC;SAC5C;QACD,SAAS,EAAE,sBAAsB;KACjC,CAAA;AACF,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACvB,OAA2B,EAC3B,MAAc,EACgG,EAAE;IAChH,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAClD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAClD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACtB,sBAAsB,CAAC,MAAM,EAAE,uCAAuC,CAAC,CAAA;QACvE,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC/C,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IACrE,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,OAAO,EAAE,sBAAsB,CAAC,OAAO,CAAC,GAAG,CAAC;QAC5C,QAAQ;QACR,IAAI;QACJ,GAAG;QACH,MAAM;KACN,CAAA;AACF,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAC,KAAyB,EAAE,MAAc,EAAiB,EAAE;IACxF,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,sBAAsB,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;QAC1D,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACrC,IAAI,CAAC,MAAM,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC5B,sBAAsB,CAAC,MAAM,EAAE,6BAA6B,KAAK,EAAE,CAAC,CAAA;QACpE,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO,MAAM,CAAA;AACd,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,KAAyB,EAAE,MAAc,EAA6B,EAAE;IAC/F,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAA;IACzC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,KAAyB,EAAE,MAAc,EAAuC,EAAE;IAC1G,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;IAC1C,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAyB,EAAsC,EAAE;IACpG,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,EAAE,EAAE,CAAC;QAC3D,OAAO,EAAE,KAAK,EAAE,sDAAsD,EAAE,CAAA;IACzE,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAyB,EAAgD,EAAE;IAC/G,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QACvD,OAAO,EAAE,KAAK,EAAE,kDAAkD,EAAE,CAAA;IACrE,CAAC;IAED,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAChF,OAAO,EAAE,KAAK,EAAE,qFAAqF,EAAE,CAAA;IACxG,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAA2B,EAAiB,EAAE;IACnF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAC7D,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAA;IACZ,CAAC;IACD,OAAO,wEAAwE,CAAA;AAChF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAA4C,EAAE;IAC7G,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IAC7C,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAChC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;IAC7B,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,2CAA2C,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;AAC1F,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,OAA2B,EAA4B,EAAE;IACrG,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAC7D,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,KAAK,CAAA;IAChC,IAAI,GAAG,KAAK,OAAO;QAAE,OAAO,MAAM,CAAA;IAClC,OAAO,SAAS,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,OAA2B,EAAE,MAAoB,EAAiB,EAAE;IAClH,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAClD,IAAI,WAAW,EAAE,CAAC;QACjB,OAAO,WAAW,CAAA;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAA;IACtD,OAAO,QAAQ,IAAI,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,qBAAqB,QAAQ,4BAA4B,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAA;AACnH,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,KAAyB,EAAE,OAA2B,EAAE,MAAc,EAAuB,EAAE;IACzH,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,4BAA4B,CAAC,OAAO,CAAC,IAAI,KAAK,CAAA;IAC7E,MAAM,WAAW,GAAG,8BAA8B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACnE,IAAI,WAAW,EAAE,CAAC;QACjB,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QAC3C,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO,MAAM,CAAA;AACd,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,KAAa,EAAyB,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAqB,CAAC,CAAA;AAE/G,MAAM,eAAe,GAAG,CAAC,KAAyB,EAAsB,EAAE;IACzE,MAAM,OAAO,GAAG,KAAK,EAAE,IAAI,EAAE,CAAA;IAC7B,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,OAAe,EAAQ,EAAE;IACxE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACzB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../src/commands/screenshot.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../src/commands/screenshot.ts"],"names":[],"mappings":"AAOA,0CAA0C;AAC1C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,uDAAuD;AACvD,eAAO,MAAM,aAAa,qFAKxB,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
|
|
2
|
+
import { resolveArtifactOutFile } from '../utils/paths.js';
|
|
2
3
|
const SCREENSHOT_REQUEST_TIMEOUT_MS = 45_000;
|
|
3
4
|
/** Execute the screenshot command for a watcher id. */
|
|
4
5
|
export const runScreenshot = defineWatcherCommand({
|
|
@@ -21,7 +22,7 @@ const buildScreenshotPlan = (options, output) => {
|
|
|
21
22
|
path: '/screenshot',
|
|
22
23
|
method: 'POST',
|
|
23
24
|
body: {
|
|
24
|
-
outFile: options.out,
|
|
25
|
+
outFile: resolveArtifactOutFile(options.out),
|
|
25
26
|
selector,
|
|
26
27
|
clip,
|
|
27
28
|
format: 'png',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../src/commands/screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAA2B,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../src/commands/screenshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"AAOA,oDAAoD;AACpD,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,2CAA2C;AAC3C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,0CAA0C;AAC1C,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,YAAY,KAAG,OAAO,CAAC,IAAI,CAsC1F,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,aAAa,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAkBpG,CAAA;AAED,uDAAuD;AACvD,eAAO,MAAM,YAAY,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAgBlG,CAAA"}
|
package/dist/commands/trace.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createOutput } from '../output/io.js';
|
|
2
2
|
import { parseDurationMs } from '@vforsh/argus-core';
|
|
3
3
|
import { fetchWatcherJson, formatWatcherTransportError, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
4
|
+
import { resolveArtifactOutFile } from '../utils/paths.js';
|
|
4
5
|
import { delay } from '@vforsh/argus-core';
|
|
5
6
|
/** Execute trace start + stop with duration. */
|
|
6
7
|
export const runTrace = async (id, options) => {
|
|
@@ -75,7 +76,7 @@ const runTraceStartInternal = async (watcher, options, output) => {
|
|
|
75
76
|
path: '/trace/start',
|
|
76
77
|
method: 'POST',
|
|
77
78
|
body: {
|
|
78
|
-
outFile: options.out,
|
|
79
|
+
outFile: resolveArtifactOutFile(options.out),
|
|
79
80
|
categories: options.categories,
|
|
80
81
|
options: options.options,
|
|
81
82
|
},
|
|
@@ -94,7 +95,7 @@ const runTraceStopInternal = async (watcher, options, output) => {
|
|
|
94
95
|
const response = await fetchWatcherJson(watcher, {
|
|
95
96
|
path: '/trace/stop',
|
|
96
97
|
method: 'POST',
|
|
97
|
-
body: { traceId: options.traceId, outFile: options.outFile },
|
|
98
|
+
body: { traceId: options.traceId, outFile: resolveArtifactOutFile(options.outFile) },
|
|
98
99
|
timeoutMs: 20_000,
|
|
99
100
|
});
|
|
100
101
|
return response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,15 @@ export type EvalAttemptResult = {
|
|
|
34
34
|
attempt: number;
|
|
35
35
|
};
|
|
36
36
|
export declare const evalOnce: (input: EvalOnceInput) => Promise<EvalOutcome>;
|
|
37
|
-
/**
|
|
37
|
+
/**
|
|
38
|
+
* Explain a transport failure that never reached the watcher's own diagnosis.
|
|
39
|
+
*
|
|
40
|
+
* The watcher deadlines its page work and answers with the layer that stalled, so a timeout *here*
|
|
41
|
+
* means something coarser: the watcher process itself did not reply. Suggesting a longer eval
|
|
42
|
+
* timeout as the sole remedy — which is what this used to do for every timeout — sends the caller
|
|
43
|
+
* to retune a knob that cannot help when the watcher is wedged or gone. Name that possibility
|
|
44
|
+
* first, then the timeout.
|
|
45
|
+
*/
|
|
38
46
|
export declare const formatEvalTransportError: (watcher: Pick<WatcherRecord, "id">, error: unknown, timeoutMs: number | undefined) => string;
|
|
39
47
|
export declare const evalWithRetries: (input: EvalWithRetriesInput) => Promise<EvalAttemptResult>;
|
|
40
48
|
//# sourceMappingURL=evalClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evalClient.d.ts","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"evalClient.d.ts","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAerE,MAAM,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IACpD,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,YAAY,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IAClD,UAAU,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,WAAW,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAA;CAAE,GACpC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAEzF,MAAM,MAAM,iBAAiB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1G,eAAO,MAAM,QAAQ,GAAU,OAAO,aAAa,KAAG,OAAO,CAAC,WAAW,CA0CxE,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,GAAI,SAAS,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,OAAO,OAAO,EAAE,WAAW,MAAM,GAAG,SAAS,KAAG,MAe5H,CAAA;AAcD,eAAO,MAAM,eAAe,GAAU,OAAO,oBAAoB,KAAG,OAAO,CAAC,iBAAiB,CAgC5F,CAAA"}
|
package/dist/eval/evalClient.js
CHANGED
|
@@ -1,18 +1,30 @@
|
|
|
1
|
+
import { classifyWatcherFailure } from '@vforsh/argus-core';
|
|
1
2
|
import { fetchWatcherJson, formatWatcherTransportError } from '../watchers/requestWatcher.js';
|
|
2
3
|
import { formatError } from '../cli/parse.js';
|
|
3
|
-
|
|
4
|
+
/** Page-side deadline used when `--timeout` is absent. */
|
|
5
|
+
const DEFAULT_EVAL_TIMEOUT_MS = 10_000;
|
|
6
|
+
/**
|
|
7
|
+
* Headroom over the page deadline, so the watcher's own answer wins the race against the HTTP
|
|
8
|
+
* timeout. Sized for the layered diagnosis the watcher runs after a stall — two short probes plus
|
|
9
|
+
* the reply — because a diagnosis that arrives after the client has given up explains nothing.
|
|
10
|
+
*/
|
|
11
|
+
const REQUEST_TIMEOUT_GRACE_MS = 8_000;
|
|
4
12
|
const MIN_SUGGESTED_TIMEOUT_MS = 60_000;
|
|
5
13
|
export const evalOnce = async (input) => {
|
|
14
|
+
// Always name the page-side deadline. The watcher can say *which layer* stalled — dead browser,
|
|
15
|
+
// replaced target, wedged renderer, slow expression — but only if it is the side that gives up
|
|
16
|
+
// first; letting the HTTP request expire instead throws that diagnosis away.
|
|
17
|
+
const evalTimeoutMs = input.timeoutMs ?? DEFAULT_EVAL_TIMEOUT_MS;
|
|
6
18
|
const body = {
|
|
7
19
|
expression: input.expression,
|
|
8
20
|
args: input.args,
|
|
9
21
|
awaitPromise: input.awaitPromise,
|
|
10
22
|
replMode: input.replMode,
|
|
11
23
|
returnByValue: input.returnByValue,
|
|
12
|
-
timeoutMs:
|
|
24
|
+
timeoutMs: evalTimeoutMs,
|
|
13
25
|
scenario: input.scenario,
|
|
14
26
|
};
|
|
15
|
-
const requestTimeoutMs =
|
|
27
|
+
const requestTimeoutMs = evalTimeoutMs + REQUEST_TIMEOUT_GRACE_MS;
|
|
16
28
|
let response;
|
|
17
29
|
try {
|
|
18
30
|
response = await fetchWatcherJson(input.watcher, {
|
|
@@ -39,16 +51,27 @@ export const evalOnce = async (input) => {
|
|
|
39
51
|
}
|
|
40
52
|
return { ok: true, response };
|
|
41
53
|
};
|
|
42
|
-
/**
|
|
54
|
+
/**
|
|
55
|
+
* Explain a transport failure that never reached the watcher's own diagnosis.
|
|
56
|
+
*
|
|
57
|
+
* The watcher deadlines its page work and answers with the layer that stalled, so a timeout *here*
|
|
58
|
+
* means something coarser: the watcher process itself did not reply. Suggesting a longer eval
|
|
59
|
+
* timeout as the sole remedy — which is what this used to do for every timeout — sends the caller
|
|
60
|
+
* to retune a knob that cannot help when the watcher is wedged or gone. Name that possibility
|
|
61
|
+
* first, then the timeout.
|
|
62
|
+
*/
|
|
43
63
|
export const formatEvalTransportError = (watcher, error, timeoutMs) => {
|
|
44
64
|
const baseMessage = formatWatcherTransportError(watcher, error);
|
|
45
|
-
|
|
65
|
+
// A rejection *is* the watcher's answer, and it already names the layer that stalled. Appending
|
|
66
|
+
// "the watcher did not answer" on top of it would contradict the sentence before it.
|
|
67
|
+
if (classifyWatcherFailure(error) === 'api-rejection' || !isTimeoutError(error)) {
|
|
46
68
|
return baseMessage;
|
|
47
69
|
}
|
|
48
|
-
const suggestedTimeoutMs = Math.max(MIN_SUGGESTED_TIMEOUT_MS, (timeoutMs ??
|
|
70
|
+
const suggestedTimeoutMs = Math.max(MIN_SUGGESTED_TIMEOUT_MS, (timeoutMs ?? DEFAULT_EVAL_TIMEOUT_MS) * 2);
|
|
49
71
|
return (`${baseMessage}. ` +
|
|
50
|
-
`
|
|
51
|
-
|
|
72
|
+
`The watcher did not answer at all, so it may be unresponsive rather than slow: check \`argus watcher status ${watcher.id}\` ` +
|
|
73
|
+
`and \`argus doctor\`. If the watcher is healthy, the expression needs more time; pass a longer timeout as milliseconds or a ` +
|
|
74
|
+
`duration, for example: \`argus eval ${watcher.id} --timeout ${formatSuggestedDuration(suggestedTimeoutMs)} ...\``);
|
|
52
75
|
};
|
|
53
76
|
const isTimeoutError = (error) => {
|
|
54
77
|
const message = formatError(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evalClient.js","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM
|
|
1
|
+
{"version":3,"file":"evalClient.js","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -147,6 +147,10 @@ argus keydown app --code Backquote --shift
|
|
|
147
147
|
argus scroll-to app --selector "#footer"
|
|
148
148
|
```
|
|
149
149
|
|
|
150
|
+
Chrome drops keyboard input aimed at an unfocused page, so `keydown` checks focus first. On a hidden page (headless, background tab, covered window) it activates the page — the same sticky state as `argus page show` — and reports `activated: true`; release it with `argus page hide <id>`. If activation does not take, it fails with `target_not_focused` instead of reporting a key the page never received.
|
|
151
|
+
|
|
152
|
+
Artifact `--out` paths (`screenshot`, `record`, `trace`) are absolute or relative to **your** working directory, not the watcher's.
|
|
153
|
+
|
|
150
154
|
For generated commands, `argus eval app --expression "document.title"` is equivalent to the positional expression form.
|
|
151
155
|
|
|
152
156
|
For iframe-active extension watchers, commands run against the selected iframe target. Screenshots, recordings, selectors, and eval are resolved relative to that iframe.
|
|
@@ -225,6 +229,8 @@ Keep these commands in the background in agent shells. See [START.md](./referenc
|
|
|
225
229
|
|
|
226
230
|
**Need to keep a page unthrottled** — Use `argus page show <id>` or `argus ext show <id>`. Hide later with `argus page hide <id>`.
|
|
227
231
|
|
|
232
|
+
**Command timed out** — Read the layer the error names before raising `--timeout`; only `cdp_timeout` ("the expression itself exceeded its deadline") is fixed by a longer one. `chrome_unreachable` means restart the browser, `cdp_target_replaced` means retry (Argus is reattaching), `cdp_renderer_unresponsive` means the page's main thread is blocked — `argus reload <id>` — and `dialog_blocking` means dismiss the dialog. A timeout reported as "failed to reach watcher" is the watcher itself not answering: `argus watcher status <id>`, then `argus doctor`.
|
|
233
|
+
|
|
228
234
|
## Google Sheets Safety Flow
|
|
229
235
|
|
|
230
236
|
With the Google Sheets plugin enabled, prefer targeted, coordinate-safe commands:
|
|
@@ -13,6 +13,12 @@ argus screenshot app --testid "game-canvas" --out game.png
|
|
|
13
13
|
|
|
14
14
|
`--selector` and `--clip` are mutually exclusive. `--clip` is viewport-relative in CSS pixels. `--testid <id>` is shorthand for `--selector "[data-testid='<id>']"`.
|
|
15
15
|
|
|
16
|
+
## Output Paths
|
|
17
|
+
|
|
18
|
+
`--out` is absolute, or relative to the working directory of the process running the CLI — `--out build/shots/page.png` lands under your cwd, and `~` expands. This holds for `screenshot`, `record`, and `trace`; the response's `outFile` is always the absolute path that was written.
|
|
19
|
+
|
|
20
|
+
The watcher writes the file, and its own working directory is a temp artifacts dir, so callers that skip the CLI (the SDK, raw HTTP) must send an absolute path — a relative one resolves under that temp dir instead.
|
|
21
|
+
|
|
16
22
|
## Recording
|
|
17
23
|
|
|
18
24
|
```bash
|
|
@@ -92,6 +92,8 @@ argus eval app "Date.now()" --interval 500 --count 10 --out ./frames.json --rota
|
|
|
92
92
|
| `--out <path>` | Write result to file |
|
|
93
93
|
| `--rotate` | One file per poll iteration |
|
|
94
94
|
|
|
95
|
+
`--timeout` defaults to 10s and is enforced _in the watcher_, which then reports which layer ran out of time. Only `cdp_timeout` — "the expression itself exceeded its deadline" — is the one a longer `--timeout` fixes. `chrome_unreachable`, `cdp_target_replaced`, `cdp_renderer_unresponsive`, and `dialog_blocking` each name a different failure and their own recovery; raising the timeout there only buys a slower version of the same error.
|
|
96
|
+
|
|
95
97
|
## Script Args
|
|
96
98
|
|
|
97
99
|
`--arg <key=value>` is repeatable on `eval`/`js` and `eval-until`/`wait`. It exposes a frozen `args` object to the evaluated source:
|
|
@@ -101,6 +101,12 @@ argus scroll-to app --selector ".panel" --by 0,500
|
|
|
101
101
|
|
|
102
102
|
`keydown` accepts `--key` (a `KeyboardEvent.key` value) and/or `--code` (a `KeyboardEvent.code` value); both are case-insensitive. Recognized codes: `KeyA`–`KeyZ`, `Digit0`–`Digit9`, `F1`–`F12`, `Enter`, `Tab`, `Escape`, `Backspace`, `Delete`, `Space`, the arrows, `Home`/`End`/`PageUp`/`PageDown`/`Insert`, and the US-layout punctuation row (`Backquote`, `Minus`, `Equal`, `BracketLeft`, `BracketRight`, `Backslash`, `Semicolon`, `Quote`, `Comma`, `Period`, `Slash`). With `--shift`, punctuation and digits resolve to their shifted character while keeping the physical code — `--code Backquote --shift` dispatches `key: ~`, `code: Backquote`, `keyCode: 192`.
|
|
103
103
|
|
|
104
|
+
`keydown` sends one `keyDown` and one `keyUp` — the same two events Chrome's other automation clients send. Keys that produce text (letters, digits, punctuation, `Space`, and `Enter`) carry it on the `keyDown`, so the page sees exactly what a real press produces: one `keydown`, one `keypress`, one `input`. `--key Enter` therefore submits a focused form and inserts a newline in a textarea. Keys that produce no text (`Tab`, `Escape`, `Backspace`, the arrows, F-keys) go out as `rawKeyDown` and fire no `keypress` — also what a real press does.
|
|
105
|
+
|
|
106
|
+
`keydown` does not set `nativeVirtualKeyCode`; that field means the _platform's_ key code (a Carbon keycode on macOS), and sending the Windows value there made Chrome 152 headless repeat the key thousands of times a second until the renderer stopped answering CDP.
|
|
107
|
+
|
|
108
|
+
Chrome delivers keyboard input only to a focused page, and acks the CDP command either way — so `keydown` proves focus before dispatching. A hidden page (headless, background tab, covered window) is activated first, using the same sticky lock as `argus page show`, and the response says `activated: true`; `argus page hide <id>` releases it. When activation does not take, the command fails with `target_not_focused` rather than reporting a key the page never received. Visible pages are untouched: `activated` stays `false` and nothing extra is sent.
|
|
109
|
+
|
|
104
110
|
`--wait <duration>` on click/fill/drag polls for the selector before acting. Duration examples: `5s`, `500ms`, `2m`.
|
|
105
111
|
|
|
106
112
|
## Dialogs
|
package/dist/utils/paths.d.ts
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
1
|
/** Expand leading ~ to user home directory, then resolve to absolute path. */
|
|
2
2
|
export declare const resolvePath: (input: string) => string;
|
|
3
|
+
/**
|
|
4
|
+
* Resolve an artifact `--out` path the CLI hands to a watcher.
|
|
5
|
+
*
|
|
6
|
+
* Artifacts (screenshots, recordings, traces) are written by the watcher process, whose working
|
|
7
|
+
* directory is its own temp artifacts dir — so a relative path used to land under
|
|
8
|
+
* `/var/folders/…/T/argus/<id>/` instead of next to the caller. The CLI resolves the path against
|
|
9
|
+
* *its* cwd before sending it, which makes `--out build/shot.png` mean what a shell user expects.
|
|
10
|
+
* `~` is expanded on the way.
|
|
11
|
+
*
|
|
12
|
+
* @returns An absolute path, or `undefined` when no output was requested (watcher picks a default).
|
|
13
|
+
*/
|
|
14
|
+
export declare const resolveArtifactOutFile: (out: string | undefined) => string | undefined;
|
|
3
15
|
//# sourceMappingURL=paths.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAGA,8EAA8E;AAC9E,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAG3C,CAAA"}
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAGA,8EAA8E;AAC9E,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAG3C,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,sBAAsB,GAAI,KAAK,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAGzE,CAAA"}
|
package/dist/utils/paths.js
CHANGED
|
@@ -5,4 +5,19 @@ export const resolvePath = (input) => {
|
|
|
5
5
|
const expanded = input.startsWith('~/') || input === '~' ? path.join(homedir(), input.slice(1)) : input;
|
|
6
6
|
return path.resolve(expanded);
|
|
7
7
|
};
|
|
8
|
+
/**
|
|
9
|
+
* Resolve an artifact `--out` path the CLI hands to a watcher.
|
|
10
|
+
*
|
|
11
|
+
* Artifacts (screenshots, recordings, traces) are written by the watcher process, whose working
|
|
12
|
+
* directory is its own temp artifacts dir — so a relative path used to land under
|
|
13
|
+
* `/var/folders/…/T/argus/<id>/` instead of next to the caller. The CLI resolves the path against
|
|
14
|
+
* *its* cwd before sending it, which makes `--out build/shot.png` mean what a shell user expects.
|
|
15
|
+
* `~` is expanded on the way.
|
|
16
|
+
*
|
|
17
|
+
* @returns An absolute path, or `undefined` when no output was requested (watcher picks a default).
|
|
18
|
+
*/
|
|
19
|
+
export const resolveArtifactOutFile = (out) => {
|
|
20
|
+
const trimmed = out?.trim();
|
|
21
|
+
return trimmed ? resolvePath(trimmed) : undefined;
|
|
22
|
+
};
|
|
8
23
|
//# sourceMappingURL=paths.js.map
|
package/dist/utils/paths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,8EAA8E;AAC9E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAa,EAAU,EAAE;IACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IACvG,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;AAC9B,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,8EAA8E;AAC9E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAa,EAAU,EAAE;IACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IACvG,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;AAC9B,CAAC,CAAA;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAuB,EAAsB,EAAE;IACrF,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,CAAA;IAC3B,OAAO,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAClD,CAAC,CAAA"}
|