From 6926c77715826541fb0bfa1c2bccda5de0a6837a Mon Sep 17 00:00:00 2001
From: Mark DeLaVergne <mdelavergne@salesforce.com>
Date: Thu, 4 Jun 2026 10:50:45 -0400
Subject: [PATCH] Revert --use-in-feature override

---
 src/base/deployBase.ts                        |  5 +-
 .../data-code-extension/function/deploy.ts    |  5 --
 src/utils/datacodeBinaryExecutor.ts           |  7 +--
 .../data-code-extension/deploy.test.ts        | 53 -------------------
 4 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/src/base/deployBase.ts b/src/base/deployBase.ts
index 66ff67f..da46608 100644
--- a/src/base/deployBase.ts
+++ b/src/base/deployBase.ts
@@ -30,7 +30,6 @@ export type BaseDeployFlags = {
   'target-org': Org;
   'cpu-size': string;
   network?: string;
-  'use-in-feature'?: string;
 };
 
 export type DeployResult = SharedResultProps & {
@@ -130,7 +129,6 @@ export abstract class DeployBase<TFlags extends BaseDeployFlags = BaseDeployFlag
     const targetOrg = flags['target-org'];
     const cpuSize = flags['cpu-size'] || 'CPU_2XL';
     const network = flags.network;
-    const useInFeature = flags['use-in-feature'];
 
     if (packageDir.length === 0) {
       throw new SfError(messages.getMessage('error.flagEmpty', ['package-dir']), 'InvalidFlagValue');
@@ -160,8 +158,7 @@ export abstract class DeployBase<TFlags extends BaseDeployFlags = BaseDeployFlag
         packageDir,
         orgUsername,
         cpuSize,
-        network,
-        useInFeature
+        network
       );
 
       this.log(cmdMessages.getMessage('info.deploymentComplete', [name, version]));
diff --git a/src/commands/data-code-extension/function/deploy.ts b/src/commands/data-code-extension/function/deploy.ts
index c93261d..eac365a 100644
--- a/src/commands/data-code-extension/function/deploy.ts
+++ b/src/commands/data-code-extension/function/deploy.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Messages } from '@salesforce/core';
-import { Flags } from '@salesforce/sf-plugins-core';
 import { DeployBase } from '../../../base/deployBase.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -29,10 +28,6 @@ export default class Deploy extends DeployBase {
 
   public static readonly flags = {
     ...DeployBase.flags,
-    'use-in-feature': Flags.string({
-      summary: 'Feature where this function will be used.',
-      default: 'SearchIndexChunking',
-    }),
   };
 
   // eslint-disable-next-line class-methods-use-this
diff --git a/src/utils/datacodeBinaryExecutor.ts b/src/utils/datacodeBinaryExecutor.ts
index 01468a3..154d949 100644
--- a/src/utils/datacodeBinaryExecutor.ts
+++ b/src/utils/datacodeBinaryExecutor.ts
@@ -105,8 +105,7 @@ export class DatacodeBinaryExecutor {
     packageDir: string,
     targetOrg: string,
     cpuSize: string,
-    network?: string,
-    useInFeature?: string
+    network?: string
   ): Promise<DatacodeDeployExecutionResult> {
     // Build args array for spawn (avoids shell-escaping issues and enables streaming)
     const args = [
@@ -129,10 +128,6 @@ export class DatacodeBinaryExecutor {
       args.push('--network', network);
     }
 
-    if (useInFeature) {
-      args.push('--use-in-feature', useInFeature);
-    }
-
     return new Promise((resolve, reject) => {
       debug('deploy spawn: datacustomcode %o', args);
       const child = spawn('datacustomcode', args, {
diff --git a/test/commands/data-code-extension/deploy.test.ts b/test/commands/data-code-extension/deploy.test.ts
index bb4b5e3..2c270a4 100644
--- a/test/commands/data-code-extension/deploy.test.ts
+++ b/test/commands/data-code-extension/deploy.test.ts
@@ -232,59 +232,6 @@ describe('data-code-extension deploy', () => {
       expect(binaryDeployStub.firstCall.args[0]).to.equal('test-function');
     });
 
-    it('should pass default use-in-feature to binary', async () => {
-      await FunctionDeploy.run([
-        '--name',
-        'test-function',
-        '--package-version',
-        '1.0.0',
-        '--description',
-        'Test function deployment',
-        '--package-dir',
-        testDir,
-        '--target-org',
-        'test@example.com',
-      ]);
-
-      expect(binaryDeployStub.firstCall.args[7]).to.equal('SearchIndexChunking');
-    });
-
-    it('should pass explicit use-in-feature to binary', async () => {
-      await FunctionDeploy.run([
-        '--name',
-        'test-function',
-        '--package-version',
-        '1.0.0',
-        '--description',
-        'Test function deployment',
-        '--package-dir',
-        testDir,
-        '--target-org',
-        'test@example.com',
-        '--use-in-feature',
-        'CustomFeature',
-      ]);
-
-      expect(binaryDeployStub.firstCall.args[7]).to.equal('CustomFeature');
-    });
-
-    it('should not pass use-in-feature for script deploy', async () => {
-      await ScriptDeploy.run([
-        '--name',
-        'test-script',
-        '--package-version',
-        '1.0.0',
-        '--description',
-        'Test script deployment',
-        '--package-dir',
-        testDir,
-        '--target-org',
-        'test@example.com',
-      ]);
-
-      expect(binaryDeployStub.firstCall.args[7]).to.be.undefined;
-    });
-
     it('should validate CPU size options', async () => {
       try {
         await FunctionDeploy.run([