fix: remove stale code re-introduced during rebase

Remove syncPlanModeTools(), getExperimentalZedIntegration(), and all
zedIntegration references that were re-introduced by conflict resolution
but had already been deleted on main. Fix stale doc path in package.json
lint-staged config.
This commit is contained in:
Jerop Kipruto
2026-03-05 21:12:34 -05:00
parent 4663dff8e2
commit fd3632c007
11 changed files with 2 additions and 252 deletions
-2
View File
@@ -2473,7 +2473,6 @@ describe('FeatureGate Integration', () => {
extensionManagement: true,
plan: true,
enableAgents: true,
zedIntegration: true,
},
});
@@ -2482,7 +2481,6 @@ describe('FeatureGate Integration', () => {
expect(config.getExtensionManagement()).toBe(true);
expect(config.isPlanEnabled()).toBe(true);
expect(config.isAgentsEnabled()).toBe(true);
expect(config.getExperimentalZedIntegration()).toBe(true);
});
});
+1 -46
View File
@@ -733,8 +733,6 @@ export class Config implements McpContext {
private readonly useBackgroundColor: boolean;
private readonly useAlternateBuffer: boolean;
private shellExecutionConfig: ShellExecutionConfig;
private readonly extensionManagement: boolean = true;
private readonly enablePromptCompletion: boolean = false;
private readonly truncateToolOutputThreshold: number;
private compressionTruncationCounter = 0;
private initialized = false;
@@ -788,7 +786,6 @@ export class Config implements McpContext {
overageStrategy: OverageStrategy;
};
private readonly enableAgents: boolean;
private agents: AgentSettings;
private readonly enableEventDrivenScheduler: boolean;
private readonly skillsSupport: boolean;
@@ -913,7 +910,6 @@ export class Config implements McpContext {
extensionManagement: params.extensionManagement,
plan: params.plan,
jitContext: params.experimentalJitContext,
zedIntegration: params.experimentalZedIntegration,
};
for (const [key, value] of Object.entries(legacyMap)) {
if (value !== undefined && params.features?.[key] === undefined) {
@@ -931,7 +927,6 @@ export class Config implements McpContext {
this.featureGate = gate;
this.modelAvailabilityService = new ModelAvailabilityService();
this.experimentalJitContext = params.experimentalJitContext ?? false;
this.modelSteering = params.modelSteering ?? false;
this.userHintService = new UserHintService(() =>
this.isModelSteeringEnabled(),
@@ -1215,7 +1210,7 @@ export class Config implements McpContext {
}
});
if (!this.interactive || this.acpMode || this.getExperimentalZedIntegration()) {
if (!this.interactive || this.acpMode) {
await this.mcpInitializationPromise;
}
@@ -2092,42 +2087,6 @@ export class Config implements McpContext {
}
}
/**
* Synchronizes enter/exit plan mode tools based on current mode.
*/
syncPlanModeTools(): void {
const isPlanMode = this.getApprovalMode() === ApprovalMode.PLAN;
const registry = this.getToolRegistry();
if (isPlanMode) {
if (registry.getTool(ENTER_PLAN_MODE_TOOL_NAME)) {
registry.unregisterTool(ENTER_PLAN_MODE_TOOL_NAME);
}
if (!registry.getTool(EXIT_PLAN_MODE_TOOL_NAME)) {
registry.registerTool(new ExitPlanModeTool(this, this.messageBus));
}
} else {
if (registry.getTool(EXIT_PLAN_MODE_TOOL_NAME)) {
registry.unregisterTool(EXIT_PLAN_MODE_TOOL_NAME);
}
if (this.isPlanEnabled()) {
if (!registry.getTool(ENTER_PLAN_MODE_TOOL_NAME)) {
registry.registerTool(new EnterPlanModeTool(this, this.messageBus));
}
} else {
if (registry.getTool(ENTER_PLAN_MODE_TOOL_NAME)) {
registry.unregisterTool(ENTER_PLAN_MODE_TOOL_NAME);
}
}
}
if (this.geminiClient?.isInitialized()) {
this.geminiClient.setTools().catch((err) => {
debugLogger.error('Failed to update tools', err);
});
}
}
/**
* Logs the duration of the current approval mode.
*/
@@ -2334,10 +2293,6 @@ export class Config implements McpContext {
}
}
getExperimentalZedIntegration(): boolean {
return this.isFeatureEnabled('zedIntegration');
}
getListExtensions(): boolean {
return this.listExtensions;
}
-7
View File
@@ -311,13 +311,6 @@ export const FeatureDefinitions: Record<string, FeatureSpec[]> = {
description: 'Enable planning features (Plan Mode and tools).',
},
],
zedIntegration: [
{
preRelease: FeatureStage.Alpha,
since: '0.30.0',
description: 'Enable Zed integration.',
},
],
};
// Register core features