Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: enable staleToolResultPrune by default on headless, desktop, and CLI by Astro-Han · Pull Request #621 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: enable staleToolResultPrune by default on headless, desktop, and CLI by Astro-Han · Pull Request #621 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: enable staleToolResultPrune by default on headless, desktop, and CLI by Astro-Han · Pull Request #621 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat: enable staleToolResultPrune by default on headless, desktop, and CLI by Astro-Han · Pull Request #621 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: enable staleToolResultPrune by default on headless, desktop, and CLI by Astro-Han · Pull Request #621 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: enable staleToolResultPrune by default on headless, desktop, and CLI by Astro-Han · Pull Request #621 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat: enable staleToolResultPrune by default on headless, desktop, and CLI by Astro-Han · Pull Request #621 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/context-budget-policy.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,3 +146,84 @@ describe('desktop activeToolResultPrune policy', () => {
assert.equal(policy?.maxHistoryEstimatedTokens, 128_000 - 4096);
});
});

const STALE_PRUNE_ENV_KEYS = [
'MAKA_CONTEXT_BUDGET',
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS',
'MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS',
'MAKA_CONTEXT_MIN_RECENT_TURNS',
] as const;

describe('desktop staleToolResultPrune policy', () => {
const savedStaleEnv: Record<string, string | undefined> = {};

beforeEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
savedStaleEnv[key] = process.env[key];
delete process.env[key];
}
});

afterEach(() => {
for (const key of STALE_PRUNE_ENV_KEYS) {
if (savedStaleEnv[key] === undefined) delete process.env[key];
else process.env[key] = savedStaleEnv[key];
}
});

test('is enabled by default with the measured 2048-token threshold', () => {
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(policy?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('can be disabled with explicit false', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'false';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('can be disabled with explicit off', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune, undefined);
});

test('accepts standard truthy values as enabled', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'true';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.enabled, true);
});

test('rejects malformed boolean values instead of silently disabling', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE = 'maybe';
assert.throws(
() => buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' }),
/MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE must be a boolean/,
);
});

test('respects max result estimated tokens env', () => {
process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MAX_TOKENS = '4096';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy?.staleToolResultPrune?.maxResultEstimatedTokens, 4096);
});

test('respects min recent turns full env with MAKA_CONTEXT_MIN_RECENT_TURNS fallback', () => {
process.env.MAKA_CONTEXT_MIN_RECENT_TURNS = '3';
const fallbackPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(fallbackPolicy?.staleToolResultPrune?.minRecentTurnsFull, 3);

process.env.MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS = '5';
const explicitPolicy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(explicitPolicy?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('MAKA_CONTEXT_BUDGET=off disables the whole policy including staleToolResultPrune', () => {
process.env.MAKA_CONTEXT_BUDGET = 'off';
const policy = buildDefaultContextBudgetPolicy(openaiConnection(), { name: 'desktop-default-history-budget' });
assert.equal(policy, undefined);
});
});
53 changes: 44 additions & 9 deletions packages/headless/src/__tests__/harbor-cell.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1430,7 +1430,7 @@ describe('runHarborCell', () => {
});

test('Harbor context budget env treats explicit false-like booleans as disabled', () => {
// stale and archive default off; activeToolResultPrune defaults on, so disabling
// archive retrieval defaults off; stale and active prune default on, so disabling
// stale/archive alone still leaves an enabled activeToolResultPrune policy.
assert.deepEqual(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'false' }).contextBudget?.activeToolResultPrune,
Expand DownExpand Up@@ -1471,14 +1471,49 @@ describe('runHarborCell', () => {
});

test('Harbor active tool result prune can be disabled with explicit off', () => {
assert.equal(
buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }).contextBudget,
undefined,
);
assert.equal(
buildHarborCellContextBudgetPolicySnapshot({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' }),
undefined,
);
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.activeToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });
});

test('Harbor stale tool result prune is enabled by default without any env', () => {
const backend = buildHarborCellContextBudgetBackendOptions({});
// minRecentTurnsFull is set explicitly so the runtime protection window
// matches the policy snapshot and desktop default instead of the runtime's
// internal ?? 1 fallback.
assert.deepEqual(backend.contextBudget?.staleToolResultPrune, { enabled: true, minRecentTurnsFull: 2 });

const snapshot = buildHarborCellContextBudgetPolicySnapshot({});
assert.equal(snapshot?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.enabled, true);
assert.equal(snapshot?.staleToolResultPrune?.maxResultEstimatedTokens, 2048);
assert.equal(snapshot?.staleToolResultPrune?.minRecentTurnsFull, 2);
});

test('Harbor stale tool result prune can be disabled with explicit off', () => {
const options = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off' });
assert.equal(options.contextBudget?.staleToolResultPrune, undefined);
assert.deepEqual(options.contextBudget?.activeToolResultPrune, { enabled: true });
});

test('Harbor stale tool result prune min recent turns falls back to MAKA_CONTEXT_MIN_RECENT_TURNS', () => {
const fallback = buildHarborCellContextBudgetBackendOptions({ MAKA_CONTEXT_MIN_RECENT_TURNS: '3' });
assert.equal(fallback.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 3);

const explicit = buildHarborCellContextBudgetBackendOptions({
MAKA_CONTEXT_MIN_RECENT_TURNS: '3',
MAKA_CONTEXT_STALE_TOOL_RESULT_MIN_RECENT_TURNS: '5',
});
assert.equal(explicit.contextBudget?.staleToolResultPrune?.minRecentTurnsFull, 5);
});

test('Harbor context budget is empty when both default-on prunes are explicitly off', () => {
const env = {
MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE: 'off',
MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE: 'off',
};
assert.equal(buildHarborCellContextBudgetBackendOptions({ ...env }).contextBudget, undefined);
assert.equal(buildHarborCellContextBudgetPolicySnapshot({ ...env }), undefined);
});

test('Harbor parses semantic compact policy for headless runs', () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/headless/src/harbor-cell.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,7 +704,7 @@ export function buildHarborCellContextBudgetBackendOptions(
env.MAKA_HARBOR_CONTEXT_STALE_TOOL_RESULT_PRUNE ??
env.MAKA_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
) ?? false;
) ?? true;
const activePruneEnabled = booleanEnv(
env.MAKA_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
env.MAKA_HARBOR_CONTEXT_ACTIVE_TOOL_RESULT_PRUNE ??
Expand DownExpand Up@@ -760,7 +760,9 @@ export function buildHarborCellContextBudgetBackendOptions(
contextBudget.staleToolResultPrune = {
enabled: true,
...(maxResultEstimatedTokens !== undefined ? { maxResultEstimatedTokens } : {}),
...(minRecentTurnsFull !== undefined ? { minRecentTurnsFull } : {}),
// Explicit so the runtime protection window matches the policy snapshot
// and desktop default (2) instead of the runtime's internal ?? 1 fallback.
minRecentTurnsFull: minRecentTurnsFull ?? minRecentTurns ?? 2,
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/runtime/src/context-budget-policy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,11 @@ export function buildManualCompactLookupPolicy(
function buildStaleToolResultPrunePolicy(
env: Record<string, string | undefined>,
): NonNullable<ContextBudgetPolicy['staleToolResultPrune']> | undefined {
if (env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE !== 'on') return undefined;
const enabled = parseOptionalBoolean(
env.MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE,
'MAKA_CONTEXT_STALE_TOOL_RESULT_PRUNE',
);
if (enabled === false) return undefined;
return {
enabled: true,
maxResultEstimatedTokens: parsePositiveInt(
Expand Down
Loading