feat(model-router): cold-read cap on main-loop downgrades, switch on by default, classifier may route down
The main loop may now move down to a cheaper model by default (mainModelSwitch true, fail-closed picker). Both caps measure the COLD READ a switch costs: the context minus what the target model's prompt cache already holds, from a per-model served record written on every main step (1 h TTL, cleared by /clear and /route reload; a smaller context than the record counts as cold). downgradeMaxTokens defaults to 120000, upgradeMaxTokens keeps 200000; no return bypass is needed since a warm return is cheap by construction. The prompt classifier writes the full phase route: coding and bookkeeping guesses move main down under the switch and the cap; a guess never ranks above the session model; a mid-turn ultrathink floor keeps its model; a user /effort typed between turns drops the guess for that turn only (engine baseline is now per turn). A model-loaded helper skill inside a best-tier run moves effort only. Main routed onto a model whose window the context outgrew returns to the session model. The skip line is said once per cap crossing; the toast names a cap hold; the status line shows the switch only when off.
This commit is contained in:
1 parent
f3b47287f9
commit
2ce203a2da
3 files changed
+552
-107
No files matched your search
+6
-2
@@ -47,8 +47,12 @@ Builtin `/effort` is NOT a lever inside a run: rows and routes outrank it.
|
|||||||
- A skill typed while a background agent is live routes only through the
|
- A skill typed while a background agent is live routes only through the
|
||||||
typed marker (unverified live 2026-10-10).
|
typed marker (unverified live 2026-10-10).
|
||||||
- Headless (`-p`, SDK) runs the hooks, so routing works there too.
|
- Headless (`-p`, SDK) runs the hooks, so routing works there too.
|
||||||
- A plain typed prompt with no route in force gets its turn effort from a
|
- A plain typed prompt with no route in force is classified by a small
|
||||||
small-model classifier (effort only; `/route classify off`; never `-p`).
|
model: the guessed phase sets the turn's effort and, under
|
||||||
|
`mainModelSwitch` and `downgradeMaxTokens` (max cold read, default
|
||||||
|
120000), may move main DOWN, never up. A user `/model` only moves the
|
||||||
|
baseline the guess starts from (`/route classify off` to stop guessing;
|
||||||
|
never `-p`).
|
||||||
- Mod off: typed agents fall back to their `model:`/`effort:` frontmatter.
|
- Mod off: typed agents fall back to their `model:`/`effort:` frontmatter.
|
||||||
- First use of a row asks once, with context (Later, Keep or Change: model,
|
- First use of a row asks once, with context (Later, Keep or Change: model,
|
||||||
then effort, then Everywhere or this project only); the answer is kept in
|
then effort, then Everywhere or this project only); the answer is kept in
|
||||||
|
|||||||
@@ -307,6 +307,7 @@ test('ultrathink in a prompt sets a max floor on main', async ($, on) => {
|
|||||||
test('/route model: alias resolved, id passed, typo refused', async (
|
test('/route model: alias resolved, id passed, typo refused', async (
|
||||||
$, on) => {
|
$, on) => {
|
||||||
await boot($, on)
|
await boot($, on)
|
||||||
|
await route($, 'switch off')
|
||||||
const alias = await route($, 'model=sonnet')
|
const alias = await route($, 'model=sonnet')
|
||||||
expect(mainLine(alias)).toContain('asked claude-sonnet-5-5, keeps ')
|
expect(mainLine(alias)).toContain('asked claude-sonnet-5-5, keeps ')
|
||||||
const id = await route($, 'model=claude-x-9')
|
const id = await route($, 'model=claude-x-9')
|
||||||
@@ -606,11 +607,11 @@ test('reload with an unreadable override keeps the previous config', async (
|
|||||||
$, on) => {
|
$, on) => {
|
||||||
const world = newWorld({ home: {} })
|
const world = newWorld({ home: {} })
|
||||||
await boot($, on, FABLE, 1000, world)
|
await boot($, on, FABLE, 1000, world)
|
||||||
await route($, 'switch on')
|
await route($, 'switch off')
|
||||||
world.files.set(HOME_FILE, '{nope')
|
world.files.set(HOME_FILE, '{nope')
|
||||||
const out = await route($, 'reload')
|
const out = await route($, 'reload')
|
||||||
expect(out).toContain('switch: on')
|
expect(out).toContain('switch: off')
|
||||||
expect(await route($, 'show')).toContain('switch: on')
|
expect(await route($, 'show')).toContain('switch: off')
|
||||||
})
|
})
|
||||||
|
|
||||||
// ---- tiers, breaker, derived phases -------------------------------------
|
// ---- tiers, breaker, derived phases -------------------------------------
|
||||||
@@ -681,8 +682,9 @@ const switchTo = (
|
|||||||
const planRoute = ($: Engine) =>
|
const planRoute = ($: Engine) =>
|
||||||
$.tool.call({ tool: ROUTE_TOOL, phase: 'plan' })
|
$.tool.call({ tool: ROUTE_TOOL, phase: 'plan' })
|
||||||
|
|
||||||
/** A bottom `session.usage` answering a context of `tokens`. */
|
/** One bottom `session.usage` over a count `set` changes (never a second). */
|
||||||
function usageOf(on: On, tokens: number): void {
|
function usageVar(on: On, initial: number): { set: (n: number) => void } {
|
||||||
|
let tokens = initial
|
||||||
on('session.usage', () => ({
|
on('session.usage', () => ({
|
||||||
value: {
|
value: {
|
||||||
startedAt: 0,
|
startedAt: 0,
|
||||||
@@ -690,6 +692,24 @@ function usageOf(on: On, tokens: number): void {
|
|||||||
rateLimits: [],
|
rateLimits: [],
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
|
return { set: n => { tokens = n } }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A bottom `session.usage` answering a context of `tokens`. */
|
||||||
|
function usageOf(on: On, tokens: number): void {
|
||||||
|
usageVar(on, tokens)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** bootRig with a context size the test changes through `usage.set`. */
|
||||||
|
async function bootRigVar(
|
||||||
|
$: Engine,
|
||||||
|
on: On,
|
||||||
|
model: string = FABLE,
|
||||||
|
tokens = 1000,
|
||||||
|
world: World = newWorld(),
|
||||||
|
) {
|
||||||
|
const usage = usageVar(on, tokens)
|
||||||
|
return { rig: await bootRig($, on, model, null, world), usage }
|
||||||
}
|
}
|
||||||
|
|
||||||
test('tier: a plan route upgrades a haiku session to fable xhigh', async (
|
test('tier: a plan route upgrades a haiku session to fable xhigh', async (
|
||||||
@@ -747,14 +767,14 @@ test('breaker: model_not_found on a non-table id marks nothing', async (
|
|||||||
test('downgrade: mechanical on fable keeps the model, switch off', async (
|
test('downgrade: mechanical on fable keeps the model, switch off', async (
|
||||||
$, on) => {
|
$, on) => {
|
||||||
const rig = await bootRig($, on)
|
const rig = await bootRig($, on)
|
||||||
|
await route($, 'switch off')
|
||||||
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
||||||
expect(await stepOn($, rig, FABLE)).toEqual({ model: FABLE, effort: 'low' })
|
expect(await stepOn($, rig, FABLE)).toEqual({ model: FABLE, effort: 'low' })
|
||||||
})
|
})
|
||||||
|
|
||||||
test('downgrade: the switch on moves main to the cheap tier', async (
|
test('cap: a downgrade under the cold-read cap moves main', async (
|
||||||
$, on) => {
|
$, on) => {
|
||||||
const rig = await bootRig($, on)
|
const rig = await bootRig($, on)
|
||||||
await route($, 'switch on')
|
|
||||||
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
||||||
const sent = await stepOn($, rig, FABLE)
|
const sent = await stepOn($, rig, FABLE)
|
||||||
expect(sent.model).toBe(HAIKU)
|
expect(sent.model).toBe(HAIKU)
|
||||||
@@ -954,6 +974,7 @@ test('text: show names the session model after the turn ended', async (
|
|||||||
|
|
||||||
test('text: show reflects a /model command to opus', async ($, on) => {
|
test('text: show reflects a /model command to opus', async ($, on) => {
|
||||||
const rig = await bootRig($, on)
|
const rig = await bootRig($, on)
|
||||||
|
await route($, 'switch off')
|
||||||
await stepOn($, rig, FABLE)
|
await stepOn($, rig, FABLE)
|
||||||
await switchTo($, FABLE, OPUS, 'command')
|
await switchTo($, FABLE, OPUS, 'command')
|
||||||
await route($, 'mechanical')
|
await route($, 'mechanical')
|
||||||
@@ -999,11 +1020,12 @@ async function bootRun(
|
|||||||
on: On,
|
on: On,
|
||||||
model: string = FABLE,
|
model: string = FABLE,
|
||||||
world: World = newWorld(),
|
world: World = newWorld(),
|
||||||
|
tokens: number | null = 1000,
|
||||||
) {
|
) {
|
||||||
on('tool.call', { tool: 'Skill' }, () => ({
|
on('tool.call', { tool: 'Skill' }, () => ({
|
||||||
result: { success: true, commandName: 'bottom' },
|
result: { success: true, commandName: 'bottom' },
|
||||||
}))
|
}))
|
||||||
return bootRig($, on, model, 1000, world)
|
return bootRig($, on, model, tokens, world)
|
||||||
}
|
}
|
||||||
|
|
||||||
const spawnOf = (agent: string, extra: object = {}) =>
|
const spawnOf = (agent: string, extra: object = {}) =>
|
||||||
@@ -1127,11 +1149,13 @@ test('run slot: survives route calls and the turn end', async ($, on) => {
|
|||||||
expect(mainLine(await route($, 'show'))).toContain('run reflect')
|
expect(mainLine(await route($, 'show'))).toContain('run reflect')
|
||||||
})
|
})
|
||||||
|
|
||||||
test('run slot: a model-loaded helper skill keeps it', async ($, on) => {
|
test('run slot: a model-loaded helper skill moves effort only', async (
|
||||||
await bootRun($, on)
|
$, on) => {
|
||||||
|
const rig = await bootRun($, on)
|
||||||
await loadSkill($, 'feat')
|
await loadSkill($, 'feat')
|
||||||
await loadSkill($, 'using-git-worktrees')
|
await loadSkill($, 'using-git-worktrees')
|
||||||
expect(mainLine(await route($, 'show'))).toContain('skill mechanical')
|
expect(mainLine(await route($, 'show'))).toContain('skill mechanical')
|
||||||
|
expect(await stepOn($, rig, FABLE)).toEqual({ model: FABLE, effort: 'low' })
|
||||||
await endTurn($)
|
await endTurn($)
|
||||||
expect(mainLine(await route($, 'show'))).toContain('run reflect')
|
expect(mainLine(await route($, 'show'))).toContain('run reflect')
|
||||||
})
|
})
|
||||||
@@ -1664,10 +1688,10 @@ test('layers: routing.json missing at start logs once, no rows', async (
|
|||||||
|
|
||||||
test('layers: session toggles survive a rebuild', async ($, on) => {
|
test('layers: session toggles survive a rebuild', async ($, on) => {
|
||||||
await bootRun($, on)
|
await bootRun($, on)
|
||||||
await route($, 'switch on')
|
await route($, 'switch off')
|
||||||
await route($, 'verbose on')
|
await route($, 'verbose on')
|
||||||
const out = await route($, 'reload')
|
const out = await route($, 'reload')
|
||||||
expect(out).toContain('switch: on')
|
expect(out).toContain('switch: off')
|
||||||
expect(out).toContain('verbose: on')
|
expect(out).toContain('verbose: on')
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -2936,6 +2960,7 @@ test('change: a downgrade names the real route and the switch', async (
|
|||||||
const toasts = recordToasts(on)
|
const toasts = recordToasts(on)
|
||||||
const w = asks([...TO_IMPLEMENT, 'Everywhere'])
|
const w = asks([...TO_IMPLEMENT, 'Everywhere'])
|
||||||
await bootRun($, on, FABLE, w)
|
await bootRun($, on, FABLE, w)
|
||||||
|
await route($, 'switch off')
|
||||||
await typeFeat($)
|
await typeFeat($)
|
||||||
expect((routingOf(w).skills as Rec).feat).toBe('implement')
|
expect((routingOf(w).skills as Rec).feat).toBe('implement')
|
||||||
expect(toasts).toContain('/feat now runs claude-fable-5-1 at medium, ' +
|
expect(toasts).toContain('/feat now runs claude-fable-5-1 at medium, ' +
|
||||||
@@ -3692,7 +3717,6 @@ test('logs: an upgrade rides on the same line', async ($, on) => {
|
|||||||
|
|
||||||
test('logs: a downgrade is a switch', async ($, on) => {
|
test('logs: a downgrade is a switch', async ($, on) => {
|
||||||
const { logs } = await bootLogged($, on)
|
const { logs } = await bootLogged($, on)
|
||||||
await route($, 'switch on')
|
|
||||||
await route($, 'mechanical')
|
await route($, 'mechanical')
|
||||||
await runStep($, highStep())
|
await runStep($, highStep())
|
||||||
expect(logs).toEqual([
|
expect(logs).toEqual([
|
||||||
@@ -4431,6 +4455,7 @@ type ClsOpts = {
|
|||||||
model?: string
|
model?: string
|
||||||
world?: World
|
world?: World
|
||||||
verbose?: boolean
|
verbose?: boolean
|
||||||
|
tokens?: number // context size the usage hook answers (default 1000)
|
||||||
}
|
}
|
||||||
|
|
||||||
const PLAIN = 'refactor the billing module please'
|
const PLAIN = 'refactor the billing module please'
|
||||||
@@ -4473,7 +4498,7 @@ async function bootCls($: Engine, on: On, o: ClsOpts = {}): Promise<Cls> {
|
|||||||
return { value: await (o.reply ?? (() => 'coding'))(asks.length) }
|
return { value: await (o.reply ?? (() => 'coding'))(asks.length) }
|
||||||
})
|
})
|
||||||
const world = o.world ?? newWorld()
|
const world = o.world ?? newWorld()
|
||||||
const clock = await boot($, on, o.model ?? FABLE, 1000, world)
|
const clock = await boot($, on, o.model ?? FABLE, o.tokens ?? 1000, world)
|
||||||
if (o.verbose) await route($, 'verbose on')
|
if (o.verbose) await route($, 'verbose on')
|
||||||
logs.splice(0)
|
logs.splice(0)
|
||||||
return { asks, seen, clock, logs, toasts, status, world }
|
return { asks, seen, clock, logs, toasts, status, world }
|
||||||
@@ -4565,7 +4590,7 @@ test('classify: an unknown label neither warns nor counts', async ($, on) => {
|
|||||||
expect(c.logs).toEqual([])
|
expect(c.logs).toEqual([])
|
||||||
})
|
})
|
||||||
|
|
||||||
test('classify: the main model never moves for a design guess', async (
|
test('classify: a design guess never moves a sonnet session up', async (
|
||||||
$, on) => {
|
$, on) => {
|
||||||
const c = await bootCls($, on, { model: SONNET, reply: () => 'design' })
|
const c = await bootCls($, on, { model: SONNET, reply: () => 'design' })
|
||||||
await typed($, PLAIN)
|
await typed($, PLAIN)
|
||||||
@@ -4573,12 +4598,12 @@ test('classify: the main model never moves for a design guess', async (
|
|||||||
expect(c.seen[c.seen.length - 1]).toEqual({ model: SONNET, effort: 'xhigh' })
|
expect(c.seen[c.seen.length - 1]).toEqual({ model: SONNET, effort: 'xhigh' })
|
||||||
})
|
})
|
||||||
|
|
||||||
test('classify: the route carries no tier', async ($, on) => {
|
test('classify: the route carries the tier', async ($, on) => {
|
||||||
const c = await bootCls($, on, { reply: () => 'design' })
|
const c = await bootCls($, on, { reply: () => 'design' })
|
||||||
await typed($, PLAIN)
|
await typed($, PLAIN)
|
||||||
const line = mainLine(await route($, 'show'))
|
const line = mainLine(await route($, 'show'))
|
||||||
expect(line).toContain('classifier plan')
|
expect(line).toContain('classifier plan')
|
||||||
expect(line).not.toContain('[tier')
|
expect(line).toContain('[tier best]')
|
||||||
expect(c.asks).toHaveLength(1)
|
expect(c.asks).toHaveLength(1)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -4609,6 +4634,7 @@ test('classify: a user /effort change beats the guessed effort', async (
|
|||||||
$, on) => {
|
$, on) => {
|
||||||
const c = await bootCls($, on, { reply: () => 'design' })
|
const c = await bootCls($, on, { reply: () => 'design' })
|
||||||
await runStep($, highStep())
|
await runStep($, highStep())
|
||||||
|
await endTurn($)
|
||||||
await typed($, PLAIN)
|
await typed($, PLAIN)
|
||||||
await runStep($, { ...highStep(), effort: 'low' as const })
|
await runStep($, { ...highStep(), effort: 'low' as const })
|
||||||
expect(c.seen[c.seen.length - 1]?.effort).toBe('low')
|
expect(c.seen[c.seen.length - 1]?.effort).toBe('low')
|
||||||
@@ -4617,6 +4643,7 @@ test('classify: a user /effort change beats the guessed effort', async (
|
|||||||
test('classify: the baseline survives /clear', async ($, on) => {
|
test('classify: the baseline survives /clear', async ($, on) => {
|
||||||
const c = await bootCls($, on, { reply: () => 'design' })
|
const c = await bootCls($, on, { reply: () => 'design' })
|
||||||
await runStep($, highStep())
|
await runStep($, highStep())
|
||||||
|
await endTurn($)
|
||||||
await clearSession($)
|
await clearSession($)
|
||||||
await typed($, PLAIN)
|
await typed($, PLAIN)
|
||||||
await runStep($, { ...highStep(), effort: 'low' as const })
|
await runStep($, { ...highStep(), effort: 'low' as const })
|
||||||
@@ -4789,6 +4816,7 @@ test('classify guard: a route landing during the call wins', async (
|
|||||||
const c = await bootCls($, on, {
|
const c = await bootCls($, on, {
|
||||||
reply: async () => { await gate; return 'design' },
|
reply: async () => { await gate; return 'design' },
|
||||||
})
|
})
|
||||||
|
await route($, 'switch off')
|
||||||
const pending = typed($, PLAIN)
|
const pending = typed($, PLAIN)
|
||||||
await c.clock.settle()
|
await c.clock.settle()
|
||||||
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
||||||
@@ -5031,3 +5059,218 @@ test('classify: /route advertises classify on|off in its hint', async (
|
|||||||
await bootCls($, on)
|
await bootCls($, on)
|
||||||
expect(hints.join('\n')).toContain('classify on|off')
|
expect(hints.join('\n')).toContain('classify on|off')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// ---- downgrade cap: the cold read -------------------------------------------
|
||||||
|
|
||||||
|
const logsWith = (logs: string[], text: string): number =>
|
||||||
|
logs.filter(l => l.includes(text)).length
|
||||||
|
|
||||||
|
const SKIP = 'downgrade skipped'
|
||||||
|
|
||||||
|
test('cap: a downgrade above the cold-read cap keeps main', async ($, on) => {
|
||||||
|
const logs = recordLogs(on)
|
||||||
|
const rig = await bootRig($, on, FABLE, 300000)
|
||||||
|
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
||||||
|
expect(await stepOn($, rig, FABLE)).toEqual({ model: FABLE, effort: 'low' })
|
||||||
|
await stepOn($, rig, FABLE)
|
||||||
|
expect(logsWith(logs, `${SKIP}: cold read 300000 tokens over 120000`))
|
||||||
|
.toBe(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('cap: unknown usage blocks the downgrade', async ($, on) => {
|
||||||
|
const logs = recordLogs(on)
|
||||||
|
const rig = await bootRig($, on, FABLE, null)
|
||||||
|
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
||||||
|
expect((await stepOn($, rig, FABLE)).model).toBe(FABLE)
|
||||||
|
expect(logsWith(logs, `${SKIP}: context size unknown`)).toBe(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('cap: a user downgradeMaxTokens overrides the default', async (
|
||||||
|
$, on) => {
|
||||||
|
const world = newWorld({ home: { downgradeMaxTokens: 500 } })
|
||||||
|
const rig = await bootRig($, on, FABLE, 1000, world)
|
||||||
|
await $.tool.call({ tool: ROUTE_TOOL, phase: 'mechanical' })
|
||||||
|
expect((await stepOn($, rig, FABLE)).model).toBe(FABLE)
|
||||||
|
})
|
||||||
|
|
||||||
|
/** Routes `phase` and steps once on FABLE; the model that was sent. */
|
||||||
|
async function routedStep($: Engine, rig: Rig, phase: string) {
|
||||||
|
await $.tool.call({ tool: ROUTE_TOOL, phase })
|
||||||
|
return (await stepOn($, rig, FABLE)).model
|
||||||
|
}
|
||||||
|
|
||||||
|
test('cap: a warm model is cheap to return to, a cold one is capped', async (
|
||||||
|
$, on) => {
|
||||||
|
const logs = recordLogs(on)
|
||||||
|
const { rig, usage } = await bootRigVar($, on, FABLE, 100000)
|
||||||
|
expect(await routedStep($, rig, 'implement')).toBe(SONNET)
|
||||||
|
await endTurn($)
|
||||||
|
expect((await stepOn($, rig, FABLE)).model).toBe(FABLE)
|
||||||
|
await endTurn($)
|
||||||
|
usage.set(210000)
|
||||||
|
expect(await routedStep($, rig, 'implement')).toBe(SONNET)
|
||||||
|
await endTurn($)
|
||||||
|
// control: opus never served, the same context is a cold read of 210000
|
||||||
|
expect(await routedStep($, rig, 'judge')).toBe(FABLE)
|
||||||
|
expect(logsWith(logs, `${SKIP}: cold read 210000 tokens over 120000`))
|
||||||
|
.toBe(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('cap: the served record expires after the TTL', async ($, on) => {
|
||||||
|
const { rig, usage } = await bootRigVar($, on, FABLE, 100000)
|
||||||
|
await routedStep($, rig, 'implement')
|
||||||
|
await endTurn($)
|
||||||
|
await stepOn($, rig, FABLE)
|
||||||
|
await endTurn($)
|
||||||
|
usage.set(210000)
|
||||||
|
await rig.clock.advance(61 * 60000)
|
||||||
|
expect(await routedStep($, rig, 'implement')).toBe(FABLE)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('cap: /route reload forgets the served record', async ($, on) => {
|
||||||
|
const { rig, usage } = await bootRigVar($, on, FABLE, 100000)
|
||||||
|
await routedStep($, rig, 'implement')
|
||||||
|
await endTurn($)
|
||||||
|
await stepOn($, rig, FABLE)
|
||||||
|
await endTurn($)
|
||||||
|
usage.set(210000)
|
||||||
|
await route($, 'reload')
|
||||||
|
expect(await routedStep($, rig, 'implement')).toBe(FABLE)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('cap: the skip line is said once until a downgrade succeeds', async (
|
||||||
|
$, on) => {
|
||||||
|
const logs = recordLogs(on)
|
||||||
|
const { rig, usage } = await bootRigVar($, on, FABLE, 300000)
|
||||||
|
for (let turn = 0; turn < 2; turn++) {
|
||||||
|
await routedStep($, rig, 'mechanical')
|
||||||
|
await endTurn($)
|
||||||
|
}
|
||||||
|
expect(logsWith(logs, SKIP)).toBe(1)
|
||||||
|
usage.set(1000)
|
||||||
|
expect(await routedStep($, rig, 'mechanical')).toBe(HAIKU)
|
||||||
|
await endTurn($)
|
||||||
|
usage.set(300000)
|
||||||
|
expect(await routedStep($, rig, 'mechanical')).toBe(FABLE)
|
||||||
|
expect(logsWith(logs, SKIP)).toBe(2)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('cap: a smaller context than the record is cold', async ($, on) => {
|
||||||
|
const world = newWorld({ home: { downgradeMaxTokens: 40000 } })
|
||||||
|
const { rig, usage } = await bootRigVar($, on, SONNET, 100000, world)
|
||||||
|
await stepOn($, rig, SONNET)
|
||||||
|
await endTurn($)
|
||||||
|
await switchTo($, SONNET, FABLE, 'command')
|
||||||
|
usage.set(50000)
|
||||||
|
expect(await routedStep($, rig, 'implement')).toBe(FABLE)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('window: haiku outgrown returns main to the session model', async (
|
||||||
|
$, on) => {
|
||||||
|
const logs = recordLogs(on)
|
||||||
|
const { rig, usage } = await bootRigVar($, on, FABLE, 1000)
|
||||||
|
expect(await routedStep($, rig, 'mechanical')).toBe(HAIKU)
|
||||||
|
usage.set(250000)
|
||||||
|
expect((await stepOn($, rig, FABLE)).model).toBe(FABLE)
|
||||||
|
await stepOn($, rig, FABLE)
|
||||||
|
expect(logsWith(logs, 'context outgrew')).toBe(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('config: a quoted "false" mainModelSwitch reads as off with a warning',
|
||||||
|
async ($, on) => {
|
||||||
|
const logs = recordLogs(on)
|
||||||
|
const world = newWorld({ home: { mainModelSwitch: 'false' } })
|
||||||
|
await boot($, on, FABLE, 1000, world)
|
||||||
|
expect(await route($, 'show')).toContain('switch: off (downgrade)')
|
||||||
|
expect(logsWith(logs, 'mainModelSwitch" is not a boolean')).toBe(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('text: show names the switch and its cap', async ($, on) => {
|
||||||
|
await boot($, on)
|
||||||
|
expect(await route($, 'show')).toContain(
|
||||||
|
'switch: on (downgrade, cap 120000 tokens cold)')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('status: the switch shows only when off', async ($, on) => {
|
||||||
|
const c = await bootCls($, on)
|
||||||
|
await route($, 'classify off')
|
||||||
|
expect(c.status[c.status.length - 1]).not.toContain('switch')
|
||||||
|
await route($, 'switch off')
|
||||||
|
expect(c.status[c.status.length - 1]).toContain(' · switch off')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('toast: a downgrade held by the cap says so', async ($, on) => {
|
||||||
|
const toasts = recordToasts(on)
|
||||||
|
const w = asks([...TO_IMPLEMENT, 'Everywhere'])
|
||||||
|
await bootRun($, on, FABLE, w, 300000)
|
||||||
|
await typeFeat($)
|
||||||
|
expect(toasts).toContain('/feat now runs claude-fable-5-1 at medium, ' +
|
||||||
|
`held: ${SKIP}: cold read 300000 tokens over 120000`)
|
||||||
|
})
|
||||||
|
|
||||||
|
// ---- downgrade cap: the classifier's model axis ---------------------------
|
||||||
|
|
||||||
|
const lastSeen = (c: Cls): Seen | undefined => c.seen[c.seen.length - 1]
|
||||||
|
|
||||||
|
test('classify: coding moves main to sonnet medium under the cap', async (
|
||||||
|
$, on) => {
|
||||||
|
const c = await bootCls($, on)
|
||||||
|
await typed($, PLAIN)
|
||||||
|
await runStep($, highStep())
|
||||||
|
expect(lastSeen(c)).toEqual({ model: SONNET, effort: 'medium' })
|
||||||
|
})
|
||||||
|
|
||||||
|
test('classify: coding above the cap keeps fable at medium', async (
|
||||||
|
$, on) => {
|
||||||
|
const c = await bootCls($, on, { tokens: 300000 })
|
||||||
|
await typed($, PLAIN)
|
||||||
|
await runStep($, highStep())
|
||||||
|
expect(lastSeen(c)).toEqual({ model: FABLE, effort: 'medium' })
|
||||||
|
})
|
||||||
|
|
||||||
|
test('classify: a user /effort drops the model guess too', async ($, on) => {
|
||||||
|
const c = await bootCls($, on)
|
||||||
|
await runStep($, highStep())
|
||||||
|
await endTurn($)
|
||||||
|
await typed($, PLAIN)
|
||||||
|
await runStep($, { ...highStep(), effort: 'low' as const })
|
||||||
|
expect(lastSeen(c)).toEqual({ model: FABLE, effort: 'low' })
|
||||||
|
expect(mainLine(await route($, 'show'))).toContain('session defaults')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('classify: a user /effort drops the guess for one turn only', async (
|
||||||
|
$, on) => {
|
||||||
|
const c = await bootCls($, on)
|
||||||
|
await runStep($, highStep())
|
||||||
|
await endTurn($)
|
||||||
|
const low = { ...highStep(), effort: 'low' as const }
|
||||||
|
await typed($, PLAIN)
|
||||||
|
await runStep($, low)
|
||||||
|
expect(lastSeen(c)).toEqual({ model: FABLE, effort: 'low' })
|
||||||
|
await endTurn($)
|
||||||
|
await typed($, PLAIN)
|
||||||
|
await runStep($, low)
|
||||||
|
expect(lastSeen(c)).toEqual({ model: SONNET, effort: 'medium' })
|
||||||
|
})
|
||||||
|
|
||||||
|
test('classify: a mid-turn ultrathink floor still reaches fable max', async (
|
||||||
|
$, on) => {
|
||||||
|
const c = await bootCls($, on)
|
||||||
|
await typed($, PLAIN)
|
||||||
|
await runStep($, highStep())
|
||||||
|
expect(lastSeen(c)?.model).toBe(SONNET)
|
||||||
|
await queued($, 'composer', 'ultrathink please')
|
||||||
|
await runStep($, highStep())
|
||||||
|
expect(lastSeen(c)).toEqual({ model: FABLE, effort: 'max' })
|
||||||
|
})
|
||||||
|
|
||||||
|
test('classify: a guessed sonnet rate-limited falls to opus, not haiku', async (
|
||||||
|
$, on) => {
|
||||||
|
const c = await bootCls($, on)
|
||||||
|
await typed($, PLAIN)
|
||||||
|
await runStep($, highStep())
|
||||||
|
expect(lastSeen(c)?.model).toBe(SONNET)
|
||||||
|
await failWith($, 'rate_limit')
|
||||||
|
await runStep($, highStep())
|
||||||
|
expect(lastSeen(c)?.model).toBe(OPUS)
|
||||||
|
})
|
||||||
@@ -29,7 +29,8 @@ type Config = {
|
|||||||
fallback: string[] // alias order, best first: the rank and the fallback chain
|
fallback: string[] // alias order, best first: the rank and the fallback chain
|
||||||
cooldownMinutes: number // breaker hold at the first strike
|
cooldownMinutes: number // breaker hold at the first strike
|
||||||
mainUpgrade: boolean // main may move UP to a phase's tier by itself
|
mainUpgrade: boolean // main may move UP to a phase's tier by itself
|
||||||
upgradeMaxTokens: number // above this context an upgrade is skipped
|
upgradeMaxTokens: number // max cold read an upgrade may cost (LRN-204)
|
||||||
|
downgradeMaxTokens: number // max cold read a downgrade may cost (LRN-204)
|
||||||
mainModelSwitch: boolean // gates DOWNGRADES only
|
mainModelSwitch: boolean // gates DOWNGRADES only
|
||||||
verbose: boolean
|
verbose: boolean
|
||||||
classify: boolean // a small-model guess of the typed prompt's phase
|
classify: boolean // a small-model guess of the typed prompt's phase
|
||||||
@@ -45,6 +46,7 @@ type Routed = {
|
|||||||
source: Source
|
source: Source
|
||||||
label?: string // the skill a skill route came from, for the logs
|
label?: string // the skill a skill route came from, for the logs
|
||||||
}
|
}
|
||||||
|
type Served = { at: number; tokens: number } // ms, context tokens
|
||||||
type Hold = { until: number; reason: string } // until: ms, Infinity = reload
|
type Hold = { until: number; reason: string } // until: ms, Infinity = reload
|
||||||
type Pushed = { prev: Routed | null; spawnIds: Set<string> }
|
type Pushed = { prev: Routed | null; spawnIds: Set<string> }
|
||||||
type Loop = {
|
type Loop = {
|
||||||
@@ -94,7 +96,11 @@ type State = {
|
|||||||
loaded: boolean // the layers were read once (else: lazily, on first use)
|
loaded: boolean // the layers were read once (else: lazily, on first use)
|
||||||
rebuildDue: boolean // /clear: re-read the layers at the next prompt
|
rebuildDue: boolean // /clear: re-read the layers at the next prompt
|
||||||
toggles: Partial<Record<Toggle, boolean>> // session toggles
|
toggles: Partial<Record<Toggle, boolean>> // session toggles
|
||||||
engineBase: NonNullable<Effort> | null // engine effort of main's first step
|
engineBase: NonNullable<Effort> | null // engine effort of the last turn's
|
||||||
|
// first main step
|
||||||
|
turnEngine: NonNullable<Effort> | null // same, for this turn
|
||||||
|
served: Map<string, Served> // canonical id -> main's last step on it
|
||||||
|
capSaid: boolean // the downgrade skip was logged for this cap crossing
|
||||||
classifyFails: number // classifier failures in a row
|
classifyFails: number // classifier failures in a row
|
||||||
classifyUntil: number // classifier paused until (ms); 0 = running
|
classifyUntil: number // classifier paused until (ms); 0 = running
|
||||||
asking: string | null // key of the one first-use dialog in flight
|
asking: string | null // key of the one first-use dialog in flight
|
||||||
@@ -196,8 +202,9 @@ const BAD_KEYS: ReadonlySet<string> = new Set([
|
|||||||
// A quantified group holding a quantifier, the shape behind catastrophic
|
// A quantified group holding a quantifier, the shape behind catastrophic
|
||||||
// backtracking ((a+)+$): rejected before compiling.
|
// backtracking ((a+)+$): rejected before compiling.
|
||||||
const NESTED_QUANT = /\((?:[^()\\]|\\.)*[+*}](?:[^()\\]|\\.)*\)[+*{]/
|
const NESTED_QUANT = /\((?:[^()\\]|\\.)*[+*}](?:[^()\\]|\\.)*\)[+*{]/
|
||||||
// Prompt classifier: label -> the phase whose effort the turn takes. `chat`
|
// Prompt classifier: label -> the phase whose route the turn takes (effort,
|
||||||
// (and any label not here) routes nothing.
|
// and a model below the session's under the switch and the cold-read cap).
|
||||||
|
// `chat` (and any label not here) routes nothing.
|
||||||
const CLASSIFY_LABELS: readonly string[] =
|
const CLASSIFY_LABELS: readonly string[] =
|
||||||
['design', 'analysis', 'coding', 'bookkeeping', 'chat']
|
['design', 'analysis', 'coding', 'bookkeeping', 'chat']
|
||||||
const LABEL_PHASE: Readonly<Record<string, string>> = {
|
const LABEL_PHASE: Readonly<Record<string, string>> = {
|
||||||
@@ -212,6 +219,9 @@ const CLASSIFY_MAX = 2000 // code points sent whole; longer: head + tail
|
|||||||
const CLASSIFY_HEAD = 500
|
const CLASSIFY_HEAD = 500
|
||||||
const CLASSIFY_TAIL = 1500
|
const CLASSIFY_TAIL = 1500
|
||||||
const CLASSIFY_FAILS = 3 // failures in a row that pause the classifier
|
const CLASSIFY_FAILS = 3 // failures in a row that pause the classifier
|
||||||
|
// The account's prompt-cache TTL (1 h here; an engine-reported `cache_ttl`
|
||||||
|
// would supersede it, TODO): a model that served main within it is warm.
|
||||||
|
const CACHE_TTL_MS = 60 * 60000
|
||||||
const TIMEOUT: unique symbol = Symbol('classify timeout')
|
const TIMEOUT: unique symbol = Symbol('classify timeout')
|
||||||
|
|
||||||
const DEFAULT_CONFIG: Config = {
|
const DEFAULT_CONFIG: Config = {
|
||||||
@@ -232,7 +242,8 @@ const DEFAULT_CONFIG: Config = {
|
|||||||
fallback: ['fable', 'opus', 'sonnet', 'haiku'], // rank = index, best first
|
fallback: ['fable', 'opus', 'sonnet', 'haiku'], // rank = index, best first
|
||||||
cooldownMinutes: 15,
|
cooldownMinutes: 15,
|
||||||
mainUpgrade: true,
|
mainUpgrade: true,
|
||||||
upgradeMaxTokens: 200000, // an upgrade re-reads the whole context cold
|
upgradeMaxTokens: 200000, // max cold read an upgrade may cost
|
||||||
|
downgradeMaxTokens: 120000, // max cold read a downgrade may cost (LRN-204)
|
||||||
phases: {
|
phases: {
|
||||||
plan: { tier: 'best', effort: 'xhigh' },
|
plan: { tier: 'best', effort: 'xhigh' },
|
||||||
reflect: { tier: 'best', effort: 'high' },
|
reflect: { tier: 'best', effort: 'high' },
|
||||||
@@ -267,7 +278,7 @@ const DEFAULT_CONFIG: Config = {
|
|||||||
mode: 'default',
|
mode: 'default',
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
mainModelSwitch: false,
|
mainModelSwitch: true,
|
||||||
verbose: false,
|
verbose: false,
|
||||||
classify: true,
|
classify: true,
|
||||||
spinner: true,
|
spinner: true,
|
||||||
@@ -509,8 +520,17 @@ function pickEnabled(v: unknown, fallback: boolean, log: Log): boolean {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The model switch fails closed: a non-boolean override reads off. */
|
||||||
|
function pickModelSwitch(v: unknown, fallback: boolean, log: Log): boolean {
|
||||||
|
if (v === undefined) return fallback
|
||||||
|
if (typeof v === 'boolean') return v
|
||||||
|
log('model-router: config "mainModelSwitch" is not a boolean; ' +
|
||||||
|
'switch off')
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
type Routing = Pick<Config, 'tiers' | 'fallback' | 'cooldownMinutes' |
|
type Routing = Pick<Config, 'tiers' | 'fallback' | 'cooldownMinutes' |
|
||||||
'mainUpgrade' | 'upgradeMaxTokens'>
|
'mainUpgrade' | 'upgradeMaxTokens' | 'downgradeMaxTokens'>
|
||||||
|
|
||||||
/** Tiers, fallback chain and breaker knobs, validated against `models`. */
|
/** Tiers, fallback chain and breaker knobs, validated against `models`. */
|
||||||
function mergeRouting(
|
function mergeRouting(
|
||||||
@@ -534,6 +554,9 @@ function mergeRouting(
|
|||||||
mainUpgrade: pickBool(user.mainUpgrade, base.mainUpgrade),
|
mainUpgrade: pickBool(user.mainUpgrade, base.mainUpgrade),
|
||||||
upgradeMaxTokens: pickPositive(
|
upgradeMaxTokens: pickPositive(
|
||||||
user.upgradeMaxTokens, base.upgradeMaxTokens, 'upgradeMaxTokens', log),
|
user.upgradeMaxTokens, base.upgradeMaxTokens, 'upgradeMaxTokens', log),
|
||||||
|
downgradeMaxTokens: pickPositive(
|
||||||
|
user.downgradeMaxTokens, base.downgradeMaxTokens, 'downgradeMaxTokens',
|
||||||
|
log),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -582,7 +605,8 @@ function mergeConfig(
|
|||||||
agents: mergeRows(base.agents, user.agents, 'agents', ref, log),
|
agents: mergeRows(base.agents, user.agents, 'agents', ref, log),
|
||||||
skills: mergeRows(base.skills, user.skills, 'skills', ref, log),
|
skills: mergeRows(base.skills, user.skills, 'skills', ref, log),
|
||||||
prompt: mergePrompt(base.prompt, user.prompt, phases, log),
|
prompt: mergePrompt(base.prompt, user.prompt, phases, log),
|
||||||
mainModelSwitch: pickBool(user.mainModelSwitch, base.mainModelSwitch),
|
mainModelSwitch: pickModelSwitch(
|
||||||
|
user.mainModelSwitch, base.mainModelSwitch, log),
|
||||||
verbose: pickSwitch(
|
verbose: pickSwitch(
|
||||||
'config "verbose" is not a boolean; ignored', user.verbose, base.verbose, log),
|
'config "verbose" is not a boolean; ignored', user.verbose, base.verbose, log),
|
||||||
classify: pickSwitch(
|
classify: pickSwitch(
|
||||||
@@ -932,6 +956,9 @@ function newState(cfg: Config, source: string): State {
|
|||||||
rebuildDue: false,
|
rebuildDue: false,
|
||||||
toggles: {},
|
toggles: {},
|
||||||
engineBase: null,
|
engineBase: null,
|
||||||
|
turnEngine: null,
|
||||||
|
served: new Map(),
|
||||||
|
capSaid: false,
|
||||||
classifyFails: 0,
|
classifyFails: 0,
|
||||||
classifyUntil: 0,
|
classifyUntil: 0,
|
||||||
asking: null,
|
asking: null,
|
||||||
@@ -1120,9 +1147,15 @@ type Call = {
|
|||||||
const keep = (cur: string, why = 'unchanged', log?: string): Call =>
|
const keep = (cur: string, why = 'unchanged', log?: string): Call =>
|
||||||
({ model: cur, why, moved: false, ...(log === undefined ? {} : { log }) })
|
({ model: cur, why, moved: false, ...(log === undefined ? {} : { log }) })
|
||||||
|
|
||||||
/** The replacement keeps the session's `[1m]` tier, haiku has none. */
|
/** The move keeps the `[1m]` tier of `cur` or the session; haiku has none. */
|
||||||
function moveTo(cur: string, target: string, why: string): Call {
|
function moveTo(
|
||||||
const carried = ONE_M.test(cur) && !target.startsWith(HAIKU)
|
cur: string,
|
||||||
|
target: string,
|
||||||
|
why: string,
|
||||||
|
session: string,
|
||||||
|
): Call {
|
||||||
|
const long = ONE_M.test(cur) || ONE_M.test(session)
|
||||||
|
const carried = long && !target.startsWith(HAIKU)
|
||||||
const model = carried ? `${target}[1m]` : target
|
const model = carried ? `${target}[1m]` : target
|
||||||
const once = carried
|
const once = carried
|
||||||
? `model-router: ${why} to ${model}: the [1m] variant is carried over`
|
? `model-router: ${why} to ${model}: the [1m] variant is carried over`
|
||||||
@@ -1139,11 +1172,38 @@ function fits(st: State, id: string, tokens: number | undefined): boolean {
|
|||||||
const noFit = (id: string): string =>
|
const noFit = (id: string): string =>
|
||||||
`model-router: no switch to ${id}: context not known to fit`
|
`model-router: no switch to ${id}: context not known to fit`
|
||||||
|
|
||||||
/** Why the upgrade cap blocks a move, or undefined. Unknown size = blocked. */
|
/**
|
||||||
function capBlock(st: State, tokens: number | undefined): string | undefined {
|
* Tokens a switch INTO `id` re-reads cold (LRN-204): the context minus what
|
||||||
|
* `id`'s cache holds, i.e. its last main step within the TTL. A context
|
||||||
|
* smaller than that step (compaction) drops the stale record.
|
||||||
|
*/
|
||||||
|
function coldRead(
|
||||||
|
st: State,
|
||||||
|
id: string,
|
||||||
|
tokens: number,
|
||||||
|
now: number,
|
||||||
|
): number {
|
||||||
|
const key = canonical(st.cfg, id)
|
||||||
|
const hit = st.served.get(key)
|
||||||
|
if (hit === undefined || now - hit.at > CACHE_TTL_MS) return tokens
|
||||||
|
if (tokens < hit.tokens) {
|
||||||
|
st.served.delete(key)
|
||||||
|
return tokens
|
||||||
|
}
|
||||||
|
return tokens - hit.tokens
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Why a cap blocks a move onto `id`, or undefined. Unknown size = blocked. */
|
||||||
|
function coldBlock(
|
||||||
|
st: State,
|
||||||
|
id: string,
|
||||||
|
tokens: number | undefined,
|
||||||
|
max: number,
|
||||||
|
now: number,
|
||||||
|
): string | undefined {
|
||||||
if (tokens === undefined) return 'context size unknown'
|
if (tokens === undefined) return 'context size unknown'
|
||||||
const max = st.cfg.upgradeMaxTokens
|
const cold = coldRead(st, id, tokens, now)
|
||||||
return tokens > max ? `context ${tokens} tokens over ${max}` : undefined
|
return cold > max ? `cold read ${cold} tokens over ${max}` : undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
/** True when `wanted` ranks above `id` in the fallback chain. */
|
/** True when `wanted` ranks above `id` in the fallback chain. */
|
||||||
@@ -1153,6 +1213,16 @@ function ranksAbove(st: State, wanted: string, id: string): boolean {
|
|||||||
return rw !== undefined && rc !== undefined && rw < rc
|
return rw !== undefined && rc !== undefined && rw < rc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Main keeps its model: a cap said no, once per turn under its own key. */
|
||||||
|
function skipped(cur: string, kind: string, block: string): Call {
|
||||||
|
const why = `${kind} skipped: ${block}`
|
||||||
|
const call = keep(cur, why, `model-router: ${why}`)
|
||||||
|
return { ...call, logKey: `${kind}-skipped` }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The state a decision reads besides the model: context size and clock. */
|
||||||
|
type Reading = { tokens: number | undefined; now: number }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `cur` is down: `wanted`, else the next model of the chain that fits. A
|
* `cur` is down: `wanted`, else the next model of the chain that fits. A
|
||||||
* better `wanted` is an upgrade and passes the same switch and cap.
|
* better `wanted` is an upgrade and passes the same switch and cap.
|
||||||
@@ -1161,15 +1231,21 @@ function leaveDown(
|
|||||||
st: State,
|
st: State,
|
||||||
cur: string,
|
cur: string,
|
||||||
wanted: string | undefined,
|
wanted: string | undefined,
|
||||||
tokens: number | undefined,
|
read: Reading,
|
||||||
): Call {
|
): Call {
|
||||||
const id = canonical(st.cfg, cur)
|
const id = canonical(st.cfg, cur)
|
||||||
const upOk = st.cfg.mainUpgrade && capBlock(st, tokens) === undefined
|
const max = st.cfg.upgradeMaxTokens
|
||||||
|
const upOk = (o: string): boolean => st.cfg.mainUpgrade &&
|
||||||
|
coldBlock(st, o, read.tokens, max, read.now) === undefined
|
||||||
for (const option of [wanted, nextAvailable(st, id)]) {
|
for (const option of [wanted, nextAvailable(st, id)]) {
|
||||||
if (option === undefined || st.down.has(option)) continue
|
if (option === undefined || st.down.has(option)) continue
|
||||||
if (aliasOf(st.cfg, option) === undefined) continue
|
if (aliasOf(st.cfg, option) === undefined) continue
|
||||||
if (option === wanted && !upOk && ranksAbove(st, option, id)) continue
|
if (option === wanted && ranksAbove(st, option, id) && !upOk(option)) {
|
||||||
if (fits(st, option, tokens)) return moveTo(cur, option, 'fallback')
|
continue
|
||||||
|
}
|
||||||
|
if (fits(st, option, read.tokens)) {
|
||||||
|
return moveTo(cur, option, 'fallback', st.sessionModel)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return keep(cur, 'fallback unavailable')
|
return keep(cur, 'fallback unavailable')
|
||||||
}
|
}
|
||||||
@@ -1179,29 +1255,33 @@ function upgradeCall(
|
|||||||
st: State,
|
st: State,
|
||||||
cur: string,
|
cur: string,
|
||||||
wanted: string,
|
wanted: string,
|
||||||
tokens: number | undefined,
|
read: Reading,
|
||||||
): Call {
|
): Call {
|
||||||
if (!st.cfg.mainUpgrade) return keep(cur, 'switch off')
|
if (!st.cfg.mainUpgrade) return keep(cur, 'switch off')
|
||||||
const block = capBlock(st, tokens)
|
const block = coldBlock(
|
||||||
if (block !== undefined) {
|
st, wanted, read.tokens, st.cfg.upgradeMaxTokens, read.now)
|
||||||
const why = `upgrade skipped: ${block}`
|
if (block !== undefined) return skipped(cur, 'upgrade', block)
|
||||||
const call = keep(cur, why, `model-router: ${why}`)
|
if (!fits(st, wanted, read.tokens)) {
|
||||||
return { ...call, logKey: 'upgrade-skipped' }
|
return keep(cur, 'no fit', noFit(wanted))
|
||||||
}
|
}
|
||||||
if (!fits(st, wanted, tokens)) return keep(cur, 'no fit', noFit(wanted))
|
return moveTo(cur, wanted, 'upgrade', st.sessionModel)
|
||||||
return moveTo(cur, wanted, 'upgrade')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** `wanted` is cheaper (or unranked): only with the downgrade switch on. */
|
/** `wanted` is cheaper (or unranked): the switch and the cold-read cap. */
|
||||||
function downgradeCall(
|
function downgradeCall(
|
||||||
st: State,
|
st: State,
|
||||||
cur: string,
|
cur: string,
|
||||||
wanted: string,
|
wanted: string,
|
||||||
tokens: number | undefined,
|
read: Reading,
|
||||||
): Call {
|
): Call {
|
||||||
if (!st.cfg.mainModelSwitch) return keep(cur, 'switch off')
|
if (!st.cfg.mainModelSwitch) return keep(cur, 'switch off')
|
||||||
if (!fits(st, wanted, tokens)) return keep(cur, 'no fit', noFit(wanted))
|
const block = coldBlock(
|
||||||
return moveTo(cur, wanted, 'downgrade')
|
st, wanted, read.tokens, st.cfg.downgradeMaxTokens, read.now)
|
||||||
|
if (block !== undefined) return skipped(cur, 'downgrade', block)
|
||||||
|
if (!fits(st, wanted, read.tokens)) {
|
||||||
|
return keep(cur, 'no fit', noFit(wanted))
|
||||||
|
}
|
||||||
|
return moveTo(cur, wanted, 'downgrade', st.sessionModel)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A model the table does not rank is never switched; said once. */
|
/** A model the table does not rank is never switched; said once. */
|
||||||
@@ -1212,9 +1292,33 @@ function unknownCall(cur: string, id: string): Call {
|
|||||||
return { ...call, once }
|
return { ...call, once }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Main sits on a model the router moved it to and whose known window the
|
||||||
|
* context outgrew (haiku): back to the session model, when that is a known,
|
||||||
|
* ranked, available, non-haiku model. Otherwise undefined: the normal
|
||||||
|
* decision runs.
|
||||||
|
*/
|
||||||
|
function windowReturn(
|
||||||
|
st: State,
|
||||||
|
cur: string,
|
||||||
|
tokens: number | undefined,
|
||||||
|
): Call | undefined {
|
||||||
|
const id = canonical(st.cfg, cur)
|
||||||
|
const home = canonical(st.cfg, st.sessionModel)
|
||||||
|
if (st.turnModel === undefined || tokens === undefined) return undefined
|
||||||
|
if (fits(st, id, tokens)) return undefined
|
||||||
|
const usable = modelRank(st.cfg, home) !== undefined &&
|
||||||
|
!st.down.has(home) && !isHaiku(st.cfg, home)
|
||||||
|
if (!usable) return undefined
|
||||||
|
const call = moveTo(cur, home, 'window', st.sessionModel)
|
||||||
|
const once = `model-router: context outgrew ${id}: back to ${home}`
|
||||||
|
return { ...call, once }
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The one decision of the main loop's model, in this order: router off, a
|
* The one decision of the main loop's model, in this order: router off, a
|
||||||
* model the table does not rank (never touched), `cur` down (leave it,
|
* model the table does not rank (never touched), a model whose window the
|
||||||
|
* context outgrew (back to the session model), `cur` down (leave it,
|
||||||
* always), no or same wanted model, a better one (upgrade), a cheaper one
|
* always), no or same wanted model, a better one (upgrade), a cheaper one
|
||||||
* (downgrade). Used by the step AND by every text, so they agree.
|
* (downgrade). Used by the step AND by every text, so they agree.
|
||||||
*/
|
*/
|
||||||
@@ -1222,25 +1326,37 @@ function decideMain(
|
|||||||
st: State,
|
st: State,
|
||||||
cur: string,
|
cur: string,
|
||||||
wanted: string | undefined,
|
wanted: string | undefined,
|
||||||
tokens: number | undefined,
|
read: Reading,
|
||||||
): Call {
|
): Call {
|
||||||
const id = canonical(st.cfg, cur)
|
const id = canonical(st.cfg, cur)
|
||||||
if (st.off) return keep(cur)
|
if (st.off) return keep(cur)
|
||||||
if (modelRank(st.cfg, id) === undefined) return unknownCall(cur, id)
|
if (modelRank(st.cfg, id) === undefined) return unknownCall(cur, id)
|
||||||
if (st.down.has(id)) return leaveDown(st, cur, wanted, tokens)
|
const back = windowReturn(st, cur, read.tokens)
|
||||||
|
if (back !== undefined) return back
|
||||||
|
if (st.down.has(id)) return leaveDown(st, cur, wanted, read)
|
||||||
if (wanted === undefined) return keep(cur)
|
if (wanted === undefined) return keep(cur)
|
||||||
if (aliasOf(st.cfg, wanted) === aliasOf(st.cfg, id)) return keep(cur)
|
if (aliasOf(st.cfg, wanted) === aliasOf(st.cfg, id)) return keep(cur)
|
||||||
return ranksAbove(st, wanted, id)
|
return ranksAbove(st, wanted, id)
|
||||||
? upgradeCall(st, cur, wanted, tokens)
|
? upgradeCall(st, cur, wanted, read)
|
||||||
: downgradeCall(st, cur, wanted, tokens)
|
: downgradeCall(st, cur, wanted, read)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The slot that names main's model: sticky, turn route, run slot, then the
|
||||||
|
* floor's own model. A floor with a model beats a classifier's guess.
|
||||||
|
*/
|
||||||
|
function mainModelSlot(st: State): Routed | null {
|
||||||
|
const slots = [st.userMain, st.turnMain, st.runMain, st.turnFloor]
|
||||||
|
const slot = slots.find(s => routeName(s?.route) !== undefined) ?? null
|
||||||
|
const floor = st.turnFloor
|
||||||
|
if (slot?.source === 'classifier' && routeName(floor?.route) !== undefined) {
|
||||||
|
return floor
|
||||||
|
}
|
||||||
|
return slot
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Model axis: sticky, turn route, run slot, then the floor's own model. */
|
|
||||||
const mainModel = (st: State): string | undefined =>
|
const mainModel = (st: State): string | undefined =>
|
||||||
routeName(st.userMain?.route) ??
|
routeName(mainModelSlot(st)?.route)
|
||||||
routeName(st.turnMain?.route) ??
|
|
||||||
routeName(st.runMain?.route) ??
|
|
||||||
routeName(st.turnFloor?.route)
|
|
||||||
|
|
||||||
async function readTokens($: Api): Promise<number | undefined> {
|
async function readTokens($: Api): Promise<number | undefined> {
|
||||||
try {
|
try {
|
||||||
@@ -1252,15 +1368,46 @@ async function readTokens($: Api): Promise<number | undefined> {
|
|||||||
|
|
||||||
type Verdict = { call: Call; wanted: string | undefined }
|
type Verdict = { call: Call; wanted: string | undefined }
|
||||||
|
|
||||||
/** What the main loop would run on from `cur`: wanted model + decision. */
|
/**
|
||||||
async function decideFor($: Api, st: State, cur: string): Promise<Verdict> {
|
* The model main is asked to run on from `cur`. A classifier's guess never
|
||||||
const name = mainModel(st)
|
* ranks above the session model: it moves main down, never above the
|
||||||
const wanted = name === undefined
|
* user's baseline.
|
||||||
? undefined
|
*/
|
||||||
: resolveName(st, name, canonical(st.cfg, cur))
|
function wantedModel(st: State, cur: string): string | undefined {
|
||||||
const needsTokens = wanted !== undefined || st.down.size > 0
|
const slot = mainModelSlot(st)
|
||||||
const tokens = needsTokens ? await readTokens($) : undefined
|
const name = routeName(slot?.route)
|
||||||
return { call: decideMain(st, cur, wanted, tokens), wanted }
|
if (name === undefined) return undefined
|
||||||
|
const wanted = resolveName(st, name, canonical(st.cfg, cur))
|
||||||
|
const above = wanted !== undefined && slot?.source === 'classifier' &&
|
||||||
|
ranksAbove(st, wanted, canonical(st.cfg, st.sessionModel))
|
||||||
|
return above ? undefined : wanted
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Reads the usage and the clock when a decision may need them. */
|
||||||
|
async function readingFor(
|
||||||
|
$: Api,
|
||||||
|
st: State,
|
||||||
|
wanted: string | undefined,
|
||||||
|
): Promise<Reading> {
|
||||||
|
const needs = wanted !== undefined || st.down.size > 0 ||
|
||||||
|
st.turnModel !== undefined
|
||||||
|
if (!needs) return { tokens: undefined, now: 0 }
|
||||||
|
return { tokens: await readTokens($), now: await $.clock.now() }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What the main loop would run on from `cur`: wanted model + decision. The
|
||||||
|
* step passes the `known` reading it took; a text reads for itself.
|
||||||
|
*/
|
||||||
|
async function decideFor(
|
||||||
|
$: Api,
|
||||||
|
st: State,
|
||||||
|
cur: string,
|
||||||
|
known?: Reading,
|
||||||
|
): Promise<Verdict> {
|
||||||
|
const wanted = wantedModel(st, cur)
|
||||||
|
const read = known ?? await readingFor($, st, wanted)
|
||||||
|
return { call: decideMain(st, cur, wanted, read), wanted }
|
||||||
}
|
}
|
||||||
|
|
||||||
function logCall($: Api, st: State, call: Call): void {
|
function logCall($: Api, st: State, call: Call): void {
|
||||||
@@ -1297,11 +1444,10 @@ function higherFloor(cur: Routed | null, next: Routed): Routed {
|
|||||||
* The one decision of the main loop's effort. The user's floor is the turn's
|
* The one decision of the main loop's effort. The user's floor is the turn's
|
||||||
* default (no sticky or turn route names an effort) and its minimum.
|
* default (no sticky or turn route names an effort) and its minimum.
|
||||||
* `by` names who set the value: the floor when it raised or supplied it.
|
* `by` names who set the value: the floor when it raised or supplied it.
|
||||||
* `skipTurn`: the turn route yields (a classified effort under a user /effort).
|
|
||||||
*/
|
*/
|
||||||
function mainEffort(st: State, engine: Effort, skipTurn = false): Decision {
|
function mainEffort(st: State, engine: Effort): Decision {
|
||||||
const sticky = st.userMain?.route.effort
|
const sticky = st.userMain?.route.effort
|
||||||
const turn = skipTurn ? undefined : st.turnMain?.route.effort
|
const turn = st.turnMain?.route.effort
|
||||||
const named = sticky ?? turn ?? st.runMain?.route.effort
|
const named = sticky ?? turn ?? st.runMain?.route.effort
|
||||||
const floor = st.turnFloor?.route.effort
|
const floor = st.turnFloor?.route.effort
|
||||||
const base = named ?? floor ?? engine
|
const base = named ?? floor ?? engine
|
||||||
@@ -1455,14 +1601,19 @@ async function snapshot($: Api, st: State) {
|
|||||||
return { now, ...(await decideFor($, st, cur)) }
|
return { now, ...(await decideFor($, st, cur)) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The downgrade switch and, when on, the cold read it is capped at. */
|
||||||
|
const switchWord = (c: Config): string => c.mainModelSwitch
|
||||||
|
? `on (downgrade, cap ${c.downgradeMaxTokens} tokens cold)`
|
||||||
|
: 'off (downgrade)'
|
||||||
|
|
||||||
async function show($: Api, st: State): Promise<string> {
|
async function show($: Api, st: State): Promise<string> {
|
||||||
const c = st.cfg
|
const c = st.cfg
|
||||||
const flag = (b: boolean) => (b ? 'on' : 'off')
|
const flag = (b: boolean) => (b ? 'on' : 'off')
|
||||||
const s = await snapshot($, st)
|
const s = await snapshot($, st)
|
||||||
return [
|
return [
|
||||||
mainText(st, s),
|
mainText(st, s),
|
||||||
`router: ${routerWord(st)} · switch: ${flag(c.mainModelSwitch)} ` +
|
`router: ${routerWord(st)} · switch: ${switchWord(c)} · upgrade: ${
|
||||||
`(downgrade) · upgrade: ${flag(c.mainUpgrade)} · verbose: ${
|
flag(c.mainUpgrade)} · verbose: ${
|
||||||
flag(c.verbose)} · classify: ${flag(c.classify)} · spinner: ${
|
flag(c.verbose)} · classify: ${flag(c.classify)} · spinner: ${
|
||||||
flag(c.spinner)}`,
|
flag(c.spinner)}`,
|
||||||
downText(st, s.now),
|
downText(st, s.now),
|
||||||
@@ -1480,7 +1631,7 @@ function statusLine(st: State): string {
|
|||||||
const floor = liveFloor(st)
|
const floor = liveFloor(st)
|
||||||
const paused = st.cfg.classify && st.classifyUntil !== 0
|
const paused = st.cfg.classify && st.classifyUntil !== 0
|
||||||
return `route: ${now}${floor ? ` · floor ${floor.level}` : ''}${
|
return `route: ${now}${floor ? ` · floor ${floor.level}` : ''}${
|
||||||
st.cfg.mainModelSwitch ? ' · switch on' : ''}${
|
st.cfg.mainModelSwitch ? '' : ' · switch off'}${
|
||||||
paused ? ' · classifier: paused' : ''}`
|
paused ? ' · classifier: paused' : ''}`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1534,6 +1685,7 @@ async function toggle(
|
|||||||
if (arg !== 'on' && arg !== 'off') return `usage: /route ${what} on|off`
|
if (arg !== 'on' && arg !== 'off') return `usage: /route ${what} on|off`
|
||||||
st.toggles[what] = arg === 'on'
|
st.toggles[what] = arg === 'on'
|
||||||
applyToggles(st)
|
applyToggles(st)
|
||||||
|
refresh($, st)
|
||||||
return show($, st)
|
return show($, st)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1594,6 +1746,8 @@ async function ensureConfig($: Api, st: State, atPrompt = false) {
|
|||||||
/** The breaker is cleared first, whatever the config read then does. */
|
/** The breaker is cleared first, whatever the config read then does. */
|
||||||
async function reloadCommand($: Api, st: State): Promise<string> {
|
async function reloadCommand($: Api, st: State): Promise<string> {
|
||||||
clearBreaker(st)
|
clearBreaker(st)
|
||||||
|
st.served.clear()
|
||||||
|
st.capSaid = false
|
||||||
st.classifyFails = 0
|
st.classifyFails = 0
|
||||||
st.classifyUntil = 0
|
st.classifyUntil = 0
|
||||||
const swapped = await reloadConfig($, st)
|
const swapped = await reloadConfig($, st)
|
||||||
@@ -2120,19 +2274,22 @@ async function skillQuestion($: Api, st: State, skill: string, phase: string) {
|
|||||||
return mainQuestion($, st, `${head}. ${routedTo(st, phase)}`)
|
return mainQuestion($, st, `${head}. ${routedTo(st, phase)}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A downgrade the switch holds back: main keeps its model, said. */
|
/** A downgrade the switch or the cold-read cap holds back, said. */
|
||||||
function downgradeHeld(st: State, v: Verdict, cur: string): boolean {
|
function downgradeHint(st: State, v: Verdict, cur: string): string {
|
||||||
return v.wanted !== undefined && v.call.why === 'switch off' &&
|
const { wanted, call } = v
|
||||||
!ranksAbove(st, v.wanted, canonical(st.cfg, cur))
|
if (wanted === undefined) return ''
|
||||||
|
if (ranksAbove(st, wanted, canonical(st.cfg, cur))) return ''
|
||||||
|
if (call.why === 'switch off') {
|
||||||
|
return ', main moves up only: /route switch on allows a downgrade'
|
||||||
|
}
|
||||||
|
return call.why.startsWith('downgrade skipped') ? `, held: ${call.why}` : ''
|
||||||
}
|
}
|
||||||
|
|
||||||
/** After a Change: what main will really run, and the switch hint. */
|
/** After a Change: what main will really run, and the switch hint. */
|
||||||
async function toastChange($: Api, st: State, skill: string) {
|
async function toastChange($: Api, st: State, skill: string) {
|
||||||
const cur = st.turnModel ?? st.sessionModel
|
const cur = st.turnModel ?? st.sessionModel
|
||||||
const v = await decideFor($, st, cur)
|
const v = await decideFor($, st, cur)
|
||||||
const hint = downgradeHeld(st, v, cur)
|
const hint = downgradeHint(st, v, cur)
|
||||||
? ', main moves up only: /route switch on allows a downgrade'
|
|
||||||
: ''
|
|
||||||
$.ui.toast(`/${skill} now runs ${idWord(st, v.call.model)} at ${
|
$.ui.toast(`/${skill} now runs ${idWord(st, v.call.model)} at ${
|
||||||
effortWord(st, v)}${hint}`)
|
effortWord(st, v)}${hint}`)
|
||||||
}
|
}
|
||||||
@@ -2495,9 +2652,9 @@ async function registerTool($: Api, st: State): Promise<void> {
|
|||||||
'Declare the phase of the work ahead so the next requests of THIS ' +
|
'Declare the phase of the work ahead so the next requests of THIS ' +
|
||||||
'loop run at the right effort and model. Call it before a span of ' +
|
'loop run at the right effort and model. Call it before a span of ' +
|
||||||
'work changes nature (planning, orchestrating, mechanical work). ' +
|
'work changes nature (planning, orchestrating, mechanical work). ' +
|
||||||
'The main loop moves up to a phase\'s tier by itself (below the ' +
|
'The main loop moves up or down to a phase\'s tier while the cold ' +
|
||||||
'context cap), down only with the switch on; a sub-agent\'s model ' +
|
'read it costs fits the cap (down also needs the switch on); a ' +
|
||||||
'is fixed at spawn. ' +
|
'sub-agent\'s model is fixed at spawn. ' +
|
||||||
`Phases: ${Object.keys(st.cfg.phases).join(', ')}.`,
|
`Phases: ${Object.keys(st.cfg.phases).join(', ')}.`,
|
||||||
inputSchema: {
|
inputSchema: {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
@@ -2626,6 +2783,13 @@ function skillRow(st: State, skill: string): Picked | undefined {
|
|||||||
return phase !== undefined && route ? { phase, route } : undefined
|
return phase !== undefined && route ? { phase, route } : undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The run slot's model outranks the route's: a helper moves effort only. */
|
||||||
|
function belowRun(st: State, route: Route): boolean {
|
||||||
|
const mine = resolveRoute(st, route)
|
||||||
|
const run = resolveRoute(st, st.runMain?.route)
|
||||||
|
return mine !== undefined && run !== undefined && ranksAbove(st, run, mine)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A rowed skill on main sets the turn route; a best-tier row also holds the
|
* A rowed skill on main sets the turn route; a best-tier row also holds the
|
||||||
* run slot. A typed non-best row drops the run; one the model loads (a
|
* run slot. A typed non-best row drops the run; one the model loads (a
|
||||||
@@ -2637,7 +2801,10 @@ function routeMainBySkill(
|
|||||||
row: Picked,
|
row: Picked,
|
||||||
typed: boolean,
|
typed: boolean,
|
||||||
): void {
|
): void {
|
||||||
const turn: Routed = { phase: row.phase, route: { ...row.route },
|
const route = !typed && belowRun(st, row.route)
|
||||||
|
? { effort: row.route.effort }
|
||||||
|
: { ...row.route }
|
||||||
|
const turn: Routed = { phase: row.phase, route,
|
||||||
source: 'skill', label: clean(skill, NAME_CAP) }
|
source: 'skill', label: clean(skill, NAME_CAP) }
|
||||||
st.turnMain = turn
|
st.turnMain = turn
|
||||||
if (row.route.tier === BEST) st.runMain = { ...turn, source: 'run' }
|
if (row.route.tier === BEST) st.runMain = { ...turn, source: 'run' }
|
||||||
@@ -2909,6 +3076,7 @@ function modelCause(st: State, why: Why): string | undefined {
|
|||||||
if (!call.moved) return undefined
|
if (!call.moved) return undefined
|
||||||
if (call.why === 'upgrade') return 'upgrade'
|
if (call.why === 'upgrade') return 'upgrade'
|
||||||
if (call.why === 'downgrade') return 'switch'
|
if (call.why === 'downgrade') return 'switch'
|
||||||
|
if (call.why === 'window') return 'window'
|
||||||
return `fallback: ${nameOf(st.cfg, cur)} down`
|
return `fallback: ${nameOf(st.cfg, cur)} down`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3031,32 +3199,60 @@ function agentPlan(st: State, e: StepIn): Plan {
|
|||||||
type Why = { by: EffortBy; call: Call; cur: string }
|
type Why = { by: EffortBy; call: Call; cur: string }
|
||||||
type Step = { plan: Plan; why?: Why }
|
type Step = { plan: Plan; why?: Why }
|
||||||
|
|
||||||
/** The engine effort of main's first step: what the user left as default. */
|
/** The engine effort of this turn's first main step: the user's default. */
|
||||||
function noteEngineBase(st: State, e: StepIn): void {
|
function noteEngineBase(st: State, e: StepIn): void {
|
||||||
if (st.engineBase === null && e.effort !== undefined) {
|
if (st.turnEngine === null && e.effort !== undefined) {
|
||||||
st.engineBase = e.effort
|
st.turnEngine = e.effort
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A user /effort beats a guessed phase: the engine effort left its base. */
|
/**
|
||||||
function userMovedEffort(st: State, e: StepIn): boolean {
|
* A user /effort beats a guessed phase: this turn's engine effort differs
|
||||||
return st.turnMain?.source === 'classifier' && e.effort !== undefined &&
|
* from the previous turn's, typed between the two.
|
||||||
st.engineBase !== null && e.effort !== st.engineBase
|
*/
|
||||||
|
function userMovedEffort(st: State): boolean {
|
||||||
|
return st.turnMain?.source === 'classifier' && st.turnEngine !== null &&
|
||||||
|
st.engineBase !== null && st.turnEngine !== st.engineBase
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Main ran `plan` at `read`: that model's cache holds this context now. */
|
||||||
|
function noteServed(st: State, plan: Plan, read: Reading): void {
|
||||||
|
const id = canonical(st.cfg, plan.model)
|
||||||
|
if (read.tokens === undefined || aliasOf(st.cfg, id) === undefined) return
|
||||||
|
st.served.set(id, { at: read.now, tokens: read.tokens })
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The downgrade skip is said once per cap crossing: it stays quiet until a
|
||||||
|
* downgrade succeeds. Returns the call the log line is taken from.
|
||||||
|
*/
|
||||||
|
function capLogged(st: State, call: Call): Call {
|
||||||
|
if (call.why === 'downgrade') st.capSaid = false
|
||||||
|
if (!call.why.startsWith('downgrade skipped')) return call
|
||||||
|
const said = st.capSaid
|
||||||
|
st.capSaid = true
|
||||||
|
if (!said) return call
|
||||||
|
const { log: _log, logKey: _key, ...quiet } = call
|
||||||
|
return quiet
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The main loop's plan: effort from the floor/sticky/turn decision, model
|
* The main loop's plan: effort from the floor/sticky/turn decision, model
|
||||||
* from `decideMain`. `cur` is the model the router moved this turn, else
|
* from `decideMain`. `cur` is the model the router moved this turn, else
|
||||||
* the engine's own (verbatim: an engine fallback is respected).
|
* the engine's own (verbatim: an engine fallback is respected). Every step
|
||||||
|
* reads the context and the clock and records the model it ran on.
|
||||||
*/
|
*/
|
||||||
async function mainPlan($: Api, st: State, e: StepIn): Promise<Step> {
|
async function mainPlan($: Api, st: State, e: StepIn): Promise<Step> {
|
||||||
noteEngineBase(st, e)
|
noteEngineBase(st, e)
|
||||||
const { effort, by } = mainEffort(st, e.effort, userMovedEffort(st, e))
|
if (userMovedEffort(st)) st.turnMain = null
|
||||||
|
const { effort, by } = mainEffort(st, e.effort)
|
||||||
await prune($, st)
|
await prune($, st)
|
||||||
const cur = st.turnModel ?? e.model
|
const cur = st.turnModel ?? e.model
|
||||||
const { call } = await decideFor($, st, cur)
|
const read = { tokens: await readTokens($), now: await $.clock.now() }
|
||||||
logCall($, st, call)
|
const { call } = await decideFor($, st, cur, read)
|
||||||
|
logCall($, st, capLogged(st, call))
|
||||||
if (call.moved) st.turnModel = call.model
|
if (call.moved) st.turnModel = call.model
|
||||||
|
noteServed(st, { model: call.model, effort }, read)
|
||||||
return { plan: { model: call.model, effort }, why: { by, call, cur } }
|
return { plan: { model: call.model, effort }, why: { by, call, cur } }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3095,6 +3291,8 @@ function endMainTurn($: Api, st: State): void {
|
|||||||
st.explicitEffort.clear()
|
st.explicitEffort.clear()
|
||||||
st.spinner = ''
|
st.spinner = ''
|
||||||
st.turnLogged.clear()
|
st.turnLogged.clear()
|
||||||
|
if (st.turnEngine !== null) st.engineBase = st.turnEngine
|
||||||
|
st.turnEngine = null
|
||||||
refresh($, st)
|
refresh($, st)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3436,9 +3634,11 @@ function noteTyped(st: State, kind: string, text: string, midTurn: boolean) {
|
|||||||
|
|
||||||
// ---- prompt classifier -----------------------------------------------
|
// ---- prompt classifier -----------------------------------------------
|
||||||
// A typed prompt no rule, skill, route or floor covers is guessed by one
|
// A typed prompt no rule, skill, route or floor covers is guessed by one
|
||||||
// small-model call: the phase's EFFORT becomes the turn's default (never a
|
// small-model call: the phase's effort becomes the turn's default and its
|
||||||
// model move, never a dialog, never a file write). The call is bounded and
|
// tier a model move DOWN only (under `mainModelSwitch` and the cold-read cap
|
||||||
// every failure leaves the prompt as it was.
|
// `downgradeMaxTokens`; never above the session model; never a dialog or a
|
||||||
|
// file write). The call is bounded and every failure leaves the prompt as
|
||||||
|
// it was.
|
||||||
|
|
||||||
/** The whole text up to CLASSIFY_MAX code points, else its head and tail. */
|
/** The whole text up to CLASSIFY_MAX code points, else its head and tail. */
|
||||||
function sampleOf(text: string): string {
|
function sampleOf(text: string): string {
|
||||||
@@ -3532,18 +3732,16 @@ async function askClassifier(
|
|||||||
return label
|
return label
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The turn route of a label: its phase's effort only; false = nothing. */
|
/** The turn route of a label: its phase's tier and effort; false = none. */
|
||||||
function routeFromLabel(st: State, label: string): boolean {
|
function routeFromLabel(st: State, label: string): boolean {
|
||||||
const phase = hasKey(LABEL_PHASE, label) ? LABEL_PHASE[label] : undefined
|
const phase = hasKey(LABEL_PHASE, label) ? LABEL_PHASE[label] : undefined
|
||||||
const effort = phase === undefined
|
const route = phase === undefined ? undefined : phaseRoute(st.cfg, phase)
|
||||||
? undefined
|
if (phase === undefined || route?.effort === undefined) return false
|
||||||
: phaseRoute(st.cfg, phase)?.effort
|
st.turnMain = { phase, route: { ...route }, source: 'classifier' }
|
||||||
if (phase === undefined || effort === undefined) return false
|
|
||||||
st.turnMain = { phase, route: { effort }, source: 'classifier' }
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Fills an empty route with the guessed phase's effort; never throws on it. */
|
/** Fills an empty route with the guessed phase's route; never throws on it. */
|
||||||
async function classifyPrompt(
|
async function classifyPrompt(
|
||||||
$: Api,
|
$: Api,
|
||||||
st: State,
|
st: State,
|
||||||
|
|||||||
Reference in new issue
Block a user