@12ui/design 0.2.56 → 0.2.57
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/SKILL.md +1 -1
- package/dist/branch-client.d.ts +2 -0
- package/dist/branch-client.d.ts.map +1 -1
- package/dist/branch-client.js +1 -0
- package/dist/branch-client.js.map +1 -1
- package/dist/cli-arguments.d.ts.map +1 -1
- package/dist/cli-arguments.js +1 -0
- package/dist/cli-arguments.js.map +1 -1
- package/dist/cli-convert-command.d.ts.map +1 -1
- package/dist/cli-convert-command.js +110 -15
- package/dist/cli-convert-command.js.map +1 -1
- package/dist/cli-corpus-command.d.ts.map +1 -1
- package/dist/cli-corpus-command.js +5 -2
- package/dist/cli-corpus-command.js.map +1 -1
- package/dist/cli-corpus-evidence.d.ts.map +1 -1
- package/dist/cli-corpus-evidence.js +2 -1
- package/dist/cli-corpus-evidence.js.map +1 -1
- package/dist/cli-corpus-reference-downloads.d.ts +1 -0
- package/dist/cli-corpus-reference-downloads.d.ts.map +1 -1
- package/dist/cli-corpus-reference-downloads.js +13 -3
- package/dist/cli-corpus-reference-downloads.js.map +1 -1
- package/dist/cli-corpus-types.d.ts +2 -0
- package/dist/cli-corpus-types.d.ts.map +1 -1
- package/dist/cli-help/design.d.ts +1 -1
- package/dist/cli-help/design.d.ts.map +1 -1
- package/dist/cli-help/design.js +6 -2
- package/dist/cli-help/design.js.map +1 -1
- package/dist/cli-help/index.d.ts +1 -1
- package/dist/cli-improve-command.d.ts.map +1 -1
- package/dist/cli-improve-command.js +68 -5
- package/dist/cli-improve-command.js.map +1 -1
- package/dist/cli-usage.js +2 -2
- package/dist/concept-input.d.ts +21 -0
- package/dist/concept-input.d.ts.map +1 -1
- package/dist/concept-input.js +32 -10
- package/dist/concept-input.js.map +1 -1
- package/dist/conversion-client.d.ts +39 -1
- package/dist/conversion-client.d.ts.map +1 -1
- package/dist/conversion-client.js +205 -3
- package/dist/conversion-client.js.map +1 -1
- package/dist/corpus-client.d.ts +7 -1
- package/dist/corpus-client.d.ts.map +1 -1
- package/dist/corpus-client.js +6 -2
- package/dist/corpus-client.js.map +1 -1
- package/dist/corpus-reference-download-retry.d.ts +68 -0
- package/dist/corpus-reference-download-retry.d.ts.map +1 -0
- package/dist/corpus-reference-download-retry.js +123 -0
- package/dist/corpus-reference-download-retry.js.map +1 -0
- package/dist/corpus-request-error.d.ts +17 -0
- package/dist/corpus-request-error.d.ts.map +1 -0
- package/dist/corpus-request-error.js +21 -0
- package/dist/corpus-request-error.js.map +1 -0
- package/dist/draft-run.d.ts +9 -0
- package/dist/draft-run.d.ts.map +1 -1
- package/dist/draft-run.js +22 -5
- package/dist/draft-run.js.map +1 -1
- package/dist/draft-workspace.d.ts +2 -1
- package/dist/draft-workspace.d.ts.map +1 -1
- package/dist/draft-workspace.js.map +1 -1
- package/dist/hosted-draft-identity.d.ts +1 -0
- package/dist/hosted-draft-identity.d.ts.map +1 -1
- package/dist/hosted-draft-identity.js +1 -0
- package/dist/hosted-draft-identity.js.map +1 -1
- package/dist/improve-added-specs.d.ts +9 -0
- package/dist/improve-added-specs.d.ts.map +1 -1
- package/dist/improve-added-specs.js +28 -7
- package/dist/improve-added-specs.js.map +1 -1
- package/dist/improve-bootstrap-secret.d.ts +35 -0
- package/dist/improve-bootstrap-secret.d.ts.map +1 -0
- package/dist/improve-bootstrap-secret.js +61 -0
- package/dist/improve-bootstrap-secret.js.map +1 -0
- package/dist/improve-capture-redirect.d.ts +46 -0
- package/dist/improve-capture-redirect.d.ts.map +1 -0
- package/dist/improve-capture-redirect.js +68 -0
- package/dist/improve-capture-redirect.js.map +1 -0
- package/dist/improve-concept.d.ts +14 -1
- package/dist/improve-concept.d.ts.map +1 -1
- package/dist/improve-concept.js +29 -8
- package/dist/improve-concept.js.map +1 -1
- package/dist/improve-conversion-attempts.d.ts +9 -5
- package/dist/improve-conversion-attempts.d.ts.map +1 -1
- package/dist/improve-conversion-attempts.js +6 -1
- package/dist/improve-conversion-attempts.js.map +1 -1
- package/dist/improve-conversion-stage.d.ts +7 -0
- package/dist/improve-conversion-stage.d.ts.map +1 -1
- package/dist/improve-conversion-stage.js +188 -171
- package/dist/improve-conversion-stage.js.map +1 -1
- package/dist/improve-convert-progress.d.ts +36 -0
- package/dist/improve-convert-progress.d.ts.map +1 -0
- package/dist/improve-convert-progress.js +43 -0
- package/dist/improve-convert-progress.js.map +1 -0
- package/dist/improve-convert-resilience.d.ts +44 -53
- package/dist/improve-convert-resilience.d.ts.map +1 -1
- package/dist/improve-convert-resilience.js +51 -58
- package/dist/improve-convert-resilience.js.map +1 -1
- package/dist/improve-delivery-stages.d.ts.map +1 -1
- package/dist/improve-delivery-stages.js +4 -0
- package/dist/improve-delivery-stages.js.map +1 -1
- package/dist/improve-generation-stages.d.ts.map +1 -1
- package/dist/improve-generation-stages.js +32 -3
- package/dist/improve-generation-stages.js.map +1 -1
- package/dist/improve-icon-svg.d.ts +47 -0
- package/dist/improve-icon-svg.d.ts.map +1 -0
- package/dist/improve-icon-svg.js +83 -0
- package/dist/improve-icon-svg.js.map +1 -0
- package/dist/improve-kit-ignore.d.ts +32 -0
- package/dist/improve-kit-ignore.d.ts.map +1 -0
- package/dist/improve-kit-ignore.js +111 -0
- package/dist/improve-kit-ignore.js.map +1 -0
- package/dist/improve-kit-readme.d.ts.map +1 -1
- package/dist/improve-kit-readme.js +101 -11
- package/dist/improve-kit-readme.js.map +1 -1
- package/dist/improve-kit-stall.d.ts +48 -2
- package/dist/improve-kit-stall.d.ts.map +1 -1
- package/dist/improve-kit-stall.js +167 -15
- package/dist/improve-kit-stall.js.map +1 -1
- package/dist/improve-kit-status.d.ts +36 -0
- package/dist/improve-kit-status.d.ts.map +1 -1
- package/dist/improve-kit-status.js +74 -4
- package/dist/improve-kit-status.js.map +1 -1
- package/dist/improve-options.d.ts +6 -0
- package/dist/improve-options.d.ts.map +1 -1
- package/dist/improve-options.js +3 -0
- package/dist/improve-options.js.map +1 -1
- package/dist/improve-plan-annotated-render.d.ts +13 -1
- package/dist/improve-plan-annotated-render.d.ts.map +1 -1
- package/dist/improve-plan-annotated-render.js +21 -0
- package/dist/improve-plan-annotated-render.js.map +1 -1
- package/dist/improve-plan-annotator.d.ts +5 -0
- package/dist/improve-plan-annotator.d.ts.map +1 -1
- package/dist/improve-plan-annotator.js +1 -0
- package/dist/improve-plan-annotator.js.map +1 -1
- package/dist/improve-run-summary.d.ts.map +1 -1
- package/dist/improve-run-summary.js +51 -5
- package/dist/improve-run-summary.js.map +1 -1
- package/dist/improve-stage-shared.d.ts +39 -1
- package/dist/improve-stage-shared.d.ts.map +1 -1
- package/dist/improve-stage-shared.js +80 -3
- package/dist/improve-stage-shared.js.map +1 -1
- package/dist/improve-terminal-event.d.ts.map +1 -1
- package/dist/improve-terminal-event.js +7 -1
- package/dist/improve-terminal-event.js.map +1 -1
- package/dist/improve-token-patch.d.ts +2 -0
- package/dist/improve-token-patch.d.ts.map +1 -1
- package/dist/improve-token-patch.js +23 -5
- package/dist/improve-token-patch.js.map +1 -1
- package/dist/improve-workspace.d.ts +84 -7
- package/dist/improve-workspace.d.ts.map +1 -1
- package/dist/improve-workspace.js +16 -1
- package/dist/improve-workspace.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/legacy-skill-catalog.d.ts.map +1 -1
- package/dist/legacy-skill-catalog.js +123 -0
- package/dist/legacy-skill-catalog.js.map +1 -1
- package/dist/mcp-tool-definitions.js +1 -1
- package/dist/mcp-tool-definitions.js.map +1 -1
- package/dist/mcp-tool-handler.d.ts.map +1 -1
- package/dist/mcp-tool-handler.js +3 -0
- package/dist/mcp-tool-handler.js.map +1 -1
- package/dist/redesign-capture.d.ts +1 -0
- package/dist/redesign-capture.d.ts.map +1 -1
- package/dist/redesign-capture.js +6 -0
- package/dist/redesign-capture.js.map +1 -1
- package/dist/responsive-alternative-materializer.d.ts +19 -0
- package/dist/responsive-alternative-materializer.d.ts.map +1 -0
- package/dist/responsive-alternative-materializer.js +76 -0
- package/dist/responsive-alternative-materializer.js.map +1 -0
- package/open-design.json +2 -2
- package/package.json +1 -1
- package/skills/12ui-design/SKILL.md +7 -1
- package/skills/12ui-design/improve.md +20 -5
- package/skills/12ui-design/inspire.md +1 -1
|
@@ -12,75 +12,56 @@ import type { ImproveRecord } from './improve-workspace.js';
|
|
|
12
12
|
*/
|
|
13
13
|
export declare const IMPROVE_RESPONSIVE_TIMEOUT_MS: number;
|
|
14
14
|
export declare const IMPROVE_TEMPORARY_UNAVAILABLE_RETRY_DELAY_MS = 30000;
|
|
15
|
-
/** At most one extra conversion, and only on a stall with nothing to derive. */
|
|
16
|
-
export declare const IMPROVE_CONVERT_STALL_ATTEMPTS = 2;
|
|
17
15
|
/**
|
|
18
16
|
* The floor `--convert-stall-seconds` refuses below: the conversion's own
|
|
19
17
|
* typical wall for the model in play. A bound inside the typical window would
|
|
20
|
-
*
|
|
18
|
+
* stop improve on healthy work.
|
|
21
19
|
*
|
|
22
|
-
* `pro` has no measured hint of its own, so it borrows the standard wall
|
|
23
|
-
* pays for that borrowing below: no automatic retry until somebody measures it.
|
|
20
|
+
* `pro` has no measured hint of its own, so it borrows the standard wall.
|
|
24
21
|
*/
|
|
25
22
|
export declare const improveConvertStallFloorSeconds: (model: ConversionModel) => number;
|
|
26
23
|
/**
|
|
27
24
|
* The DEFAULT bound, which used to be the fused median alone — 300s against a
|
|
28
25
|
* standard conversion's own 240s typical wall, a ratio of 1.25. That is inside
|
|
29
|
-
* the healthy population by any reading, and
|
|
30
|
-
*
|
|
31
|
-
* would cost double, and nothing measures P(convert half > 300s | healthy).
|
|
26
|
+
* the healthy population by any reading, and a bound that tight was dangerous
|
|
27
|
+
* while a stall still bought a second conversion.
|
|
32
28
|
*
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
29
|
+
* The bound is twice the model's typical wall, or the fused median, whichever
|
|
30
|
+
* is larger. Standard 480s, fast 300s. An explicit `--convert-stall-seconds` is
|
|
31
|
+
* still allowed down to the floor — a caller who wants the tighter bound can
|
|
32
|
+
* ask for it and owns the consequence. Nothing is re-bought when it passes
|
|
33
|
+
* (`improveConvertStallHalted`), so the bound now only decides how long improve
|
|
34
|
+
* waits before handing the conversion back to the operator.
|
|
37
35
|
*/
|
|
38
36
|
export declare const improveConvertStallDefaultSeconds: (model: ConversionModel) => number;
|
|
39
|
-
/**
|
|
40
|
-
* Whether the automatic retry may fire for this model.
|
|
41
|
-
*
|
|
42
|
-
* The retry's whole justification is that the bound sits outside the model's
|
|
43
|
-
* typical window, so it cannot fire on healthy work. `pro` has no measured
|
|
44
|
-
* typical wall — `CONVERSION_DURATION_HINTS` carries `convert` and
|
|
45
|
-
* `convertFast` and nothing else — so for pro that justification does not
|
|
46
|
-
* exist, and buying a second pro conversion on an unmeasured guess is the
|
|
47
|
-
* blind fix the study-first doctrine forbids. Pro stalls the way it did before
|
|
48
|
-
* the retry shipped: STALL.md, terminal event, recovery commands.
|
|
49
|
-
*/
|
|
50
|
-
export declare const improveConvertStallRetryAllowed: (model: ConversionModel) => boolean;
|
|
51
|
-
/** The reason every stall abandonment carries, and the prefix that counts them. */
|
|
37
|
+
/** The reason a pre-F19 stall abandonment carries, and the prefix that counts them. */
|
|
52
38
|
export declare const IMPROVE_CONVERT_STALL_REASON = "convert stalled";
|
|
53
39
|
/** The reason `--fresh` writes when it rotates the base key away from a conversion. */
|
|
54
40
|
export declare const IMPROVE_FRESH_ABANDON_REASON = "fresh requested after recorded conversion remained unavailable";
|
|
55
|
-
export declare const improveConvertStallReason: (seconds: number) => string;
|
|
56
41
|
/**
|
|
57
|
-
* How many conversions this KIT
|
|
42
|
+
* How many conversions this KIT bought and abandoned to a stall BEFORE F19.
|
|
58
43
|
*
|
|
59
|
-
*
|
|
60
|
-
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
64
|
-
* another random key. Counting the durable abandonments makes the retry's
|
|
65
|
-
* identity reproducible across invocations and makes the bound a property of
|
|
66
|
-
* the kit rather than of one shell.
|
|
44
|
+
* Nothing writes these any more: a stall abandons nothing, because the
|
|
45
|
+
* conversion it was waiting on is still running and is exactly what the next
|
|
46
|
+
* invocation must re-attach to. The count survives for kits written by an
|
|
47
|
+
* earlier CLI, whose newest conversion is reachable only through the derived
|
|
48
|
+
* retry key below.
|
|
67
49
|
*
|
|
68
|
-
* The attempt ledger is counted alongside
|
|
69
|
-
* whose conversion never reported an id
|
|
70
|
-
* abandonments alone read that spend as zero
|
|
71
|
-
* another retry, and the one after that, forever.
|
|
50
|
+
* The attempt ledger is counted alongside the abandonments, and the larger
|
|
51
|
+
* wins: a stall whose conversion never reported an id could not be abandoned by
|
|
52
|
+
* id, so counting abandonments alone read that spend as zero.
|
|
72
53
|
*/
|
|
73
54
|
export declare const improveConvertStallCount: (record: ImproveRecord) => number;
|
|
74
55
|
/**
|
|
75
|
-
* The idempotency key of the Nth conversion dispatched under one
|
|
76
|
-
* The first is the key itself
|
|
77
|
-
*
|
|
78
|
-
*
|
|
79
|
-
*
|
|
56
|
+
* The idempotency key of the Nth conversion a pre-F19 kit dispatched under one
|
|
57
|
+
* attempt key. The first is the key itself and every later one is derived from
|
|
58
|
+
* the count of stalls that preceded it, so a resume of such a kit computes the
|
|
59
|
+
* same key for the same conversion with no ledger to read. Nothing mints new
|
|
60
|
+
* keys of this shape.
|
|
80
61
|
*/
|
|
81
62
|
export declare const improveConvertRetryKey: (key: string, index: number) => string;
|
|
82
63
|
/** Why the resume reaches the conversion it reaches. */
|
|
83
|
-
export type ImproveResumeReason = 'settled' | 'fresh' | 'stall-retry' | 'fresh-rotated-away';
|
|
64
|
+
export type ImproveResumeReason = 'settled' | 'primary' | 'fresh' | 'stall-retry' | 'fresh-rotated-away';
|
|
84
65
|
/** The id is absent when the attempt is recorded but never reported one. */
|
|
85
66
|
export type ImproveResumeConversion = {
|
|
86
67
|
id?: string;
|
|
@@ -94,8 +75,8 @@ export type ImproveResumeConversion = {
|
|
|
94
75
|
* above backwards:
|
|
95
76
|
* - a settled convert block: the stage replays and buys nothing;
|
|
96
77
|
* - an open attempt in the ledger: the resume rebuilds the exact key that
|
|
97
|
-
* attempt was dispatched under,
|
|
98
|
-
*
|
|
78
|
+
* attempt was dispatched under — the ordinary base key, `--fresh`, or a
|
|
79
|
+
* pre-F19 retry — and lands back on the conversion it is still waiting for;
|
|
99
80
|
* - a kit that abandoned conversions to a stall with no ledger to read (one
|
|
100
81
|
* written before the ledger existed): `improveConvertRetryKey` reaches the
|
|
101
82
|
* newest of them, which is also what the base key reaches when only one was
|
|
@@ -109,14 +90,24 @@ export type ImproveResumeConversion = {
|
|
|
109
90
|
*/
|
|
110
91
|
export declare const improveResumeConversion: (record: ImproveRecord) => ImproveResumeConversion | undefined;
|
|
111
92
|
/**
|
|
112
|
-
* The
|
|
113
|
-
*
|
|
114
|
-
*
|
|
93
|
+
* The wait ended and improve stopped. It bought nothing (F19).
|
|
94
|
+
*
|
|
95
|
+
* The CLI used to dispatch a second parent conversion here, on the reasoning
|
|
96
|
+
* that a bound outside the model's typical window cannot fire on healthy work.
|
|
97
|
+
* That reasoning was never a measurement, and the pipedrive lane paid for it:
|
|
98
|
+
* one operator command, one stalled conversion, and four conversion ids in the
|
|
99
|
+
* journal — with the first one still running and still billing, because there
|
|
100
|
+
* is no cancel. CLAUDE.md item 3 says retries never repeat paid work, so a
|
|
101
|
+
* stall now ends the invocation and hands the conversion back by id.
|
|
102
|
+
*
|
|
103
|
+
* The message is the recovery: both commands re-attach to what is already
|
|
104
|
+
* bought, and neither creates a conversion.
|
|
115
105
|
*/
|
|
116
|
-
export declare const
|
|
106
|
+
export declare const improveConvertStallHalted: (args: {
|
|
117
107
|
seconds: number;
|
|
118
|
-
|
|
119
|
-
|
|
108
|
+
conversionId?: string;
|
|
109
|
+
input: string;
|
|
110
|
+
runDir: string;
|
|
120
111
|
cause: unknown;
|
|
121
112
|
}) => Error;
|
|
122
113
|
export declare const improveErrorText: (error: unknown) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"improve-convert-resilience.d.ts","sourceRoot":"","sources":["../src/improve-convert-resilience.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"improve-convert-resilience.d.ts","sourceRoot":"","sources":["../src/improve-convert-resilience.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAI5D;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,QAA0C,CAAC;AACrF,eAAO,MAAM,4CAA4C,QAAS,CAAC;AAEnE;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,GAAI,OAAO,eAAe,KAAG,MAExE,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,iCAAiC,GAAI,OAAO,eAAe,KAAG,MAG1E,CAAC;AAEF,uFAAuF;AACvF,eAAO,MAAM,4BAA4B,oBAAoB,CAAC;AAE9D,uFAAuF;AACvF,eAAO,MAAM,4BAA4B,mEAAmE,CAAC;AAE7G;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GAAI,QAAQ,aAAa,KAAG,MAKhE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,MAEnE,CAAC;AAEF,wDAAwD;AACxD,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,SAAS,GACT,OAAO,GACP,aAAa,GACb,oBAAoB,CAAC;AAEzB,4EAA4E;AAC5E,MAAM,MAAM,uBAAuB,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEnF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,uBAAuB,GAClC,QAAQ,aAAa,KACpB,uBAAuB,GAAG,SAe5B,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,yBAAyB,GAAI,MAAM;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;CAChB,KAAG,KAeH,CAAC;AAIF,eAAO,MAAM,gBAAgB,GAAI,OAAO,OAAO,KAAG,MAOjD,CAAC;AAEF,eAAO,MAAM,+BAA+B,GAAI,OAAO,OAAO,KAAG,OAEhE,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAAU,CAAC,EAAE,MAAM;IAChE,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/B,KAAG,OAAO,CAAC,CAAC,CAaZ,CAAC;AAaF,eAAO,MAAM,cAAc,GAAI,OAAO,OAAO,KAAG,OAK/C,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,OAAO,MAAM,KAAG,MAAM,GAAG,SAIpE,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,QAAQ,aAAa,KACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAc5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,OAAO,OAAO,KAAG,MAAM,GAAG,SAYlE,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,WAAW,MAAM,KAAG,OAAO,CAAC;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAUA,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAU,WAAW,MAAM,KAAG,OAAO,CAAC,IAAI,CAG/E,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAU,WAAW,MAAM,KAAG,OAAO,CAAC;IAC5E,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAiBA,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { CONVERSION_DURATION_HINTS } from './cli-progress.js';
|
|
|
4
4
|
import { isCliRefusal } from './cli-refusal.js';
|
|
5
5
|
import { derivedOutputFilePath } from './cli-conversion-output-directory.js';
|
|
6
6
|
import { improveConversionAttemptCount, openImproveConversionAttempt, } from './improve-conversion-attempts.js';
|
|
7
|
+
import { shellArg } from './improve-kit-status.js';
|
|
7
8
|
import { readRunJournal } from './run-journal.js';
|
|
8
9
|
const UUID = /[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}/iu;
|
|
9
10
|
/**
|
|
@@ -18,73 +19,54 @@ const UUID = /[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}/iu;
|
|
|
18
19
|
*/
|
|
19
20
|
export const IMPROVE_RESPONSIVE_TIMEOUT_MS = CONVERSION_DURATION_HINTS.fused * 1_000;
|
|
20
21
|
export const IMPROVE_TEMPORARY_UNAVAILABLE_RETRY_DELAY_MS = 30_000;
|
|
21
|
-
/** At most one extra conversion, and only on a stall with nothing to derive. */
|
|
22
|
-
export const IMPROVE_CONVERT_STALL_ATTEMPTS = 2;
|
|
23
22
|
/**
|
|
24
23
|
* The floor `--convert-stall-seconds` refuses below: the conversion's own
|
|
25
24
|
* typical wall for the model in play. A bound inside the typical window would
|
|
26
|
-
*
|
|
25
|
+
* stop improve on healthy work.
|
|
27
26
|
*
|
|
28
|
-
* `pro` has no measured hint of its own, so it borrows the standard wall
|
|
29
|
-
* pays for that borrowing below: no automatic retry until somebody measures it.
|
|
27
|
+
* `pro` has no measured hint of its own, so it borrows the standard wall.
|
|
30
28
|
*/
|
|
31
29
|
export const improveConvertStallFloorSeconds = (model) => (model === 'fast' ? CONVERSION_DURATION_HINTS.convertFast : CONVERSION_DURATION_HINTS.convert);
|
|
32
30
|
/**
|
|
33
31
|
* The DEFAULT bound, which used to be the fused median alone — 300s against a
|
|
34
32
|
* standard conversion's own 240s typical wall, a ratio of 1.25. That is inside
|
|
35
|
-
* the healthy population by any reading, and
|
|
36
|
-
*
|
|
37
|
-
* would cost double, and nothing measures P(convert half > 300s | healthy).
|
|
33
|
+
* the healthy population by any reading, and a bound that tight was dangerous
|
|
34
|
+
* while a stall still bought a second conversion.
|
|
38
35
|
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
36
|
+
* The bound is twice the model's typical wall, or the fused median, whichever
|
|
37
|
+
* is larger. Standard 480s, fast 300s. An explicit `--convert-stall-seconds` is
|
|
38
|
+
* still allowed down to the floor — a caller who wants the tighter bound can
|
|
39
|
+
* ask for it and owns the consequence. Nothing is re-bought when it passes
|
|
40
|
+
* (`improveConvertStallHalted`), so the bound now only decides how long improve
|
|
41
|
+
* waits before handing the conversion back to the operator.
|
|
43
42
|
*/
|
|
44
43
|
export const improveConvertStallDefaultSeconds = (model) => Math.max(IMPROVE_RESPONSIVE_TIMEOUT_MS / 1_000, 2 * improveConvertStallFloorSeconds(model));
|
|
45
|
-
/**
|
|
46
|
-
* Whether the automatic retry may fire for this model.
|
|
47
|
-
*
|
|
48
|
-
* The retry's whole justification is that the bound sits outside the model's
|
|
49
|
-
* typical window, so it cannot fire on healthy work. `pro` has no measured
|
|
50
|
-
* typical wall — `CONVERSION_DURATION_HINTS` carries `convert` and
|
|
51
|
-
* `convertFast` and nothing else — so for pro that justification does not
|
|
52
|
-
* exist, and buying a second pro conversion on an unmeasured guess is the
|
|
53
|
-
* blind fix the study-first doctrine forbids. Pro stalls the way it did before
|
|
54
|
-
* the retry shipped: STALL.md, terminal event, recovery commands.
|
|
55
|
-
*/
|
|
56
|
-
export const improveConvertStallRetryAllowed = (model) => model !== 'pro';
|
|
57
|
-
/** The reason every stall abandonment carries, and the prefix that counts them. */
|
|
44
|
+
/** The reason a pre-F19 stall abandonment carries, and the prefix that counts them. */
|
|
58
45
|
export const IMPROVE_CONVERT_STALL_REASON = 'convert stalled';
|
|
59
46
|
/** The reason `--fresh` writes when it rotates the base key away from a conversion. */
|
|
60
47
|
export const IMPROVE_FRESH_ABANDON_REASON = 'fresh requested after recorded conversion remained unavailable';
|
|
61
|
-
export const improveConvertStallReason = (seconds) => (`${IMPROVE_CONVERT_STALL_REASON} past ${seconds}s with no LayerDoc`);
|
|
62
48
|
/**
|
|
63
|
-
* How many conversions this KIT
|
|
49
|
+
* How many conversions this KIT bought and abandoned to a stall BEFORE F19.
|
|
64
50
|
*
|
|
65
|
-
*
|
|
66
|
-
*
|
|
67
|
-
*
|
|
68
|
-
*
|
|
69
|
-
*
|
|
70
|
-
* another random key. Counting the durable abandonments makes the retry's
|
|
71
|
-
* identity reproducible across invocations and makes the bound a property of
|
|
72
|
-
* the kit rather than of one shell.
|
|
51
|
+
* Nothing writes these any more: a stall abandons nothing, because the
|
|
52
|
+
* conversion it was waiting on is still running and is exactly what the next
|
|
53
|
+
* invocation must re-attach to. The count survives for kits written by an
|
|
54
|
+
* earlier CLI, whose newest conversion is reachable only through the derived
|
|
55
|
+
* retry key below.
|
|
73
56
|
*
|
|
74
|
-
* The attempt ledger is counted alongside
|
|
75
|
-
* whose conversion never reported an id
|
|
76
|
-
* abandonments alone read that spend as zero
|
|
77
|
-
* another retry, and the one after that, forever.
|
|
57
|
+
* The attempt ledger is counted alongside the abandonments, and the larger
|
|
58
|
+
* wins: a stall whose conversion never reported an id could not be abandoned by
|
|
59
|
+
* id, so counting abandonments alone read that spend as zero.
|
|
78
60
|
*/
|
|
79
61
|
export const improveConvertStallCount = (record) => Math.max((record.abandonedConversions ?? [])
|
|
80
62
|
.filter((entry) => entry.reason.startsWith(IMPROVE_CONVERT_STALL_REASON))
|
|
81
63
|
.length, improveConversionAttemptCount(record, 'stall-retry'));
|
|
82
64
|
/**
|
|
83
|
-
* The idempotency key of the Nth conversion dispatched under one
|
|
84
|
-
* The first is the key itself
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
65
|
+
* The idempotency key of the Nth conversion a pre-F19 kit dispatched under one
|
|
66
|
+
* attempt key. The first is the key itself and every later one is derived from
|
|
67
|
+
* the count of stalls that preceded it, so a resume of such a kit computes the
|
|
68
|
+
* same key for the same conversion with no ledger to read. Nothing mints new
|
|
69
|
+
* keys of this shape.
|
|
88
70
|
*/
|
|
89
71
|
export const improveConvertRetryKey = (key, index) => (`${key}:stall:${index - 1}`);
|
|
90
72
|
/**
|
|
@@ -95,8 +77,8 @@ export const improveConvertRetryKey = (key, index) => (`${key}:stall:${index - 1
|
|
|
95
77
|
* above backwards:
|
|
96
78
|
* - a settled convert block: the stage replays and buys nothing;
|
|
97
79
|
* - an open attempt in the ledger: the resume rebuilds the exact key that
|
|
98
|
-
* attempt was dispatched under,
|
|
99
|
-
*
|
|
80
|
+
* attempt was dispatched under — the ordinary base key, `--fresh`, or a
|
|
81
|
+
* pre-F19 retry — and lands back on the conversion it is still waiting for;
|
|
100
82
|
* - a kit that abandoned conversions to a stall with no ledger to read (one
|
|
101
83
|
* written before the ledger existed): `improveConvertRetryKey` reaches the
|
|
102
84
|
* newest of them, which is also what the base key reaches when only one was
|
|
@@ -127,22 +109,33 @@ export const improveResumeConversion = (record) => {
|
|
|
127
109
|
return rotated ? { id: rotated.id, reason: 'fresh-rotated-away' } : undefined;
|
|
128
110
|
};
|
|
129
111
|
/**
|
|
130
|
-
* The
|
|
131
|
-
*
|
|
132
|
-
*
|
|
112
|
+
* The wait ended and improve stopped. It bought nothing (F19).
|
|
113
|
+
*
|
|
114
|
+
* The CLI used to dispatch a second parent conversion here, on the reasoning
|
|
115
|
+
* that a bound outside the model's typical window cannot fire on healthy work.
|
|
116
|
+
* That reasoning was never a measurement, and the pipedrive lane paid for it:
|
|
117
|
+
* one operator command, one stalled conversion, and four conversion ids in the
|
|
118
|
+
* journal — with the first one still running and still billing, because there
|
|
119
|
+
* is no cancel. CLAUDE.md item 3 says retries never repeat paid work, so a
|
|
120
|
+
* stall now ends the invocation and hands the conversion back by id.
|
|
121
|
+
*
|
|
122
|
+
* The message is the recovery: both commands re-attach to what is already
|
|
123
|
+
* bought, and neither creates a conversion.
|
|
133
124
|
*/
|
|
134
|
-
export const
|
|
125
|
+
export const improveConvertStallHalted = (args) => new Error(
|
|
135
126
|
// The stalled attempt's own text leads, because it is what carries the
|
|
136
127
|
// conversion id every downstream reader digs out of it — the terminal event,
|
|
137
|
-
// STALL.md's hosted run line
|
|
128
|
+
// STALL.md's hosted run line.
|
|
138
129
|
`${improveErrorText(args.cause)}\n\n`
|
|
139
|
-
+ `The wait ended at ${args.seconds}s
|
|
140
|
-
+ `
|
|
141
|
-
+ '
|
|
142
|
-
+
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
130
|
+
+ `The wait ended at ${args.seconds}s. improve dispatched nothing else:`
|
|
131
|
+
+ ` the conversion${args.conversionId ? ` ${args.conversionId}` : ''} is still running,`
|
|
132
|
+
+ ' it keeps billing, it cannot be cancelled, and buying a second one would pay twice for'
|
|
133
|
+
+ ' the same design. Re-attach to it — neither command buys a conversion:\n\n'
|
|
134
|
+
+ ` 12ui improve ${shellArg(args.input)} --out-dir ${shellArg(args.runDir)} --from convert\n`
|
|
135
|
+
+ ` 12ui resume ${args.conversionId ?? '<conversion-id>'}`
|
|
136
|
+
+ ` --out-dir ${shellArg(path.join(args.runDir, 'target'))}\n\n`
|
|
137
|
+
+ 'plan/STALL.md names the same conversion and the same commands.'
|
|
138
|
+
+ ' Pass --fresh only to buy another one deliberately.', { cause: args.cause });
|
|
146
139
|
const RESPONSIVE_PARTIAL_FAILURE = 'could not be completed for every required viewport size';
|
|
147
140
|
export const improveErrorText = (error) => {
|
|
148
141
|
const detail = error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"improve-convert-resilience.js","sourceRoot":"","sources":["../src/improve-convert-resilience.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EACL,6BAA6B,EAC7B,4BAA4B,GAC7B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,MAAM,IAAI,GAAG,+CAA+C,CAAC;AAE7D;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,yBAAyB,CAAC,KAAK,GAAG,KAAK,CAAC;AACrF,MAAM,CAAC,MAAM,4CAA4C,GAAG,MAAM,CAAC;AAEnE
|
|
1
|
+
{"version":3,"file":"improve-convert-resilience.js","sourceRoot":"","sources":["../src/improve-convert-resilience.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"improve-delivery-stages.d.ts","sourceRoot":"","sources":["../src/improve-delivery-stages.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA6FhF,eAAO,MAAM,mBAAmB,GAAU,MAAM;IAC9C,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,YAAY,EAAE,0BAA0B,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"improve-delivery-stages.d.ts","sourceRoot":"","sources":["../src/improve-delivery-stages.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA6FhF,eAAO,MAAM,mBAAmB,GAAU,MAAM;IAC9C,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,YAAY,EAAE,0BAA0B,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC,aAAa,CAkExB,CAAC"}
|
|
@@ -105,6 +105,7 @@ export const runImprovePlanStage = async (args) => {
|
|
|
105
105
|
let mode;
|
|
106
106
|
let gate;
|
|
107
107
|
let artifacts;
|
|
108
|
+
let fonts = [];
|
|
108
109
|
if (args.options.input.kind === 'url') {
|
|
109
110
|
const diff = await writeImproveDomDiff({
|
|
110
111
|
beforePath: args.options.paths.currentDomDoc,
|
|
@@ -125,6 +126,7 @@ export const runImprovePlanStage = async (args) => {
|
|
|
125
126
|
mode,
|
|
126
127
|
});
|
|
127
128
|
artifacts.push(...annotated.artifacts);
|
|
129
|
+
fonts = annotated.fonts;
|
|
128
130
|
}
|
|
129
131
|
}
|
|
130
132
|
else {
|
|
@@ -141,6 +143,7 @@ export const runImprovePlanStage = async (args) => {
|
|
|
141
143
|
mode,
|
|
142
144
|
});
|
|
143
145
|
artifacts.push(...annotated.artifacts);
|
|
146
|
+
fonts = annotated.fonts;
|
|
144
147
|
}
|
|
145
148
|
record = {
|
|
146
149
|
...record,
|
|
@@ -149,6 +152,7 @@ export const runImprovePlanStage = async (args) => {
|
|
|
149
152
|
gate,
|
|
150
153
|
artifacts: [...new Set(artifacts)],
|
|
151
154
|
...(record.sourceConvert ? { sourceLayerDoc: record.sourceConvert.layerDoc } : {}),
|
|
155
|
+
...(fonts.length > 0 ? { fonts } : {}),
|
|
152
156
|
purchaseIds: record.sourceConvert?.purchaseIds ?? [],
|
|
153
157
|
},
|
|
154
158
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"improve-delivery-stages.js","sourceRoot":"","sources":["../src/improve-delivery-stages.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"improve-delivery-stages.js","sourceRoot":"","sources":["../src/improve-delivery-stages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"improve-generation-stages.d.ts","sourceRoot":"","sources":["../src/improve-generation-stages.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"improve-generation-stages.d.ts","sourceRoot":"","sources":["../src/improve-generation-stages.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAiBhC,eAAO,MAAM,sBAAsB,GAAU,MAAM;IACjD,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,YAAY,EAAE,0BAA0B,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC,aAAa,CAyExB,CAAC;AAwBF,eAAO,MAAM,oBAAoB,GAAU,MAAM;IAC/C,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,KAAK,EAAE,QAAQ,CAAC;IAChB,YAAY,EAAE,0BAA0B,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC,aAAa,CAiDxB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,MAAM;IAC9C,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC,aAAa,CAuCxB,CAAC"}
|
|
@@ -4,10 +4,26 @@ import sharp from 'sharp';
|
|
|
4
4
|
import { runDraftCommand } from './cli-draft-command.js';
|
|
5
5
|
import { CliRefusal } from './cli-refusal.js';
|
|
6
6
|
import { draftPaths, readDraftRecord } from './draft-workspace.js';
|
|
7
|
+
import { IMPROVE_BOOTSTRAP_NOT_STORED } from './improve-bootstrap-secret.js';
|
|
7
8
|
import { abandonImproveConversions, withoutImproveStages } from './improve-reset.js';
|
|
8
|
-
import { captureImprovePage
|
|
9
|
+
import { captureImprovePage } from './redesign-capture.js';
|
|
9
10
|
import { improveSha256, noteImproveStage, } from './improve-stage-shared.js';
|
|
10
11
|
import { writeImproveRecord, } from './improve-workspace.js';
|
|
12
|
+
/**
|
|
13
|
+
* The captured URL as the DOM extraction saw it, for a capture boundary that
|
|
14
|
+
* did not report one. `current.domdoc.json` has recorded `source.url` all
|
|
15
|
+
* along — it is the file the notion redirect was found in — so the comparison
|
|
16
|
+
* never depends on a browser implementation detail.
|
|
17
|
+
*/
|
|
18
|
+
const domDocSourceUrl = async (file) => {
|
|
19
|
+
try {
|
|
20
|
+
const doc = JSON.parse(await readFile(file, 'utf8'));
|
|
21
|
+
return typeof doc.source?.url === 'string' ? doc.source.url : undefined;
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
};
|
|
11
27
|
export const runImproveCaptureStage = async (args) => {
|
|
12
28
|
if (args.record.capture)
|
|
13
29
|
return noteImproveStage({
|
|
@@ -17,6 +33,13 @@ export const runImproveCaptureStage = async (args) => {
|
|
|
17
33
|
let sourceImage;
|
|
18
34
|
let dimensions;
|
|
19
35
|
if (args.options.input.kind === 'url') {
|
|
36
|
+
// The record holds only a redacted bootstrap (F31), so a resume that has to
|
|
37
|
+
// capture again needs the live triple passed once more. Saying so before
|
|
38
|
+
// the browser opens costs nothing; capturing a signed-out page and
|
|
39
|
+
// converting it costs a run.
|
|
40
|
+
if (args.record.bootstrap.length > 0 && args.options.bootstrap.length === 0) {
|
|
41
|
+
throw new CliRefusal(IMPROVE_BOOTSTRAP_NOT_STORED, 'improve_bootstrap_not_stored');
|
|
42
|
+
}
|
|
20
43
|
await mkdir(paths.captureDir, { recursive: true });
|
|
21
44
|
sourceImage = path.join(paths.captureDir, 'source.png');
|
|
22
45
|
dimensions = await (args.dependencies.capture ?? captureImprovePage)({
|
|
@@ -25,7 +48,8 @@ export const runImproveCaptureStage = async (args) => {
|
|
|
25
48
|
domDocFile: paths.currentDomDoc,
|
|
26
49
|
viewport: args.record.viewport,
|
|
27
50
|
fullPage: args.record.fullPage,
|
|
28
|
-
|
|
51
|
+
// The parsed, in-process value — never the record's redacted copy.
|
|
52
|
+
bootstrap: args.options.bootstrap,
|
|
29
53
|
});
|
|
30
54
|
}
|
|
31
55
|
else {
|
|
@@ -44,6 +68,9 @@ export const runImproveCaptureStage = async (args) => {
|
|
|
44
68
|
dimensions = { width: metadata.width, height: metadata.height };
|
|
45
69
|
}
|
|
46
70
|
const bytes = await readFile(sourceImage);
|
|
71
|
+
const capturedUrl = args.options.input.kind === 'url'
|
|
72
|
+
? dimensions.url ?? await domDocSourceUrl(paths.currentDomDoc)
|
|
73
|
+
: undefined;
|
|
47
74
|
let record = {
|
|
48
75
|
...args.record,
|
|
49
76
|
input: {
|
|
@@ -55,8 +82,10 @@ export const runImproveCaptureStage = async (args) => {
|
|
|
55
82
|
capture: {
|
|
56
83
|
sourceImage,
|
|
57
84
|
sha256: improveSha256(bytes),
|
|
58
|
-
|
|
85
|
+
width: dimensions.width,
|
|
86
|
+
height: dimensions.height,
|
|
59
87
|
...(args.options.input.kind === 'url' ? { domDoc: paths.currentDomDoc } : {}),
|
|
88
|
+
...(capturedUrl ? { capturedUrl } : {}),
|
|
60
89
|
},
|
|
61
90
|
};
|
|
62
91
|
record = await noteImproveStage({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"improve-generation-stages.js","sourceRoot":"","sources":["../src/improve-generation-stages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,eAAe,EAA6B,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,eAAe,EAA8B,MAAM,sBAAsB,CAAC;AAE/F,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"improve-generation-stages.js","sourceRoot":"","sources":["../src/improve-generation-stages.ts"],"names":[],"mappings":"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"}
|