@senpi/runtime 3.0.36 → 3.0.38
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/actions/decision-error-notification.d.ts +6 -4
- package/dist/actions/decision-error-notification.d.ts.map +1 -1
- package/dist/actions/decision-error-notification.js +10 -5
- package/dist/actions/decision-error-notification.js.map +1 -1
- package/dist/dsl/engine-client/event-mapping.d.ts +2 -0
- package/dist/dsl/engine-client/event-mapping.d.ts.map +1 -1
- package/dist/dsl/engine-client/event-mapping.js +4 -1
- package/dist/dsl/engine-client/event-mapping.js.map +1 -1
- package/dist/dsl/events/handlers.d.ts +8 -0
- package/dist/dsl/events/handlers.d.ts.map +1 -1
- package/dist/dsl/events/handlers.js +25 -4
- package/dist/dsl/events/handlers.js.map +1 -1
- package/dist/dsl/events/initial-state.d.ts +11 -1
- package/dist/dsl/events/initial-state.d.ts.map +1 -1
- package/dist/dsl/events/initial-state.js +4 -1
- package/dist/dsl/events/initial-state.js.map +1 -1
- package/dist/dsl/monitor/process-one-position.d.ts.map +1 -1
- package/dist/dsl/monitor/process-one-position.js +5 -0
- package/dist/dsl/monitor/process-one-position.js.map +1 -1
- package/dist/dsl/notifications/floor-store.d.ts +16 -0
- package/dist/dsl/notifications/floor-store.d.ts.map +1 -0
- package/dist/dsl/notifications/floor-store.js +57 -0
- package/dist/dsl/notifications/floor-store.js.map +1 -0
- package/dist/dsl/notifications/format-utils.d.ts +15 -4
- package/dist/dsl/notifications/format-utils.d.ts.map +1 -1
- package/dist/dsl/notifications/format-utils.js +24 -5
- package/dist/dsl/notifications/format-utils.js.map +1 -1
- package/dist/dsl/notifications/formatter.d.ts +10 -8
- package/dist/dsl/notifications/formatter.d.ts.map +1 -1
- package/dist/dsl/notifications/formatter.js +21 -20
- package/dist/dsl/notifications/formatter.js.map +1 -1
- package/dist/dsl/notifications/index.d.ts +23 -8
- package/dist/dsl/notifications/index.d.ts.map +1 -1
- package/dist/dsl/notifications/index.js +108 -11
- package/dist/dsl/notifications/index.js.map +1 -1
- package/dist/dsl/plugin/index.d.ts.map +1 -1
- package/dist/dsl/plugin/index.js +5 -3
- package/dist/dsl/plugin/index.js.map +1 -1
- package/dist/dsl/plugin/options.d.ts +0 -2
- package/dist/dsl/plugin/options.d.ts.map +1 -1
- package/dist/runtime/decision-errors.d.ts +4 -3
- package/dist/runtime/decision-errors.d.ts.map +1 -1
- package/dist/runtime/decision-errors.js +8 -9
- package/dist/runtime/decision-errors.js.map +1 -1
- package/dist/runtime/notifications.d.ts.map +1 -1
- package/dist/runtime/notifications.js +28 -10
- package/dist/runtime/notifications.js.map +1 -1
- package/dist/runtime/runtime.d.ts.map +1 -1
- package/dist/runtime/runtime.js +1 -2
- package/dist/runtime/runtime.js.map +1 -1
- package/dist/runtime/strategy-lifecycle.d.ts.map +1 -1
- package/dist/runtime/strategy-lifecycle.js +28 -23
- package/dist/runtime/strategy-lifecycle.js.map +1 -1
- package/dist/types/dsl/index.d.ts +22 -0
- package/dist/types/dsl/index.d.ts.map +1 -1
- package/dist/types/notification.d.ts +34 -43
- package/dist/types/notification.d.ts.map +1 -1
- package/dist/types/notification.js +1 -60
- package/dist/types/notification.js.map +1 -1
- package/openclaw.plugin.json +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,10 @@ import type { NotificationCopy, NotificationPayload, NotificationService } from
|
|
|
7
7
|
* `context` verbatim and reads `context.contextText` from it; a sibling on the
|
|
8
8
|
* payload root is dropped before the wire).
|
|
9
9
|
*
|
|
10
|
+
* `strategyWalletAddress` is set from the same address but is NOT tied to
|
|
11
|
+
* openability — the notification service resolves the strategy/skill name from
|
|
12
|
+
* it, so it ships whenever the address is known.
|
|
13
|
+
*
|
|
10
14
|
* Fail-safe: a missing/blank strategy address is an unusable chat key (a dead
|
|
11
15
|
* tap), so we WARN and ship the message non-openable rather than an empty seed.
|
|
12
16
|
*/
|
|
@@ -18,17 +22,15 @@ export interface DecisionErrorNotifyContext {
|
|
|
18
22
|
strategyState: {
|
|
19
23
|
address: string;
|
|
20
24
|
};
|
|
21
|
-
/** Human strategy label (name or truncated address) for the `[strategy]` prefix. */
|
|
22
|
-
notificationLabel?: string;
|
|
23
25
|
}
|
|
24
26
|
/**
|
|
25
|
-
* The classify → log → bucket → build →
|
|
27
|
+
* The classify → log → bucket → build → notify ritual shared by every
|
|
26
28
|
* action's decision-failure catch block. Extracted here so it lives in ONE place:
|
|
27
29
|
* the classified `code` + `retryable` are logged (previously only the raw string
|
|
28
30
|
* was), the two-bucket copy/subtype is derived, and the openable notification is
|
|
29
31
|
* emitted (fire-and-forget — a delivery failure never disturbs the caller).
|
|
30
32
|
*
|
|
31
|
-
* @param ctx - the action's runtime context (notifications + strategy address
|
|
33
|
+
* @param ctx - the action's runtime context (notifications + strategy address).
|
|
32
34
|
* @param message - the raw decision-error string (already unwrapped from the thrown value).
|
|
33
35
|
*/
|
|
34
36
|
export declare function emitDecisionErrorNotification(ctx: DecisionErrorNotifyContext, message: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decision-error-notification.d.ts","sourceRoot":"","sources":["../../src/actions/decision-error-notification.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"decision-error-notification.d.ts","sourceRoot":"","sources":["../../src/actions/decision-error-notification.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAM3G;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,mBAAmB,CAsBrB;AAED;sEACsE;AACtE,MAAM,WAAW,0BAA0B;IACzC,aAAa,EAAE,mBAAmB,CAAC;IACnC,aAAa,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,0BAA0B,EAC/B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAcf"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { applyMessagePrefix, labelPrefix } from "../types/notification.js";
|
|
3
2
|
import { classifyDecisionError, decisionErrorBucket, DECISION_ERROR_BUCKET_COPY } from "../runtime/decision-errors.js";
|
|
4
3
|
import { createLogger } from "../utils/logger.js";
|
|
5
4
|
const logger = createLogger("[actions][decision-error-notification]");
|
|
@@ -11,13 +10,18 @@ const logger = createLogger("[actions][decision-error-notification]");
|
|
|
11
10
|
* `context` verbatim and reads `context.contextText` from it; a sibling on the
|
|
12
11
|
* payload root is dropped before the wire).
|
|
13
12
|
*
|
|
13
|
+
* `strategyWalletAddress` is set from the same address but is NOT tied to
|
|
14
|
+
* openability — the notification service resolves the strategy/skill name from
|
|
15
|
+
* it, so it ships whenever the address is known.
|
|
16
|
+
*
|
|
14
17
|
* Fail-safe: a missing/blank strategy address is an unusable chat key (a dead
|
|
15
18
|
* tap), so we WARN and ship the message non-openable rather than an empty seed.
|
|
16
19
|
*/
|
|
17
20
|
export function buildDecisionErrorNotification(copy, subtype, address) {
|
|
18
21
|
const message = copy.inApp;
|
|
19
22
|
const createdAt = new Date().toISOString();
|
|
20
|
-
|
|
23
|
+
const strategyWalletAddress = address?.trim() ? address.trim() : undefined;
|
|
24
|
+
if (strategyWalletAddress === undefined) {
|
|
21
25
|
logger.warn("Decision-error notification missing strategy address; delivering non-openable", { subtype });
|
|
22
26
|
return { message, canOpenAgentChat: false, subtype, copy };
|
|
23
27
|
}
|
|
@@ -26,6 +30,7 @@ export function buildDecisionErrorNotification(copy, subtype, address) {
|
|
|
26
30
|
canOpenAgentChat: true,
|
|
27
31
|
subtype,
|
|
28
32
|
copy,
|
|
33
|
+
strategyWalletAddress,
|
|
29
34
|
context: {
|
|
30
35
|
notificationId: randomUUID(),
|
|
31
36
|
subtype,
|
|
@@ -36,13 +41,13 @@ export function buildDecisionErrorNotification(copy, subtype, address) {
|
|
|
36
41
|
};
|
|
37
42
|
}
|
|
38
43
|
/**
|
|
39
|
-
* The classify → log → bucket → build →
|
|
44
|
+
* The classify → log → bucket → build → notify ritual shared by every
|
|
40
45
|
* action's decision-failure catch block. Extracted here so it lives in ONE place:
|
|
41
46
|
* the classified `code` + `retryable` are logged (previously only the raw string
|
|
42
47
|
* was), the two-bucket copy/subtype is derived, and the openable notification is
|
|
43
48
|
* emitted (fire-and-forget — a delivery failure never disturbs the caller).
|
|
44
49
|
*
|
|
45
|
-
* @param ctx - the action's runtime context (notifications + strategy address
|
|
50
|
+
* @param ctx - the action's runtime context (notifications + strategy address).
|
|
46
51
|
* @param message - the raw decision-error string (already unwrapped from the thrown value).
|
|
47
52
|
*/
|
|
48
53
|
export async function emitDecisionErrorNotification(ctx, message) {
|
|
@@ -52,7 +57,7 @@ export async function emitDecisionErrorNotification(ctx, message) {
|
|
|
52
57
|
logger.error("decision error", message, { code: classified.code, retryable: classified.retryable });
|
|
53
58
|
const bucket = decisionErrorBucket(classified.code, classified.retryable);
|
|
54
59
|
const subtype = bucket === "transient" ? "DECISION_ERROR_TRANSIENT" : "DECISION_ERROR_ATTENTION";
|
|
55
|
-
const notification =
|
|
60
|
+
const notification = buildDecisionErrorNotification(DECISION_ERROR_BUCKET_COPY[bucket], subtype, ctx.strategyState.address);
|
|
56
61
|
await ctx.notifications.notify(notification).catch(() => { });
|
|
57
62
|
}
|
|
58
63
|
//# sourceMappingURL=decision-error-notification.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decision-error-notification.js","sourceRoot":"","sources":["../../src/actions/decision-error-notification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"decision-error-notification.js","sourceRoot":"","sources":["../../src/actions/decision-error-notification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AACvH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,MAAM,GAAG,YAAY,CAAC,wCAAwC,CAAC,CAAC;AAEtE;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,8BAA8B,CAC5C,IAAsB,EACtB,OAAe,EACf,OAAe;IAEf,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;IAC3B,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3C,MAAM,qBAAqB,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,IAAI,qBAAqB,KAAK,SAAS,EAAE,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,+EAA+E,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1G,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7D,CAAC;IACD,OAAO;QACL,OAAO;QACP,gBAAgB,EAAE,IAAI;QACtB,OAAO;QACP,IAAI;QACJ,qBAAqB;QACrB,OAAO,EAAE;YACP,cAAc,EAAE,UAAU,EAAE;YAC5B,OAAO;YACP,SAAS;YACT,OAAO;YACP,WAAW,EAAE,OAAO;SACrB;KACF,CAAC;AACJ,CAAC;AASD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,GAA+B,EAC/B,OAAe;IAEf,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,iFAAiF;IACjF,qFAAqF;IACrF,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IAEpG,MAAM,MAAM,GAAG,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,0BAA0B,CAAC;IACjG,MAAM,YAAY,GAAG,8BAA8B,CACjD,0BAA0B,CAAC,MAAM,CAAC,EAClC,OAAO,EACP,GAAG,CAAC,aAAa,CAAC,OAAO,CAC1B,CAAC;IACF,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -15,6 +15,8 @@ export interface TierBusEnrichment {
|
|
|
15
15
|
margin: number;
|
|
16
16
|
currentROE: number;
|
|
17
17
|
highWaterRoe: number;
|
|
18
|
+
/** High-water PRICE (DslState.highWaterPrice); the stop-raise "new high" copy input. */
|
|
19
|
+
highWaterPrice: number;
|
|
18
20
|
lastPrice: number;
|
|
19
21
|
lockedProfitPct: number;
|
|
20
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-mapping.d.ts","sourceRoot":"","sources":["../../../src/dsl/engine-client/event-mapping.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEjF,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,wFAAwF;IACxF,aAAa,EAAE,MAAM,CAAC;IACtB,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wFAAwF;IACxF,aAAa,EAAE,uBAAuB,CAAC;IACvC,qGAAqG;IACrG,cAAc,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC3C;AAkBD,iFAAiF;AACjF,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,aAAa,GACrB,cAAc,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"event-mapping.d.ts","sourceRoot":"","sources":["../../../src/dsl/engine-client/event-mapping.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEjF,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,wFAAwF;IACxF,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,wFAAwF;IACxF,aAAa,EAAE,MAAM,CAAC;IACtB,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wFAAwF;IACxF,aAAa,EAAE,uBAAuB,CAAC;IACvC,qGAAqG;IACrG,cAAc,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC3C;AAkBD,iFAAiF;AACjF,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,aAAa,GACrB,cAAc,GAAG,IAAI,CAwFvB"}
|
|
@@ -63,8 +63,11 @@ export function mapBackendEventToBusEvent(event, context) {
|
|
|
63
63
|
// Instance-scoped baseline key + direction-aware compare for the
|
|
64
64
|
// stop-raise gate. correlationId is ALWAYS carried (omitting it keys
|
|
65
65
|
// every backend event under a fallback → cross-position collision);
|
|
66
|
-
// direction
|
|
66
|
+
// direction/leverage/high-water ride on tierEnrichment when the poll
|
|
67
|
+
// supplies it (leverage + high-water price feed the stop-raise copy).
|
|
67
68
|
direction: context.tierEnrichment?.direction,
|
|
69
|
+
leverage: context.tierEnrichment?.leverage,
|
|
70
|
+
highWaterPrice: context.tierEnrichment?.highWaterPrice,
|
|
68
71
|
correlationId: context.correlationId,
|
|
69
72
|
timestamp: ts,
|
|
70
73
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-mapping.js","sourceRoot":"","sources":["../../../src/dsl/engine-client/event-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"event-mapping.js","sourceRoot":"","sources":["../../../src/dsl/engine-client/event-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,14 @@ import type { StateManager } from "../../state/index.js";
|
|
|
10
10
|
export interface HandlePositionOpenedOpts {
|
|
11
11
|
/** When false, skip the initial editPosition SL placement; slOrderId stays null. Default true. */
|
|
12
12
|
placeSl?: boolean;
|
|
13
|
+
/**
|
|
14
|
+
* Persisted announced-floor baseline to carry into the rebuilt state
|
|
15
|
+
* (increase/decrease/resize/adopt). Threaded through to {@link buildInitialState}
|
|
16
|
+
* so a mid-trading rebuild — which mints a fresh correlationId and resets the
|
|
17
|
+
* in-memory ratchet — cannot re-announce a lower stop. Omitted for a fresh open
|
|
18
|
+
* and deliberately NOT set on a flip (favorable polarity inverts).
|
|
19
|
+
*/
|
|
20
|
+
carryLastNotifiedStopFloor?: number;
|
|
13
21
|
}
|
|
14
22
|
export declare function createEventHandlers(config: DslPluginConfig, stateManager: StateManager, strategyStates: Map<string, StrategyState>, bus: SenpiEventBus, _baseDir: string): {
|
|
15
23
|
handlePositionOpened: (payload: unknown, triggerReason?: DslCreatedTriggerReason, opts?: HandlePositionOpenedOpts) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../../src/dsl/events/handlers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EACV,eAAe,EAGf,uBAAuB,EACvB,mBAAmB,EAGpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAyDzD,MAAM,WAAW,wBAAwB;IACvC,kGAAkG;IAClG,OAAO,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../../src/dsl/events/handlers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EACV,eAAe,EAGf,uBAAuB,EACvB,mBAAmB,EAGpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAyDzD,MAAM,WAAW,wBAAwB;IACvC,kGAAkG;IAClG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;OAMG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAC1C,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,GACf;IACD,oBAAoB,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,uBAAuB,EAAE,IAAI,CAAC,EAAE,wBAAwB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpI,oBAAoB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,uBAAuB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,uBAAuB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,2FAA2F;IAC3F,qBAAqB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClD;;;;OAIG;IACH,aAAa,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,wBAAwB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChG;;;;OAIG;IACH,cAAc,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,wBAAwB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClG,CA6kBA"}
|
|
@@ -103,7 +103,9 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
103
103
|
const leverage = event.leverage ?? 1;
|
|
104
104
|
const phase1Floor = phase1FloorFromPreset(entryPrice, direction, preset.maxLossPct, leverage);
|
|
105
105
|
const resolvedTrigger = triggerReason ?? "position_opened";
|
|
106
|
-
const state = buildInitialState(event, preset, phase1Floor, resolvedTrigger
|
|
106
|
+
const state = buildInitialState(event, preset, phase1Floor, resolvedTrigger, {
|
|
107
|
+
lastNotifiedStopFloor: opts?.carryLastNotifiedStopFloor,
|
|
108
|
+
});
|
|
107
109
|
const floor = state.floorPrice;
|
|
108
110
|
logger.info("[dsl] position.opened handling", {
|
|
109
111
|
address: event.address,
|
|
@@ -324,6 +326,11 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
324
326
|
preset: event.preset ?? config.preset,
|
|
325
327
|
...(event.positionId != null ? { positionId: event.positionId } : {}),
|
|
326
328
|
};
|
|
329
|
+
// Deliberately NO carryLastNotifiedStopFloor here: a flip inverts the trade
|
|
330
|
+
// direction, so the favorable polarity of the announced-floor baseline
|
|
331
|
+
// inverts too (an old LONG floor is meaningless — and would misjudge
|
|
332
|
+
// favorability — against a new SHORT, and vice-versa). The rebuild resets it
|
|
333
|
+
// and the first raise in the new direction re-establishes it from scratch.
|
|
327
334
|
await handlePositionOpened(openedPayload, "flipped");
|
|
328
335
|
}
|
|
329
336
|
async function handlePositionIncreased(payload) {
|
|
@@ -340,10 +347,15 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
340
347
|
// Archive the OLD state under its key — lock released BEFORE calling handlePositionOpened
|
|
341
348
|
// (which re-locks the same key; holding it across the nested call would deadlock).
|
|
342
349
|
const archiveKey = stateKey(event.address, event.coin, event.dex ?? "");
|
|
350
|
+
// Carry the persisted announced-floor baseline across the rebuild so a lower
|
|
351
|
+
// stop cannot re-announce (the rebuild mints a fresh correlationId, resetting
|
|
352
|
+
// the in-memory ratchet). Same direction after an increase, so it stays valid.
|
|
353
|
+
let carryLastNotifiedStopFloor;
|
|
343
354
|
await stateManager.withKeyLock(archiveKey, async () => {
|
|
344
355
|
const oldState = await stateManager.getDslStateByAsset(event.address, event.coin, event.dex);
|
|
345
356
|
if (!oldState?.active)
|
|
346
357
|
return;
|
|
358
|
+
carryLastNotifiedStopFloor = oldState.lastNotifiedStopFloor;
|
|
347
359
|
const closedState = {
|
|
348
360
|
...oldState,
|
|
349
361
|
active: false,
|
|
@@ -358,7 +370,7 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
358
370
|
}
|
|
359
371
|
});
|
|
360
372
|
// archiveKey lock is released; handlePositionOpened re-acquires it safely.
|
|
361
|
-
await handlePositionOpened(event, "position_increased");
|
|
373
|
+
await handlePositionOpened(event, "position_increased", { carryLastNotifiedStopFloor });
|
|
362
374
|
}
|
|
363
375
|
async function handlePositionDecreased(payload) {
|
|
364
376
|
let raw = null;
|
|
@@ -374,10 +386,14 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
374
386
|
// Archive the OLD state under its key — lock released BEFORE calling handlePositionOpened
|
|
375
387
|
// (which re-locks the same key; holding it across the nested call would deadlock).
|
|
376
388
|
const archiveKey = stateKey(event.address, event.coin, event.dex ?? "");
|
|
389
|
+
// Carry the persisted announced-floor baseline across the rebuild (same
|
|
390
|
+
// direction after a decrease) so a lower stop cannot re-announce.
|
|
391
|
+
let carryLastNotifiedStopFloor;
|
|
377
392
|
await stateManager.withKeyLock(archiveKey, async () => {
|
|
378
393
|
const oldState = await stateManager.getDslStateByAsset(event.address, event.coin, event.dex);
|
|
379
394
|
if (!oldState?.active)
|
|
380
395
|
return;
|
|
396
|
+
carryLastNotifiedStopFloor = oldState.lastNotifiedStopFloor;
|
|
381
397
|
const closedState = {
|
|
382
398
|
...oldState,
|
|
383
399
|
active: false,
|
|
@@ -392,7 +408,7 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
392
408
|
}
|
|
393
409
|
});
|
|
394
410
|
// archiveKey lock is released; handlePositionOpened re-acquires it safely.
|
|
395
|
-
await handlePositionOpened(event, "position_decreased");
|
|
411
|
+
await handlePositionOpened(event, "position_decreased", { carryLastNotifiedStopFloor });
|
|
396
412
|
}
|
|
397
413
|
async function deleteDslsForStrategy(address) {
|
|
398
414
|
const keys = await stateManager.listDslKeys(`${address}/`);
|
|
@@ -485,10 +501,15 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
485
501
|
async function resizePosition(payload, opts) {
|
|
486
502
|
const dexKey = payload.dex ?? "";
|
|
487
503
|
const archiveKey = stateKey(payload.address, payload.coin, dexKey);
|
|
504
|
+
// A resize is a same-direction size drift, so the persisted announced-floor
|
|
505
|
+
// baseline stays valid: carry it across so the rebuild can't re-announce a
|
|
506
|
+
// lower stop (a direction change comes through the flip path, which resets it).
|
|
507
|
+
let carryLastNotifiedStopFloor;
|
|
488
508
|
await stateManager.withKeyLock(archiveKey, async () => {
|
|
489
509
|
const oldState = await stateManager.getDslStateByAsset(payload.address, payload.coin, dexKey);
|
|
490
510
|
if (!oldState?.active)
|
|
491
511
|
return;
|
|
512
|
+
carryLastNotifiedStopFloor = oldState.lastNotifiedStopFloor;
|
|
492
513
|
const closedState = {
|
|
493
514
|
...oldState,
|
|
494
515
|
active: false,
|
|
@@ -501,7 +522,7 @@ export function createEventHandlers(config, stateManager, strategyStates, bus, _
|
|
|
501
522
|
}
|
|
502
523
|
});
|
|
503
524
|
// archiveKey lock released above; adoptPosition (via handlePositionOpened) re-acquires it safely.
|
|
504
|
-
await adoptPosition(payload, opts);
|
|
525
|
+
await adoptPosition(payload, { ...opts, carryLastNotifiedStopFloor });
|
|
505
526
|
}
|
|
506
527
|
function fireAndForgetBackendDelete(state, trigger) {
|
|
507
528
|
const resolveAndDelete = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../../src/dsl/events/handlers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../../src/dsl/events/handlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,15 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import type { DslCreatedTriggerReason, DslPluginConfig, DslState, PositionOpenedEvent } from "../../types/dsl/index.js";
|
|
5
5
|
export declare function phase1FloorFromPreset(entryPrice: number, direction: string, maxLossPct: number, leverage: number): number;
|
|
6
|
-
export declare function buildInitialState(event: PositionOpenedEvent, preset: DslPluginConfig["presets"][string], phase1Floor: number, triggerReason: DslCreatedTriggerReason
|
|
6
|
+
export declare function buildInitialState(event: PositionOpenedEvent, preset: DslPluginConfig["presets"][string], phase1Floor: number, triggerReason: DslCreatedTriggerReason, carry?: {
|
|
7
|
+
/**
|
|
8
|
+
* Persisted announced-floor baseline carried over from the state being
|
|
9
|
+
* rebuilt (increase/decrease/resize/adopt). Preserves cross-rebuild retreat
|
|
10
|
+
* suppression: without it every rebuild would reset the baseline and a lower
|
|
11
|
+
* stop could re-announce. Omitted for a fresh open and for a direction flip
|
|
12
|
+
* (the favorable polarity inverts, so an old LONG floor is meaningless to a
|
|
13
|
+
* new SHORT and vice-versa).
|
|
14
|
+
*/
|
|
15
|
+
lastNotifiedStopFloor?: number;
|
|
16
|
+
}): DslState;
|
|
7
17
|
//# sourceMappingURL=initial-state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initial-state.d.ts","sourceRoot":"","sources":["../../../src/dsl/events/initial-state.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EACf,QAAQ,EACR,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAYlC,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAIR;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAC1C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,uBAAuB,
|
|
1
|
+
{"version":3,"file":"initial-state.d.ts","sourceRoot":"","sources":["../../../src/dsl/events/initial-state.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EACf,QAAQ,EACR,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAYlC,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAIR;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAC1C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,uBAAuB,EACtC,KAAK,CAAC,EAAE;IACN;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GACA,QAAQ,CAwFV"}
|
|
@@ -16,7 +16,7 @@ export function phase1FloorFromPreset(entryPrice, direction, maxLossPct, leverag
|
|
|
16
16
|
return round(entryPrice * (1 - pct), PRICE_DECIMALS);
|
|
17
17
|
return round(entryPrice * (1 + pct), PRICE_DECIMALS);
|
|
18
18
|
}
|
|
19
|
-
export function buildInitialState(event, preset, phase1Floor, triggerReason) {
|
|
19
|
+
export function buildInitialState(event, preset, phase1Floor, triggerReason, carry) {
|
|
20
20
|
const asset = event.coin;
|
|
21
21
|
const direction = parseFloat(String(event.szi)) > 0 ? "LONG" : "SHORT";
|
|
22
22
|
const size = Math.abs(parseFloat(String(event.szi)));
|
|
@@ -100,6 +100,9 @@ export function buildInitialState(event, preset, phase1Floor, triggerReason) {
|
|
|
100
100
|
lockedProfitPct: 0,
|
|
101
101
|
phaseSince: ts,
|
|
102
102
|
tierSince: null,
|
|
103
|
+
...(carry?.lastNotifiedStopFloor !== undefined
|
|
104
|
+
? { lastNotifiedStopFloor: carry.lastNotifiedStopFloor }
|
|
105
|
+
: {}),
|
|
103
106
|
};
|
|
104
107
|
}
|
|
105
108
|
//# sourceMappingURL=initial-state.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initial-state.js","sourceRoot":"","sources":["../../../src/dsl/events/initial-state.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAOzC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEjF,SAAS,GAAG;IACV,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,KAAK,CAAC,CAAS,EAAE,CAAS;IACjC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAClB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,UAAkB,EAClB,SAAiB,EACjB,UAAkB,EAClB,QAAgB;IAEhB,MAAM,GAAG,GAAG,UAAU,GAAG,GAAG,GAAG,QAAQ,CAAC;IACxC,IAAI,SAAS,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC;IAC/E,OAAO,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,KAA0B,EAC1B,MAA0C,EAC1C,WAAmB,EACnB,aAAsC;
|
|
1
|
+
{"version":3,"file":"initial-state.js","sourceRoot":"","sources":["../../../src/dsl/events/initial-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-one-position.d.ts","sourceRoot":"","sources":["../../../src/dsl/monitor/process-one-position.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAmBzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AA+F/C,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,GAAG,EAAE,aAAa,CAAC;IACnB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,6DAA6D;IAC7D,cAAc,CAAC,EAAE,OAAO,sBAAsB,EAAE,cAAc,CAAC;IAC/D,oDAAoD;IACpD,wBAAwB,CAAC,EAAE,OAAO,sBAAsB,EAAE,wBAAwB,CAAC;CACpF;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,qBAAqB,EAC1B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,QAAQ,EACf,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"process-one-position.d.ts","sourceRoot":"","sources":["../../../src/dsl/monitor/process-one-position.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAmBzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AA+F/C,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,GAAG,EAAE,aAAa,CAAC;IACnB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,6DAA6D;IAC7D,cAAc,CAAC,EAAE,OAAO,sBAAsB,EAAE,cAAc,CAAC;IAC/D,oDAAoD;IACpD,wBAAwB,CAAC,EAAE,OAAO,sBAAsB,EAAE,wBAAwB,CAAC;CACpF;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,qBAAqB,EAC1B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,QAAQ,EACf,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,IAAI,CAAC,CAwvBf"}
|
|
@@ -607,6 +607,10 @@ export async function processOnePosition(ctx, key, state, price, span) {
|
|
|
607
607
|
triggerReason: synced.triggerReason,
|
|
608
608
|
__positionId: synced.positionId ?? synced.correlationId,
|
|
609
609
|
direction: synced.direction,
|
|
610
|
+
// Stop-raise copy inputs: position leverage and the high-water price
|
|
611
|
+
// behind the raise ("new high …").
|
|
612
|
+
leverage: synced.leverage,
|
|
613
|
+
highWaterPrice: synced.highWaterPrice,
|
|
610
614
|
correlationId: synced.correlationId,
|
|
611
615
|
timestamp: ts,
|
|
612
616
|
});
|
|
@@ -913,6 +917,7 @@ async function handleHandoffOk(ctx, key, next, original, strategy, span) {
|
|
|
913
917
|
margin: marginForTier,
|
|
914
918
|
currentROE: updated.currentROE,
|
|
915
919
|
highWaterRoe: updated.highWaterRoe,
|
|
920
|
+
highWaterPrice: updated.highWaterPrice,
|
|
916
921
|
lastPrice: updated.lastPrice,
|
|
917
922
|
lockedProfitPct: updated.lockedProfitPct,
|
|
918
923
|
},
|