@tangle-network/agent-app 0.60.101 → 0.60.102
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/chat-routes/index.js +1 -1
- package/dist/{chunk-MWJK4HLU.js → chunk-P2EKAQUB.js} +52 -8
- package/dist/{chunk-MWJK4HLU.js.map → chunk-P2EKAQUB.js.map} +1 -1
- package/dist/sandbox/index.js +3 -1
- package/dist/sandbox/warm-lease-d1.d.ts +3 -1
- package/dist/sandbox/warm-lease.d.ts +16 -0
- package/package.json +1 -1
|
@@ -755,7 +755,7 @@ function createWarmLeases(options) {
|
|
|
755
755
|
} catch {
|
|
756
756
|
}
|
|
757
757
|
};
|
|
758
|
-
const spentToday = (row, at) => row && row.day === utcDay(at) ? row.dayWarmMs : 0;
|
|
758
|
+
const spentToday = (row, at) => (row && row.day === utcDay(at) ? row.dayWarmMs : 0) + (row && row.pendingWarmAt > 0 && utcDay(row.pendingWarmAt) === utcDay(at) ? row.pendingMs : 0);
|
|
759
759
|
function chargeOf(row) {
|
|
760
760
|
if (!row.resumed || row.usedAt > 0 || row.warmAt <= 0) return 0;
|
|
761
761
|
const lastActivity = Math.max(row.warmAt, row.pingAt);
|
|
@@ -803,11 +803,21 @@ function createWarmLeases(options) {
|
|
|
803
803
|
if (hit && before) {
|
|
804
804
|
emit({ type: "warm_hit", key, reason: before.reason ?? "unknown", leadMs: at - before.startedAt });
|
|
805
805
|
}
|
|
806
|
+
let lateHit = false;
|
|
807
|
+
if (before && before.pendingWarmAt > 0 && at < before.pendingWarmAt + before.pendingMs) {
|
|
808
|
+
const unused = Math.max(0, at - before.pendingWarmAt);
|
|
809
|
+
if (await store.settlePending(key, before.pendingWarmAt, utcDay(before.pendingWarmAt), unused)) {
|
|
810
|
+
lateHit = true;
|
|
811
|
+
const reason = before.pendingReason ?? "unknown";
|
|
812
|
+
emit({ type: "warm_hit", key, reason, leadMs: unused });
|
|
813
|
+
if (unused >= 6e4) emit({ type: "warm_wasted", key, reason, minutes: Math.round(unused / 6e4) });
|
|
814
|
+
}
|
|
815
|
+
}
|
|
806
816
|
if (coldArrival) {
|
|
807
817
|
const slots = addColdArrival(before?.slots ?? [], before?.slotsAt ?? 0, at);
|
|
808
818
|
await store.writeProfile(key, slots, at, before?.firstSeenAt || at);
|
|
809
819
|
}
|
|
810
|
-
return { hit, coldArrival };
|
|
820
|
+
return { hit: hit || lateHit, coldArrival };
|
|
811
821
|
}
|
|
812
822
|
async function sweep(sweepOptions = {}) {
|
|
813
823
|
const limit = sweepOptions.limit ?? 50;
|
|
@@ -821,14 +831,18 @@ function createWarmLeases(options) {
|
|
|
821
831
|
const current = row.threshold > 0 ? row.threshold : initialThreshold;
|
|
822
832
|
threshold = Math.min(THRESHOLD_CEILING, Math.max(THRESHOLD_FLOOR, current * (row.usedAt > 0 ? 0.85 : 1.3)));
|
|
823
833
|
}
|
|
824
|
-
await store.end(row.key, row.leaseId, utcDay(row.warmAt || row.startedAt),
|
|
834
|
+
await store.end(row.key, row.leaseId, utcDay(row.warmAt || row.startedAt), 0, threshold);
|
|
835
|
+
if (charge > 0) await store.markPending(row.key, row.warmAt, charge, row.reason ?? "unknown");
|
|
825
836
|
report.ended += 1;
|
|
826
837
|
if (row.warmAt <= 0) {
|
|
827
838
|
report.abandoned += 1;
|
|
828
839
|
emit({ type: "warm_abandoned", key: row.key, reason: row.reason ?? "unknown" });
|
|
829
|
-
}
|
|
840
|
+
}
|
|
841
|
+
}
|
|
842
|
+
for (const row of await store.listPendingDue(at, limit)) {
|
|
843
|
+
if (await store.settlePending(row.key, row.pendingWarmAt, utcDay(row.pendingWarmAt), row.pendingMs)) {
|
|
830
844
|
report.wasted += 1;
|
|
831
|
-
emit({ type: "warm_wasted", key: row.key, reason: row.
|
|
845
|
+
emit({ type: "warm_wasted", key: row.key, reason: row.pendingReason ?? "unknown", minutes: Math.round(row.pendingMs / 6e4) });
|
|
832
846
|
}
|
|
833
847
|
}
|
|
834
848
|
if (options.keepAlive && burstHoldMs > boxIdleMs) {
|
|
@@ -884,9 +898,17 @@ var WARM_LEASE_TABLE_DDL = `CREATE TABLE IF NOT EXISTS ${DEFAULT_WARM_LEASE_TABL
|
|
|
884
898
|
slots_at INTEGER NOT NULL DEFAULT 0,
|
|
885
899
|
first_seen_at INTEGER NOT NULL DEFAULT 0,
|
|
886
900
|
predicted_at INTEGER NOT NULL DEFAULT 0,
|
|
887
|
-
declined_until INTEGER NOT NULL DEFAULT 0
|
|
901
|
+
declined_until INTEGER NOT NULL DEFAULT 0,
|
|
902
|
+
pending_warm_at INTEGER NOT NULL DEFAULT 0,
|
|
903
|
+
pending_ms INTEGER NOT NULL DEFAULT 0,
|
|
904
|
+
pending_reason TEXT
|
|
888
905
|
)`;
|
|
889
906
|
var WARM_LEASE_DECLINED_UNTIL_DDL = `ALTER TABLE ${DEFAULT_WARM_LEASE_TABLE} ADD COLUMN declined_until INTEGER NOT NULL DEFAULT 0`;
|
|
907
|
+
var WARM_LEASE_PENDING_DDL = [
|
|
908
|
+
`ALTER TABLE ${DEFAULT_WARM_LEASE_TABLE} ADD COLUMN pending_warm_at INTEGER NOT NULL DEFAULT 0`,
|
|
909
|
+
`ALTER TABLE ${DEFAULT_WARM_LEASE_TABLE} ADD COLUMN pending_ms INTEGER NOT NULL DEFAULT 0`,
|
|
910
|
+
`ALTER TABLE ${DEFAULT_WARM_LEASE_TABLE} ADD COLUMN pending_reason TEXT`
|
|
911
|
+
];
|
|
890
912
|
var SAFE_IDENTIFIER2 = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
891
913
|
function parseSlots(text) {
|
|
892
914
|
if (!text) return [];
|
|
@@ -916,7 +938,10 @@ function toRow(row) {
|
|
|
916
938
|
slotsAt: row.slots_at,
|
|
917
939
|
firstSeenAt: row.first_seen_at,
|
|
918
940
|
predictedAt: row.predicted_at,
|
|
919
|
-
declinedUntil: row.declined_until ?? 0
|
|
941
|
+
declinedUntil: row.declined_until ?? 0,
|
|
942
|
+
pendingWarmAt: row.pending_warm_at ?? 0,
|
|
943
|
+
pendingMs: row.pending_ms ?? 0,
|
|
944
|
+
pendingReason: row.pending_reason ?? null
|
|
920
945
|
};
|
|
921
946
|
}
|
|
922
947
|
function createD1WarmLeaseStore(db, options = {}) {
|
|
@@ -986,6 +1011,24 @@ WHERE key = ?1 AND lease_id = ?2`;
|
|
|
986
1011
|
async markPinged(key, at) {
|
|
987
1012
|
await q(`UPDATE ${t} SET ping_at = ?2 WHERE key = ?1`, key, at).run();
|
|
988
1013
|
},
|
|
1014
|
+
async markPending(key, warmAt, maxMs, reason) {
|
|
1015
|
+
await q(
|
|
1016
|
+
`UPDATE ${t} SET pending_warm_at = ?2, pending_ms = ?3, pending_reason = ?4 WHERE key = ?1`,
|
|
1017
|
+
key,
|
|
1018
|
+
warmAt,
|
|
1019
|
+
Math.max(0, Math.round(maxMs)),
|
|
1020
|
+
reason
|
|
1021
|
+
).run();
|
|
1022
|
+
},
|
|
1023
|
+
async settlePending(key, warmAt, day, chargeMs) {
|
|
1024
|
+
const settled = await q(`UPDATE ${t} SET
|
|
1025
|
+
day_warm_ms = CASE WHEN day = ?3 THEN day_warm_ms + ?4 WHEN day < ?3 THEN ?4 ELSE day_warm_ms END,
|
|
1026
|
+
day = CASE WHEN day < ?3 THEN ?3 ELSE day END,
|
|
1027
|
+
pending_warm_at = 0, pending_ms = 0, pending_reason = NULL
|
|
1028
|
+
WHERE key = ?1 AND pending_warm_at = ?2 RETURNING key`, key, warmAt, day, Math.max(0, Math.round(chargeMs))).first();
|
|
1029
|
+
return settled != null;
|
|
1030
|
+
},
|
|
1031
|
+
listPendingDue: (now, limit) => list(`SELECT * FROM ${t} WHERE pending_warm_at > 0 AND pending_warm_at + pending_ms <= ?1 ORDER BY pending_warm_at LIMIT ?2`, now, limit),
|
|
989
1032
|
async markDeclined(key, until) {
|
|
990
1033
|
await q(`UPDATE ${t} SET declined_until = ?2 WHERE key = ?1`, key, until).run();
|
|
991
1034
|
},
|
|
@@ -2933,6 +2976,7 @@ export {
|
|
|
2933
2976
|
DEFAULT_WARM_LEASE_TABLE,
|
|
2934
2977
|
WARM_LEASE_TABLE_DDL,
|
|
2935
2978
|
WARM_LEASE_DECLINED_UNTIL_DDL,
|
|
2979
|
+
WARM_LEASE_PENDING_DDL,
|
|
2936
2980
|
createD1WarmLeaseStore,
|
|
2937
2981
|
parsePrewarmHint,
|
|
2938
2982
|
DEFAULT_ESCALATION_TOOLS,
|
|
@@ -2991,4 +3035,4 @@ export {
|
|
|
2991
3035
|
isTerminalPromptEvent,
|
|
2992
3036
|
detectInteractiveQuestion
|
|
2993
3037
|
};
|
|
2994
|
-
//# sourceMappingURL=chunk-
|
|
3038
|
+
//# sourceMappingURL=chunk-P2EKAQUB.js.map
|