Merge remote-tracking branch 'origin/develop' into wt-7565

Author: mshanemc

.claude/plans/W-23094925.md

@@ -0,0 +1,34 @@
+# W-23094925 — enable unicorn/prefer-promise-with-resolvers
+
+## Context
+- enable `unicorn/prefer-promise-with-resolvers` (error) in `eslint.config.mjs`
+- rule: prefer `Promise.withResolvers()` over extracting `resolve`/`reject` from `new Promise()` executor
+- depends: W-23094922 (must be merged first)
+- 2 violations across repo (verified by adding rule + lint run); rule meta `fixable: 'code'` but autofix declines both (executor has extra statements), so manual rewrite
+- prereq: build `packages/eslint-local-rules` (`npm run compile` there) before lint runs, else config import fails
+
+## Phases
+
+### Phase 1 — fix violations
+- `streamingClient.ts:137-191` `subscribe()`: replace `let subscribeAccept/subscribeReject` + `new Promise<void>(...)` (lines 138-143) with `const { promise: returnPromise, resolve: subscribeAccept, reject: subscribeReject } = Promise.withResolvers<void>();`. drop executor body. resolver usages (148,164,171) + `return returnPromise` (190) unchanged
+- `determineReporters.test.ts:159-165`: replace `let resolveInit` + `new Promise<void>(res => { resolveInit = res; })` with `const { promise, resolve: resolveInit } = Promise.withResolvers<void>();` returned from mock impl; `resolveInit()` at 169
+- files:
+  - `packages/salesforcedx-apex-debugger/src/core/streamingClient.ts`
+  - `packages/salesforcedx-utils-vscode/test/jest/telemetry/reporters/determineReporters.test.ts`
+- commit: `refactor: use Promise.withResolvers - W-23094925`
+
+### Phase 2 — enable rule
+- add `'unicorn/prefer-promise-with-resolvers': 'error'` to unicorn block in `eslint.config.mjs` (alpha order, after `prefer-optional-catch-binding`)
+- files: `eslint.config.mjs`
+- commit: `build: enable unicorn/prefer-promise-with-resolvers - W-23094925`
+
+## Skills
+- typescript
+- verification
+
+## Verification
+- `npm run compile` in `packages/eslint-local-rules` (prereq for lint)
+- `npx eslint packages` — 0 `prefer-promise-with-resolvers` errors
+- typecheck/build `salesforcedx-apex-debugger` — `returnPromise` typed `Promise<void>`
+- jest `determineReporters.test.ts` "in-progress initialization" test passes (concurrent-init behavior)
+- streamingClient `subscribe()`: no direct unit test coverage (test file at `packages/salesforcedx-apex-debugger/test/unit/core/streamingClient.test.ts` only covers setReplayId/getReplayId + headers; subscribe() relies on integration/manual testing). run `npm test -w @salesforce/salesforcedx-apex-debugger` (package exposes `test`, not `test:unit`) — passes. refactor is mechanical/semantically identical; typecheck confirms `returnPromise` typed `Promise<void>`

.claude/plans/W-23094927.md

@@ -0,0 +1,30 @@
+# W-23094927 — enable unicorn/prefer-while-loop-condition
+
+## Context
+- Enable `unicorn/prefer-while-loop-condition` (`error`) in `eslint.config.mjs`.
+- Rule: prefer condition in `while` over infinite loop + immediate `break`.
+- Independent of W-23094925 (PR #7556 DRAFT); branch from develop.
+- Unicorn v68 (`node_modules/eslint-plugin-unicorn`); rule fixable: `code`.
+- Verified zero violations: only `while(true)`/`for(;;)` matches sit in already-ignored paths:
+  - `salesforcedx-visualforce-markup-language-server/src/**` (eslint.config.mjs:47)
+  - `salesforcedx-aura-language-server/src/tern/**` (:48)
+  - `salesforcedx-vscode-lightning/src/resources/**` (:51)
+- Pure config flip, no source edits.
+
+## Phases
+
+### Phase 1 — enable rule
+- `eslint.config.mjs`: add `'unicorn/prefer-while-loop-condition': 'error'` in unicorn block (after :219 `prefer-simple-condition-first`).
+- Files: `eslint.config.mjs`
+- Commit: `chore(eslint): enable unicorn/prefer-while-loop-condition - W-23094927`
+
+## Skills
+- concise (plan/md)
+- packageJson (n/a — no manifest change)
+- typescript
+- verification
+
+## Verification
+- `npx eslint --rule '{"unicorn/prefer-while-loop-condition":"error"}' "packages/**/*.{ts,js}"` → 0 violations (confirmed pre-write).
+- `npm run lint` clean.
+- Not e2e-covered (lint-config-only change).

.claude/plans/W-23094932.md

@@ -0,0 +1,38 @@
+# W-23094932 — enable unicorn/prefer-single-replace
+
+## Context
+
+- Rule: `unicorn/prefer-single-replace` — chains same-replacement single-char replaces into `replaceAll(/[..]/g, ...)`.
+- unicorn v68 installed; rule file `node_modules/eslint-plugin-unicorn/rules/prefer-single-replace.js` exists.
+- Config: `eslint.config.mjs` line ~214 `'unicorn/prefer-single-call'`; insert new rule alphabetically (before `prefer-string-replace-all`).
+- Trigger criteria (verified in rule src): chained `.replaceAll('x',R)` (string, 1 char) or `.replace(/x/g,R)` (single literal char, only g/m/s flags); ALL links share identical string-literal replacement `R`; `R` must not include any searched char; no `$\`` / `$'`.
+- Pattern matches prior WIs (W-23094920/891/898): single config line via `chore(eslint): enable ...` commit.
+- Dependency W-23094931: only a plan commit on develop, not merged. Proceeding per task instruction.
+
+## Violations
+
+- Audited via temp rule injection + targeted eslint + grep.
+- 17 chained-`.replace` sites in linted src; none qualify:
+  - `.ts` candidates: multi-char strings, non-`g` regex, or differing replacement values.
+  - 3 chained `.replaceAll`: `contextMenu.ts` (differing R), `traceFlagJsonSync.ts` (`\W+` multi-char), `newlineUtils.ts` (`\r\n` multi-char) — none trigger.
+  - resource `.js` (aura/visualforce) ignored by eslint config (verified: "File ignored").
+
+## Phases
+
+### Phase 1 — enable rule
+
+- `eslint.config.mjs`: add `'unicorn/prefer-single-replace': 'error',` after `prefer-single-call`.
+- No source refactors (0 violations).
+- Commit: `chore(eslint): enable unicorn/prefer-single-replace - W-23094932`
+
+## Skills
+
+- packageJson — n/a
+- typescript — eslint config
+- verification
+
+## Verification
+
+- `npm run lint` (or per-pkg lint) clean — 0 new errors.
+- Build local rules first if `packages/eslint-local-rules/out/index.js` missing (config import fails otherwise).
+- Not e2e-covered; lint is the gate.

.claude/plans/W-23141742.md

@@ -0,0 +1,40 @@
+# W-23141742 — Sort replay debugger variables alphabetically
+
+## Context
+- Variables panel = log-parse insertion order (random to user)
+- Want: alphabetical, case-insensitive, natural numeric (item2 < item10)
+- Choke point: `getAllVariables()` — `packages/salesforcedx-apex-replay-debugger/src/adapter/variableContainer.ts:34`
+  - covers top-level scope vars + nested object children
+- Scopes (Local/Static/Global) stay fixed order — not touched (`apexReplayDebug.ts:287` only calls per-scope `getAllVariables`)
+- Ref discussion: github.com/forcedotcom/salesforcedx-vscode/discussions/5457 (PR must link)
+- `toSorted` already common in repo; lint `unicorn/no-array-sort` enforced (eslint.config.mjs:172)
+
+## Phases
+
+### Phase 1 — sort + unit test
+- edit `getAllVariables()` (variableContainer.ts:34): `.toSorted((a, b) => a.name.localeCompare(b.name, undefined, { sensitivity: 'base', numeric: true }))` on mapped `ApexVariable[]`
+  - non-mutational; satisfies no-array-sort + no-immediate-mutation
+- add unit test: container w/ out-of-order var names → assert sorted output
+  - case-insensitivity (Zebra/apple) + numeric (item2 < item10)
+  - file: `packages/salesforcedx-apex-replay-debugger/test/unit/adapter/` (new or extend existing variableContainer coverage)
+
+### Phase 2 — update integration gold files (REQUIRED, not optional)
+- Why: integration suite (test/integration/adapter.test.ts) does exact string compare vs gold; gold encodes insertion order → sort breaks it.
+- Affected golds (both contain variable blocks in insertion order today):
+  - `test/integration/config/logs/recursive.gold` — first var block lines 28-89: `this, myClass, mySimpleList, myComplexList, myNestedList, mySimpleMap, myComplexMap, mySimpleSet, myComplexSet` (NOT alphabetical)
+  - `test/integration/config/logs/statics.gold` — verify + update each variable block
+- Approach: run integration suite, capture new sorted output as gold. Verify each block is alphabetical (e.g. recursive block 1 → `myClass, myComplexList, …, this`).
+- commit (single, Phase 1+2 together so tree stays green): `feat(apex-replay-debugger): sort variables panel alphabetically - W-23141742`
+
+## Skills
+- typescript
+- concise
+- pr-draft (link discussion 5457)
+- verification
+
+## Verification
+- `npm test` in salesforcedx-apex-replay-debugger green
+- lint clean (no-array-sort / no-immediate-mutation)
+- manually inspect regenerated recursive.gold + statics.gold variable blocks: each is alphabetical/numeric ordered (the assertion now encodes the sort contract)
+- scope (Local/Static/Global) ordering unchanged — only within-scope variable order changes
+- no dedicated e2e on branch; integration gold suite is the behavioral coverage

.claude/plans/W-23150428.md

@@ -0,0 +1,77 @@
+# W-23150428 — Include GitHub discussion/issue URLs from WI Details\_\_c in PR body
+
+## Context
+
+- SF strips external hrefs in rich-text `Details__c` → `<a href="">discussions/5867</a>` loses URL
+- Observed: W-23145031 / PR #7560 — `discussions/5867` link text, empty href
+- PRs from auto-build-wi never reference originating discussion/issue
+- Files:
+  - `.claude/workflows/auto-build-wi.js` — `draftPrPrompt` (L893-932), helpers near `extractPrUrl`/`stripHtml` (L282-329), `chosen.details` available (L351 build, L827 already interpolated into `planPrompt`)
+  - `.claude/skills/pr-draft/SKILL.md` — `## GitHub issues & discussions` (L52-61)
+  - `.claude/skills/gus-cli/SKILL.md` — `Details__c formatting` (L99-105)
+- Workflow file = script, no exports/unit tests → verify via node REPL
+
+## Mechanism (load-bearing — addresses adversary findings)
+
+- `draftPrPrompt(chosen, identity, fixerResult)` = plain template string handed to `agent()`. No function calling — agent cannot call `extractDiscussionUrls` directly. Mechanism: run `extractDiscussionUrls(chosen.details)` in JS scope before prompt built, then string-interpolate output into template (same pattern as `chosen.details` at L827).
+- Insertion: `const reconstructedUrls = extractDiscussionUrls(chosen.details)` at top of `draftPrPrompt` body (after `pathsFor` destructure, L894). Interpolate joined list into step-4 `## Summary`/reference area — exact text in Phase 1. Empty → interpolate nothing (no placeholder, no instruction).
+- Reconstructed URLs = precomputed strings injected verbatim; agent copies into PR body, does not derive.
+
+## Regex / re-tick safety (load-bearing — addresses adversary findings)
+
+- L924 PR snippet: text=`#NNN`, href=populated URL → never matches empty-href filter; no re-tick ghost. Verify via fixture (see Verification).
+- "Empty href" covers all SF storage forms: `href=""`, `href=" "` / whitespace-only, entity-encoded `href=&quot;&quot;`, absent `href`.
+- Populated-href anchors (real `href="https://..."`) EXCLUDED even when text matches `discussions/\d+` — user-authored live links; URL already present, reconstructing would risk overwriting correct host/path.
+
+## Phases
+
+### Phase 1 — `extractDiscussionUrls` + interpolate into `draftPrPrompt`
+
+- Add `extractDiscussionUrls(details)` near `extractPrUrl` (L289), arrow `const`, returns `string[]`:
+  - match `<a ...>TEXT</a>` where TEXT matches `(discussions|issues)\/\d+`
+  - INCLUDE only if href is empty/missing in ALL stored forms: no `href` attr, `href=""`, `href="<whitespace>"`, or entity-encoded `href=&quot;&quot;`. EXCLUDE any anchor whose href holds a real value (e.g. `href="https://..."`).
+  - reconstruct `https://github.com/forcedotcom/salesforcedx-vscode/${path}` from the matched `discussions/NNN`|`issues/NNN`
+  - dedupe (Set); return array (empty when none)
+- `draftPrPrompt` (L894): `const reconstructedUrls = extractDiscussionUrls(chosen.details)` as first statement. Interpolate, ONLY when non-empty, into the body — add to step 4's reference area, e.g.:
+  ```
+  ${reconstructedUrls.length ? `\n   - ## References — the originating GitHub discussion/issue links (SF stripped their hrefs; reconstructed below). Include each verbatim in the body:\n${reconstructedUrls.map(u => `     ${u}`).join('\n')}` : ''}
+  ```
+  Agent copies the precomputed strings; it does not derive them. Empty → nothing injected.
+- commit: `feat(auto-build-wi): reconstruct stripped discussion/issue URLs for PR body - W-23150428`
+- files: `.claude/workflows/auto-build-wi.js`
+
+### Phase 2 — pr-draft SKILL step
+
+- `## GitHub issues & discussions`: add step — scan WI `Details__c` for anchors w/ `discussions/`|`issues/` text whose href is empty/missing in any stored form (`href=""`, `href=&quot;&quot;`, whitespace, absent); EXCLUDE anchors with a populated real href; auto-include reconstructed `https://github.com/forcedotcom/salesforcedx-vscode/<path>` URLs, no user prompt
+- concise style
+- commit: `docs(pr-draft): auto-include stripped discussion/issue URLs - W-23150428`
+- files: `.claude/skills/pr-draft/SKILL.md`
+
+### Phase 3 — gus-cli SKILL href-stripping note
+
+- `Details__c formatting` section: document SF strips external hrefs on save; advise always write full `href` even if stripped (text-preserved path lets auto-build reconstruct)
+- concise style
+- commit: `docs(gus-cli): note SF href-stripping in rich-text Details__c - W-23150428`
+- files: `.claude/skills/gus-cli/SKILL.md`
+
+## Skills to apply
+
+- concise (all `.md` + plan)
+- gus-cli, pr-draft (domain conventions)
+- typescript (auto-build-wi.js changes)
+
+## Verification
+
+- `node -e` load `extractDiscussionUrls`; assert each href-empty form maps to reconstructed URL and each excluded form is dropped:
+  - `<a href="">discussions/5867</a>` → `https://github.com/forcedotcom/salesforcedx-vscode/discussions/5867`
+  - `<a href=&quot;&quot;>discussions/42</a>` (entity-encoded empty) → reconstructed
+  - `<a href=" ">issues/123</a>` (whitespace href) → reconstructed
+  - `<a>issues/9</a>` (absent href) → reconstructed
+  - `<a href="https://github.com/forcedotcom/salesforcedx-vscode/discussions/77">discussions/77</a>` (populated href) → EXCLUDED
+  - workflow's own PR snippet `<p><strong>PR:</strong> <a href="https://github.com/forcedotcom/salesforcedx-vscode/pull/7382">#7382</a></p>` → EXCLUDED (text `#7382` not a path; guards re-tick ghost URL)
+  - non-matching link text → excluded
+  - duplicate empty-href anchors → single deduped entry
+  - empty/null details → `[]`
+- `node --check .claude/workflows/auto-build-wi.js`
+- lint/prettier — CI-covered, skip manual
+- no e2e on branch (workflow script + skill docs)

.claude/skills/gus-cli/SKILL.md

@@ -82,6 +82,8 @@ Objects: `ADM_Work__c`, `ADM_Epic__c` (not ADM_Theme\_\_c).
 
 Closed statuses: see ## Status\_\_c values. Use `LIMIT 50` (or 100) when querying team or epic work.
 
+**Open-WI queries must ALSO exclude the "Bug no-fix" terminals**: `Duplicate`, `Inactive`, `Never`, `Not a bug`, `Not Reproducible`, `Rejected`, `Eng Internal`. Terminal despite no "Closed" prefix — omit them and a `Duplicate` WI wrongly shows as open.
+
 **Create:** Always set `Story_Points__c=2`, `Product_Tag__c=a1aB000000005G3IAI`, `RecordTypeId`. Include `Subject__c`, `Assignee__c`, `Scrum_Team__c=a00B0000000w9xPIAQ`, `Epic__c` (optional), `QA_Engineer__c` (optional), `Details__c` (optional). Leave `Sprint__c` blank; never modify it. **Details\_\_c:** write concisely—fragments/bullets, minimal words, no repetition (see .claude/skills/concise/SKILL.md).
 
 **`Details__c` ≥20 chars required.** `Details__c` (field label "Description") has a User Story validation rule: <20 chars → create fails with `Description must be at least 20 characters to submit a User Story`. Despite docs marking it optional, treat as required on create. Note: `Description__c` is a DIFFERENT field (label "Comment", unvalidated)—don't confuse them; the validated body field is `Details__c`.
@@ -104,6 +106,8 @@ Closed statuses: see ## Status\_\_c values. Use `LIMIT 50` (or 100) when queryin
 
 Constraints: File single-line (flags-dir treats each line as a separate flag invocation). Values in single quotes. HTML: `<p>`, `<strong>`, `<code>`, `<ul><li>`, `<a href="...">`. Escape `"` inside value as `&quot;`.
 
+**SF strips external hrefs on save:** `<a href=&quot;https://github.com/...discussions/5867&quot;>discussions/5867</a>` persists as `<a href="">discussions/5867</a>` — link text survives, href empties. Write full `href` regardless — surviving `discussions/NNN`|`issues/NNN` path text lets auto-build reconstruct the PR URL. Prefer link text that IS the path (`discussions/5867`), not a label.
+
 **After create:** Always provide the work item link. Format: `https://gus.lightning.force.com/lightning/r/ADM_Work__c/<recordId>/view` (replace `<recordId>` with the Id from the create output, e.g. `a07EE00002V3a8YYAR`). Example: [a07EE00002V3a8YYAR](https://gus.lightning.force.com/lightning/r/ADM_Work__c/a07EE00002V3a8YYAR/view).
 
 **CRITICAL:** After creation, you MUST query the `Name` (W-XXXXX) to append to the PR title as ` - W-XXXXX`. The `id` returned by `sf data create` is NOT the `W-XXXXX` name.
@@ -130,6 +134,8 @@ sf data query --query "SELECT Id, Name, Description__c FROM ADM_Epic__c WHERE Te
 
 Closed = `Health__c` in ('Completed', 'Canceled'). Use `Description__c` when populated to match work to epic.
 
+**`Description__c` is not filterable in SOQL** — `WHERE`/`LIKE` on it errors `field 'Description__c' can not be filtered in a query call`. To match an epic by text, fetch all open epics and match on `Name`, or post-filter `Description__c` client-side (e.g. with jq). Only `SELECT` it.
+
 ## Epic guide: which work items go where
 
 Use to pick the right Epic\_\_c when creating work. Query epics first; match by Name/Description. Key epics:
@@ -161,9 +167,9 @@ When unsure which epic: ask the user.
 
 `[ai-auto]` in `Subject__c` or `Details__c` opts a WI into the [auto-build-wi workflow](../../workflows/auto-build-wi.js) (claim → plan → build → review → draft PR). See [workflows/README.md](../../workflows/README.md).
 
-- Add only on explicit user request; prefer `Subject__c`
+- Add only on explicit user request; only `Subject__c` (title), never `Details__c`
 - Skip for WIs needing design/coordination
-- Query: `(Subject__c LIKE '%[ai-auto]%' OR Details__c LIKE '%[ai-auto]%')`
+- Query: `Subject__c LIKE '%[ai-auto]%'`
 
 ## Compound workflows
 
@@ -191,6 +197,8 @@ When unsure which epic: ask the user.
 When creating/updating, only use New,In Progress,Ready for Review,QA In Progress,Fixed,Waiting,Closed
 When completing a work item, use `Closed`.
 
+To mark a WI as a duplicate: set `Status__c='Duplicate'` + link the original via `Related_Work__c` (label "Duplicate Of"). `Closed - Duplicate` does NOT persist here — a trigger reverts it to `Duplicate` — so use `Duplicate` directly. `Duplicate` is terminal (treat like Closed) for open/unfinished queries.
+
 **Flow:** New → Acknowledged → Triaged → In Progress → Ready for Review → Fixed → QA In Progress → Completed/Closed
 
 **Blocked:** Investigating | More Info Reqd from Support | Waiting On Customer | Waiting On 3rd Party | Waiting | Deferred | Integrate | Pending Release
@@ -201,6 +209,6 @@ When completing a work item, use `Closed`.
 
 ## CLI tips
 
-- `--result-format json` for parseable output
-- Strip CLI version warning before JSON parse (`tail -1` or parse last object)
+- `--json` for parseable output (not `--result-format json`)
+- Parse with `jq`, not python
 - `sf data create record` / `sf data update record` for single-record writes