Skip to content

Commit 8beff11

Browse files
Merge pull request #1432 from corbitsdev/cl-10671-dead-code-no-op-flag-shim-unread-settings-stub-dead
chore: delete five verified-dead artifacts
2 parents efc3596 + b8ec985 commit 8beff11

10 files changed

Lines changed: 9 additions & 73 deletions

File tree

‎bun.lock‎

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/config.test.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,12 +1744,10 @@ describe("buildProviderCatalog", () => {
17441744
web: "exa",
17451745
hiddenCommands: ["help"],
17461746
onboarded: true,
1747-
compactionMode: "pruning",
17481747
sessionMode: "orchestrator",
17491748
agentModelFallback: "none",
17501749
shell: { timeoutMs: 30_000, maxTimeoutMs: 120_000 },
17511750
tools: { timeoutMs: 60_000 },
1752-
workflowProfiles: { fast: { implement: "fp-large" } },
17531751
};
17541752
const settings = providerCatalogToSettings(
17551753
[

‎src/config/index.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -659,8 +659,6 @@ export interface Config {
659659
*/
660660
modelOverride?: boolean;
661661

662-
// Deprecated no-op retained for CLI compatibility.
663-
noWorkflow: boolean;
664662
/**
665663
* Runtime settings view for provider resolution, including OAuth
666664
* projections never written to settings.json. Not for saveGlobalSettings —
@@ -884,7 +882,6 @@ export async function loadConfig(
884882
let provider: string | undefined;
885883
let model: string | undefined;
886884
let profileFlag: string | undefined;
887-
let noWorkflow = false;
888885
const positional: string[] = [];
889886

890887
const requireValue = (flag: string, value: string | undefined): string => {
@@ -946,10 +943,6 @@ export async function loadConfig(
946943
auto = false;
947944
continue;
948945
}
949-
if (arg === "--no-workflow") {
950-
noWorkflow = true;
951-
continue;
952-
}
953946
if (arg === "-p") {
954947
command = "exec";
955948
continue;
@@ -1213,7 +1206,6 @@ export async function loadConfig(
12131206
...(director !== undefined ? { director } : {}),
12141207
globalSettingsPath: effectiveSettingsPath,
12151208
sessionId,
1216-
noWorkflow,
12171209
...(resumeMode !== undefined
12181210
? {
12191211
resumeMode,

‎src/config/settings.test.ts‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -202,21 +202,6 @@ test("loadConfig --no-auto disables auto mode", async () => {
202202
});
203203
});
204204

205-
test("loadConfig --no-workflow remains a recognized flag", async () => {
206-
await withSettings(async ({ cwd, globalSettingsPath }) => {
207-
const { impl } = offlineFetch();
208-
const config = await loadConfig(
209-
["--cwd", cwd, "--no-workflow", "do something"],
210-
{
211-
globalSettingsPath,
212-
pricing: { fetchImpl: impl },
213-
},
214-
);
215-
expect(config.configured).toBe(true);
216-
if (config.configured) expect(config.noWorkflow).toBe(true);
217-
});
218-
});
219-
220205
test("loadConfig uses the injected pricing fetchImpl instead of the network", async () => {
221206
await withSettings(async ({ cwd, globalSettingsPath }) => {
222207
resetPricingMetadataRefreshForTests();
@@ -419,7 +404,6 @@ test("loadSettings cannot silently drop a known optional key", async () => {
419404
defaultProvider: "p",
420405
mcpServers: [{ name: "s", command: "echo" }],
421406
tiers: { fast: { provider: "p", model: "m" } },
422-
workflowProfiles: { default: { implement: "m" } },
423407
plugins: { "plug-a": { enabled: true } },
424408
pluginPaths: ["/tmp/plugin"],
425409
hooks: { "/tmp/hook.ts": { enabled: false } },
@@ -428,7 +412,6 @@ test("loadSettings cannot silently drop a known optional key", async () => {
428412
hiddenCommands: ["/help"],
429413
onboarded: true,
430414
lastChangelogVersion: "0.1.0",
431-
compactionMode: "pruning" as const,
432415
subagentMaxTurns: 20,
433416
sessionMode: "orchestrator" as const,
434417
agentModelFallback: "none" as const,

‎src/config/settings.ts‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ export interface Settings {
8181
defaultProvider?: string;
8282
providers: Record<string, ProviderSettings>;
8383
mcpServers?: MCPServerSettingsEntry[];
84-
// Per-phase model overrides keyed by profile name, then workflow step
85-
// profile key; a step's `profile` selects the entry.
86-
workflowProfiles?: Record<string, Record<string, string>>;
8784
// Per-plugin config keyed by plugin id: enabled flag plus manifest-declared
8885
// credentials (e.g. an Exa API key). Global-only because it carries secrets;
8986
// the /plugins UI writes it.
@@ -111,9 +108,6 @@ export interface Settings {
111108
// Last package version whose release notes were shown (or stamped on first
112109
// interactive install).
113110
lastChangelogVersion?: string;
114-
// Deprecated: compaction is always the evidence-backed LLM handoff now.
115-
// Legacy values still load but are ignored; new writes omit this field.
116-
compactionMode?: "llm" | "pruning";
117111
// Deprecated: orchestrator is the only product path. Legacy values still
118112
// load but are ignored.
119113
sessionMode?: SessionMode;
@@ -656,7 +650,6 @@ const SettingsSchema = type({
656650
// Model tiers were removed; older files may still carry this key. Accepted
657651
// and ignored so the file loads, then dropped on next save.
658652
"tiers?": "unknown",
659-
"workflowProfiles?": type({ "[string]": type({ "[string]": "string" }) }),
660653
"plugins?": type({
661654
"[string]": type({
662655
"enabled?": "boolean",
@@ -671,7 +664,6 @@ const SettingsSchema = type({
671664
"hiddenCommands?": "string[]",
672665
"onboarded?": "boolean",
673666
"lastChangelogVersion?": "string",
674-
"compactionMode?": "'llm' | 'pruning'",
675667
// Legacy disk values still load; product resolve ignores them.
676668
"sessionMode?": "'single' | 'orchestrator'",
677669

@@ -891,7 +883,6 @@ type OptionalLocalSettingsFields = {
891883
export const GLOBAL_SETTINGS_OPTIONAL_KEYS = [
892884
"defaultProvider",
893885
"mcpServers",
894-
"workflowProfiles",
895886
"plugins",
896887
"pluginPaths",
897888
"hooks",
@@ -900,7 +891,6 @@ export const GLOBAL_SETTINGS_OPTIONAL_KEYS = [
900891
"hiddenCommands",
901892
"onboarded",
902893
"lastChangelogVersion",
903-
"compactionMode",
904894
"sessionMode",
905895
"agentModelFallback",
906896
"shell",
@@ -1089,9 +1079,6 @@ function normalizeParsedSettings(path: string, parsed: unknown): Settings {
10891079
s.mcpServers !== undefined
10901080
? normalizeMcpServers(s.mcpServers)
10911081
: undefined,
1092-
workflowProfiles: s.workflowProfiles as
1093-
| Settings["workflowProfiles"]
1094-
| undefined,
10951082
plugins: s.plugins as Settings["plugins"] | undefined,
10961083
pluginPaths: s.pluginPaths as string[] | undefined,
10971084
hooks: s.hooks as Settings["hooks"] | undefined,
@@ -1104,10 +1091,6 @@ function normalizeParsedSettings(path: string, parsed: unknown): Settings {
11041091
s.lastChangelogVersion.trim().length > 0
11051092
? s.lastChangelogVersion.trim()
11061093
: undefined,
1107-
compactionMode:
1108-
s.compactionMode === "llm" || s.compactionMode === "pruning"
1109-
? s.compactionMode
1110-
: undefined,
11111094
// Drop legacy "single"; keep only explicit orchestrator if present.
11121095
sessionMode: s.sessionMode === "orchestrator" ? "orchestrator" : undefined,
11131096
agentModelFallback:

‎src/session/assemble-runtime.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -551,9 +551,10 @@ export interface ChatAgentWiring {
551551
getSources: () => InferenceSource[];
552552
getDefaultSource: () => string;
553553
/**
554-
* Read at each build so a compaction-mode toggle is visible on rebuild.
555-
* assemble passes the completeness gate as `wrapPruning` so fold-commit
556-
* side effects (stub notice, onFolded prune) run only after a fold lands.
554+
* Read at each build so operator-side compaction changes are visible on
555+
* rebuild. assemble passes the completeness gate as `wrapPruning` so
556+
* fold-commit side effects (stub notice, onFolded prune) run only after a
557+
* fold lands.
557558
*/
558559
getCompactor: (wrapPruning?: (pruning: Compactor) => Compactor) => Compactor;
559560
/**

‎src/subagent/index.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ describe("sub-agent stop helpers", () => {
347347
evaluateSubAgentStop({
348348
hasToolCalls: false,
349349
lastAssistantText: SUMMARY_ONLY_NARRATION,
350-
incompleteReportNudgeFired: true,
350+
// The nudge bumps the cycle count (nudge-director wraps up here).
351+
toolLessNarrationCycles: 2,
351352
}),
352353
).toBe("incomplete-report-stop");
353354
});
@@ -362,13 +363,12 @@ describe("sub-agent stop helpers", () => {
362363
).toBe("stop");
363364
});
364365

365-
test("evaluateSubAgentStop spiral uses toolLessNarrationCycles over the deprecated flag", () => {
366+
test("evaluateSubAgentStop nudges once on the first tool-less turn, then stops at the cap", () => {
366367
expect(
367368
evaluateSubAgentStop({
368369
hasToolCalls: false,
369370
lastAssistantText: SUMMARY_ONLY_NARRATION,
370371
toolLessNarrationCycles: 1,
371-
incompleteReportNudgeFired: true,
372372
}),
373373
).toBe("incomplete-report");
374374
expect(

‎src/subagent/stop-policy.ts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,10 @@ export function evaluateSubAgentStop(input: {
105105
thrashState?: ThrashState;
106106
/** Final assistant text; missing envelope nudges once then salvages. */
107107
lastAssistantText: string;
108-
/** 1-based tool-less turn count; falls back to `incompleteReportNudgeFired` when omitted. */
108+
/** 1-based tool-less turn count; start at 1 for the first completed tool-less turn. */
109109
toolLessNarrationCycles?: number;
110-
/**
111-
* @deprecated Prefer `toolLessNarrationCycles`. True after the one-shot
112-
* incomplete-report wrap-up nudge has been injected.
113-
*/
114-
incompleteReportNudgeFired?: boolean;
115110
}): SubAgentStopReason | null {
116-
const spiralCycles =
117-
input.toolLessNarrationCycles ??
118-
(input.incompleteReportNudgeFired === true ? 2 : 1);
111+
const spiralCycles = input.toolLessNarrationCycles ?? 1;
119112
const spiralStop = (): SubAgentStopReason =>
120113
evaluateToolLessNarrationSpiral(spiralCycles) === "stop"
121114
? "incomplete-report-stop"

‎src/tui/session-start.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ function launchConfig(overrides: Partial<Config> = {}): Config {
138138
providers: [],
139139
mcpServerEntries: [],
140140
sessionId: "launch-session",
141-
noWorkflow: false,
142141
...overrides,
143142
} as Config;
144143
}

‎workflows/_stub/package.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)