feat(metadata): move Apex trigger creation to metadata extension W-21671104

.claude/skills/services-extension-consumption/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: services-extension-consumption
-description: Guidelines for consuming salesforcedx-vscode-services extension API. Use when working with extensions that have extensionDependency on salesforcedx-vscode-services, registering commands, using Workspace/Connection/Project/Settings/FS/Channel/Media services, or implementing file/config watchers.
+description: Guidelines for consuming salesforcedx-vscode-services extension API. Use when working with extensions that have extensionDependency on salesforcedx-vscode-services, registering commands, using Workspace/Connection/Project/Settings/FS/Channel/Media services, quickpick/quickInput, or implementing file/config watchers.
 ---
 
 # Consuming salesforcedx-vscode-services
@@ -87,14 +87,19 @@ export const activate = async (context: vscode.ExtensionContext): Promise<void>
 
 ## Registering Commands
 
-Use `registerCommandWithLayer` pre-loaded with AllServicesLayer:
+Use `registerCommandWithLayer` (for layers) or `registerCommandWithRuntime` (for runtimes):
 
 ```typescript
 import { myCommandEffect } from './commands/myCommand';
 
 const api = yield * (yield * ExtensionProviderService).getServicesApi;
+
+// Using Layer
 const registerCommand = api.services.registerCommandWithLayer(AllServicesLayer);
+yield * registerCommand('sf.my.command', myCommandEffect);
 
+// Using Runtime
+const registerCommand = api.services.registerCommandWithRuntime(getRuntime());
 yield * registerCommand('sf.my.command', myCommandEffect);
 ```
 
@@ -103,6 +108,7 @@ Commands auto:
 - Register with ExtensionContext subscriptions
 - Wrap with error handling
 - Trace with observability spans
+- Handle Cancellation
 
 ## Basic Services
 
@@ -116,6 +122,7 @@ Accessor pattern: call methods directly, don't assign to variable first.
 - [SettingsService](references/settings-service.md) - Settings read/write
 - [FsService](references/fs-service.md) - File ops (web-compatible) and uri/path conversion
 - [EditorService](references/editor-service.md) - Active editor changes and current URI
+- [Prompts](references/prompts.md) - QuickPick, InputBox, and UserCancellationError handling
 
 ## Watchers
 

.claude/skills/services-extension-consumption/references/prompts.md

@@ -0,0 +1,102 @@
+# VS Code Prompts
+
+Best practices for `quickPick` and `quickInput` in Effect-TS.
+
+## PromptService
+
+### `considerUndefinedAsCancellation`
+
+Converts `undefined` (Esc) or empty strings to `UserCancellationError`.
+
+```typescript
+const choice =
+  yield *
+  Effect.promise(() => vscode.window.showQuickPick(['a', 'b'])).pipe(
+    Effect.flatMap(promptService.considerUndefinedAsCancellation)
+  );
+```
+
+### `ensureMetadataOverwriteOrThrow`
+
+Checks file existence; prompts for overwrite. Fails with `UserCancellationError` on cancel.
+
+```typescript
+yield * promptService.ensureMetadataOverwriteOrThrow({ uris });
+```
+
+## Handling Cancellations
+
+### `UserCancellationError`
+
+`Schema.TaggedError` for silent exits.
+
+- **Silent**: `registerCommandWithLayer/Runtime` catch this and return `Effect.void` (no UI error).
+- **Messages**: Only set `message` for trace/log details.
+
+```typescript
+// Silent exit
+return yield * new UserCancellationError();
+
+// Exit with log context
+return yield * new UserCancellationError({ message: 'User cancelled overwrite' });
+```
+
+## Pattern: Wrapping Promises
+
+Always wrap VS Code prompt promises in `Effect.promise`.
+
+```typescript
+const promptForTemplate = Effect.fn('promptForTemplate')(function* () {
+  const api = yield* (yield* ExtensionProviderService).getServicesApi;
+  const promptService = yield* api.services.PromptService;
+
+  return yield* Effect.promise(() =>
+    vscode.window.showQuickPick(
+      [
+        { label: 'DefaultApexClass', description: '...' },
+        { label: 'ApexException', description: '...' }
+      ],
+      { placeHolder: 'Select template' }
+    )
+  ).pipe(
+    Effect.flatMap(promptService.considerUndefinedAsCancellation),
+    Effect.map(choice => choice.label)
+  );
+});
+```
+
+## Template Helpers
+
+Use `sfTemplateProjectHelpers.ts` for metadata generation.
+
+### `promptForApexTypeName`
+
+Validates Apex names.
+
+```typescript
+const className =
+  yield *
+  promptForApexTypeName({
+    prompt: nls.localize('apex_class_name_prompt')
+  });
+```
+
+- prompt text uses `apex_class_name_prompt`
+- built-in validation strings: `apex_name_empty_error`, `apex_name_format_error`, `apex_class_name_max_length_error`, `apex_name_cannot_be_default`
+- supply `messages` with localized overrides if you need custom copy or translations
+
+### `promptForOutputDir`
+
+Selects metadata package folder (apex classes/triggers, etc.).
+
+```typescript
+const outputDirUri = yield * promptForOutputDir(project, 'classes', 'Select output directory');
+```
+
+### `getApiVersion`
+
+Waterfall: `sfdx-project.json` → connection → fallback.
+
+```typescript
+const apiVersion = yield * getApiVersion(project);
+```

.cursor/hooks.json

@@ -7,6 +7,7 @@
         "matcher": "git.*--no-verify"
       }
     ],
-    "stop": [{ "command": ".cursor/hooks/verify-stop.sh" }]
+    "stop": [{ "command": ".cursor/hooks/verify-stop.sh" }],
+    "afterFileEdit": [{ "command": ".cursor/hooks/mark-edit.sh" }]
   }
 }

.cursor/hooks/mark-edit.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# afterFileEdit hook: mark that an edit occurred in this session.
+# We use CURSOR_TRACE_ID to distinguish sessions.
+
+if [ -n "$CURSOR_TRACE_ID" ]; then
+  touch "/tmp/cursor_edit_${CURSOR_TRACE_ID}"
+  echo "[afterFileEdit] marked session ${CURSOR_TRACE_ID} as dirty" >&2
+fi
+exit 0

.cursor/hooks/verify-stop.sh

@@ -26,6 +26,19 @@ run_step() {
   out=$(eval "$cmd" 2>&1) || fail "$step" "$out"
 }
 
+# Check if this agent session made any changes.
+# We use CURSOR_TRACE_ID to track the session and a temporary file to mark if an edit occurred.
+SESSION_MARKER="/tmp/cursor_edit_${CURSOR_TRACE_ID:-default}"
+
+if [ ! -f "$SESSION_MARKER" ]; then
+  echo "[verify-stop] no edits in this session, skipping verification" >&2
+  exit 0
+fi
+
+echo "[verify-stop] edits detected in session, running verification" >&2
+# Clean up marker for next run
+rm -f "$SESSION_MARKER"
+
 run_step "compile" "npm run compile" && echo "[verify-stop] compile ok" >&2
 run_step "lint" "npm run lint" && echo "[verify-stop] lint ok" >&2
 

docs/Build.md

@@ -34,7 +34,7 @@ When you add a dependency, run the bundling process to make sure that your dep i
 
 **Web:** [esbuild-plugin-copy](https://www.npmjs.com/package/esbuild-plugin-copy) for static assets; `globbyOptions: { dot: true }` when copying templates with dot files.
 
-**Web:** Manifest for extension assets — `vscode.workspace.fs.readDirectory` not supported on HTTPS extension URIs. Build-time manifest (e.g. services `generateTemplatesManifest`) + runtime `readFile` per path. See [templateService.ts](../packages/salesforcedx-vscode-services/src/core/templateService.ts).
+**Web:** Manifest for extension assets — `vscode.workspace.fs.readDirectory` not supported on HTTPS extension URIs. Build-time manifest (e.g. services `generateTemplatesManifest`) + runtime `readFile` per path. Services template hydration runs once (`Effect.once`); templates root is memoized (`Effect.cached`). See [templateService.ts](../packages/salesforcedx-vscode-services/src/core/templateService.ts).
 
 **ESBUILD_PLATFORM:** Bundle-time define (web.mjs injects `'web'` or `'node'`). Not a runtime check — value baked in at bundle; dead branches tree-shaken. Examples: [connectionService](../packages/salesforcedx-vscode-services/src/core/connectionService.ts), [templateService](../packages/salesforcedx-vscode-services/src/core/templateService.ts), [soql LSP client](../packages/salesforcedx-vscode-soql/src/lspClient/client.ts).
 

packages/salesforcedx-vscode-apex-log/src/commands/createAnonymousApexScript.ts

@@ -7,13 +7,15 @@
 
 import { ExtensionProviderService } from '@salesforce/effect-ext-utils';
 import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
 import * as vscode from 'vscode';
 import { Utils } from 'vscode-uri';
 import { nls } from '../messages';
 
 const promptForScriptName = Effect.fn('promptForScriptName')(function* () {
-  const name = yield* Effect.promise(() =>
+  const api = yield* (yield* ExtensionProviderService).getServicesApi;
+  const promptService = yield* api.services.PromptService;
+
+  return yield* Effect.promise(() =>
     vscode.window.showInputBox({
       prompt: nls.localize('create_script_name_prompt'),
       validateInput: (value: string) => {
@@ -23,59 +25,25 @@ const promptForScriptName = Effect.fn('promptForScriptName')(function* () {
         return undefined;
       }
     })
+  ).pipe(
+    Effect.map(raw => raw?.trim()),
+    Effect.flatMap(promptService.considerUndefinedAsCancellation)
   );
-  return name?.trim() ? Option.some(name.trim()) : Option.none();
-});
-
-const CUSTOM_DIR_LABEL = `$(file-directory) ${nls.localize('create_script_custom_output_directory')}`;
-
-const promptForOutputDir = Effect.fn('promptForOutputDir')(function* () {
-  const api = yield* (yield* ExtensionProviderService).getServicesApi;
-  const promptService = yield* api.services.PromptService;
-  const workspaceInfo = yield* api.services.WorkspaceService.getWorkspaceInfoOrThrow();
-
-  const defaultUri = Utils.joinPath(workspaceInfo.uri, 'scripts', 'apex');
-
-  const selected = yield* Effect.promise(() =>
-    vscode.window.showQuickPick(
-      [
-        { label: defaultUri.fsPath, description: nls.localize('create_script_output_dir_default_description'), uri: defaultUri },
-        { label: CUSTOM_DIR_LABEL, description: undefined, uri: undefined }
-      ],
-      {
-        placeHolder: nls.localize('create_script_output_dir_prompt'),
-        matchOnDescription: true
-      }
-    )
-  ).pipe(Effect.flatMap(choice => promptService.considerUndefinedAsCancellation(choice)));
-
-  if (selected.label === CUSTOM_DIR_LABEL) {
-    const folders = yield* Effect.promise(() =>
-      vscode.window.showOpenDialog({
-        canSelectFiles: false,
-        canSelectFolders: true,
-        canSelectMany: false,
-        defaultUri: workspaceInfo.uri,
-        openLabel: 'Select'
-      })
-    );
-    return folders?.[0];
-  }
-
-  return selected.uri;
 });
 
 export const createAnonymousApexScriptCommand = Effect.fn('ApexLog.Command.createAnonymousApexScript')(function* () {
   const api = yield* (yield* ExtensionProviderService).getServicesApi;
   const fsService = yield* api.services.FsService;
   const promptService = yield* api.services.PromptService;
+  const workspaceInfo = yield* api.services.WorkspaceService.getWorkspaceInfoOrThrow();
 
-  const scriptNameOpt = yield* promptForScriptName();
-  if (Option.isNone(scriptNameOpt)) return;
-  const scriptName = scriptNameOpt.value;
+  const scriptName = yield* promptForScriptName();
 
-  const outputDir = yield* promptForOutputDir();
-  if (!outputDir) return;
+  const outputDir = yield* promptService.promptForOutputDir({
+    defaultUri: Utils.joinPath(workspaceInfo.uri, 'scripts', 'apex'),
+    description: nls.localize('create_script_output_dir_default_description'),
+    pickerPlaceHolder: nls.localize('create_script_output_dir_prompt')
+  });
 
   const targetUri = Utils.joinPath(outputDir, `${scriptName}.apex`);
   yield* promptService.ensureMetadataOverwriteOrThrow({ uris: [targetUri] });

packages/salesforcedx-vscode-apex-log/src/messages/i18n.ts

@@ -7,8 +7,7 @@
 
 export const messages = {
   create_script_name_empty_error: 'Script name cannot be empty',
-  create_script_name_format_error:
-    'Name must start with a letter and contain only letters, numbers, and underscores',
+  create_script_name_format_error: 'Name must start with a letter and contain only letters, numbers, and underscores',
   create_script_name_prompt: 'Enter script name',
   log_get_no_logs: 'No Apex debug logs found',
   log_get_pick_log: 'Select an Apex debug log to open',
@@ -50,6 +49,5 @@ export const messages = {
   exec_anon_success: 'Anonymous Apex executed successfully',
   open_log: 'Open Log',
   create_script_output_dir_prompt: 'Select the target directory',
-  create_script_output_dir_default_description: '(default)',
-  create_script_custom_output_directory: 'Choose a Custom Directory'
+  create_script_output_dir_default_description: '(default)'
 } as const;

packages/salesforcedx-vscode-apex-log/test/playwright/specs/executeAnonymous.headless.spec.ts

@@ -55,6 +55,9 @@ test('Execute Anonymous Apex: document, selection, script creation, compile erro
     // Wait for directory QuickPick list rows (InputBox has none; QuickPick has 2 options)
     await quickInput.locator(QUICK_INPUT_LIST_ROW).first().waitFor({ state: 'visible', timeout: 10_000 });
     await page.keyboard.press('Enter');
+    // Wait for directory QuickPick list rows (InputBox has none; QuickPick has 2 options)
+    await quickInput.locator(QUICK_INPUT_LIST_ROW).first().waitFor({ state: 'visible', timeout: 10_000 });
+    await page.keyboard.press('Enter');
     const editor = page.locator(EDITOR_WITH_URI).first();
     await editor.waitFor({ state: 'visible', timeout: 15_000 });
     await expect(page.locator(TAB).filter({ hasText: /\.apex$/ })).toBeVisible({ timeout: 5000 });

packages/salesforcedx-vscode-apex-testing/src/commands/apexGenerateUnitTestClass.ts

@@ -26,26 +26,6 @@ type ApexGenerateUnitTestClassParams = {
   readonly template?: ApexTestTemplate;
 };
 
-const fromProject = Effect.fn('getApiVersion.fromProject')(function* (project: SfProject) {
-  const projectJson = yield* Effect.tryPromise(() => project.retrieveSfProjectJson());
-  return String(projectJson.get<string>('sourceApiVersion'));
-});
-
-const fromConnection = Effect.fn('getApiVersion.fromConnection')(function* () {
-  const connectionService = yield* (yield* (yield* ExtensionProviderService).getServicesApi).services.ConnectionService;
-  const connection = yield* connectionService.getConnection();
-  return connection.version;
-});
-
-const getApiVersion = Effect.fn('getApiVersion')(function* (project: SfProject) {
-  return yield* fromProject(project).pipe(
-    Effect.orElse(() => fromConnection()),
-    Effect.catchAll(err =>
-      Effect.log('Could not determine API version, using default', { error: err }).pipe(Effect.as('65.0'))
-    )
-  );
-});
-
 const promptForOutputDir = Effect.fn('promptForOutputDir')(function* (project: SfProject) {
   const api = yield* (yield* ExtensionProviderService).getServicesApi;
   const promptService = yield* api.services.PromptService;
@@ -121,15 +101,14 @@ export const apexGenerateUnitTestClassCommand = Effect.fn('apexGenerateUnitTestC
   const outputDirUri = params?.outputDir ?? outputDirectory ?? (yield* promptForOutputDir(project));
 
   const workspaceInfo = yield* api.services.WorkspaceService.getWorkspaceInfoOrThrow();
-  const apiVersion = yield* getApiVersion(project);
   const uris = [`${className}.cls`, `${className}.cls-meta.xml`].map(uri => Utils.joinPath(outputDirUri, uri));
   yield* promptService.ensureMetadataOverwriteOrThrow({ uris });
 
   const result = yield* api.services.TemplateService.create({
     cwd: yield* fsService.uriToPath(workspaceInfo.uri),
     templateType: api.services.TemplateType.ApexClass,
     outputdir: outputDirUri,
-    options: { template, classname: className, apiversion: apiVersion }
+    options: { template, classname: className }
   });
   const channelService = yield* api.services.ChannelService;
 

packages/salesforcedx-vscode-core/package.json

@@ -308,10 +308,6 @@
           "command": "sf.internal.lightning.generate.interface",
           "when": "explorerResourceIsFolder && sf:internal_dev"
         },
-        {
-          "command": "sf.apex.generate.trigger",
-          "when": "explorerResourceIsFolder && resourceFilename == triggers && sf:project_opened"
-        },
         {
           "command": "sf.diff",
           "when": "!explorerResourceIsFolder && sf:project_opened && resourceLangId != 'forcesourcemanifest' && sf:has_target_org && sf:show_shared_commands"
@@ -426,10 +422,6 @@
           "command": "sf.rename.lightning.component",
           "when": "false"
         },
-        {
-          "command": "sf.apex.generate.trigger",
-          "when": "sf:project_opened"
-        },
         {
           "command": "sf.retrieve.source.path",
           "when": "false"
@@ -617,10 +609,6 @@
         "command": "sf.project.generate.with.manifest",
         "title": "%project_generate_with_manifest_text%"
       },
-      {
-        "command": "sf.apex.generate.trigger",
-        "title": "%apex_generate_trigger_text%"
-      },
       {
         "command": "sf.retrieve.source.path",
         "title": "%retrieve_this_source_text%"

packages/salesforcedx-vscode-core/package.nls.ja.json

@@ -2,7 +2,6 @@
   "alias_list_text": "SFDX: すべてのエイリアスを一覧表示",
   "analytics_generate_template_text": "SFDX: サンプルの Analytics テンプレートを作成",
   "apex_generate_class_text": "SFDX: Apex クラスを作成",
-  "apex_generate_trigger_text": "SFDX: Apex トリガを作成",
   "config_list_text": "SFDX: すべての設定変数を一覧表示",
   "conflict_detect_open_file": "ファイルを開く",
   "conflict_detect_resolve_view": "Org Differences",