Merge bugfix/line-width-80 into develop

This commit is contained in:
bchanot committed 2026-11-15 16:40:19 +01:00
commit 2315a0b33a
4 files changed
+32 -4

No files matched your search

+1
View File
@@ -760,3 +760,4 @@ rules:
## 2026-11-15
- Docker host-root mount deny shipped 0f73d7e: 28 rows (7 shapes x 4 prefixes), bench-proven echo analogue, verifier CONFORME, security PASS. Legacy rows dead, kept. Wrapper/podman residual added TODO:90. Docs committed.
- A2 line width: 4 lines >80 cols re-wrapped (register.ts 591/683/3765, transcripts.ts 133; audit line numbers had drifted), no behavior change, make test green, security PASS.
@@ -0,0 +1,23 @@
# CONTRACT — line-width-80 (BDR-125 gap audit A2)
- date: 2026-11-15 | flow: hotfix | branch: bugfix/line-width-80 (off develop)
- status: active
## REQUEST (verbatim — IMMUTABLE)
A2 (BDR-125 gap audit): two lines over the 80-column limit in our code. mods/model-router/hooks/register.ts:976 (86 columns) and lib/memory-feedback/transcripts.ts:133 (over 80). Wrap each to ≤80 columns with no behavior change; type-check and the related test suites stay green.
## CLARIFICATIONS
- [internal 2026-11-15] register.ts line numbers drifted since the audit; today 3 lines exceed 80 there (591, 683, 3765), transcripts.ts 1 (133). All four in scope: same two files, same intent.
## ACCEPTANCE CRITERIA
1. No line over 80 columns in either file.
CHECK: cd /home/bchanot/Documents/claude && awk 'length>80' mods/model-router/hooks/register.ts lib/memory-feedback/transcripts.ts | wc -l
EXPECT: 0
EVIDENCE: PENDING
2. Full test suite green.
CHECK: cd /home/bchanot/Documents/claude && PATH=$HOME/.bun/bin:$PATH make test </dev/null 2>&1 | tail -1
EXPECT: all suites green
EVIDENCE: PENDING
3. No behavior change: the diff only re-wraps lines (manual).
## FILE SCOPE
mods/model-router/hooks/register.ts (lines 591, 683, 3765), lib/memory-feedback/transcripts.ts (line 133).
+2 -1
View File
@@ -130,7 +130,8 @@ function replyAfter(recs: Rec[], ts: number): string {
.filter(r => r.type === 'assistant' && r.isSidechain !== true)
.filter(r => tsOf(r) > ts && tsOf(r) < end)
.flatMap(textsOf)
return [...new Map(texts).values()].join('\n') // first position kept; the value is derived from the key
// first position kept; the value is derived from the key
return [...new Map(texts).values()].join('\n')
}
export type PromptJoin = { prompt: string; injected: string; reply: string }
+6 -3
View File
@@ -588,7 +588,8 @@ function pickSwitch(
function pickEnabled(v: unknown, fallback: boolean, log: Log): boolean {
if (v === undefined) return fallback
if (typeof v === 'boolean') return v
log('model-router: config "enabled" is not a boolean; router off (fail closed)')
log('model-router: config "enabled" is not a boolean; ' +
'router off (fail closed)')
return false
}
@@ -680,7 +681,8 @@ function mergeConfig(
mainModelSwitch: pickModelSwitch(
user.mainModelSwitch, base.mainModelSwitch, log),
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(
'model-router: config "classify" is not a boolean; ignored',
user.classify, base.classify, log),
@@ -3762,7 +3764,8 @@ function onSkillLoad(st: State, skill: string, agentId: string | undefined) {
if (row) routeMainBySkill(st, skill, row, false)
return
}
if (row) writeLoop(loopOf(st, agentId), row.route, `skill ${clean(skill, NAME_CAP)}`)
if (row) writeLoop(
loopOf(st, agentId), row.route, `skill ${clean(skill, NAME_CAP)}`)
}
type TypedPath = 'typed-marker' | 'typed-fallback'