🤖 refactor: auto-cleanup#3291
Open
mux-bot[bot] wants to merge 14 commits into
Open
Conversation
2ca21da to
31a3fa8
Compare
Contributor
Author
|
Failure: Why this is a flake, not caused by the cleanup commit:
Action: No fix pushed. Recommend retrying the Windows job; if it persists, the Windows ready-wait may need to be bumped above 900ms or the assertion further hardened (separate from this cleanup PR). |
Both image_generate and image_edit duplicated the same "Adjust Settings > Experiments > Image Tools or request fewer images." setup hint literal when the requested image count exceeded the configured maxImagesPerCall. Hoist it next to the existing IMAGE_TOOL_PROVIDER_SETUP_HINT in imageArtifacts.ts so the guidance has a single source of truth, matching the pattern established by the prior auto-cleanup PR.
Move `urlAttributes`/`blockedSchemes` out of `sanitizeMermaidSvg` and into module-level constants (`SANITIZER_URL_ATTRIBUTES`, `SANITIZER_BLOCKED_URL_SCHEMES`). They are pure lookup data with no per-call dependency, so allocating them on every render of every Mermaid diagram was wasted work — these now allocate once per module load. Pure cleanup: identical contents, identical lookup semantics, no behavior change. The full Mermaid.test.tsx suite (including the recent sanitizer regression tests) still passes. --- _Generated with `mux` • Model: `anthropic:claude-opus-4-7` • Thinking: `xhigh` • Cost: `$`_ <!-- mux-attribution: model=anthropic:claude-opus-4-7 thinking=xhigh costs= -->
`summarizeToolPart` carried the AI SDK v5 `state` → lifecycle phase mapping inline as a nested ternary plus a multi-line comment listing the states. The ternary obscured the actual mapping (output-available and output-redacted both fold to "done") and made adding new states a multi-line edit. Hoist the mapping to a `TOOL_PART_PHASE_BY_STATE` record at module scope, keyed on the SDK state strings and typed as the literal phase union. The summarizer now does a single table lookup. States not in the table (e.g. `input-streaming`) still yield `null` and the bare `[tool <name>]` form, matching prior behavior exactly. Behavior-preserving: same input strings, same output bytes for every `state` value the prior code handled, and the same `null` fallthrough for everything else.
Three slash-command discovery surfaces (suggestions in ChatInput, ghost
hints in ChatInput, and CommandPalette) duplicated the same inline
lambda:
(experimentId) =>
resolveSlashCommandExperimentValue(experimentId, {
goals: goalsExperimentEnabled,
workspaceHeartbeats: workspaceHeartbeatsExperimentEnabled,
})
Add createSlashCommandExperimentResolver(snapshot) next to its sibling
resolver so each callsite only describes the experiment snapshot it
observes. The new helper returns the exact same closure each callsite
previously built inline, so behavior is byte-identical.
The SSH-provisioning commit (#3302) added a second `import type { Runtime } from "../node/runtime/Runtime"` line right below an existing `import type { InitLogger, WorkspaceInitResult }` from the same module. Fold the new symbol into the existing import — byte-identical semantics, one fewer line of boilerplate, no behavior change.
Extract a shared `BUILT_IN_SKILL_NAMES` constant for the two test assertions in `agentSkillsService.test.ts` that previously enumerated the same five built-in skill names inline. The two existing call sites differ only in their project-skill prefix; spreading the shared constant at the end of each list preserves the exact sort order and assertion semantics. Byte-equivalent to the previous inline arrays; the only effect is that the next new built-in skill needs to land in one place instead of two.
The Tooltip + Switch + Reset Button block for the per-agent advisor toggle was duplicated between renderAgentDefaults and renderUnknownAgentDefaults. The two call sites differ only in the agent id variable and which setter/resetter to invoke, so wrap the shared markup in a small AdvisorSwitch component. Same aria-label, same tooltip text via getAdvisorSwitchState, same conditional Reset semantics — pure cleanup with no behavior change.
Hoist the ["text", "delta", "textDelta"] field priority used to extract AI SDK v5 text-delta payloads into a shared TEXT_OUTPUT_DELTA_FIELDS constant in src/common/utils/ai/streamChunks.ts and reuse it from streamManager.ts (fullStream text-delta handling) and tools/advisor.ts (advisor streamText onChunk handling). Byte-equivalent semantics; only the wiring detail (that the same fallback list applies to both callsites) moves into the shared module.
BudgetTile and TurnsTile each render the same dt-label + Edit-button
header row. Lift the duplicated markup into a small file-scoped
`StatTileHeader` helper so the styling lives in one place and the
tile bodies focus on their own numeric content. Behavior, aria
labels, and class names are unchanged — `GoalTab.test.tsx` (23
tests, including the inline budget/turn-cap editors that locate
the openers via `getByLabelText("Edit goal …")`) still passes.
Three callsites (ChatInput/types.ts, messageQueue.ts, agentSession.ts) each privately redeclared the same NonNullable<SendMessageOptions["goalInterventionPolicy"]> alias after #3319 added the field. Centralizing the type next to SendMessageOptions itself removes the duplication and ensures future sub-typing changes only need to land in one place. Pure relocation — identical type semantics at every callsite.
The silent-continuation summary helper added in #3326 was declared as a private method on `AgentSession` but only depends on its input `parts` argument — it never touches `this`. Convert it to a module-level free function alongside the existing free helpers (`stripGoalInterventionPolicy`, `coerceGoalSyntheticMessageKind`, `extractAgentSkillRefs`, etc.) so the no-`this` contract is obvious to readers and the file's helper style stays consistent. The companion `maybeAutoCompleteGoalFromSilentContinuation` method stays on the class because it accesses `this.workspaceGoalService`, `this.workspaceId`, and `log` indirectly through instance context. Byte-for-byte identical logic at the only callsite. Pure cleanup, no behavior change.
The seed loop in applyReviewPaneUpdate built a key→index map for the existing base list by calling base.indexOf(h) on every iteration — O(n²) when the loop already had the index in hand. Switch to `base.entries()` so the position the map stores is unambiguously the slot we just visited. Behavior-identical for unique references (the only realistic case), and now correct-by-construction even if a future refactor ever introduced duplicate references in `base`.
This test-only export was added speculatively in #3262 (Instructions tab) but no test ever imports it; ripgrep across src/ and tests/ finds zero callers. Removing the unused export lets pendingFocusGeneration become `const` since the reset helper was the only reason it was `let`. The Map is still mutated in place via .set(), and getter/setter exports are unchanged, so observable runtime behavior is byte-identical.
Five toolPolicy entries differed only by tool name and all shared
`action: "disable" as const`. Hoist the names into a local
`CLI_DISABLED_TOOL_NAMES` tuple and produce the policy array via
`.map(name => ({ regex_match: name, action: "disable" as const }))`.
Picked from the `ask_user_question` disable that landed in #3336 —
that commit added a fifth identical-shape entry, so the table form is
now strictly tidier than five copy-pasted object literals. Adding the
next disabled CLI tool drops to one string instead of duplicating the
shape. Byte-equivalent toolPolicy contents (same five entries, same
order, same action), so no behavior change.
Generated with `mux`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Rolling, low-risk cleanup batch. Each run adds one extremely small,
behavior-preserving refactor picked from changes that have landed on
mainsince the last checkpoint.
Auto-cleanup checkpoint: a84603b
Current diff against
main:src/browser/utils/additionalSystemContextStore.ts— drop theunused
__resetAdditionalSystemContextFocusForTestsexport andpromote
pendingFocusGenerationfromlettoconst. The resethelper was added speculatively alongside the Instructions tab in
🤖 feat: Instructions tab in right sidebar #3262, but ripgrep across
src/andtests/finds zero importers —no test ever calls it. Removing it lets the only other reason the
module needed a mutable binding (the
pendingFocusGeneration = new Map()reassignment inside the helper) go away, so the binding canbe a
constMap that's still mutated in place via.set(). TherequestAdditionalSystemContextFocus/getAdditionalSystemContextFocusGenerationcallers continue to seethe exact same Map identity and counter semantics — pure dead-code
removal with no runtime behavior change.
src/browser/features/Messages/Mermaid.tsx— hoist the URL-attributeset and blocked-scheme list out of
sanitizeMermaidSvgintomodule-level constants (
SANITIZER_URL_ATTRIBUTES,SANITIZER_BLOCKED_URL_SCHEMES). They are pure lookup data with noper-call dependency, so allocating them on every Mermaid render was
wasted work; they now allocate once per module load. Identical
contents and identical lookup semantics — pure cleanup with no
behavior change.
src/node/services/agentStatusService.ts— hoist the AI SDK v5tool-part
state→ lifecycle phase mapping out ofsummarizeToolPartinto a module-level
TOOL_PART_PHASE_BY_STATErecord. The previousnested ternary obscured the actual mapping (
output-availableandoutput-redactedboth fold to"done") and made adding new states amulti-line edit. The summarizer now does a single table lookup; the
union-typed values document the two valid phases inline. States not
in the table (e.g.
input-streaming) still yieldnulland the bare[tool <name>]form, byte-for-byte identical to before.src/browser/utils/slashCommands/experimentVisibility.ts(+ twoconsumers) — add
createSlashCommandExperimentResolver(snapshot)alongside
resolveSlashCommandExperimentValue. Three slash-commanddiscovery surfaces (suggestions in
ChatInput, the ghost-hint call inChatInput, and theCommandPalettepalette query) had each inlinedthe same
(experimentId) => resolveSlashCommandExperimentValue(experimentId, snapshot)lambda. The new helper returns the exact same closure eachcallsite previously built inline, so the
isExperimentEnabledpredicate handed to
getSlashCommandSuggestions/getCommandGhostHintis behaviorally identical; only the wiring detail (that resolution
is parameterized by experiment id) moves into the visibility module.
Rebased through the
goalsGA removal — the snapshot now carriesonly
workspaceHeartbeatsbut the resolver helper itself isunchanged.
src/cli/run.ts— fold theRuntimetype import into the existingimport type { InitLogger, WorkspaceInitResult } from "../node/runtime/Runtime"line. The SSH-provisioning commit (🤖 perf: cut SSH workspace startup ~9× on the warm path via fused single-RTT materialization #3302) added a second
import type { Runtime } from "../node/runtime/Runtime"directly below it; mergingthem is byte-identical semantics with one fewer line of boilerplate.
No behavior change.
src/node/services/agentSkills/agentSkillsService.test.ts— extract ashared
BUILT_IN_SKILL_NAMESconstant for the twotoEqual([...])assertions that previously enumerated the same five built-in skill
names (
imagegen,init,mux-diagram,mux-docs,orchestrate)inline. The two call sites differ only in their project-skill prefix;
spreading the shared constant at the end of each list preserves the
exact sort order and assertion semantics. The next built-in skill
added (e.g. when
/orchestrategraduates to advertised, or a newhidden skill lands) only needs to update one list instead of two.
Byte-equivalent assertion output; no runtime behavior change.
src/browser/features/Settings/Sections/TasksSection.tsx— extract anAdvisorSwitchcomponent for the per-agent advisor toggle. TheTooltip+Switch+ optionalResetbutton block was duplicatedbetween
renderAgentDefaultsandrenderUnknownAgentDefaults(addedin 🤖 fix: enable advisor for default subagents #3309 when the Advisor experiment gained default-on behavior for
Exec and Plan). The two call sites differ only in the agent-id
variable they close over and which setter/resetter to invoke, so the
shared markup now lives in one place. Same
aria-label, sametooltip text via
getAdvisorSwitchState, same conditional Resetsemantics — the TasksSection UI test (
defaults advisor on for Exec and Plan when the experiment is enabled) still finds both switchesby their unchanged role + name.
src/common/utils/ai/streamChunks.ts(+ two consumers) — hoist the["text", "delta", "textDelta"]field priority used to extract AI SDKv5 text-delta payloads into a shared
TEXT_OUTPUT_DELTA_FIELDSconstant. Both
streamManager.ts(thefullStreamtext-deltaparthandler) and
tools/advisor.ts(the advisorstreamTextonChunktext-delta handler, added in 🤖 feat: stream advisor output live #3310) had inlined the same array
literal; centralizing it prevents drift if the AI SDK normalizes
another alias and documents the intent in one place. The other two
extractChunkDeltaTextcallsites inaiService.tsuse deliberatelydifferent field orderings (
["textDelta", "delta", "text"]forparent-step text-delta capture,
["text", "textDelta", "delta"]forreasoning-delta capture) and are intentionally left untouched.
Byte-equivalent lookup semantics at every callsite — pure DRY.
src/browser/features/RightSidebar/GoalTab.tsx— extract a smallfile-scoped
StatTileHeadercomponent for the duplicated<dt>+inline-
Edit-button header row used byBudgetTileandTurnsTile(added in 🤖 feat(goals-tab): consolidate Cost/Budget/Remaining + always show Turn cap #3314 when the active-goal stat surface was consolidated).
The two tiles previously inlined the same
flexwrapper, the sametext-muted text-xs<dt>, and the sametext-xs underlineEditbutton — only the label string and
aria-labeldiffered. The sharedhelper preserves those two parameters as props and keeps every class
name,
type="button", and aria label byte-for-byte identical, so theinline budget/turn-cap editors in
GoalTab.test.tsx(which locatetheir openers via
getByLabelText("Edit goal budget")/getByLabelText("Edit goal turn cap")) still match. Pure DRY; nobehavior change.
src/common/orpc/types.ts(+ three consumers) — hoist theGoalInterventionPolicy = NonNullable<SendMessageOptions["goalInterventionPolicy"]>alias next to
SendMessageOptionsitself. After 🤖 feat: add goal intervention policy #3319 added thepolicy field, three independent files re-derived the same alias:
the browser
ChatInput/types.tsbarrel,node/services/messageQueue.ts,and
node/services/agentSession.ts. The canonical alias now livesbeside its source schema;
ChatInput/types.tsre-exports it so thefeature-local import surface stays unchanged, and the two node-side
files import directly. Identical type semantics at every callsite —
pure relocation with no runtime behavior change.
src/node/services/agentSession.ts— convertsynthesizeSilentContinuationSummaryfrom a private method onAgentSessionto a module-level free function. The helper, added in🤖 fix(goals): treat text-only continuation turns as goal completion #3326 as part of the silent-continuation auto-complete hook, only
depends on its input
partsargument — it never touchesthis.Moving it alongside the existing free helpers
(
stripGoalInterventionPolicy,coerceGoalSyntheticMessageKind,extractAgentSkillRefs, etc.) makes the no-thiscontract obviousto readers and keeps the file's helper style consistent. The
companion
maybeAutoCompleteGoalFromSilentContinuationmethod stayson the class because it accesses
this.workspaceGoalService,this.workspaceId, and the instance-scopedlog. Byte-for-byteidentical logic at the only callsite; the
agentSession.goalAutoPause.test.tssuite (18/18 pass) continues tocover the silent-continuation, dynamic-tool-present, manual-user, and
paused-goal branches.
src/node/services/tools/review_pane.ts— switch the dedup seed loopin
applyReviewPaneUpdatefromfor (const h of base) { seen.set(..., base.indexOf(h)) }tofor (const [i, h] of base.entries()) { seen.set(..., i) }. The previous form ran an O(n²) reference scan on every seediteration even though the loop already had the index in hand; the
result is byte-equivalent for the realistic case where every entry in
baseis a unique reference (which is always true today —baseiseither
[]or[...current]after the previous deduped call) and nowcorrect-by-construction even if a future refactor ever introduced
duplicate references. Same dedup map contents, same final hunk
ordering — the 15 existing
review_pane.test.tstests (including the"dedupes by formatted path:range key when adding, preferring the
latest comment" case) all pass unchanged. Picked from the
review_pane_updatetool feature landed in 🤖 feat: add review_pane_update tool + Assisted review toggle #3331.src/cli/run.ts— extract aCLI_DISABLED_TOOL_NAMEStuple and buildthe
mux runtoolPolicyarray via.map(name => ({ regex_match: name, action: "disable" as const })). The five entries previously inlinedin
buildSendOptions(ask_user_question,status_set,todo_write,todo_read,notify) differed only by tool name and all shared theexact same
action: "disable"shape. Picked from theask_user_questiondisable that landed in 🤖 fix: disable ask_user_question in mux run #3336 — that commit addeda fifth identical-shape entry, so the table form is now strictly
tidier than five copy-pasted object literals, and the next disabled
CLI tool drops to one string instead of duplicating the object
shape. Byte-equivalent
toolPolicycontents (same five entries,same order, same regex_match and action values), so no behavior
change.
Validation
make static-check— eslint, tsgo (×2 configs), and prettier all greenlocally; the only red step is
fmt-shell-checkfailing becauseshfmtisn't installed in this environment (pre-existing env limitation, no
shell files touched by these changes).
bun test src/node/services/tools/review_pane.test.ts— 15/15 pass,covering replace/add/dedupe/reject/normalize/clear/persistence paths.
Generated with
mux• Model:anthropic:claude-opus-4-7• Thinking:xhigh