🤖 refactor: auto-cleanup

[mux-bot]

Summary

This is the long-lived auto-cleanup PR. Each run, the auto-cleanup agent reviews new commits merged to main, rebases onto the latest main, and applies at most one extremely low-risk, behavior-preserving cleanup. The branch accumulates a small stack of independent cleanups until it is merged.

Cleanups in this branch

1. Dedupe memory sweep recordUsage callbacks (MemoryConsolidationService). The consolidation sweep and the harvest sweep each inlined the same 15-line callback that routes billed usage to the headless-usage sidecar and emits analyticsIngest. Extracted into a private makeSweepUsageRecorder(...) helper.

2. Dedupe the "memory scope is full" cap check (MemoryService). The create and saveFile (new-file) paths each inlined a byte-identical block that called store.listFiles(), compared the count against MEMORY_MAX_FILES_PER_SCOPE, and threw a MemoryCommandError with the same message. Extracted into a private assertScopeHasRoom(store, scope) helper.

3. Dedupe blockquote line formatting in the bash monitor wake prompt (bashMonitorWakeStore.ts). buildBashMonitorWakePrompt rendered both the matched-output lines and the lost-monitor script with the identical .map((line) => \> ${line}`).join("\n")blockquote pattern in two places. Extracted into a module-levelblockquoteLines(lines)` helper.

4. Dedupe the tool_search removal in prepareToolSearch (toolCatalog.ts). Both fallback branches (PTC enabled, and empty deferred catalog) inlined the identical { [TOOL_SEARCH_TOOL_NAME]: _removed, ...rest } destructure to drop the built-in tool_search entry from the tool record. Extracted into a module-level withoutToolSearch(tools) helper.

5. Dedupe the Anthropic cache-create token extraction in accumulateProviderMetadata (usageHelpers.ts). The function inlined the same verbose (metadata.anthropic as { cacheCreationInputTokens?: number } | undefined)?.cacheCreationInputTokens ?? 0 cast twice (once for the accumulated metadata, once for the current step). Extracted into a module-private getAnthropicCacheCreateTokens(metadata) helper.

6. Dedupe capability-model thinking-policy resolution (thinking/policy.ts). After 🤖 feat: integrate GPT-5.6 Sol/Terra/Luna with native max effort and pro-mode toggle #3708 taught the thinking policy to resolve mappedToModel aliases, both getThinkingPolicyForModel and hasExplicitThinkingPolicy inlined the identical getExplicitThinkingPolicy(resolveModelForMetadata(modelString, providersConfig ?? null)) call. Extracted into a private getExplicitThinkingPolicyForModel(modelString, providersConfig) helper.

7. Dedupe queue entry clear-callback projection (messageQueue.ts). After 🤖 feat: queue messages behind special sends instead of erroring (FIFO message queue) #3696 rewrote MessageQueue into FIFO QueueEntry items, both getClearCallbacks and removeWorkspaceTurn inlined the identical spread that builds a QueueClearCallbacks object from an entry's optional onCanceled / onAcceptedPreStreamFailure fields. Extracted into a private entryClearCallbacks(entry) helper.

8. Dedupe the OpenAI-origin model check in openaiExplicitPromptCachingAvailable (cacheStrategy.ts). After 🤖 feat: GPT-5.6 explicit prompt cache breakpoints for direct OpenAI #3712 added the GPT-5.6 explicit-prompt-caching eligibility gate, the function inlined the identical split(":", 2) + origin !== "openai" || !modelName check twice — once for the request model and once for the resolved capability target — and the destructured origin/modelName locals were unused past their guard in both places. Extracted into a module-private isOpenAIOriginModel(canonical) helper.

9. Dedupe the tool-call-execution-start emit in StreamManager (streamManager.ts). 🤖 fix: start tool elapsed timers when execute() actually runs #3716 introduced the ToolCallExecutionStartEvent, emitted from two places: applyToolExecutionStart (part already stored) and the "tool-call" case that consumes a pendingExecutionStart recorded before the part landed. Both inlined the byte-identical this.emit("tool-call-execution-start", { type, workspaceId, messageId, toolCallId, timestamp } satisfies ToolCallExecutionStartEvent) block, differing only in the toolCallId/timestamp source. Extracted into a private emitToolCallExecutionStart(workspaceId, streamInfo, toolCallId, timestamp) helper.

10. Dedupe model-parameter extras merge (aiService.ts). After 🤖 feat: apply mid-turn thinking-level changes at the next model step #3718 added mid-turn thinking-level rebuilds, the initial-model path and the fallback-model path each inlined a byte-identical closure (mergeModelParameterExtras / mergeNextModelParameterExtras) that folds providers.jsonc providerExtras UNDER the Mux-built provider-options namespace (short-circuiting when there are no extras, deep-merging via mergeProviderExtrasUnderMux when the namespace is a plain object). The two differed only in the namespace key and the overrides source. Extracted into a module-level makeModelParameterExtrasMerger(namespaceKey, providerExtras) factory that returns the merger closure.

11. Unify the legacy tool_search part-rename helper (toolCatalog.ts). 🤖 fix: avoid OpenAI tool search name collision #3719 renamed the built-in tool-search tool to tool_catalog_search and added request-time rewriting of historical tool_search call/result parts. It introduced two byte-identical helpers — renameLegacyToolSearchCallPart(part: ToolCallPart) and renameLegacyToolSearchResultPart(part: ToolResultPart) — that differ only in the part type; the rename body is identical. Collapsed both into a single generic renameLegacyToolSearchPart<T extends { toolName: string }>(part: T) and dropped the now-unused ToolCallPart / ToolResultPart imports.

12. Trim duplicated context-cap rationale comment (codexOAuth.ts). 🤖 fix: cap GPT-5.6 context over Codex OAuth #3724 added the GPT-5.6 family to CODEX_OAUTH_CONTEXT_WINDOW_OVERRIDES and rewrote the map's inline comment with a sentence that restated the rationale already given in the map's doc comment directly above it. Dropped the duplicated rationale sentence, keeping only the tier-specific explanation. Comment-only; no behavior change. (Re-applied on top of [openai] 🤖 fix: use 372K GPT-5.6 OAuth context #3730, which later rewrote the same inline comment and re-introduced the duplicate.)

13. Dedupe flat-section pinned block resolution (pinnedReorder.ts). 🤖 feat: project-less scratch chats #3723 added a scratch branch to locatePinnedBlock that renders scratch chats as one flat "Chats" section, mirroring the existing multi-project branch. Both branches inlined the byte-identical collectFlatSectionRows(...).filter(isWorkspacePinned).map((row) => row.id) projection, the if (!pinnedIds.includes(meta.id)) return null guard, and the return { fullOrder: pinnedIds, blockIds: pinnedIds } shape — differing only in the includeRow predicate ((row) => row.kind === "scratch" vs isMultiProject). Extracted into a private locateFlatSectionPinnedBlock(meta, sortedWorkspacesByProject, includeRow) helper.

14. Dedupe JSON-wrapped tool-output unwrap (workflowRunMessages.ts). 🤖 fix: stop terminal workflow await loops #3725 added isTerminalWorkflowRunToolOutput, which re-inlined the byte-identical output.type === "json" && "value" in output container check already used by stripWorkflowRunRecordForModel to detect the { type: "json", value } SDK/UI wrapper before recursing on the inner value. Extracted the check into a module-private isJsonWrappedOutput(output) helper that both functions call, moving the shared rationale into the helper's doc comment. No control flow or return-shape change.

15. Hoist errorType local in finalizeWorkspaceTurnFromStreamError (taskService.ts). 🤖 fix: keep workspace-turn handles running through auto-retryable stream errors #3729 reworked workspace-turn stream-error settlement, and the reworked function read event.errorType three times and repeated the event.errorType != null guard once for the explicitRecovery computation and once in the recovery if. Hoisted a single const errorType = event.errorType and routed all uses through it, deduplicating the repeated member access and null guard. ErrorEvent is a Zod-inferred plain data type, so the property read has no side effects; pure behavior-preserving simplification with no control-flow change.

16. Extract buildSkillDescriptor helper for skill discovery (common/orpc/schemas/agentSkill.ts + agent_skill_list.ts + agentSkillsService.ts). 🤖 feat: skills refresh — invocation control, $ARGUMENTS, dynamic context, .claude compat #3728 (skills refresh) added user-invocable / argument-hint / when_to_use frontmatter and normalized them via resolveSkillAdvertise / resolveSkillUserInvocable / resolveSkillWhenToUse. Both descriptor-building sites — readSkillDescriptor (the agent_skill_list tool) and readSkillDescriptorFromDir (agentSkillsService discovery) — then inlined the byte-identical 7-field object literal mapping parsed.frontmatter + scope into an AgentSkillDescriptor before AgentSkillDescriptorSchema.safeParse. Extracted the mapping into a shared buildSkillDescriptor(frontmatter, scope) in agentSkill.ts (co-located with the resolveSkill* helpers it calls) and dropped the now-unused resolveSkill* imports at both call sites. Callers still run safeParse themselves since they handle validation failure differently. No behavior change.

17. Hoist duplicated Date.parse(record.createdAt) in the bash monitor delivery gate (workspaceService.ts). 🤖 fix: defer bash monitor wakes during task_await #3732 (defer bash monitor wakes during task_await) reworked the delivery gate in drainBashMonitorWakes so a match is re-checked against the shown frontier while pinned to its originating process instance via Date.parse(record.createdAt). The new non-blocking getMonitorWakeDeliveryState branch and the fallback getSettledShownThroughOffset branch each inlined the identical Date.parse(record.createdAt) call as the originNotAfterMs argument. Hoisted a single const originNotAfterMs = Date.parse(record.createdAt) before the branches (with a clarifying comment on why the origin timestamp pins the check) and routed both calls through it. Date.parse is pure, so the hoist is behavior-preserving.

18. Dedupe the "wait for any in-flight load" block in DevToolsService (devToolsService.ts). 🤖 fix: clean up devtools.jsonl on archive/remove and reap orphaned session dirs #3733 added removeWorkspaceData (archive/remove DevTools cleanup) directly beside the existing clear; both inlined the byte-identical const pendingLoad = this.loadingPromises.get(workspaceId); if (pendingLoad) { await pendingLoad; } guard that drains any in-flight loadFromDisk before mutating in-memory state so a late load cannot repopulate stale data after the mutation. Extracted into a private awaitPendingLoad(workspaceId) helper with the shared rationale in its doc comment; both call sites keep their situational one-line comment. No control-flow change.

19. Dedupe MCP OAuth redirect URI resolution (router.ts). Both the global (mcpOauth.startServerFlow) and per-project (projects.mcpOauth.startServerFlow) handlers inlined the byte-identical block that derives the OAuth callback redirectUri from request headers — preferring the Origin header (used verbatim when it parses as a URL), then falling back to x-forwarded-host/host with the forwarded proto (defaulting to http), and returning Err("Missing Host header") when no usable Host header exists. Extracted into a module-level resolveMcpOauthRedirectUri(headers) helper that returns the resolved URI or undefined; each handler now maps undefined to the same Err. startServerFlow is async (its returned promise is passed through unawaited), so moving the call out of the origin-branch try cannot change behavior — the try only ever guarded the synchronous new URL(...) construction. No header semantics or return-shape change.

20. Extract getTotalTokens helper for total-token sums (usageAggregator.ts + 6 call sites). 🤖 feat: show per-model cost breakdown in workspace Costs tab #3739 (per-model cost breakdown in the Costs tab) added a fifth+ copy of the "sum every usage component" expression — input + cached + cacheCreate + output + reasoning .tokens — already inlined byte-for-byte in CostsTab (session model rows), WorkspaceStore (session totalTokens), tokenMeterUtils (calculateTokenMeterData total), sessionUsageService (per-model totalTokens accumulation), and twice in cli/run.ts (budget hasTokens gates). Added a getTotalTokens(usage) helper in usageAggregator.ts, co-located with and mirroring the existing getTotalCost (same five-component iteration; undefined → 0), and routed all six sites through it. The four-component sum in cli/debug/costs.ts (which omits cacheCreate) was intentionally left untouched to preserve its existing behavior.

21. Hoist the duplicated dedupeKeys snapshot in removeByDedupeKeyPrefix (messageQueue.ts). 🤖 refactor: support incremental subagent reports #3714 (incremental sub-agent reports) added MessageQueue.removeByDedupeKeyPrefix, which spread the entry's dedupeKeys Set into an array once for the matchingKeys prefix filter and then re-spread the same Set inside the entry.messages.filter(...) callback — once per message iteration — to map each message index back to its dedupe key. The Set is not mutated until after keptMessages is computed, so both reads observe the same ordered snapshot. Hoisted a single const dedupeKeyList = [...entry.dedupeKeys] before the filter and routed both reads through it, eliminating the per-message re-spread. Pure behavior-preserving simplification with no control-flow change.

22. Dedupe the settled workspace-turn reconciliation guard (taskService.ts). 🤖 fix: report live workspace-turn state from task_await instead of stale settlements #3738 (report live workspace-turn state from task_await) added two read-time reconciliation helpers — persistRepairedSettledWorkspaceTurn and reviveRetryingWorkspaceTurn — that each open their settlement-lock body with the byte-identical guard: reload the handle via getWorkspaceTurn and return current unless it is still the exact record we reconciled against (current != null && current.status === record.status && current.updatedAt === record.updatedAt). Extracted the condition into a module-level isReconciledWorkspaceTurnUnchanged(current, record) type guard, co-located with 🤖 fix: report live workspace-turn state from task_await instead of stale settlements #3738's own isSelfHealEligibleSettledWorkspaceTurn, so the generic "compare updatedAt too, not just status" rationale lives in one doc comment while each call site keeps its situational note. The current is WorkspaceTurnTaskHandleRecord return type preserves the non-null narrowing that reviveRetryingWorkspaceTurn relies on after the guard. No control-flow or return-shape change.

23. Dedupe the fire-and-forget archive-all catch (TaskGroupListItem.tsx). 🤖 fix: archive all sidebar variants #3741 (archive all sidebar variants) added an onArchiveAll prop invoked from two places — the archive keyboard-shortcut branch in onKeyDown and the Archive all variants context-menu item's onClick. Both inlined the byte-identical fire-and-forget props.onArchiveAll(...).catch(() => { /* the sidebar owner surfaces archive failures through its shared error UI */ }) block, differing only in optional-call syntax (inert because the prop is defined in both branches). Extracted a local archiveAll(buttonElement) helper so the swallow-and-surface rationale lives in one place. No control flow, arguments, or error-handling change.

24. Extract someDescendantAgentTaskWorkspace helper for sticky-descendant queries (taskService.ts). [tasks] 🤖 feat: support sticky subagents #3744 (sticky subagents) added two adjacent query methods — hasStickyDescendants and hasUnarchivedStickyDescendants — that each rebuilt the agent-task index the same way (loadConfigOrDefault() → buildAgentTaskIndex(cfg) → listDescendantAgentTaskIdsFromIndex(index, workspaceId).some(...)) and differed only in the .some() predicate. Extracted a private someDescendantAgentTaskWorkspace(workspaceId, predicate) helper that resolves each descendant entry and threads it through the predicate (keeping .some() short-circuiting); the two public methods now just supply their predicate and keep their own assert. The helper's descendant != null && predicate(descendant) guard is equivalent to the prior index.byId.get(descendantId)?.taskSticky === true form, so no behavior changes.

25. Drop the duplicated Kimi K3 max-effort rationale (providerOptions.ts). 🤖 feat: add native Kimi K3 support via a new Moonshot AI provider #3737 (native Kimi K3 via a new Moonshot AI provider) added the isKimiK3Model predicate, whose docstring is the authoritative statement that K3 always reasons and supports only the max reasoning effort and that the provider-options branches key off it. Both the Moonshot and OpenRouter branches of buildProviderOptions then restated that same lead sentence verbatim, so the duplicated sentence was trimmed from each while keeping only the branch-specific "send it explicitly" rationale (Moonshot: don't rely on the API default; OpenRouter: enabled: true alone falls back to the unsupported default medium effort). Comment-only; behavior-preserving.

This run

Considered origin/main from the previous checkpoint 4c1fa27cd through d6886e93b (HEAD), covering the one new commit merged since the last run:

• feat: add native Kimi K3 support via a new Moonshot AI provider (🤖 feat: add native Kimi K3 support via a new Moonshot AI provider #3737, d6886e93b)

• Cleanup 🤖 Improve plan tool description for better quality plans #25 taken (see above). 🤖 feat: add native Kimi K3 support via a new Moonshot AI provider #3737 introduced isKimiK3Model, whose docstring already carries K3's fixed "max" reasoning-effort rationale; the two buildProviderOptions branches restated that lead sentence verbatim, so it was trimmed from each while their distinct "send it explicitly" notes were preserved.

• The remainder of 🤖 feat: add native Kimi K3 support via a new Moonshot AI provider #3737 was additive provider wiring (a new moonshotai direct provider, config schema, MOONSHOT_API_KEY env var, icon, registry/metadata entries, and OpenRouter routing) with no byte-identical code duplication that a safe local extraction would remove.

• Checkpoint advanced to d6886e93b.

Validation

• Rebased cleanly onto origin/main (d6886e93b); all prior cleanups replayed without conflict and the branch merges cleanly into main.
• make static-check passes fully — ESLint, both TypeScript configs, Prettier, shell formatting (shfmt), Python formatting (ruff), shellcheck, hadolint, generated-file/doc-sync checks, and code-to-docs link checks.

Risks

Very low. Cleanup #25 is comment-only: it trims a duplicated rationale sentence from two comment blocks in buildProviderOptions, changing no code, control flow, or provider-options payloads. The authoritative rationale still lives in the isKimiK3Model docstring.

Auto-cleanup checkpoint: d6886e9

---

Generated with mux • Model: anthropic:claude-opus-4-8 • Thinking: xhigh • Cost: $0.00

[mux-bot]

@codex review

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

⚠️ Auto-fixup: CI failure appears to be infrastructure/flaky, not caused by this cleanup commit — no code pushed.

Root cause: The Static Checks job failed with the runner annotation "The self-hosted runner lost communication with the server" after running the full 10m, and its log blob was never uploaded (BlobNotFound). Test / Integration was cancelled and Required failure are both downstream of that (Required only aggregates results).

Verification: Ran make static-check locally on this PR's HEAD (a2454d31b). ESLint, both TypeScript configs (tsgo --noEmit ×2), and Prettier all pass. The only local miss is fmt-shell-check because shfmt isn't installed in the fixup sandbox — and this PR changes no shell files, so it's irrelevant.

Recommendation: Re-run the failed CI jobs. No code change needed.

[mux-bot]

@codex review

Latest push rebases onto origin/main (through #3698) and adds one low-risk, behavior-preserving cleanup: extract the duplicated per-scope "memory scope is full" cap check in MemoryService.create / saveFile into a private assertScopeHasRoom(store, scope) helper. No control flow, thresholds, error types, or events change. make static-check (ESLint + both tsconfigs + Prettier) and bun test memoryService.test.ts (75/0) pass locally.

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

New in this run: cleanup #3 — deduped the identical blockquote line-prefixing (> per line, joined by newlines) in buildBashMonitorWakePrompt into a module-level blockquoteLines(lines) helper. Behavior-preserving; validated by the existing buildBashMonitorWakePrompt output-format tests (21/21 pass).

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

Added auto-cleanup #5: getCodexOauthContextLimit now reuses the already-resolved, non-null compatibilityModelId with the isCodexOauthAllowedModelId / isCodexOauthRequiredModelId variants instead of re-invoking isCodexOauthAllowedModel / isCodexOauthRequiredModel (which re-derive the same id and re-scan providersConfig). Behavior-preserving; targeted tests + make static-check (minus sandbox-only shfmt) pass.

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

Added cleanup #6: extracted a module-private getAnthropicCacheCreateTokens(metadata) helper in usageHelpers.ts to dedupe two byte-identical Anthropic cache-create token reads inside accumulateProviderMetadata. Behavior-preserving; rebased onto latest main (checkpoint ec47caf).

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

Added cleanup #7: deduped the byte-identical QueueClearCallbacks projection in MessageQueue.getClearCallbacks and removeWorkspaceTurn into a private entryClearCallbacks(entry) helper (behavior-preserving). Rebased onto latest main and advanced the checkpoint to 956ac533e.

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

This run adds one behavior-preserving cleanup (#8 in the branch list): dedupes the two identical openai-origin model checks in openaiExplicitPromptCachingAvailable (cacheStrategy.ts, introduced by #3712) into a module-private isOpenAIOriginModel(canonical) helper. The destructured origin/modelName locals were unused past their guard. Rebased onto origin/main (48722b9); make static-check passes (except fmt-shell-check, which needs shfmt unavailable in this env) and the cacheStrategy/providerOptions test suites pass (173).

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

New auto-cleanup change on this run: extracted a private someDescendantAgentTaskWorkspace(workspaceId, predicate) helper in taskService.ts that dedupes the byte-identical index-building boilerplate shared by the two sticky-descendant query methods added in #3744 (hasStickyDescendants / hasUnarchivedStickyDescendants). Behavior-preserving; the two methods now just supply their .some() predicate. Checkpoint advanced to 4c1fa27cd.

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.

[mux-bot]

@codex review

[chatgpt-codex-connector]

To use Codex here, create a Codex account and connect to github.