pi-mega-compact 0.5.2 → 0.6.1
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/README.md +5 -4
- package/dist/extensions/dashboard-server.js +12 -3
- package/dist/extensions/mega-commands.js +5 -23
- package/dist/extensions/mega-compact.test.js +54 -3
- package/dist/extensions/mega-config.js +12 -9
- package/dist/extensions/mega-events.js +15 -20
- package/dist/extensions/mega-pipeline.js +37 -0
- package/dist/extensions/mega-runtime.js +30 -3
- package/dist/src/config.js +48 -0
- package/dist/src/memoryOps.test.js +73 -1
- package/dist/src/store/compression.test.js +24 -0
- package/dist/src/store/sqlite.js +79 -3
- package/extensions/dashboard-server.ts +14 -3
- package/extensions/mega-commands.ts +6 -25
- package/extensions/mega-compact.test.ts +58 -5
- package/extensions/mega-config.ts +26 -11
- package/extensions/mega-dashboard.ts +5 -0
- package/extensions/mega-events.ts +15 -19
- package/extensions/mega-pipeline.ts +42 -0
- package/extensions/mega-runtime.ts +32 -3
- package/package.json +1 -1
- package/src/config.ts +61 -0
- package/src/memoryOps.test.ts +80 -1
- package/src/store/compression.test.ts +27 -0
- package/src/store/sqlite.ts +77 -3
package/dist/src/store/sqlite.js
CHANGED
|
@@ -573,14 +573,90 @@ export function addLesson(sessionId, repo, lesson, stateDir = getStateDir()) {
|
|
|
573
573
|
const now = Math.floor(Date.now() / 1000);
|
|
574
574
|
db.prepare(`INSERT INTO lessons(session_id, repo, lesson, ts) VALUES(?, ?, ?, ?)`).run(normalizeSessionId(sessionId), repo ?? null, lesson, now);
|
|
575
575
|
}
|
|
576
|
-
|
|
576
|
+
// --- Durable memory (save-to-memory takeover) ---------------------------------
|
|
577
|
+
// One SQLite store for user-saved memories, scoped by repo. Mirrors the
|
|
578
|
+
// lessons/sessions pattern: all state lives in SQLite from day one.
|
|
579
|
+
// S24 storage hardening: keep each memory row bounded so the durable store can
|
|
580
|
+
// never blow a downstream consumer's per-entry buffer (e.g. pi's native
|
|
581
|
+
// file-backed memory caps a single entry at ~5k chars). We truncate content at
|
|
582
|
+
// MEMORY_MAX_CHARS and evict the least-recently-referenced rows past
|
|
583
|
+
// MEMORY_MAX_ROWS per repo via LRU. Both are SQLite-only (PREVENT-PI-004): no
|
|
584
|
+
// file-backed memory is written anywhere. Defaults are overridable via env
|
|
585
|
+
// (MEGACOMPACT_MEMORY_MAX_CHARS / MEGACOMPACT_MEMORY_MAX_ROWS).
|
|
586
|
+
export const MEMORY_MAX_CHARS = 4000;
|
|
587
|
+
export const MEMORY_MAX_ROWS = 500;
|
|
588
|
+
/** Read an env override as a positive int, falling back to `fallback`. */
|
|
589
|
+
function envInt(name, fallback) {
|
|
590
|
+
const v = process.env[name];
|
|
591
|
+
if (v == null || v === "")
|
|
592
|
+
return fallback;
|
|
593
|
+
const n = Number(v);
|
|
594
|
+
return Number.isFinite(n) && n > 0 ? Math.floor(n) : fallback;
|
|
595
|
+
}
|
|
596
|
+
/** Effective per-entry char cap (env-overridable, default MEMORY_MAX_CHARS). */
|
|
597
|
+
export function memoryMaxChars() {
|
|
598
|
+
return envInt("MEGACOMPACT_MEMORY_MAX_CHARS", MEMORY_MAX_CHARS);
|
|
599
|
+
}
|
|
600
|
+
/** Effective per-repo row cap (env-overridable, default MEMORY_MAX_ROWS). */
|
|
601
|
+
export function memoryMaxRows() {
|
|
602
|
+
return envInt("MEGACOMPACT_MEMORY_MAX_ROWS", MEMORY_MAX_ROWS);
|
|
603
|
+
}
|
|
604
|
+
/** Truncate memory content to the per-entry cap, preserving a trailing marker. */
|
|
605
|
+
function capMemoryContent(content) {
|
|
606
|
+
const cap = memoryMaxChars();
|
|
607
|
+
if (content.length <= cap)
|
|
608
|
+
return content;
|
|
609
|
+
return content.slice(0, cap) + "…[truncated]";
|
|
610
|
+
}
|
|
611
|
+
/**
|
|
612
|
+
* Evict the least-recently-referenced rows for a repo past MEMORY_MAX_ROWS.
|
|
613
|
+
* LRU key = COALESCE(last_referenced, last_recalled_at, created_at) so a memory
|
|
614
|
+
* that is recalled/referenced survives over a stale one. Best-effort: any error
|
|
615
|
+
* is swallowed by the caller. Repo-scoped so one noisy repo can't evict another.
|
|
616
|
+
*/
|
|
617
|
+
function evictMemoryLru(repo, stateDir) {
|
|
618
|
+
const db = openStore(stateDir);
|
|
619
|
+
const maxRows = memoryMaxRows();
|
|
620
|
+
// SQLite `= NULL` is never true, so the null-repo scope (memories are
|
|
621
|
+
// stateDir-scoped when repo is null — the applyMemoryOps path) needs `IS NULL`.
|
|
622
|
+
const where = repo == null ? "repo IS NULL" : "repo = ?";
|
|
623
|
+
const countRow = repo == null
|
|
624
|
+
? db.prepare(`SELECT COUNT(*) AS n FROM memories WHERE ${where}`).get()
|
|
625
|
+
: db.prepare(`SELECT COUNT(*) AS n FROM memories WHERE ${where}`).get(repo);
|
|
626
|
+
const count = countRow.n;
|
|
627
|
+
const over = count - maxRows;
|
|
628
|
+
if (over <= 0)
|
|
629
|
+
return;
|
|
630
|
+
// Delete the `over` least-recently-used rows. ORDER BY the LRU key ASC, id ASC
|
|
631
|
+
// (id ASC breaks ties deterministically — oldest created first). The `where`
|
|
632
|
+
// clause is a code-controlled constant (never user input) → PREVENT-002 OK.
|
|
633
|
+
const sql = `DELETE FROM memories WHERE ${where} AND id IN (
|
|
634
|
+
SELECT id FROM memories WHERE ${where}
|
|
635
|
+
ORDER BY COALESCE(last_referenced, last_recalled_at, created_at) ASC, id ASC
|
|
636
|
+
LIMIT ?
|
|
637
|
+
)`;
|
|
638
|
+
if (repo == null)
|
|
639
|
+
db.prepare(sql).run(over);
|
|
640
|
+
else
|
|
641
|
+
db.prepare(sql).run(repo, repo, over);
|
|
642
|
+
}
|
|
643
|
+
/** Save a memory to the current repo's store. Returns the new row id.
|
|
644
|
+
* S24 hardening: content is truncated to MEMORY_MAX_CHARS and, once the per-repo
|
|
645
|
+
* row count exceeds MEMORY_MAX_ROWS, the least-recently-used rows are evicted
|
|
646
|
+
* (LRU) so the store stays bounded. */
|
|
577
647
|
export function addMemory(memory, repo, stateDir = getStateDir()) {
|
|
578
648
|
const db = openStore(stateDir);
|
|
579
649
|
const now = Math.floor(Date.now() / 1000);
|
|
580
650
|
const res = db
|
|
581
651
|
.prepare(`INSERT INTO memories(repo, kind, content, tags, created_at, last_recalled_at, category, target, source_turn)
|
|
582
652
|
VALUES(?, ?, ?, ?, ?, NULL, ?, ?, ?)`)
|
|
583
|
-
.run(repo ?? null, memory.kind ?? "note", memory.content, JSON.stringify(memory.tags ?? []), now, memory.category ?? null, memory.target ?? null, memory.sourceTurn ?? null);
|
|
653
|
+
.run(repo ?? null, memory.kind ?? "note", capMemoryContent(memory.content), JSON.stringify(memory.tags ?? []), now, memory.category ?? null, memory.target ?? null, memory.sourceTurn ?? null);
|
|
654
|
+
try {
|
|
655
|
+
evictMemoryLru(repo, stateDir);
|
|
656
|
+
}
|
|
657
|
+
catch {
|
|
658
|
+
/* non-fatal: eviction must never fail an add */
|
|
659
|
+
}
|
|
584
660
|
return Number(res.lastInsertRowid);
|
|
585
661
|
}
|
|
586
662
|
/** List recent memories for a repo (or all repos when repo is null). */
|
|
@@ -626,7 +702,7 @@ export function replaceMemory(id, patch, stateDir = getStateDir()) {
|
|
|
626
702
|
target = COALESCE(?, target),
|
|
627
703
|
source_turn = COALESCE(?, source_turn)
|
|
628
704
|
WHERE id = ?`)
|
|
629
|
-
.run(patch.kind ?? null, patch.content
|
|
705
|
+
.run(patch.kind ?? null, patch.content != null ? capMemoryContent(patch.content) : null, patch.tags ? JSON.stringify(patch.tags) : null, "category" in patch ? (patch.category ?? null) : null, "target" in patch ? (patch.target ?? null) : null, "sourceTurn" in patch ? (patch.sourceTurn ?? null) : null, id);
|
|
630
706
|
return res.changes > 0;
|
|
631
707
|
}
|
|
632
708
|
/** Remove a memory by id. Returns true if a row was deleted. */
|
|
@@ -138,6 +138,8 @@ interface Snapshot {
|
|
|
138
138
|
version: number;
|
|
139
139
|
updatedAt: string | null;
|
|
140
140
|
tier: string;
|
|
141
|
+
presetTier: string;
|
|
142
|
+
pressure: number;
|
|
141
143
|
config: {
|
|
142
144
|
fastGatePct: number;
|
|
143
145
|
thresholdTokens: number;
|
|
@@ -217,6 +219,8 @@ function readSnapshot(snapshotPath: string) {
|
|
|
217
219
|
version: 1,
|
|
218
220
|
updatedAt: null,
|
|
219
221
|
tier: "unknown",
|
|
222
|
+
presetTier: "unknown",
|
|
223
|
+
pressure: 0,
|
|
220
224
|
config: { fastGatePct: 80, thresholdTokens: 100_000, anchorUserMessages: 1, preserveRecent: 2, auto: true, autoInlineK: 3 },
|
|
221
225
|
session: { id: null, state: null, persistedThisSession: false, lastCheckpointId: null, lastCompactedFrom: 0 },
|
|
222
226
|
context: { tokens: null, percent: null, contextWindow: 0 },
|
|
@@ -343,7 +347,7 @@ function dashboardHtml(tierName: string): string {
|
|
|
343
347
|
|
|
344
348
|
<div class="offline-banner" id="offline-banner">Dashboard data unavailable — waiting for a pi session to write snapshot...</div>
|
|
345
349
|
|
|
346
|
-
<h1><span>mega-compact</span><span class="tier">${tierName}</span><span class="version-pill">v${dashboardServerVersion}</span><span class="model-pill" id="hdr-model">—</span></h1>
|
|
350
|
+
<h1><span>mega-compact</span><span class="tier" id="hdr-tier">${tierName}</span><span class="version-pill">v${dashboardServerVersion}</span><span class="model-pill" id="hdr-model">—</span></h1>
|
|
347
351
|
|
|
348
352
|
<nav class="tabs">
|
|
349
353
|
<button class="tab active" data-tab="current">Current repo</button>
|
|
@@ -405,7 +409,9 @@ function dashboardHtml(tierName: string): string {
|
|
|
405
409
|
<div class="card">
|
|
406
410
|
<h2>Configuration</h2>
|
|
407
411
|
<div class="conf-grid">
|
|
408
|
-
<span class="label">Tier</span><span class="value" id="cf-tier">${tierName}</span>
|
|
412
|
+
<span class="label" title="Live pressure band — climbs low→mega as context fills the window.">Tier (live)</span><span class="value" id="cf-tier">${tierName}</span>
|
|
413
|
+
<span class="label" title="The env-resolved base compaction preset (low/medium/high/ultra/mega) that set the token threshold.">Preset</span><span class="value" id="cf-preset">—</span>
|
|
414
|
+
<span class="label" title="Live pressure = currentTokens / thresholdTokens (0–100%).">Pressure</span><span class="value" id="cf-pressure">—</span>
|
|
409
415
|
<span class="label">Threshold</span><span class="value" id="cf-threshold">—</span>
|
|
410
416
|
<span class="label">Fast Gate</span><span class="value" id="cf-gate">—</span>
|
|
411
417
|
<span class="label">Auto</span><span class="value" id="cf-auto">—</span>
|
|
@@ -584,7 +590,12 @@ function dashboardHtml(tierName: string): string {
|
|
|
584
590
|
document.getElementById('cr-status').textContent = (crew.activeAgents > 0)
|
|
585
591
|
? ('▶ ' + crew.activeAgents + ' running') : 'idle';
|
|
586
592
|
|
|
587
|
-
|
|
593
|
+
// S24: headline tier is the LIVE pressure band; the config card shows the
|
|
594
|
+
// env preset + live pressure ratio so the user sees the system react.
|
|
595
|
+
document.getElementById('hdr-tier').textContent = d.tier;
|
|
596
|
+
document.getElementById('cf-tier').textContent = d.tier + ' (live)';
|
|
597
|
+
document.getElementById('cf-preset').textContent = d.presetTier;
|
|
598
|
+
document.getElementById('cf-pressure').textContent = Math.round((d.pressure || 0) * 100) + '%';
|
|
588
599
|
document.getElementById('cf-threshold').textContent = d.config.thresholdTokens.toLocaleString();
|
|
589
600
|
document.getElementById('cf-gate').textContent = d.config.fastGatePct + '%';
|
|
590
601
|
document.getElementById('cf-auto').textContent = d.config.auto ? 'enabled' : 'disabled';
|
|
@@ -14,7 +14,7 @@ import { decompressSmart } from "../src/store/compression.js";
|
|
|
14
14
|
import { loadMetrics, fpRate, p95 } from "../src/monitoring.js";
|
|
15
15
|
import { MegaRuntime, C, recentUserQuery } from "./mega-runtime.js";
|
|
16
16
|
import { runCompact, doRecall, doRecallAsync } from "./mega-pipeline.js";
|
|
17
|
-
import {
|
|
17
|
+
import { type MegaConfig } from "./mega-config.js";
|
|
18
18
|
|
|
19
19
|
/** Resolve a checkpoint by id (or "recent"/"last") from this session's store. */
|
|
20
20
|
export function findCheckpoint(runtime: MegaRuntime, sid: string, ref: string) {
|
|
@@ -126,7 +126,8 @@ export function registerCommands(pi: ExtensionAPI, runtime: MegaRuntime, config:
|
|
|
126
126
|
} catch { /* non-fatal */ }
|
|
127
127
|
const crossRepoStr = `${crossRepoInjections} cross-repo injections recorded · ${repoCount} repos indexed`;
|
|
128
128
|
ctx.ui.notify(
|
|
129
|
-
`[mega-compact] pct=${pct} tokens=${tokens} tier=${
|
|
129
|
+
`[mega-compact] pct=${pct} tokens=${tokens} tier=${runtime.pressureBand} (live) preset=${config.tier} ` +
|
|
130
|
+
`pressure=${Math.round(runtime.pressure * 100)}% fastGate=${config.fastGatePct}% ` +
|
|
130
131
|
`threshold=${config.thresholdTokens} auto=${config.auto} autoInline=${config.autoInline}\n` +
|
|
131
132
|
`[mega-compact] store: ${st.checkpointCount} chkpt · ` +
|
|
132
133
|
`${st.totalTokenEstimate} tok · last=${st.lastCheckpointId ?? "—"} · ` +
|
|
@@ -239,27 +240,7 @@ export function registerCommands(pi: ExtensionAPI, runtime: MegaRuntime, config:
|
|
|
239
240
|
},
|
|
240
241
|
});
|
|
241
242
|
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
const arg = args.trim().toLowerCase();
|
|
246
|
-
if (!arg) {
|
|
247
|
-
// Show current tier and available options.
|
|
248
|
-
ctx.ui.notify(
|
|
249
|
-
`[mega-compact] current tier: ${config.tier} (${config.thresholdTokens} tok)\n` +
|
|
250
|
-
`[mega-compact] available tiers: ${Object.entries(COMPACT_TIERS).map(([k, v]) => `${k}=${v}`).join(", ")}`,
|
|
251
|
-
);
|
|
252
|
-
return;
|
|
253
|
-
}
|
|
254
|
-
if (!(arg in COMPACT_TIERS)) {
|
|
255
|
-
ctx.ui.notify(`[mega-compact] unknown tier "${arg}". Available: ${Object.keys(COMPACT_TIERS).join(", ")}`);
|
|
256
|
-
return;
|
|
257
|
-
}
|
|
258
|
-
const newTier = arg as CompactTier;
|
|
259
|
-
setTier(config, newTier);
|
|
260
|
-
runtime.setStatus(ctx, `mega-compact: tier → ${newTier} (${config.thresholdTokens} tok)`);
|
|
261
|
-
ctx.ui.notify(`[mega-compact] tier changed to ${newTier} (threshold: ${config.thresholdTokens} tokens)`);
|
|
262
|
-
runtime.snapshot(ctx);
|
|
263
|
-
},
|
|
264
|
-
});
|
|
243
|
+
// NOTE: /mega-tier was removed in S24. The tier the user sees is now the LIVE
|
|
244
|
+
// pressure band (low/medium/high/ultra/mega), which climbs automatically as
|
|
245
|
+
// context fills — there is no manual tier to set. See docs/specs/s24-unified-pressure.md.
|
|
265
246
|
}
|
|
@@ -416,19 +416,22 @@ const TIER_CASES: Array<[string, number]> = [
|
|
|
416
416
|
["mega", 10_000_000],
|
|
417
417
|
];
|
|
418
418
|
for (const [tier, threshold] of TIER_CASES) {
|
|
419
|
-
test(`tier "${tier}" resolves to a ${threshold}-token threshold`, async () => {
|
|
419
|
+
test(`tier "${tier}" resolves to a ${threshold}-token threshold (preset; live band shown separately)`, async () => {
|
|
420
420
|
// Keep tier + keep threshold UNSET so the tier (not an explicit number)
|
|
421
421
|
// drives the threshold. harness() would otherwise reset the threshold.
|
|
422
422
|
delete process.env.MEGACOMPACT_THRESHOLD_TOKENS;
|
|
423
423
|
process.env.MEGACOMPACT_TIER = tier;
|
|
424
424
|
const h = harness({ keepTier: true, keepThreshold: true });
|
|
425
|
+
// tokens=1 against a 2M window → near-zero pressure → live band "low".
|
|
425
426
|
const ctx = h.ctx({ getContextUsage: () => ({ tokens: 1, contextWindow: 2_000_000, percent: 0.01 }) });
|
|
426
427
|
await h.commands["mega-status"].handler("", ctx);
|
|
427
428
|
delete process.env.MEGACOMPACT_TIER;
|
|
428
429
|
assert.ok(
|
|
429
|
-
h.notifies.some((n) => n.includes(`
|
|
430
|
-
`status should report
|
|
430
|
+
h.notifies.some((n) => n.includes(`preset=${tier}`) && n.includes(`threshold=${threshold}`)),
|
|
431
|
+
`status should report preset=${tier} threshold=${threshold}`,
|
|
431
432
|
);
|
|
433
|
+
// S24: the headline tier is the LIVE pressure band, shown as "tier=low (live)".
|
|
434
|
+
assert.ok(h.notifies.some((n) => n.includes("tier=low (live)")), "live band reported (low at near-zero pressure)");
|
|
432
435
|
});
|
|
433
436
|
}
|
|
434
437
|
|
|
@@ -440,11 +443,61 @@ test("explicit MEGACOMPACT_THRESHOLD_TOKENS overrides the tier", async () => {
|
|
|
440
443
|
await h.commands["mega-status"].handler("", ctx);
|
|
441
444
|
delete process.env.MEGACOMPACT_TIER;
|
|
442
445
|
assert.ok(
|
|
443
|
-
h.notifies.some((n) => n.includes("
|
|
444
|
-
"explicit threshold wins over tier (
|
|
446
|
+
h.notifies.some((n) => n.includes("preset=custom") && n.includes("threshold=777")),
|
|
447
|
+
"explicit threshold wins over tier (preset=custom)",
|
|
445
448
|
);
|
|
446
449
|
});
|
|
447
450
|
|
|
451
|
+
// ---- S24: memory review tied to pressure / compaction -----------------------
|
|
452
|
+
// Build a decision-bearing session large enough to guarantee a real (non-skipped,
|
|
453
|
+
// non-deduped) compaction. Each user turn contains a decision phrase
|
|
454
|
+
// (/\bactually\b/i, /\bwe (?:use|decided)\b/i) so reviewConversation yields ops.
|
|
455
|
+
function decisionSession(): AgentMessage[] {
|
|
456
|
+
const out: AgentMessage[] = [];
|
|
457
|
+
for (let i = 0; i < 14; i++) {
|
|
458
|
+
out.push({ role: "user", content: `actually we decided to use approach ${i} for module ${i}`, timestamp: i } as unknown as AgentMessage);
|
|
459
|
+
out.push({ role: "assistant", content: [{ type: "toolCall", name: "Edit", id: `c${i}`, arguments: {} }], api: "anthropic-messages", provider: "anthropic", model: "m", usage: { inputTokens: 1, outputTokens: 1, cacheReadTokens: 0, cacheWriteTokens: 0 }, stopReason: "tool_use", timestamp: i } as unknown as AgentMessage);
|
|
460
|
+
out.push({ role: "toolResult", content: [{ type: "text", text: `edited module ${i}` }], toolCallId: `c${i}`, toolName: "Edit", isError: false, timestamp: i } as unknown as AgentMessage);
|
|
461
|
+
}
|
|
462
|
+
return out;
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
test("S24: high pressure triggers a memory review on compaction", async () => {
|
|
466
|
+
const h = harness();
|
|
467
|
+
// Force a real (non-legacy) compaction at full pressure → pressureBand "mega",
|
|
468
|
+
// which must fire the shared runMemoryReview on compact (review-on-compact).
|
|
469
|
+
process.env.MEGACOMPACT_LEGACY_DURABLE_TRIM = "false";
|
|
470
|
+
try {
|
|
471
|
+
const messages = decisionSession();
|
|
472
|
+
const ctx = h.ctx({ getContextUsage: () => ({ tokens: 200000, contextWindow: 200000, percent: 100 }) });
|
|
473
|
+
await h.fire("context", { type: "context", messages }, ctx);
|
|
474
|
+
// review-on-compact runs as a fire-and-forget async (doCompact is sync), so
|
|
475
|
+
// let the microtask/macrotask queue drain before asserting the side effect.
|
|
476
|
+
await new Promise((r) => setTimeout(r, 20));
|
|
477
|
+
const { listMemories, listCheckpoints } = await import("../src/store/sqlite.js");
|
|
478
|
+
// A checkpoint must have been persisted (proves compaction ran, not skipped).
|
|
479
|
+
assert.ok(listCheckpoints("sess_ext_001", h.stateDir).length > 0, "checkpoint persisted to local vector db");
|
|
480
|
+
// The just-compacted region is worth remembering, so durable memories must
|
|
481
|
+
// have been written to the SQLite store (review-on-compact path).
|
|
482
|
+
const mem = listMemories(null, 50, h.stateDir);
|
|
483
|
+
assert.ok(mem.length > 0, "memory review wrote durable memories on compact");
|
|
484
|
+
} finally {
|
|
485
|
+
delete process.env.MEGACOMPACT_LEGACY_DURABLE_TRIM;
|
|
486
|
+
}
|
|
487
|
+
});
|
|
488
|
+
|
|
489
|
+
test("S24: /mega-status reports the live pressure band + %", async () => {
|
|
490
|
+
const h = harness();
|
|
491
|
+
// Populate the runtime's live context first (a context event sets
|
|
492
|
+
// lastCtxTokens/lastCtxPercent), then read /mega-status. At 100% usage the live
|
|
493
|
+
// band must read "mega" and pressure must report 100%.
|
|
494
|
+
const ctx = h.ctx({ getContextUsage: () => ({ tokens: 200000, contextWindow: 200000, percent: 100 }) });
|
|
495
|
+
await h.fire("context", { type: "context", messages: h.session }, ctx);
|
|
496
|
+
await h.commands["mega-status"].handler("", ctx);
|
|
497
|
+
assert.ok(h.notifies.some((n) => n.includes("tier=mega (live)")), "live band reported as mega at 100% pressure");
|
|
498
|
+
assert.ok(h.notifies.some((n) => n.includes("pressure=100%")), "live pressure % reported");
|
|
499
|
+
});
|
|
500
|
+
|
|
448
501
|
// ---- /dashboard commands ----------------------------------------------------
|
|
449
502
|
test("/dashboard-status reports no server when pid file missing", async () => {
|
|
450
503
|
// Private base so this asserts "no server" on a range nothing else uses,
|
|
@@ -25,8 +25,13 @@ export const COMPACT_TIERS = {
|
|
|
25
25
|
} as const;
|
|
26
26
|
export type CompactTier = keyof typeof COMPACT_TIERS;
|
|
27
27
|
|
|
28
|
-
/**
|
|
29
|
-
*
|
|
28
|
+
/**
|
|
29
|
+
* Resolved, frozen-at-load config. `tier` is the base compaction PRESET chosen
|
|
30
|
+
* by env (low/medium/high/ultra/mega) — it sets the threshold token budget and
|
|
31
|
+
* is NOT changed at runtime (the /mega-tier command was removed in S24). The
|
|
32
|
+
* *displayed* tier the user sees in the toolbar/dashboard is the LIVE pressure
|
|
33
|
+
* band (see MegaRuntime.pressureBand), which climbs low→mega as context fills.
|
|
34
|
+
*/
|
|
30
35
|
export interface MegaConfig {
|
|
31
36
|
tier: CompactTier | "custom";
|
|
32
37
|
thresholdTokens: number;
|
|
@@ -97,11 +102,20 @@ function resolveThreshold(): { tier: CompactTier | "custom"; thresholdTokens: nu
|
|
|
97
102
|
}
|
|
98
103
|
|
|
99
104
|
/**
|
|
100
|
-
* Pressure helpers for adaptive compression
|
|
101
|
-
*
|
|
102
|
-
*
|
|
105
|
+
* Pressure helpers for adaptive compression live in src/config.ts (pi-agnostic)
|
|
106
|
+
* so unit tests can import them without the pi runtime. Re-export here so the
|
|
107
|
+
* extension has one import surface. (S24 unified the previously percentage-only
|
|
108
|
+
* signal into pressureRatio/pressureBand, which the runtime uses as the single
|
|
109
|
+
* "how full" signal that drives the tier label, trim depth, and memory cadence.)
|
|
103
110
|
*/
|
|
104
|
-
export {
|
|
111
|
+
export {
|
|
112
|
+
pressureFromPct,
|
|
113
|
+
preserveRecentForPressure,
|
|
114
|
+
pressureRatio,
|
|
115
|
+
pressureBand,
|
|
116
|
+
memoryReviewCadence,
|
|
117
|
+
type PressureBand,
|
|
118
|
+
} from "../src/config.js";
|
|
105
119
|
|
|
106
120
|
/** Build the resolved config from env + defaults. */
|
|
107
121
|
export function loadConfig(): MegaConfig {
|
|
@@ -132,11 +146,12 @@ export function loadConfig(): MegaConfig {
|
|
|
132
146
|
};
|
|
133
147
|
}
|
|
134
148
|
|
|
135
|
-
/**
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
149
|
+
/**
|
|
150
|
+
* Remove a cached tier mutation helper here — the live tier the user sees is the
|
|
151
|
+
* pressure band (MegaRuntime.pressureBand), and the base preset is env-resolved
|
|
152
|
+
* at load (loadConfig). The /mega-tier command was removed in S24 so there is no
|
|
153
|
+
* runtime tier mutation; see the S24 spec (docs/specs/s24-unified-pressure.md).
|
|
154
|
+
*/
|
|
140
155
|
|
|
141
156
|
/**
|
|
142
157
|
* Resolve the current repo's git root from a cwd. Returns undefined for a
|
|
@@ -19,7 +19,12 @@ import { existsSync, mkdirSync, writeFileSync, appendFileSync } from "node:fs";
|
|
|
19
19
|
export interface DashboardSnapshot {
|
|
20
20
|
version: 1;
|
|
21
21
|
updatedAt: string;
|
|
22
|
+
/** Live pressure band (low/medium/high/ultra/mega) — climbs as context fills. */
|
|
22
23
|
tier: string;
|
|
24
|
+
/** Base compaction preset from env (the S24-removed /mega-tier style selector). */
|
|
25
|
+
presetTier: string;
|
|
26
|
+
/** Live 0–1 pressure ratio (currentTokens / thresholdTokens). */
|
|
27
|
+
pressure: number;
|
|
23
28
|
config: {
|
|
24
29
|
fastGatePct: number;
|
|
25
30
|
thresholdTokens: number;
|
|
@@ -13,11 +13,11 @@ import { normalizeSessionId } from "../src/store.js";
|
|
|
13
13
|
import { autoCompactCheck } from "../src/compact.js";
|
|
14
14
|
import { estimateSessionTokens } from "../src/tokens.js";
|
|
15
15
|
import { MegaRuntime, recentUserQuery, WIDGET_KEY } from "./mega-runtime.js";
|
|
16
|
-
import { runCompact, doRecall, doRecallAsync, piCompactWouldNoop } from "./mega-pipeline.js";
|
|
16
|
+
import { runCompact, doRecall, doRecallAsync, piCompactWouldNoop, runMemoryReview } from "./mega-pipeline.js";
|
|
17
17
|
import { recallMemoriesAndInline } from "../src/recall.js";
|
|
18
18
|
import { driveNativeCompaction } from "./mega-compact-driver.js";
|
|
19
19
|
import { computeLiveTrimCut, liveTrimSummaryMessage } from "./mega-trim.js";
|
|
20
|
-
import { pressureFromPct, type MegaConfig } from "./mega-config.js";
|
|
20
|
+
import { pressureFromPct, memoryReviewCadence, type MegaConfig } from "./mega-config.js";
|
|
21
21
|
|
|
22
22
|
/** Register all pi lifecycle event handlers. */
|
|
23
23
|
export function registerEventHandlers(pi: ExtensionAPI, runtime: MegaRuntime, config: MegaConfig): void {
|
|
@@ -164,25 +164,21 @@ export function registerEventHandlers(pi: ExtensionAPI, runtime: MegaRuntime, co
|
|
|
164
164
|
runtime.dashboard.event("turn_end", { turnIndex: event.turnIndex });
|
|
165
165
|
runtime.snapshot(ctx);
|
|
166
166
|
|
|
167
|
-
// S20: auto-review the conversation
|
|
168
|
-
//
|
|
169
|
-
//
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
167
|
+
// S20+S24: auto-review the conversation and persist durable memories. The
|
|
168
|
+
// review cadence scales with pressure (memoryReviewCadence): as context
|
|
169
|
+
// fills, the conversation is reviewed more often so memories keep pace with
|
|
170
|
+
// faster churn. Best-effort + non-fatal: a review failure must never break
|
|
171
|
+
// the agent loop. Debounced by the pressure-adjusted interval.
|
|
172
|
+
if (config.memoryAutoReview && runtime.currentTurn > 0) {
|
|
173
|
+
const cadence = memoryReviewCadence(runtime.pressureBand, config.memoryReviewInterval);
|
|
174
|
+
if (runtime.currentTurn % cadence === 0) {
|
|
175
|
+
// S20+S24: review the conversation and persist durable memories. The
|
|
176
|
+
// cadence scales with pressure (memoryReviewCadence): as context fills,
|
|
177
|
+
// the conversation is reviewed more often so memories keep pace with
|
|
178
|
+
// faster churn. Shared runMemoryReview body (also used on compact).
|
|
174
179
|
const entries = ctx.sessionManager.getEntries();
|
|
175
180
|
const view = runtime.engineView(entries.flatMap((e: any) => (e.message ? [e.message] : [])));
|
|
176
|
-
|
|
177
|
-
if (ops.length) {
|
|
178
|
-
await applyMemoryOps(ops, runtime.currentStateDir);
|
|
179
|
-
// S21.2: a memory op landed in this turn window. The pipeline reads
|
|
180
|
-
// this counter after a successful compaction and fires
|
|
181
|
-
// `consolidateMemories` only when it's > 0.
|
|
182
|
-
runtime.memoriesTouchedThisCompaction += ops.length;
|
|
183
|
-
}
|
|
184
|
-
} catch {
|
|
185
|
-
/* non-fatal — auto-review must not break the turn loop */
|
|
181
|
+
await runMemoryReview(runtime, view, "turn");
|
|
186
182
|
}
|
|
187
183
|
}
|
|
188
184
|
});
|
|
@@ -31,6 +31,39 @@ export type RunCompactResult =
|
|
|
31
31
|
| { skipped: true }
|
|
32
32
|
| { skipped: false; result: ReturnType<typeof compactSession>; keepFrom: number; saved: number };
|
|
33
33
|
|
|
34
|
+
/**
|
|
35
|
+
* Review the live conversation and persist durable memories (S20+S24). Shared by
|
|
36
|
+
* the pressure-scaled turn-end cadence (mega-events.ts) AND review-on-compact
|
|
37
|
+
* (below) so both paths run the identical review body. Best-effort + non-fatal:
|
|
38
|
+
* a review failure is swallowed and never breaks the caller. On success, the
|
|
39
|
+
* number of applied ops is returned so callers can feed the consolidation gate.
|
|
40
|
+
*
|
|
41
|
+
* @param view the engine message view to review (caller builds it)
|
|
42
|
+
* @param label a short source tag for the ticker line (e.g. "pressure" / "turn")
|
|
43
|
+
*/
|
|
44
|
+
export async function runMemoryReview(
|
|
45
|
+
runtime: MegaRuntime,
|
|
46
|
+
view: ReturnType<MegaRuntime["engineView"]>,
|
|
47
|
+
label: string,
|
|
48
|
+
): Promise<number> {
|
|
49
|
+
try {
|
|
50
|
+
const { reviewConversation } = await import("../src/memory.js");
|
|
51
|
+
const { applyMemoryOps } = await import("../src/memoryOps.js");
|
|
52
|
+
const ops = reviewConversation(view, []);
|
|
53
|
+
if (ops.length) {
|
|
54
|
+
await applyMemoryOps(ops, runtime.currentStateDir);
|
|
55
|
+
// S21.2: ops landed — the compaction path reads this counter and fires
|
|
56
|
+
// `consolidateMemories` only when > 0.
|
|
57
|
+
runtime.memoriesTouchedThisCompaction += ops.length;
|
|
58
|
+
runtime.pushTicker(`${C.green}🧠${C.reset} reviewed ${ops.length} memory op${ops.length === 1 ? "" : "s"} (${label})`);
|
|
59
|
+
}
|
|
60
|
+
return ops.length;
|
|
61
|
+
} catch {
|
|
62
|
+
/* non-fatal — auto-review must never break the turn loop / compaction */
|
|
63
|
+
return 0;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
34
67
|
/** Run the full compaction pipeline and persist a checkpoint. Returns the result. */
|
|
35
68
|
export function runCompact(
|
|
36
69
|
pi: ExtensionAPI,
|
|
@@ -175,6 +208,15 @@ function doCompact(
|
|
|
175
208
|
}
|
|
176
209
|
}
|
|
177
210
|
|
|
211
|
+
// S24 review-on-compact: when pressure is high, the just-compacted region is
|
|
212
|
+
// exactly the context worth remembering, so review it immediately rather than
|
|
213
|
+
// waiting for the next turn-cadence tick. Uses the shared runMemoryReview
|
|
214
|
+
// helper (fire-and-forget; doCompact is sync). Best-effort + non-fatal. Only
|
|
215
|
+
// fires above the `high` band so low-pressure compactions don't pay the cost.
|
|
216
|
+
if (!result.deduped && config.memoryAutoReview && runtime.pressureBand !== "low" && runtime.pressureBand !== "medium") {
|
|
217
|
+
void runMemoryReview(runtime, view, "pressure");
|
|
218
|
+
}
|
|
219
|
+
|
|
178
220
|
// Sentinel marker: a non-LLM bookkeeping entry so subsequent triggers can
|
|
179
221
|
// skip re-vectorizing an already-compacted region (zero token cost).
|
|
180
222
|
pi.appendEntry(MARKER_TYPE, {
|
|
@@ -20,7 +20,7 @@ import { toEngineMessages } from "../src/adapt.js";
|
|
|
20
20
|
import { normalizeSessionId } from "../src/store.js";
|
|
21
21
|
import { Logger } from "../src/log.js";
|
|
22
22
|
import { recordModelSnapshot, latestModelSnapshot, upsertRepoRegistry, recordRepoModel, type ModelSnapshot } from "../src/store/sqlite.js";
|
|
23
|
-
import { repoStateDir, resolveRepoRoot, type MegaConfig } from "./mega-config.js";
|
|
23
|
+
import { repoStateDir, resolveRepoRoot, pressureRatio, pressureFromPct, pressureBand, type MegaConfig, type PressureBand } from "./mega-config.js";
|
|
24
24
|
import { Dashboard, type DashboardSnapshot } from "./mega-dashboard.js";
|
|
25
25
|
|
|
26
26
|
export const STATUS_KEY = "mega-compact";
|
|
@@ -143,6 +143,26 @@ export class MegaRuntime {
|
|
|
143
143
|
lastCtxPercent: number | null = null;
|
|
144
144
|
lastCtxWindow = 0;
|
|
145
145
|
|
|
146
|
+
/**
|
|
147
|
+
* Live 0–1 pressure: how full the context window is relative to the compaction
|
|
148
|
+
* threshold. Computed from the most recent context event the runtime already
|
|
149
|
+
* tracks (token count when available — the direct signal — otherwise the usage
|
|
150
|
+
* percentage). This is the single "how full" number every subsystem reads; the
|
|
151
|
+
* toolbar/dashboard tier label is `pressureBand` over this, so it climbs
|
|
152
|
+
* low→mega as context rises (S24). Always finite + in [0,1].
|
|
153
|
+
*/
|
|
154
|
+
get pressure(): number {
|
|
155
|
+
if (this.lastCtxTokens != null && this.lastCtxTokens > 0 && this.config.thresholdTokens > 0) {
|
|
156
|
+
return pressureRatio(this.lastCtxTokens, this.config.thresholdTokens);
|
|
157
|
+
}
|
|
158
|
+
return pressureFromPct(this.lastCtxPercent);
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/** Live discrete pressure band (low/medium/high/ultra/mega) over `pressure`. */
|
|
162
|
+
get pressureBand(): PressureBand {
|
|
163
|
+
return pressureBand(this.pressure);
|
|
164
|
+
}
|
|
165
|
+
|
|
146
166
|
constructor(config: MegaConfig) {
|
|
147
167
|
this.config = config;
|
|
148
168
|
this.store = new VectorStore({ dedupSim: config.dedupSim, stateDir: config.stateDir });
|
|
@@ -214,7 +234,11 @@ export class MegaRuntime {
|
|
|
214
234
|
this.dashboard.snapshot({
|
|
215
235
|
version: 1,
|
|
216
236
|
updatedAt: new Date().toISOString(),
|
|
217
|
-
|
|
237
|
+
// S24: the headline tier is the LIVE pressure band; the env preset is kept
|
|
238
|
+
// alongside as presetTier so the dashboard can show both.
|
|
239
|
+
tier: this.pressureBand,
|
|
240
|
+
presetTier: this.config.tier,
|
|
241
|
+
pressure: this.pressure,
|
|
218
242
|
config: {
|
|
219
243
|
fastGatePct: this.config.fastGatePct,
|
|
220
244
|
thresholdTokens: this.config.thresholdTokens,
|
|
@@ -261,6 +285,11 @@ export class MegaRuntime {
|
|
|
261
285
|
const tokStr = this.lastCtxTokens != null ? `${Math.round(this.lastCtxTokens / 1000)}k` : "?";
|
|
262
286
|
const maxStr = this.lastCtxWindow > 0 ? `${Math.round(this.lastCtxWindow / 1000)}k` : "?";
|
|
263
287
|
const pctStr = this.lastCtxPercent != null ? `${Math.round(this.lastCtxPercent * 10) / 10}%` : "?%";
|
|
288
|
+
// S24: the tier label is the LIVE pressure band (low/medium/high/ultra/
|
|
289
|
+
// mega), not the static env preset. It climbs as context fills, so the
|
|
290
|
+
// user can see the system react. The base preset is shown as a dim suffix.
|
|
291
|
+
const liveBand = this.pressureBand;
|
|
292
|
+
const tierLabel = `${C.bold}${liveBand}${C.reset}${C.gray}·${this.config.tier}${C.reset}`;
|
|
264
293
|
const triggerLabel = ready ? `${C.green}● ready${C.reset}` : armed ? `${C.amber}◐ armed${C.reset}` : `${C.gray}○ idle${C.reset}`;
|
|
265
294
|
// Storage dedup rate is cumulative (store-wide, per-repo) and survives
|
|
266
295
|
// session resets. Always show a number: 0% before any compaction, a
|
|
@@ -283,7 +312,7 @@ export class MegaRuntime {
|
|
|
283
312
|
// Phase 3 — pulsing status glyph while a compaction is in flight.
|
|
284
313
|
const pulse = this.pulsing ? `${C.cyan}${PULSE[Math.floor(Date.now() / 250) % PULSE.length]}${C.reset} ` : "";
|
|
285
314
|
const lines = [
|
|
286
|
-
` ${C.amber}⚡ ${
|
|
315
|
+
` ${C.amber}⚡ ${tierLabel}${C.reset} v${C.bold}${ownVersion()}${C.reset} │ ${tokStr}/${maxStr} tokens (${C.bold}${pctStr}${C.reset}) │ ${st.checkpointCount} saved${agentStr}${turnStr}`,
|
|
287
316
|
` ${triggerLabel} │ ${C.magenta}repeat-skipped: ${dedupStr}${C.reset} │ ${C.gray}memory held:${C.reset} ${usedStr} │ ${C.gray}space freed:${C.reset} ${savedStr}`,
|
|
288
317
|
];
|
|
289
318
|
// Phase 3 — compact progress bar: session tokens saved toward the rolling goal.
|
package/package.json
CHANGED
package/src/config.ts
CHANGED
|
@@ -39,3 +39,64 @@ export function preserveRecentForPressure(
|
|
|
39
39
|
const v = Math.round(preserveRecent - (preserveRecent - preserveRecentMin) * p);
|
|
40
40
|
return Math.max(preserveRecentMin, Math.min(preserveRecent, v));
|
|
41
41
|
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Discrete pressure band derived from the live 0–1 pressure ratio. This is the
|
|
45
|
+
* single signal every subsystem (tier label, trim depth, memory cadence)
|
|
46
|
+
* branches on, so context rising actually *moves* the dashboard/menu instead of
|
|
47
|
+
* sitting on a static env-resolved preset. (S24 — unified pressure signal.)
|
|
48
|
+
*
|
|
49
|
+
* Bands:
|
|
50
|
+
* low < 0.50 plenty of headroom — minimal trimming, infrequent review
|
|
51
|
+
* medium 0.50–0.75
|
|
52
|
+
* high 0.75–0.90
|
|
53
|
+
* ultra 0.90–1.00
|
|
54
|
+
* mega >= 1.00 at/over threshold — deepest trim, most aggressive review
|
|
55
|
+
*/
|
|
56
|
+
export type PressureBand = "low" | "medium" | "high" | "ultra" | "mega";
|
|
57
|
+
|
|
58
|
+
/** Clamp a pressure ratio into [0, 1]. */
|
|
59
|
+
function clamp01(p: number): number {
|
|
60
|
+
if (!Number.isFinite(p)) return 0;
|
|
61
|
+
return p < 0 ? 0 : p > 1 ? 1 : p;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Pressure as a 0–1 ratio from live token usage relative to the compaction
|
|
66
|
+
* threshold. Cheaper + more direct than deriving from a usage percentage when
|
|
67
|
+
* we already have both numbers (the context handler does). Re-exports
|
|
68
|
+
* `pressureFromPct` covers the percentage-only path. (S24.)
|
|
69
|
+
*/
|
|
70
|
+
export function pressureRatio(currentTokens: number, thresholdTokens: number): number {
|
|
71
|
+
if (!Number.isFinite(currentTokens) || currentTokens <= 0) return 0;
|
|
72
|
+
const t = Number.isFinite(thresholdTokens) && thresholdTokens > 0 ? thresholdTokens : 0;
|
|
73
|
+
return clamp01(t > 0 ? currentTokens / t : 0);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/** Map a 0–1 pressure ratio to a discrete band. (S24.) */
|
|
77
|
+
export function pressureBand(pressure: number): PressureBand {
|
|
78
|
+
const p = clamp01(pressure);
|
|
79
|
+
if (p >= 1.0) return "mega";
|
|
80
|
+
if (p >= 0.9) return "ultra";
|
|
81
|
+
if (p >= 0.75) return "high";
|
|
82
|
+
if (p >= 0.5) return "medium";
|
|
83
|
+
return "low";
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Memory auto-review cadence (in turns) for a given pressure band. As pressure
|
|
88
|
+
* climbs, the conversation is reviewed more often so durable memories keep pace
|
|
89
|
+
* with the faster context churn. Returns a divisor used as
|
|
90
|
+
* `turn % cadence === 0`. Always >= 1. (S24 — memory cadence tie-in.)
|
|
91
|
+
*/
|
|
92
|
+
export function memoryReviewCadence(band: PressureBand, baseInterval: number): number {
|
|
93
|
+
const base = baseInterval >= 1 ? baseInterval : 1;
|
|
94
|
+
switch (band) {
|
|
95
|
+
case "mega": return Math.max(1, Math.round(base / 5));
|
|
96
|
+
case "ultra": return Math.max(1, Math.round(base / 3));
|
|
97
|
+
case "high": return Math.max(1, Math.round(base / 2));
|
|
98
|
+
case "medium": return Math.max(1, Math.round((base * 2) / 3));
|
|
99
|
+
case "low":
|
|
100
|
+
default: return base;
|
|
101
|
+
}
|
|
102
|
+
}
|