.

Prune unused definitions from workflow schema
Remove 10 unreachable definitions from workflow-v1.0.json: - workflow-root, on, on-mapping (non-strict variants) - job-if-result, step-if-result - boolean-needs-context, number-needs-context, string-needs-context - boolean-steps-context, number-steps-context Saves 2,039 bytes minified (2.9%), 146 bytes gzipped (1.2%). Also adds script/prune-schema.cjs for future maintenance.
2025-12-06 23:02:24 +00:00 · 2025-12-06 22:57:10 +00:00 · 2025-12-06 20:05:44 +00:00
54 changed files with 25376 additions and 51675 deletions
@@ -64,3 +64,33 @@ jobs:
          echo ""
          exit 1
        fi
+
+  validate-webhooks:
+    runs-on: ubuntu-latest
+    name: Validate webhook optimization
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js 22.x
+      uses: actions/setup-node@v4
+      with:
+        node-version: 22.x
+        cache: 'npm'
+        registry-url: 'https://npm.pkg.github.com'
+    - run: npm ci
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build workspaces
+      run: npm run build -ws
+    - name: Generate full webhooks file
+      run: cd languageservice && npm run update-webhooks
+    - name: Run optimization validation tests
+      run: cd languageservice && npm test -- --testPathPattern=eventPayloads
+    - name: Verify validation tests ran
+      run: |
+        if [ ! -f languageservice/src/context-providers/events/webhooks.full.validation-complete ]; then
+          echo "ERROR: Validation tests did not run!"
+          echo "The webhooks.full.validation-complete marker file was not created."
+          exit 1
+        fi
+        echo "Validation tests completed at: $(cat languageservice/src/context-providers/events/webhooks.full.validation-complete)"
@@ -7,7 +7,11 @@ node_modules
 # Minified JSON (generated at build time)
 *.min.json

-# Intermediate JSON for size comparison (generated by update-webhooks --all)
-*.all.json
-*.drop.json
-*.strip.json
+# Optimized workflow schema (generated by optimize-workflow-schema.js)
+*.optimized.json
+
+# Full webhooks source (generated by update-webhooks, used for validation tests)
+*.full.json
+
+# Validation marker (generated by tests)
+*.validation-complete
@@ -6,8 +6,9 @@ This document describes the JSON data files used by the language service package

 The language service uses several JSON files containing schema definitions, webhook payloads, and other metadata. To reduce bundle size, these files are:

-1. **Optimized at generation time** — unused events are dropped, unused fields are stripped
-2. **Minified at build time** — whitespace is removed to produce `.min.json` files
+1. **Optimized at generation time** — unused events are dropped, unused fields are stripped, shared objects are deduplicated, property names are interned
+2. **Compacted using a space-efficient format** — params use type-based dispatch arrays instead of objects
+3. **Minified at build time** — whitespace is removed to produce `.min.json` files

 The source `.json` files are human-readable and checked into the repository. The `.min.json` files are generated during build and gitignored.

@@ -18,7 +19,8 @@ The source `.json` files are human-readable and checked into the repository. The
 | File | Description |
 |------|-------------|
 | `src/context-providers/events/webhooks.json` | Webhook event payload schemas for autocompletion |
-| `src/context-providers/events/objects.json` | Deduplicated shared object definitions referenced by webhooks |
+| `src/context-providers/events/webhooks.objects.json` | Deduplicated shared object definitions referenced by webhooks |
+| `src/context-providers/events/webhooks.strings.json` | Interned property names shared by webhooks and objects |
 | `src/context-providers/events/schedule.json` | Schedule event context data |
 | `src/context-providers/events/workflow_call.json` | Reusable workflow call context data |
 | `src/context-providers/descriptions.json` | Context variable descriptions for hover |
@@ -33,7 +35,7 @@ The source `.json` files are human-readable and checked into the repository. The

 ### Webhooks and Objects

-The `webhooks.json` and `objects.json` files are generated from the [GitHub REST API description](https://github.com/github/rest-api-description):
+The `webhooks.json`, `webhooks.objects.json`, and `webhooks.strings.json` files are generated from the [GitHub REST API description](https://github.com/github/rest-api-description):

 ```bash
 cd languageservice
@@ -44,9 +46,10 @@ This script:
 1. Fetches webhook schemas from the GitHub API description
 2. **Validates** all events are categorized (fails if new events are found)
 3. **Drops** events that aren't valid workflow triggers (see [Dropped Events](#dropped-events))
-4. **Strips** unused fields like `description` and `summary` (see [Stripped Fields](#stripped-fields))
-5. **Deduplicates** shared object definitions into `objects.json`
-6. Writes the optimized, pretty-printed JSON files
+4. **Compacts** params into a space-efficient array format, keeping only `name`, `description`, and `childParamsGroups` (see [Compact Format](#compact-format))
+5. **Deduplicates** shared object definitions into `webhooks.objects.json`
+6. **Interns** duplicate property names into `webhooks.strings.json` (see [String Interning](#string-interning))
+7. Writes the optimized, pretty-printed JSON files

 ### Handling New Webhook Events

@@ -67,9 +70,9 @@ Action required:

 1. Check [Events that trigger workflows](https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows)

-2. Edit `languageservice/script/webhooks/index.ts`:
-   - Add to `KEPT_EVENTS` if it's a valid workflow trigger
-   - Add to `DROPPED_EVENTS` if it's GitHub App or API-only
+2. Edit `languageservice/src/context-providers/events/event-filters.json`:
+   - Add to `kept` array if it's a valid workflow trigger
+   - Add to `dropped` array if it's GitHub App or API-only

 3. Run `npm run update-webhooks` and commit the changes

@@ -101,13 +104,15 @@ The code imports the minified versions:

 ```ts
 import webhooks from "./events/webhooks.min.json"
+import objects from "./events/webhooks.objects.min.json"
+import strings from "./events/webhooks.strings.min.json"
 ```

 ## CI Verification

 CI verifies that generated source files are up-to-date:

-1. Runs `npm run update-webhooks` to regenerate webhooks.json and objects.json
+1. Runs `npm run update-webhooks` to regenerate webhooks.json, webhooks.objects.json, and webhooks.strings.json
 2. Checks for uncommitted changes with `git diff --exit-code`

 The `.min.json` files are generated at build time and are not committed to the repository.
@@ -118,80 +123,101 @@ If the build fails, run `cd languageservice && npm run update-webhooks` locally

 Webhook events that aren't valid workflow `on:` triggers are dropped (e.g., `installation`, `ping`, `member`, etc.). These are GitHub App or API-only events.

-See `DROPPED_EVENTS` in `script/webhooks/index.ts` for the full list.
+See `dropped` array in `src/context-providers/events/event-filters.json` for the full list.

-## Stripped Fields
+## Compact Format

-Unused fields are stripped to reduce bundle size. For example:
+Params are converted from verbose objects into compact arrays, keeping only the fields needed for autocompletion and hover docs (`name`, `description`, `childParamsGroups`). Unused fields like `type`, `in`, `isRequired`, `enum`, and `default` are discarded.
+
+| Format | Meaning |
+|--------|---------|
+| `"name"` | Name only (no description, no children) |
+| `[name, desc]` | Name + description (arr[1] is a string) |
+| `[name, children]` | Name + children (arr[1] is an array) |
+| `[name, desc, children]` | Name + description + children |
+
+The reader uses `typeof arr[1]` to determine the format: if it's a string, it's a description; if it's an array, it's children.
+
+**Example:**

 ```json
-// Before (from webhooks.all.json)
-{
-  "type": "object",
-  "name": "issue",
-  "in": "body",
-  "description": "The issue itself.",
-  "isRequired": true,
-  "childParamsGroups": [...]
-}
-
-// After (webhooks.json)
+// Before (object format)
 {
  "name": "issue",
  "description": "The issue itself.",
-  "childParamsGroups": [...]
+  "childParamsGroups": [
+    { "name": "id" },
+    { "name": "title", "description": "Issue title" }
+  ]
+}
+
+// After (compact format)
+["issue", "The issue itself.", [
+  "id",
+  ["title", "Issue title"]
+]]
+```
+
+## String Interning
+
+Property names that appear 2+ times are "interned" into a shared string table (`webhooks.strings.json`). In the compact arrays, these names are replaced with non-negative numeric indices:
+
+```json
+// webhooks.strings.json
+["url", "id", "name", ...]  // Index 0 = "url", 1 = "id", 2 = "name"
+
+// webhooks.json - uses indices instead of strings
+{
+  "push": {
+    "default": {
+      "p": [
+        [0, "The URL..."],  // 0 = "url" from string table
+        [1, "Unique ID"],   // 1 = "id"
+        2                   // 2 = "name" (name-only, no description)
+      ]
+    }
+  }
 }
 ```

-Only `name`, `description`, and `childParamsGroups` are kept — these are used for autocompletion and hover docs.
+**How to distinguish indices from other values:**

-To compare all fields vs stripped, run `npm run update-webhooks -- --all` and diff the `.all.json` files against the regular ones.
+- **Negative numbers** → Object indices: `-1` = object 0, `-2` = object 1, etc. (formula: `-(index + 1)`)
+- **Non-negative numbers** → String indices (references into `webhooks.strings.json`)
+- **Literal strings** → Singletons (names appearing only once, not interned)

-See `EVENT_ACTION_FIELDS` and `BODY_PARAM_FIELDS` in `script/webhooks/index.ts` to modify what gets stripped.
+Singletons are kept as literal strings for readability and to avoid the overhead of adding rarely-used names to the string table.

-## Schema Synchronization
+## Deduplication

-The `workflow-v1.0.json` schema defines which activity types are valid for each workflow trigger event. A test in `workflow-parser/src/schema-sync.test.ts` verifies these stay in sync with `webhooks.json`.
+Shared object definitions are extracted into `webhooks.objects.json` and referenced by negative index:

-### When the Test Fails
+```json
+// webhooks.objects.json
+[
+  ["url", "The URL"],           // Index 0 (referenced as -1)
+  ["id", "Unique identifier"],  // Index 1 (referenced as -2)
+  [...]
+]

-If the schema-sync test fails, you'll see an error like:
-
-```
-Event "pull_request" is missing activity type "new_activity" in workflow-v1.0.json
+// webhooks.json - negative numbers reference objects
+{
+  "push": {
+    "default": {
+      "p": [-1, -2, ["ref", "The git ref"]]  // -1 = object 0, -2 = object 1
+    }
+  }
+}
 ```

-**To resolve:**
+This reduces duplication when the same object structure appears in multiple events (e.g., `repository`, `sender`, `organization`).

-1. Check [Events that trigger workflows](https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows) to verify the activity type is a valid workflow trigger:
-   - Find the event section (e.g., "pull_request")
-   - Look at the "Activity types" table — it lists which types can be used in `on.<event>.types`
-   - If the type is listed there, it's a valid workflow trigger
-   - If the type only appears in webhook docs but NOT in the workflow trigger docs, it's webhook-only
+## Size Reduction

-2. If it IS a valid workflow trigger:
-   - Edit `workflow-parser/src/workflow-v1.0.json`
-   - Find the `<event>-activity-type` definition (e.g., `pull-request-activity-type`)
-   - Add the new activity type to `allowed-values`
-   - Update the `description` in `<event>-activity` to list all types
-   - Run `npm test` to regenerate the minified JSON
+The optimizations achieve approximately 99% file size reduction:

-3. If it is NOT a valid workflow trigger (webhook-only):
-   - Edit `workflow-parser/src/schema-sync.test.ts`
-   - Add the type to `WEBHOOK_ONLY` for that event
-
-### Known Discrepancies
-
-The test tracks several types of known discrepancies:
-
-| Category | Purpose | Example |
-|----------|---------|---------|
-| `WEBHOOK_ONLY` | Types in webhooks that aren't valid workflow triggers | `check_suite.requested` |
-| `SCHEMA_ONLY` | Types valid for workflows but missing from webhooks | `registry_package.updated` |
-| `NAME_MAPPINGS` | Different names for the same concept | `project_column`: webhook uses `edited`, schema uses `updated` |
-
-### Bidirectional Checking
-
-The test checks both directions:
- **webhooks → schema**: Ensures all webhook activity types are in the schema (or listed in `WEBHOOK_ONLY`)
- **schema → webhooks**: Ensures the schema doesn't have types that don't exist in webhooks (or listed in `SCHEMA_ONLY` or `NAME_MAPPINGS`)
+| Stage | Minified | Gzip |
+|-------|----------|------|
+| Original (webhooks.full.json) | 15.8 MB | 968 KB |
+| After optimization (combined) | 152 KB | 15.6 KB |
+| **Reduction** | **99%** | **98%** |
@@ -1,6 +1,6 @@
 {
  "name": "@actions/expressions",
-  "version": "0.3.25",
+  "version": "0.3.23",
  "license": "MIT",
  "type": "module",
  "source": "./src/index.ts",
@@ -1,6 +1,6 @@
 {
  "name": "@actions/languageserver",
-  "version": "0.3.25",
+  "version": "0.3.23",
  "description": "Language server for GitHub Actions",
  "license": "MIT",
  "type": "module",
@@ -43,8 +43,8 @@
    "watch": "tsc --build tsconfig.build.json --watch"
  },
  "dependencies": {
-    "@actions/languageservice": "^0.3.25",
-    "@actions/workflow-parser": "^0.3.25",
+    "@actions/languageservice": "^0.3.23",
+    "@actions/workflow-parser": "^0.3.23",
    "@octokit/rest": "^21.1.1",
    "@octokit/types": "^9.0.0",
    "vscode-languageserver": "^8.0.2",
@@ -1,76 +0,0 @@
-import {data, DescriptionDictionary} from "@actions/expressions";
-import {WorkflowContext} from "@actions/languageservice/context/workflow-context";
-import {Mode} from "@actions/languageservice/context-providers/default";
-import {contextProviders} from "./context-providers";
-import {RepositoryContext} from "./initializationOptions";
-import {TTLCache} from "./utils/cache";
-
-describe("contextProviders", () => {
-  const mockCache = new TTLCache();
-  const mockRepo: RepositoryContext = {
-    id: 123,
-    owner: "test-owner",
-    name: "test-repo",
-    organizationOwned: true,
-    workspaceUri: "file:///workspace"
-  };
-  const mockWorkflowContext: WorkflowContext = {
-    uri: "test.yaml",
-    template: undefined
-  };
-
-  describe("when client is undefined", () => {
-    it("should return incomplete context for secrets", async () => {
-      const config = contextProviders(undefined, mockRepo, mockCache);
-      const result = await config.getContext("secrets", undefined, mockWorkflowContext, Mode.Validation);
-
-      expect(result).toBeInstanceOf(DescriptionDictionary);
-      expect((result as DescriptionDictionary).complete).toBe(false);
-    });
-
-    it("should return incomplete context for vars", async () => {
-      const config = contextProviders(undefined, mockRepo, mockCache);
-      const result = await config.getContext("vars", undefined, mockWorkflowContext, Mode.Validation);
-
-      expect(result).toBeInstanceOf(DescriptionDictionary);
-      expect((result as DescriptionDictionary).complete).toBe(false);
-    });
-
-    it("should preserve defaultContext and mark as incomplete for secrets", async () => {
-      const config = contextProviders(undefined, mockRepo, mockCache);
-      const defaultContext = new DescriptionDictionary();
-      defaultContext.add("EXISTING_SECRET", new data.StringData("test"));
-
-      const result = await config.getContext("secrets", defaultContext, mockWorkflowContext, Mode.Validation);
-
-      expect(result).toBe(defaultContext);
-      expect((result as DescriptionDictionary).complete).toBe(false);
-      expect((result as DescriptionDictionary).get("EXISTING_SECRET")).toBeDefined();
-    });
-
-    it("should return undefined for other contexts like steps", async () => {
-      const config = contextProviders(undefined, mockRepo, mockCache);
-      const result = await config.getContext("steps", undefined, mockWorkflowContext, Mode.Validation);
-
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe("when both client and repo are undefined", () => {
-    it("should return incomplete context for secrets", async () => {
-      const config = contextProviders(undefined, undefined, mockCache);
-      const result = await config.getContext("secrets", undefined, mockWorkflowContext, Mode.Validation);
-
-      expect(result).toBeInstanceOf(DescriptionDictionary);
-      expect((result as DescriptionDictionary).complete).toBe(false);
-    });
-
-    it("should return incomplete context for vars", async () => {
-      const config = contextProviders(undefined, undefined, mockCache);
-      const result = await config.getContext("vars", undefined, mockWorkflowContext, Mode.Validation);
-
-      expect(result).toBeInstanceOf(DescriptionDictionary);
-      expect((result as DescriptionDictionary).complete).toBe(false);
-    });
-  });
-});
@@ -15,18 +15,7 @@ export function contextProviders(
  cache: TTLCache
 ): ContextProviderConfig {
  if (!repo || !client) {
-    // When GitHub client/repo is unavailable, return an incomplete dictionary
-    // to avoid false "Context access might be invalid" warnings
-    return {
-      getContext: (name: string, defaultContext: DescriptionDictionary | undefined) => {
-        if (name === "secrets" || name === "vars") {
-          const context = defaultContext || new DescriptionDictionary();
-          context.complete = false;
-          return Promise.resolve(context);
-        }
-        return Promise.resolve(undefined);
-      }
-    };
+    return {getContext: () => Promise.resolve(undefined)};
  }

  const getContext = async (
@@ -49,7 +49,7 @@ export async function getSecrets(
          if (isString(x.value)) {
            environmentName = x.value.value;
          } else {
-            // this means we have a dynamic environment, in those situations we
+            // this means we have a dynamic enviornment, in those situations we
            // want to make sure we skip doing secret validation
            secretsContext.complete = false;
          }
@@ -1,4 +1,4 @@
-import {data, DescriptionDictionary, isDescriptionDictionary} from "@actions/expressions";
+import {data, DescriptionDictionary} from "@actions/expressions";
 import {getStepsContext as getDefaultStepsContext} from "@actions/languageservice/context-providers/steps";
 import {Octokit} from "@octokit/rest";
 import fetchMock from "fetch-mock";
@@ -63,43 +63,6 @@ it("returns default context when job is undefined", async () => {
  expect(stepsContext).toEqual(defaultContext);
 });

-it("outputs is an incomplete dictionary to allow dynamic outputs", async () => {
-  const mock = fetchMock
-    .sandbox()
-    .getOnce("https://api.github.com/repos/actions/cache/contents/action.yml?ref=v3", actionMetadata);
-
-  const workflowContext = await createWorkflowContext(workflow, "build");
-  const defaultContext = getDefaultStepsContext(workflowContext);
-
-  const stepsContext = await getStepsContext(
-    new Octokit({
-      request: {
-        fetch: mock
-      }
-    }),
-    new TTLCache(),
-    defaultContext,
-    workflowContext
-  );
-
-  // Get the step context
-  const stepContext = stepsContext?.get("cache-primes");
-  expect(stepContext).toBeDefined();
-  expect(isDescriptionDictionary(stepContext!)).toBe(true);
-
-  // Get the outputs - should be a dictionary, not null
-  const outputs = (stepContext as DescriptionDictionary).get("outputs");
-  expect(outputs).toBeDefined();
-  expect(isDescriptionDictionary(outputs!)).toBe(true);
-
-  // Outputs should be marked incomplete to allow dynamic outputs
-  const outputsDict = outputs as DescriptionDictionary;
-  expect(outputsDict.complete).toBe(false);
-
-  // Known outputs from action.yml should be present
-  expect(outputsDict.get("cache-hit")).toBeDefined();
-});
-
 it("adds action outputs", async () => {
  const mock = fetchMock
    .sandbox()
@@ -120,22 +83,17 @@ it("adds action outputs", async () => {
  );
  expect(stepsContext).toBeDefined();

-  // Create expected outputs dict with complete = false
-  // (actions can have dynamic outputs beyond what's declared in action.yml)
-  const expectedOutputs = new DescriptionDictionary({
-    key: "cache-hit",
-    value: new data.StringData("A boolean value to indicate an exact match was found for the primary key"),
-    description: "A boolean value to indicate an exact match was found for the primary key"
-  });
-  expectedOutputs.complete = false;
-
  expect(stepsContext).toEqual(
    new DescriptionDictionary({
      key: "cache-primes",
      value: new DescriptionDictionary(
        {
          key: "outputs",
-          value: expectedOutputs
+          value: new DescriptionDictionary({
+            key: "cache-hit",
+            value: new data.StringData("A boolean value to indicate an exact match was found for the primary key"),
+            description: "A boolean value to indicate an exact match was found for the primary key"
+          })
        },
        {
          key: "conclusion",
@@ -58,8 +58,6 @@ export async function getStepsContext(
            continue;
          }
          const outputsDict = new DescriptionDictionary();
-          // Actions can have dynamic outputs beyond what's declared in action.yml
-          outputsDict.complete = false;
          for (const [key, value] of Object.entries(outputs)) {
            outputsDict.add(key, new data.StringData(value.description), value.description);
          }
@@ -26,8 +26,6 @@ export async function getVariables(
    return secretsContext;
  }

-  const variablesContext = defaultContext || new DescriptionDictionary();
-
  let environmentName: string | undefined;
  if (workflowContext?.job?.environment) {
    if (isString(workflowContext.job.environment)) {
@@ -37,19 +35,14 @@ export async function getVariables(
        if (isString(x.key) && x.key.value === "name") {
          if (isString(x.value)) {
            environmentName = x.value.value;
-          } else {
-            // this means we have a dynamic environment, in those situations we want to skip validation
-            variablesContext.complete = false;
          }
          break;
        }
      }
-    } else {
-      // if the expression is something like environment: ${{ ... }} then we want to skip validation
-      variablesContext.complete = false;
    }
  }

+  const variablesContext = defaultContext || new DescriptionDictionary();
  try {
    const variables = await getRemoteVariables(octokit, cache, repo, environmentName);

@@ -16,7 +16,7 @@ inputs:
    description: 'Repository name with owner. For example, actions/checkout'
    deprecationMessage: 'Use repository instead'
 runs:
-  using: node24
+  using: node16
  main: dist/index.js
  post: dist/index.js
 `;
@@ -12,7 +12,7 @@ inputs:
    description: Repository name with owner. For example, actions/checkout
    default: \${{ github.repository }}
 runs:
-  using: node24
+  using: node16
  main: dist/index.js
  post: dist/index.js
 `;
@@ -231,7 +231,7 @@ inputs:
    description: 📦 Repository 📦 name with owner. For example, actions/checkout
    default: \${{ github.repository }}
 runs:
-  using: node24
+  using: node16
  main: dist/index.js
  post: dist/index.js
 `;
@@ -1,6 +1,6 @@
 {
  "name": "@actions/languageservice",
-  "version": "0.3.25",
+  "version": "0.3.23",
  "description": "Language service for GitHub Actions",
  "license": "MIT",
  "type": "module",
@@ -37,18 +37,18 @@
    "format-check": "prettier --check '**/*.ts'",
    "lint": "eslint 'src/**/*.ts'",
    "lint-fix": "eslint --fix 'src/**/*.ts'",
-    "minify-json": "node ../script/minify-json.js src/context-providers/descriptions.json src/context-providers/events/webhooks.json src/context-providers/events/objects.json src/context-providers/events/schedule.json src/context-providers/events/workflow_call.json",
+    "minify-json": "node ../script/minify-json.js src/context-providers/descriptions.json src/context-providers/events/webhooks.json src/context-providers/events/webhooks.objects.json src/context-providers/events/webhooks.strings.json src/context-providers/events/schedule.json src/context-providers/events/workflow_call.json",
    "prebuild": "npm run minify-json",
    "prepublishOnly": "npm run build && npm run test",
    "pretest": "npm run minify-json",
    "test": "NODE_OPTIONS=\"--experimental-vm-modules\" jest",
    "test-watch": "NODE_OPTIONS=\"--experimental-vm-modules\" jest --watch",
-    "update-webhooks": "npx tsx script/webhooks/index.ts",
+    "update-webhooks": "npx tsx script/webhooks/update-webhooks.ts",
    "watch": "tsc --build tsconfig.build.json --watch"
  },
  "dependencies": {
-    "@actions/expressions": "^0.3.25",
-    "@actions/workflow-parser": "^0.3.25",
+    "@actions/expressions": "^0.3.23",
+    "@actions/workflow-parser": "^0.3.23",
    "vscode-languageserver-textdocument": "^1.0.7",
    "vscode-languageserver-types": "^3.17.2",
    "vscode-uri": "^3.0.8",
@@ -1,5 +1,38 @@
 import Webhook from "./webhook";

+/**
+ * Get the name from a param.
+ * Formats: "name" (string), or [name, ...] (array)
+ */
+function getParamName(param: any): string {
+  if (typeof param === "string") {
+    return param;
+  }
+  if (Array.isArray(param)) {
+    return param[0];
+  }
+  return param.name;
+}
+
+/**
+ * Get params from a webhook action.
+ * Uses 'p' (short key) if present, falls back to 'bodyParameters'
+ */
+function getParams(webhook: any): any[] {
+  return webhook.p || webhook.bodyParameters || [];
+}
+
+/**
+ * Set params on a webhook action using the short key 'p'
+ */
+function setParams(webhook: any, params: any[]): void {
+  if (webhook.p !== undefined) {
+    webhook.p = params;
+  } else {
+    webhook.bodyParameters = params;
+  }
+}
+
 // Store any repeated body parameters in an array
 // and replace them in the webhook with an index in the array
 export function deduplicateWebhooks(webhooks: Record<string, Record<string, Webhook>>): any[] {
@@ -10,10 +43,11 @@ export function deduplicateWebhooks(webhooks: Record<string, Record<string, Webh
  const objectCount: Record<string, number> = {};

  for (const webhook of iterateWebhooks(webhooks)) {
-    for (const param of webhook.bodyParameters) {
-      objectsByName[param.name] ||= [];
-      const index = findOrAdd(param, objectsByName[param.name]);
-      const key = `${param.name}:${index}`;
+    for (const param of getParams(webhook)) {
+      const name = getParamName(param);
+      objectsByName[name] ||= [];
+      const index = findOrAdd(param, objectsByName[name]);
+      const key = `${name}:${index}`;
      objectCount[key] ||= 0;
      objectCount[key]++;
    }
@@ -27,18 +61,19 @@ export function deduplicateWebhooks(webhooks: Record<string, Record<string, Webh

  for (const webhook of iterateWebhooks(webhooks)) {
    const newParams: any[] = [];
-    for (const param of webhook.bodyParameters) {
-      const index = find(param, objectsByName[param.name]);
-      const key = `${param.name}:${index}`;
+    for (const param of getParams(webhook)) {
+      const name = getParamName(param);
+      const index = find(param, objectsByName[name]);
+      const key = `${name}:${index}`;
      if (objectCount[key] > 1) {
-        newParams.push(indexForParam(param, index, bodyParamIndexMap, duplicatedBodyParams));
+        newParams.push(indexForParam(param, name, index, bodyParamIndexMap, duplicatedBodyParams));
      } else {
        // If an object is only used once, keep it inline
        newParams.push(param);
      }
    }

-    webhook.bodyParameters = newParams;
+    setParams(webhook, newParams);
  }

  return duplicatedBodyParams;
@@ -74,11 +109,12 @@ function find(param: any, objects: any[]): number {

 function indexForParam(
  param: any,
+  paramName: string,
  paramNameIndex: number,
  objectIndexMap: Record<string, number>,
  duplicatedBodyParams: any[]
 ): number {
-  const key = `${param.name}:${paramNameIndex}`;
+  const key = `${paramName}:${paramNameIndex}`;

  const existingIndex = objectIndexMap[key];
  if (existingIndex !== undefined) {
@@ -1,310 +0,0 @@
-import {promises as fs} from "fs";
-import Webhook from "./webhook.js";
-
-import schemaImport from "rest-api-description/descriptions/api.github.com/dereferenced/api.github.com.deref.json";
-import {deduplicateWebhooks} from "./deduplicate.js";
-const schema = schemaImport as any;
-
-const OUTPUT_PATH = "./src/context-providers/events/webhooks.json";
-const OBJECTS_PATH = "./src/context-providers/events/objects.json";
-const ALL_OUTPUT_PATH = "./src/context-providers/events/webhooks.all.json";
-const ALL_OBJECTS_PATH = "./src/context-providers/events/objects.all.json";
-const DROP_OUTPUT_PATH = "./src/context-providers/events/webhooks.drop.json";
-const DROP_OBJECTS_PATH = "./src/context-providers/events/objects.drop.json";
-const STRIP_OUTPUT_PATH = "./src/context-providers/events/webhooks.strip.json";
-const STRIP_OBJECTS_PATH = "./src/context-providers/events/objects.strip.json";
-
-// Parse --all flag
-const generateAll = process.argv.includes("--all");
-
-// Events to drop - not valid workflow triggers (GitHub App or API-only events)
-// See: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows
-const DROPPED_EVENTS = new Set([
-  "branch_protection_configuration",
-  "code_scanning_alert",
-  "commit_comment",
-  "custom_property",
-  "custom_property_values",
-  "dependabot_alert",
-  "deploy_key",
-  "github_app_authorization",
-  "installation",
-  "installation_repositories",
-  "installation_target",
-  "marketplace_purchase",
-  "member",
-  "membership",
-  "merge_group",
-  "meta",
-  "org_block",
-  "organization",
-  "package",
-  "personal_access_token_request",
-  "ping",
-  "repository",
-  "repository_advisory",
-  "repository_ruleset",
-  "secret_scanning_alert",
-  "secret_scanning_alert_location",
-  "security_advisory",
-  "security_and_analysis",
-  "sponsorship",
-  "star",
-  "team",
-  "team_add"
-]);
-
-// Events to keep - valid workflow triggers
-// See: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows
-const KEPT_EVENTS = new Set([
-  "branch_protection_rule",
-  "check_run",
-  "check_suite",
-  "create",
-  "delete",
-  "deployment",
-  "deployment_status",
-  "discussion",
-  "discussion_comment",
-  "fork",
-  "gollum",
-  "issue_comment",
-  "issues",
-  "label",
-  "milestone",
-  "page_build",
-  "project",
-  "project_card",
-  "project_column",
-  "projects_v2",
-  "projects_v2_item",
-  "public",
-  "pull_request",
-  "pull_request_review",
-  "pull_request_review_comment",
-  "pull_request_review_thread",
-  "push",
-  "registry_package",
-  "release",
-  "repository_dispatch",
-  "repository_import",
-  "repository_vulnerability_alert",
-  "status",
-  "watch",
-  "workflow_dispatch",
-  "workflow_job",
-  "workflow_run"
-]);
-
-/**
- * Fields to strip from the JSON data.
- *
- * EVENT_ACTION_FIELDS: stripped from each event action object (top level only)
- * Example event action object before stripping:
- *   {
- *     "description": "This event is triggered when...",  // <-- stripped
- *     "summary": "A brief summary",                      // <-- stripped
- *     "availability": ["repository"],                    // <-- stripped
- *     "category": "issues",                              // <-- stripped
- *     "action": "opened",                                // kept
- *     "bodyParameters": [...]                            // kept
- *   }
- *
- * BODY_PARAM_FIELDS: stripped from every bodyParameters object, recursively through childParamsGroups
- * Example bodyParameter object before stripping:
- *   {
- *     "type": "object",                                  // <-- stripped
- *     "name": "changes",                                 // kept (used for property names)
- *     "in": "body",                                      // <-- stripped
- *     "description": "The changes that were made.",      // kept (used for hover docs)
- *     "isRequired": true,                                // <-- stripped
- *     "enum": ["a", "b"],                                // <-- stripped
- *     "default": "a",                                    // <-- stripped
- *     "childParamsGroups": [                             // kept (used for nested properties)
- *       {
- *         "type": "string",                              // <-- stripped (recursive)
- *         "name": "from",                                // kept
- *         "isRequired": true                             // <-- stripped (recursive)
- *       }
- *     ]
- *   }
- */
-const EVENT_ACTION_FIELDS = ["description", "summary", "availability", "category"];
-const BODY_PARAM_FIELDS = ["type", "in", "isRequired", "enum", "default"];
-
-/**
- * Strip fields from a bodyParameter object and recursively from childParamsGroups.
- */
-function stripBodyParam(param: any): any {
-  if (typeof param !== "object" || param === null) {
-    return param;
-  }
-
-  const result: any = {};
-  for (const [key, value] of Object.entries(param)) {
-    if (BODY_PARAM_FIELDS.includes(key)) {
-      continue; // Strip this field
-    }
-    if (key === "childParamsGroups" && Array.isArray(value)) {
-      result[key] = value.map(stripBodyParam);
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-
-/**
- * Strip unused fields from event action data.
- */
-function stripEventActionFields(action: any): any {
-  const result: any = {};
-  for (const [key, value] of Object.entries(action)) {
-    if (EVENT_ACTION_FIELDS.includes(key)) {
-      continue; // Strip this field
-    }
-    if (key === "bodyParameters" && Array.isArray(value)) {
-      result[key] = value.map((p: any) => (typeof p === "number" ? p : stripBodyParam(p)));
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-
-/**
- * Strip unused fields from all webhooks.
- * Structure: { eventName: { actionName: { ...fields } } }
- */
-function stripFields(webhooks: Record<string, Record<string, any>>): Record<string, Record<string, any>> {
-  const result: Record<string, Record<string, any>> = {};
-  for (const [eventName, actions] of Object.entries(webhooks)) {
-    result[eventName] = {};
-    for (const [actionName, actionData] of Object.entries(actions)) {
-      result[eventName][actionName] = stripEventActionFields(actionData);
-    }
-  }
-  return result;
-}
-
-const rawWebhooks = Object.values(schema.webhooks || schema["x-webhooks"]) as any[];
-if (!rawWebhooks) {
-  throw new Error("No webhooks found in schema");
-}
-
-const webhooks: Webhook[] = [];
-for (const webhook of Object.values(rawWebhooks)) {
-  webhooks.push(new Webhook(webhook.post));
-}
-
-await Promise.all(webhooks.map(webhook => webhook.process()));
-
-// Check for unknown events (not in DROPPED_EVENTS or KEPT_EVENTS)
-const unknownEvents: string[] = [];
-for (const webhook of webhooks) {
-  if (!DROPPED_EVENTS.has(webhook.category) && !KEPT_EVENTS.has(webhook.category)) {
-    if (!unknownEvents.includes(webhook.category)) {
-      unknownEvents.push(webhook.category);
-    }
-  }
-}
-
-if (unknownEvents.length > 0) {
-  console.error("");
-  console.error("══════════════════════════════════════════════════════════════════");
-  console.error("ERROR: New webhook event(s) detected!");
-  console.error("══════════════════════════════════════════════════════════════════");
-  console.error("");
-  console.error("The following events are not categorized:");
-  for (const event of unknownEvents.sort()) {
-    console.error(`  - ${event}`);
-  }
-  console.error("");
-  console.error("Action required:");
-  console.error("  1. Check if the event is a valid workflow trigger:");
-  console.error(
-    "     https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows"
-  );
-  console.error("");
-  console.error("  2. Add the event to DROPPED_EVENTS or KEPT_EVENTS in:");
-  console.error("     languageservice/script/webhooks/index.ts");
-  console.error("");
-  console.error("  3. See docs/json-data-files.md for more details.");
-  console.error("");
-  process.exit(1);
-}
-
-// The category is the name of the webhook
-const categorizedWebhooks: Record<string, Record<string, Webhook>> = {};
-for (const webhook of webhooks) {
-  if (!webhook.action) webhook.action = "default";
-
-  // Drop unused events
-  if (DROPPED_EVENTS.has(webhook.category)) {
-    continue;
-  }
-
-  if (categorizedWebhooks[webhook.category]) {
-    categorizedWebhooks[webhook.category][webhook.action] = webhook;
-  } else {
-    categorizedWebhooks[webhook.category] = {};
-    categorizedWebhooks[webhook.category][webhook.action] = webhook;
-  }
-}
-
-// Strip fields before deduplication
-const strippedWebhooks = stripFields(categorizedWebhooks);
-
-// Deduplicate after dropping and stripping
-const objectsArray = deduplicateWebhooks(strippedWebhooks);
-
-// Write optimized output
-await fs.writeFile(OBJECTS_PATH, JSON.stringify(objectsArray, null, 2));
-await fs.writeFile(OUTPUT_PATH, JSON.stringify(strippedWebhooks, null, 2));
-
-console.log(`Wrote ${OUTPUT_PATH} (${Object.keys(strippedWebhooks).length} events)`);
-console.log(`Wrote ${OBJECTS_PATH} (${objectsArray.length} objects)`);
-
-// Optionally generate intermediate versions for size comparison
-if (generateAll) {
-  // Helper to deep clone
-  function clone<T>(obj: T): T {
-    return JSON.parse(JSON.stringify(obj));
-  }
-
-  // Build full webhooks (no drop, no strip) from fresh data
-  const fullWebhooks: Record<string, Record<string, any>> = {};
-  for (const webhook of webhooks) {
-    const w = clone(webhook);
-    if (!w.action) w.action = "default";
-    fullWebhooks[w.category] ||= {};
-    fullWebhooks[w.category][w.action] = w;
-  }
-
-  // Generate all version (no drop, no strip)
-  const allWebhooks = clone(fullWebhooks);
-  const allObjects = deduplicateWebhooks(allWebhooks);
-  await fs.writeFile(ALL_OUTPUT_PATH, JSON.stringify(allWebhooks, null, 2));
-  await fs.writeFile(ALL_OBJECTS_PATH, JSON.stringify(allObjects, null, 2));
-  console.log(`Wrote ${ALL_OUTPUT_PATH} (${Object.keys(allWebhooks).length} events)`);
-  console.log(`Wrote ${ALL_OBJECTS_PATH} (${allObjects.length} objects)`);
-
-  // Generate drop-only version (drop events, no strip)
-  const dropWebhooks = clone(fullWebhooks);
-  for (const event of DROPPED_EVENTS) {
-    delete dropWebhooks[event];
-  }
-  const dropObjects = deduplicateWebhooks(dropWebhooks);
-  await fs.writeFile(DROP_OUTPUT_PATH, JSON.stringify(dropWebhooks, null, 2));
-  await fs.writeFile(DROP_OBJECTS_PATH, JSON.stringify(dropObjects, null, 2));
-  console.log(`Wrote ${DROP_OUTPUT_PATH} (${Object.keys(dropWebhooks).length} events)`);
-  console.log(`Wrote ${DROP_OBJECTS_PATH} (${dropObjects.length} objects)`);
-
-  // Generate strip-only version (strip fields, no drop)
-  const stripWebhooks = stripFields(clone(fullWebhooks));
-  const stripObjects = deduplicateWebhooks(stripWebhooks);
-  await fs.writeFile(STRIP_OUTPUT_PATH, JSON.stringify(stripWebhooks, null, 2));
-  await fs.writeFile(STRIP_OBJECTS_PATH, JSON.stringify(stripObjects, null, 2));
-  console.log(`Wrote ${STRIP_OUTPUT_PATH} (${Object.keys(stripWebhooks).length} events)`);
-  console.log(`Wrote ${STRIP_OBJECTS_PATH} (${stripObjects.length} objects)`);
-}
@@ -0,0 +1,291 @@
+import {promises as fs} from "fs";
+import Webhook from "./webhook.js";
+
+import schemaImport from "rest-api-description/descriptions/api.github.com/dereferenced/api.github.com.deref.json";
+import {deduplicateWebhooks} from "./deduplicate.js";
+import eventFilters from "../../src/context-providers/events/event-filters.json";
+const schema = schemaImport as any;
+
+const DROPPED_EVENTS = new Set(eventFilters.dropped);
+const KEPT_EVENTS = new Set(eventFilters.kept);
+
+const OUTPUT_PATH = "./src/context-providers/events/webhooks.json";
+const OBJECTS_PATH = "./src/context-providers/events/webhooks.objects.json";
+const STRINGS_PATH = "./src/context-providers/events/webhooks.strings.json";
+const FULL_OUTPUT_PATH = "./src/context-providers/events/webhooks.full.json";
+
+/**
+ * Fields discarded from each event action object (top level only).
+ * Body parameters are compacted to only keep name, description, and childParamsGroups.
+ */
+const EVENT_ACTION_FIELDS = ["description", "summary", "availability", "category", "action"];
+
+/**
+ * Convert a bodyParameter object to compact array format.
+ *
+ * Format (type-based dispatch):
+ *   - "name"                      - name only (just a string)
+ *   - [name, desc]                - name + description (desc is string)
+ *   - [name, [...children]]       - name + children (arr[1] is array)
+ *   - [name, desc, [...children]] - name + description + children
+ *
+ * The reader uses typeof to determine the meaning:
+ *   - string -> name only
+ *   - array with string arr[1] -> name + description
+ *   - array with array arr[1] -> name + children
+ */
+function compactParam(param: any): any {
+  if (typeof param !== "object" || param === null) {
+    return param;
+  }
+
+  const name: string = param.name;
+  const desc: string | undefined = param.description;
+  const children: any[] | undefined = param.childParamsGroups;
+
+  const hasDesc = desc && desc.length > 0;
+  const hasChildren = children && children.length > 0;
+
+  if (hasDesc && hasChildren) {
+    return [name, desc, children.map(compactParam)];
+  } else if (hasChildren) {
+    return [name, children.map(compactParam)];
+  } else if (hasDesc) {
+    return [name, desc];
+  } else {
+    return name; // Just the string, not wrapped in array
+  }
+}
+
+/**
+ * Convert event action data to compact format.
+ */
+function compactEventAction(action: any): any {
+  const result: any = {};
+  for (const [key, value] of Object.entries(action)) {
+    if (EVENT_ACTION_FIELDS.includes(key)) {
+      continue; // Discard this field
+    }
+    if (key === "bodyParameters" && Array.isArray(value)) {
+      // Use short key 'p' for params
+      result["p"] = value.map((p: any) => (typeof p === "number" ? p : compactParam(p)));
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+
+/**
+ * Convert all webhooks to compact format.
+ * Structure: { eventName: { actionName: { ...fields } } }
+ */
+function compactWebhooks(webhooks: Record<string, Record<string, any>>): Record<string, Record<string, any>> {
+  const result: Record<string, Record<string, any>> = {};
+  for (const [eventName, actions] of Object.entries(webhooks)) {
+    result[eventName] = {};
+    for (const [actionName, actionData] of Object.entries(actions)) {
+      result[eventName][actionName] = compactEventAction(actionData);
+    }
+  }
+  return result;
+}
+
+const rawWebhooks = Object.values(schema.webhooks || schema["x-webhooks"]) as any[];
+if (!rawWebhooks) {
+  throw new Error("No webhooks found in schema");
+}
+
+const webhooks: Webhook[] = [];
+for (const webhook of Object.values(rawWebhooks)) {
+  webhooks.push(new Webhook(webhook.post));
+}
+
+await Promise.all(webhooks.map(webhook => webhook.process()));
+
+// Check for unknown events (not in DROPPED_EVENTS or KEPT_EVENTS)
+const unknownEvents: string[] = [];
+for (const webhook of webhooks) {
+  if (!DROPPED_EVENTS.has(webhook.category) && !KEPT_EVENTS.has(webhook.category)) {
+    if (!unknownEvents.includes(webhook.category)) {
+      unknownEvents.push(webhook.category);
+    }
+  }
+}
+
+if (unknownEvents.length > 0) {
+  console.error("");
+  console.error("══════════════════════════════════════════════════════════════════");
+  console.error("ERROR: New webhook event(s) detected!");
+  console.error("══════════════════════════════════════════════════════════════════");
+  console.error("");
+  console.error("The following events are not categorized:");
+  for (const event of unknownEvents.sort()) {
+    console.error(`  - ${event}`);
+  }
+  console.error("");
+  console.error("Action required:");
+  console.error("  1. Check if the event is a valid workflow trigger:");
+  console.error(
+    "     https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows"
+  );
+  console.error("");
+  console.error("  2. Add the event to 'dropped' or 'kept' array in:");
+  console.error("     languageservice/src/context-providers/events/event-filters.json");
+  console.error("");
+  console.error("  3. See docs/json-data-files.md for more details.");
+  console.error("");
+  process.exit(1);
+}
+
+// Build full webhooks (all events, no transformations) for validation tests
+const fullWebhooks: Record<string, Record<string, Webhook>> = {};
+for (const webhook of webhooks) {
+  if (!webhook.action) webhook.action = "default";
+
+  if (fullWebhooks[webhook.category]) {
+    fullWebhooks[webhook.category][webhook.action] = webhook;
+  } else {
+    fullWebhooks[webhook.category] = {};
+    fullWebhooks[webhook.category][webhook.action] = webhook;
+  }
+}
+
+// Write full version (before any optimizations)
+await fs.writeFile(FULL_OUTPUT_PATH, JSON.stringify(fullWebhooks, null, 2));
+console.log(`Wrote ${FULL_OUTPUT_PATH} (${Object.keys(fullWebhooks).length} events, unoptimized)`);
+
+// The category is the name of the webhook
+const categorizedWebhooks: Record<string, Record<string, Webhook>> = {};
+for (const webhook of webhooks) {
+  if (!webhook.action) webhook.action = "default";
+
+  // Drop unused events
+  if (DROPPED_EVENTS.has(webhook.category)) {
+    continue;
+  }
+
+  if (categorizedWebhooks[webhook.category]) {
+    categorizedWebhooks[webhook.category][webhook.action] = webhook;
+  } else {
+    categorizedWebhooks[webhook.category] = {};
+    categorizedWebhooks[webhook.category][webhook.action] = webhook;
+  }
+}
+
+// Convert to compact format before deduplication
+const compactedWebhooks = compactWebhooks(categorizedWebhooks);
+
+// Deduplicate after compacting
+const objectsArray = deduplicateWebhooks(compactedWebhooks);
+
+// ============================================================================
+// String Interning (Phase 3)
+// ============================================================================
+// Intern duplicate property names to reduce file size.
+// Names appearing 2+ times are stored in a string table and referenced by index.
+// Singleton names stay as literal strings for readability.
+
+/**
+ * Collect all property names from params (for frequency counting)
+ */
+function collectNames(param: any, counts: Map<string, number>): void {
+  if (typeof param === "number") return;
+  if (typeof param === "string") {
+    counts.set(param, (counts.get(param) || 0) + 1);
+    return;
+  }
+  if (Array.isArray(param)) {
+    const name = param[0] as string;
+    counts.set(name, (counts.get(name) || 0) + 1);
+    const children = Array.isArray(param[1]) ? param[1] : param[2];
+    if (children) children.forEach((c: any) => collectNames(c, counts));
+  }
+}
+
+/**
+ * Replace duplicate names with indices into the string table.
+ * Object references use negative indices: objectIndex -> -(objectIndex + 1)
+ * String references use non-negative indices: stringIndex -> stringIndex
+ *
+ * @param param - The param to process
+ * @param nameToIndex - Map from name to string table index
+ */
+function internNames(param: any, nameToIndex: Map<string, number>): any {
+  // Object reference (already a number from deduplication) -> make negative
+  if (typeof param === "number") return -(param + 1);
+
+  // String -> intern if in table, otherwise keep as literal
+  if (typeof param === "string") {
+    const idx = nameToIndex.get(param);
+    return idx !== undefined ? idx : param;
+  }
+
+  if (Array.isArray(param)) {
+    const name = param[0] as string;
+    const idx = nameToIndex.get(name);
+    const internedName = idx !== undefined ? idx : name;
+
+    // Handle different array formats
+    if (typeof param[1] === "string" && !Array.isArray(param[1])) {
+      // [name, desc] or [name, desc, children]
+      if (param.length === 2) {
+        return [internedName, param[1]];
+      } else {
+        return [internedName, param[1], (param[2] as any[]).map((c: any) => internNames(c, nameToIndex))];
+      }
+    } else if (Array.isArray(param[1])) {
+      // [name, children]
+      return [internedName, param[1].map((c: any) => internNames(c, nameToIndex))];
+    }
+    // Shouldn't happen, but fallback
+    return [internedName, ...param.slice(1)];
+  }
+  return param;
+}
+
+// Pass 1: Count all names
+const nameCounts = new Map<string, number>();
+objectsArray.forEach((obj: any) => collectNames(obj, nameCounts));
+for (const event of Object.values(compactedWebhooks)) {
+  for (const action of Object.values(event as Record<string, any>)) {
+    if (action.p) action.p.forEach((p: any) => collectNames(p, nameCounts));
+  }
+}
+
+// Build string table from duplicates, sorted by frequency (most common first = smaller indices)
+const sortedNames = [...nameCounts.entries()].filter(([, count]) => count >= 2).sort((a, b) => b[1] - a[1]);
+const stringTable = sortedNames.map(([name]) => name);
+const nameToIndex = new Map(stringTable.map((name, i) => [name, i]));
+
+console.log(
+  `String table: ${stringTable.length} interned names (${nameCounts.size - stringTable.length} singletons kept inline)`
+);
+
+// Pass 2: Intern names in objects and webhooks
+// Objects use negative indices, strings use non-negative indices
+const internedObjects = objectsArray.map((obj: any) => internNames(obj, nameToIndex));
+const internedWebhooks: Record<string, Record<string, any>> = {};
+for (const [eventName, actions] of Object.entries(compactedWebhooks)) {
+  internedWebhooks[eventName] = {};
+  for (const [actionName, actionData] of Object.entries(actions as Record<string, any>)) {
+    internedWebhooks[eventName][actionName] = {
+      p: actionData.p.map((p: any) => internNames(p, nameToIndex))
+    };
+  }
+}
+
+// Write optimized output with separate string table
+// Format: webhooks.strings.json has string table, webhooks.json/webhooks.objects.json reference by index
+const finalOutput = {
+  "//": "Generated file - refer to docs/json-data-files.md for format documentation",
+  ...internedWebhooks
+};
+
+await fs.writeFile(STRINGS_PATH, JSON.stringify(stringTable, null, 2));
+await fs.writeFile(OBJECTS_PATH, JSON.stringify(internedObjects, null, 2));
+await fs.writeFile(OUTPUT_PATH, JSON.stringify(finalOutput, null, 2));
+
+console.log(`Wrote ${STRINGS_PATH} (${stringTable.length} interned strings)`);
+console.log(`Wrote ${OUTPUT_PATH} (${Object.keys(compactedWebhooks).length} events)`);
+console.log(`Wrote ${OBJECTS_PATH} (${internedObjects.length} objects)`);
@@ -299,16 +299,7 @@ jobs:
        "on: push\njobs:\n  build:\n    runs-on: ubuntu-latest\n    environment:\n      url: ${{ runner.| }}\n    steps:\n      - run: echo";
      const result = await complete(...getPositionFromCursor(input), {contextProviderConfig});

-      expect(result.map(x => x.label)).toEqual([
-        "arch",
-        "debug",
-        "environment",
-        "name",
-        "os",
-        "temp",
-        "tool_cache",
-        "workspace"
-      ]);
+      expect(result.map(x => x.label)).toEqual(["arch", "name", "os", "temp", "tool_cache"]);
    });

    describe("job if", () => {
@@ -870,7 +861,7 @@ jobs:
  });

  describe("strategy context", () => {
-    it("strategy is suggested even when no strategy defined", async () => {
+    it("strategy is not suggested when outside of a matrix job", async () => {
      const input = `
 on: push

@@ -884,7 +875,7 @@ jobs:

      const result = await complete(...getPositionFromCursor(input), {contextProviderConfig});

-      expect(result.map(x => x.label)).toContain("strategy");
+      expect(result.map(x => x.label)).not.toContain("strategy");
    });

    it("strategy is suggested within a matrix job", async () => {
@@ -931,7 +922,7 @@ jobs:
  });

  describe("matrix context", () => {
-    it("matrix is suggested even when no strategy defined", async () => {
+    it("matrix is not suggested when outside of a matrix job", async () => {
      const input = `
 on: push

@@ -945,7 +936,7 @@ jobs:

      const result = await complete(...getPositionFromCursor(input), {contextProviderConfig});

-      expect(result.map(x => x.label)).toContain("matrix");
+      expect(result.map(x => x.label)).not.toContain("strategy");
    });

    it("matrix is suggested within a matrix job", async () => {
@@ -1132,12 +1123,10 @@ jobs:
        "github",
        "inputs",
        "job",
-        "matrix",
        "needs",
        "runner",
        "secrets",
        "steps",
-        "strategy",
        "vars",
        "contains",
        "endsWith",
@@ -1,169 +0,0 @@
-import {complete} from "./complete";
-import {TextDocument} from "vscode-languageserver-textdocument";
-import {clearCache} from "./utils/workflow-cache";
-import {getPositionFromCursor} from "./test-utils/cursor-position";
-
-beforeEach(() => {
-  clearCache();
-});
-
-describe("Issue #81 - multi-line if expression completion", () => {
-  it("should complete in block scalar if with | (exact position)", async () => {
-    // Exact reproduction from issue - cursor after "github." in block scalar
-    const input = `on: push
-
-jobs:
-  build:
-    if: |
-      github.
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`;
-
-    const doc = TextDocument.create("file:///test.yaml", "yaml", 1, input);
-    // Line 5 (0-indexed) = "      github.", character 13 = after the dot
-    const pos = {line: 5, character: 13};
-
-    const result = await complete(doc, pos, {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("event");
-    expect(result.map(x => x.label)).toContain("actor");
-  });
-
-  it("should complete in block scalar if with > (exact position)", async () => {
-    const input = `on: push
-
-jobs:
-  build:
-    if: >
-      github.
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`;
-
-    const doc = TextDocument.create("file:///test.yaml", "yaml", 1, input);
-    const pos = {line: 5, character: 13};
-
-    const result = await complete(doc, pos, {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("event");
-  });
-
-  it("should complete in block scalar with multiple lines", async () => {
-    const input = `on: push
-jobs:
-  build:
-    if: |
-      github.event_name == 'push' &&
-      github.|
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`;
-
-    // Skip 1 to skip the `|` block scalar indicator (same character as cursor marker)
-    const result = await complete(...getPositionFromCursor(input, 1), {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("event");
-  });
-
-  it("should complete step if in block scalar", async () => {
-    const input = `on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo
-      if: |
-        github.
-`;
-
-    const doc = TextDocument.create("file:///test.yaml", "yaml", 1, input);
-    // Line 7 = "        github.", character 15 = after the dot (8 spaces + 7 chars)
-    const pos = {line: 7, character: 15};
-
-    const result = await complete(doc, pos, {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("event");
-  });
-
-  it("should complete in block scalar with ${{ expression markers", async () => {
-    // This case works because transform() skips lines with ${{
-    // Note: Using explicit position because | appears in multiple places (block scalar, ||, cursor)
-    const input = `on: push
-jobs:
-  build:
-    if: |
-      \${{
-        github.ref == 'refs/heads/main' ||
-        github.
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`;
-
-    const doc = TextDocument.create("file:///test.yaml", "yaml", 1, input);
-    // Line 6 = "        github." = 8 spaces + 7 chars = 15 chars, cursor after dot is at char 15
-    const pos = {line: 6, character: 15};
-
-    const result = await complete(doc, pos, {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("ref");
-    expect(result.map(x => x.label)).toContain("ref_name");
-  });
-});
-
-describe("Edge cases for getOffsetInContent", () => {
-  it("should complete in single-line if (not block scalar)", async () => {
-    const input = `on: push
-jobs:
-  build:
-    if: github.|
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`;
-
-    const result = await complete(...getPositionFromCursor(input), {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("event");
-  });
-
-  it("should complete on third content line of block scalar", async () => {
-    const input = `on: push
-jobs:
-  build:
-    if: |
-      github.event_name == 'push' &&
-      github.ref == 'refs/heads/main' &&
-      github.|
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`;
-
-    const result = await complete(...getPositionFromCursor(input, 1), {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("event");
-  });
-
-  it("should complete when block scalar has empty first line", async () => {
-    const input = `on: push
-jobs:
-  build:
-    if: |
-
-      github.|
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`;
-
-    const result = await complete(...getPositionFromCursor(input, 1), {});
-
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.map(x => x.label)).toContain("event");
-  });
-});
@@ -5,7 +5,6 @@ import {ErrorPolicy} from "@actions/workflow-parser/model/convert";
 import {OPEN_EXPRESSION} from "@actions/workflow-parser/templates/template-constants";
 import {TemplateToken} from "@actions/workflow-parser/templates/tokens/index";
 import {MappingToken} from "@actions/workflow-parser/templates/tokens/mapping-token";
-import {TokenRange} from "@actions/workflow-parser/templates/tokens/token-range";
 import {TokenType} from "@actions/workflow-parser/templates/tokens/types";
 import {File} from "@actions/workflow-parser/workflows/file";
 import {FileProvider} from "@actions/workflow-parser/workflows/file-provider";
@@ -20,6 +19,7 @@ import {isPotentiallyExpression} from "./utils/expression-detection";
 import {findToken} from "./utils/find-token";
 import {guessIndentation} from "./utils/indentation-guesser";
 import {mapRange} from "./utils/range";
+import {getRelCharOffset} from "./utils/rel-char-pos";
 import {isPlaceholder, transform} from "./utils/transform";
 import {fetchOrConvertWorkflowTemplate, fetchOrParseWorkflow} from "./utils/workflow-cache";
 import {Value, ValueProviderConfig} from "./value-providers/config";
@@ -238,12 +238,12 @@ function getExpressionCompletionItems(
    currentInput = stringToken.source || stringToken.value;
  }

-  const cursorOffset = getOffsetInContent(token.range, currentInput, pos);
-  const expressionInput = (getExpressionInput(currentInput, cursorOffset) || "").trim();
+  const relCharOffset = getRelCharOffset(token.range, currentInput, pos);
+  const expressionInput = (getExpressionInput(currentInput, relCharOffset) || "").trim();

  try {
    return completeExpression(expressionInput, context, [], validatorFunctions).map(item =>
-      mapExpressionCompletionItem(item, currentInput[cursorOffset])
+      mapExpressionCompletionItem(item, currentInput[relCharOffset])
    );
  } catch (e) {
    error(`Error while completing expression: '${(e as Error)?.message || "<no details>"}'`);
@@ -274,50 +274,3 @@ function mapExpressionCompletionItem(item: ExpressionCompletionItem, charAfterPo
    kind: item.function ? CompletionItemKind.Function : CompletionItemKind.Variable
  };
 }
-
-/**
- * Converts a document position to an offset within the token's content string.
- */
-function getOffsetInContent(tokenRange: TokenRange, currentInput: string, pos: Position): number {
-  const range = mapRange(tokenRange);
-
-  if (range.start.line === range.end.line) {
-    // Single-line example:
-    //   if: github.ref == 'main'
-    //       ^8      ^15 (cursor)
-    // currentInput = "github.ref == 'main'"
-    // offset = 15 - 8 = 7
-    return pos.character - range.start.character;
-  }
-
-  // Multi-line example:
-  //   if: |                         <- line 3 (range.start.line)
-  //     first line                  <- line 4, content line 0
-  //     second line                 <- line 5, content line 1
-  //     github.                     <- line 6, content line 2, cursor at index 11
-  //            ^11 (cursor)
-  //
-  // currentInput = "    first line\n    second line\n    github."
-  //                 ^0              ^15              ^32        ^43
-
-  // Line index within content.
-  // From the example:
-  // lineIndexWithinContent = pos.line - range.start.line - 1
-  //                        = 6 - 3 - 1 = 2
-  const lineIndexWithinContent = pos.line - range.start.line - 1;
-
-  // Length of content before current line.
-  // From the example:
-  // lengthOfContentBeforeCurrentLine => 14 + 1 = 15 (after first iteration)
-  //                                  => 31 + 1 = 32 (after second iteration)
-  let lengthOfContentBeforeCurrentLine = 0;
-  for (let i = 0; i < lineIndexWithinContent; i++) {
-    lengthOfContentBeforeCurrentLine = currentInput.indexOf("\n", lengthOfContentBeforeCurrentLine) + 1;
-  }
-
-  // Final offset within content.
-  // From the example:
-  // finalOffset = lengthOfContentBeforeCurrentLine + pos.character
-  //             = 32 + 11 = 43
-  return lengthOfContentBeforeCurrentLine + pos.character;
-}
@@ -1,97 +0,0 @@
-import {DescriptionDictionary} from "@actions/expressions";
-import {WorkflowContext} from "../context/workflow-context";
-import {getContext, Mode} from "./default";
-
-describe("getContext", () => {
-  const emptyWorkflowContext: WorkflowContext = {
-    uri: "test.yaml",
-    template: undefined
-  };
-
-  describe("when no contextProviderConfig is provided", () => {
-    it("should mark secrets context as incomplete", async () => {
-      const result = await getContext(["secrets"], undefined, emptyWorkflowContext, Mode.Validation);
-
-      const secretsContext = result.get("secrets") as DescriptionDictionary;
-      expect(secretsContext).toBeDefined();
-      expect(secretsContext.complete).toBe(false);
-    });
-
-    it("should mark vars context as incomplete", async () => {
-      const result = await getContext(["vars"], undefined, emptyWorkflowContext, Mode.Validation);
-
-      const varsContext = result.get("vars") as DescriptionDictionary;
-      expect(varsContext).toBeDefined();
-      expect(varsContext.complete).toBe(false);
-    });
-
-    it("should not mark other contexts as incomplete", async () => {
-      const result = await getContext(["env", "github"], undefined, emptyWorkflowContext, Mode.Validation);
-
-      const envContext = result.get("env") as DescriptionDictionary;
-      const githubContext = result.get("github") as DescriptionDictionary;
-
-      // These contexts are derived from the workflow file, so they can be complete
-      expect(envContext).toBeDefined();
-      expect(envContext.complete).toBe(true);
-      expect(githubContext).toBeDefined();
-      expect(githubContext.complete).toBe(true);
-    });
-  });
-
-  describe("when contextProviderConfig returns a value", () => {
-    it("should use the provided context for secrets", async () => {
-      const providedContext = new DescriptionDictionary();
-      providedContext.complete = true; // Provider fetched from API, so it's complete
-
-      const config = {
-        getContext: () => Promise.resolve(providedContext)
-      };
-
-      const result = await getContext(["secrets"], config, emptyWorkflowContext, Mode.Validation);
-
-      const secretsContext = result.get("secrets");
-      expect(secretsContext).toBe(providedContext);
-      expect((secretsContext as DescriptionDictionary).complete).toBe(true);
-    });
-
-    it("should use the provided context for vars", async () => {
-      const providedContext = new DescriptionDictionary();
-      providedContext.complete = true;
-
-      const config = {
-        getContext: () => Promise.resolve(providedContext)
-      };
-
-      const result = await getContext(["vars"], config, emptyWorkflowContext, Mode.Validation);
-
-      const varsContext = result.get("vars");
-      expect(varsContext).toBe(providedContext);
-      expect((varsContext as DescriptionDictionary).complete).toBe(true);
-    });
-  });
-
-  describe("when contextProviderConfig returns undefined", () => {
-    it("should mark secrets as incomplete", async () => {
-      const config = {
-        getContext: () => Promise.resolve(undefined)
-      };
-
-      const result = await getContext(["secrets"], config, emptyWorkflowContext, Mode.Validation);
-
-      const secretsContext = result.get("secrets") as DescriptionDictionary;
-      expect(secretsContext.complete).toBe(false);
-    });
-
-    it("should mark vars as incomplete", async () => {
-      const config = {
-        getContext: () => Promise.resolve(undefined)
-      };
-
-      const result = await getContext(["vars"], config, emptyWorkflowContext, Mode.Validation);
-
-      const varsContext = result.get("vars") as DescriptionDictionary;
-      expect(varsContext.complete).toBe(false);
-    });
-  });
-});
@@ -32,24 +32,15 @@ export async function getContext(
 ): Promise<DescriptionDictionary> {
  const context = new DescriptionDictionary();

-  // All context names are valid - strategy and matrix are always available
-  // (with default values when no strategy block is defined)
-  for (const contextName of names) {
+  const filteredNames = filterContextNames(names, workflowContext);
+  for (const contextName of filteredNames) {
    let value = getDefaultContext(contextName, workflowContext, mode) || new DescriptionDictionary();
    if (value.kind === Kind.Null) {
      context.add(contextName, value);
      continue;
    }

-    const remoteValue = await config?.getContext(contextName, value, workflowContext, mode);
-    if (remoteValue) {
-      value = remoteValue;
-    } else if (contextName === "secrets" || contextName === "vars") {
-      // Without a context provider to fetch remote secrets/vars, we can't know
-      // what values exist, so mark the context as incomplete to avoid false
-      // "Context access might be invalid" warnings
-      value.complete = false;
-    }
+    value = (await config?.getContext(contextName, value, workflowContext, mode)) || value;

    context.add(contextName, value, getDescription(RootContext, contextName));
  }
@@ -83,14 +74,11 @@ function getDefaultContext(name: string, workflowContext: WorkflowContext, mode:

    case "runner":
      return objectToDictionary({
-        arch: "X64",
-        debug: "1",
-        environment: "github-hosted",
-        name: "GitHub Actions 2",
        os: "Linux",
-        temp: "/home/runner/work/_temp",
+        arch: "X64",
+        name: "GitHub Actions 2",
        tool_cache: "/opt/hostedtoolcache",
-        workspace: "/home/runner/work/repo"
+        temp: "/home/runner/work/_temp"
      });

    case "secrets":
@@ -115,3 +103,18 @@ function objectToDictionary(object: {[key: string]: string}): DescriptionDiction

  return dictionary;
 }
+
+function filterContextNames(contextNames: string[], workflowContext: WorkflowContext): string[] {
+  return contextNames.filter(name => {
+    switch (name) {
+      case "matrix":
+      case "strategy":
+        return hasStrategy(workflowContext);
+    }
+    return true;
+  });
+}
+
+function hasStrategy(workflowContext: WorkflowContext): boolean {
+  return workflowContext.job?.strategy !== undefined || workflowContext.reusableWorkflowJob?.strategy !== undefined;
+}
@@ -239,13 +239,7 @@
      "description": "The path to the directory containing preinstalled tools for GitHub-hosted runners. For more information, see \"[About GitHub-hosted runners](https://docs.github.com/actions/reference/specifications-for-github-hosted-runners/#supported-software).\""
    },
    "debug": {
-      "description": "This is set only if [`ACTIONS_STEP_DEBUG`](https://docs.github.com/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging) is enabled, and always has the value of `\"1\"`. It can be useful as an indicator to enable additional debugging or verbose logging in your own job steps."
-    },
-    "environment": {
-      "description": "The environment of the runner executing the job. Possible values are `github-hosted` for GitHub-hosted runners, or `self-hosted` for self-hosted runners."
-    },
-    "workspace": {
-      "description": "The runner-specific working directory path for the job."
+      "description": "This is set only if [debug logging](https://docs.github.com/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging) is enabled, and always has the value of `1`. It can be useful as an indicator to enable additional debugging or verbose logging in your own job steps."
    }
  },
  "strategy": {
@@ -0,0 +1,75 @@
+{
+  "dropped": [
+    "branch_protection_configuration",
+    "code_scanning_alert",
+    "commit_comment",
+    "custom_property",
+    "custom_property_values",
+    "dependabot_alert",
+    "deploy_key",
+    "github_app_authorization",
+    "installation",
+    "installation_repositories",
+    "installation_target",
+    "marketplace_purchase",
+    "member",
+    "membership",
+    "merge_group",
+    "meta",
+    "org_block",
+    "organization",
+    "package",
+    "personal_access_token_request",
+    "ping",
+    "repository",
+    "repository_advisory",
+    "repository_ruleset",
+    "secret_scanning_alert",
+    "secret_scanning_alert_location",
+    "security_advisory",
+    "security_and_analysis",
+    "sponsorship",
+    "star",
+    "team",
+    "team_add"
+  ],
+  "kept": [
+    "branch_protection_rule",
+    "check_run",
+    "check_suite",
+    "create",
+    "delete",
+    "deployment",
+    "deployment_status",
+    "discussion",
+    "discussion_comment",
+    "fork",
+    "gollum",
+    "issue_comment",
+    "issues",
+    "label",
+    "milestone",
+    "page_build",
+    "project",
+    "project_card",
+    "project_column",
+    "projects_v2",
+    "projects_v2_item",
+    "public",
+    "pull_request",
+    "pull_request_review",
+    "pull_request_review_comment",
+    "pull_request_review_thread",
+    "push",
+    "registry_package",
+    "release",
+    "repository_dispatch",
+    "repository_import",
+    "repository_vulnerability_alert",
+    "status",
+    "watch",
+    "workflow_dispatch",
+    "workflow_job",
+    "workflow_run"
+  ]
+}
@@ -1,5 +1,34 @@
-import {DescriptionDictionary} from "@actions/expressions";
+import {existsSync} from "fs";
+import {fileURLToPath} from "url";
+import {dirname, join} from "path";
+import {data, DescriptionDictionary, DescriptionPair, isDescriptionDictionary} from "@actions/expressions";
 import {getEventPayload, getSupportedEventTypes} from "./eventPayloads";
+import eventFilters from "./event-filters.json";
+
+const DROPPED_EVENTS = new Set(eventFilters.dropped);
+
+// Check if full webhooks file exists (generated by npm run update-webhooks)
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const fullWebhooksPath = join(__dirname, "webhooks.full.json");
+const hasFullWebhooks = existsSync(fullWebhooksPath);
+
+type Param = {
+  name: string;
+  description?: string;
+  childParamsGroups?: Param[];
+};
+
+type FullAction = {
+  action?: string;
+  bodyParameters?: Param[];
+};
+
+type FullWebhooks = {
+  [event: string]: {
+    [action: string]: FullAction;
+  };
+};

 describe("eventPayloads", () => {
  describe("getSupportedEventTypes", () => {
@@ -100,3 +129,149 @@ describe("eventPayloads", () => {
    });
  });
 });
+
+// Optimization validation tests - only run if webhooks.full.json exists
+// This file is generated by: npm run update-webhooks
+// In CI, a separate job runs these tests after generating the file
+const describeIfFullExists = hasFullWebhooks ? describe : describe.skip;
+
+// Marker file path - written after validation tests complete
+const fullValidationMarkerPath = join(__dirname, "webhooks.full.validation-complete");
+
+describeIfFullExists("optimization validation", () => {
+  let keptWebhooks: FullWebhooks;
+
+  beforeAll(async () => {
+    // Dynamically import the full webhooks file using fs to avoid TS module resolution
+    const {readFileSync} = await import("fs");
+    const fullWebhooks = JSON.parse(readFileSync(fullWebhooksPath, "utf-8")) as FullWebhooks;
+
+    // Filter to only kept events
+    keptWebhooks = {};
+    for (const [event, actions] of Object.entries(fullWebhooks)) {
+      if (!DROPPED_EVENTS.has(event)) {
+        keptWebhooks[event] = actions;
+      }
+    }
+  });
+
+  afterAll(async () => {
+    // Write marker file to prove validation tests ran
+    const {writeFileSync} = await import("fs");
+    writeFileSync(fullValidationMarkerPath, new Date().toISOString());
+  });
+
+  /**
+   * Build a DescriptionDictionary from raw params (same logic as eventPayloads.ts)
+   */
+  function buildFromParams(params: Param[]): DescriptionDictionary {
+    const d = new DescriptionDictionary();
+    for (const param of params) {
+      if (param.childParamsGroups && param.childParamsGroups.length > 0) {
+        const child = buildFromParams(param.childParamsGroups);
+        d.add(param.name, child, param.description);
+      } else {
+        // Match the behavior in eventPayloads.ts - don't overwrite existing
+        if (!d.get(param.name)) {
+          d.add(param.name, new data.Null(), param.description);
+        }
+      }
+    }
+    return d;
+  }
+
+  /**
+   * Compare two DescriptionDictionary structures recursively
+   */
+  function compareStructures(full: DescriptionDictionary, optimized: DescriptionDictionary, path: string): string[] {
+    const errors: string[] = [];
+
+    const fullPairs = full.pairs();
+    const optimizedPairs = optimized.pairs();
+
+    const fullKeys = new Set(fullPairs.map((p: DescriptionPair) => p.key));
+    const optimizedKeys = new Set(optimizedPairs.map((p: DescriptionPair) => p.key));
+
+    // Check for missing keys in optimized
+    for (const key of fullKeys) {
+      if (!optimizedKeys.has(key)) {
+        errors.push(`Missing key in optimized: ${path}.${key}`);
+      }
+    }
+
+    // Check for extra keys in optimized
+    for (const key of optimizedKeys) {
+      if (!fullKeys.has(key)) {
+        errors.push(`Extra key in optimized: ${path}.${key}`);
+      }
+    }
+
+    // Compare descriptions and recurse into nested structures
+    for (const fullPair of fullPairs) {
+      const optimizedValue = optimized.get(fullPair.key);
+      if (optimizedValue === undefined) continue;
+
+      // Compare descriptions
+      const fullDesc = full.getDescription(fullPair.key) ?? "";
+      const optimizedDesc = optimized.getDescription(fullPair.key) ?? "";
+      if (fullDesc !== optimizedDesc) {
+        errors.push(
+          `Description mismatch at ${path}.${fullPair.key}: ` + `full="${fullDesc}" vs optimized="${optimizedDesc}"`
+        );
+      }
+
+      // Recurse into nested dictionaries
+      if (isDescriptionDictionary(fullPair.value) && isDescriptionDictionary(optimizedValue)) {
+        errors.push(...compareStructures(fullPair.value, optimizedValue, `${path}.${fullPair.key}`));
+      }
+    }
+
+    return errors;
+  }
+
+  it("optimized webhooks match full source for all events and actions", () => {
+    const allErrors: string[] = [];
+
+    for (const [event, actions] of Object.entries(keptWebhooks)) {
+      for (const [action, actionData] of Object.entries(actions)) {
+        // Build from full source (use bodyParameters, may be undefined)
+        const params = actionData.bodyParameters || [];
+        const fullPayload = buildFromParams(params);
+
+        // Get from optimized (deduplicated) source
+        const optimizedPayload = getEventPayload(event, action);
+
+        if (!optimizedPayload) {
+          allErrors.push(`Missing optimized payload for ${event}.${action}`);
+          continue;
+        }
+
+        const errors = compareStructures(fullPayload, optimizedPayload, `${event}.${action}`);
+        allErrors.push(...errors);
+      }
+    }
+
+    if (allErrors.length > 0) {
+      fail(
+        `Optimization validation failed:\n${allErrors.slice(0, 20).join("\n")}` +
+          (allErrors.length > 20 ? `\n... and ${allErrors.length - 20} more errors` : "")
+      );
+    }
+  });
+
+  it("all full source events are present in optimized version", () => {
+    for (const event of Object.keys(keptWebhooks)) {
+      const types = getSupportedEventTypes(event);
+      expect(types.length).toBeGreaterThan(0);
+    }
+  });
+
+  it("all full source actions are present in optimized version", () => {
+    for (const [event, actions] of Object.entries(keptWebhooks)) {
+      for (const action of Object.keys(actions)) {
+        const payload = getEventPayload(event, action);
+        expect(payload).toBeDefined();
+      }
+    }
+  });
+});
@@ -1,7 +1,8 @@
 import {data, DescriptionDictionary} from "@actions/expressions";

-import webhookObjects from "./objects.min.json";
-import webhooks from "./webhooks.min.json";
+import webhooksData from "./webhooks.min.json";
+import objectsData from "./webhooks.objects.min.json";
+import stringsData from "./webhooks.strings.min.json";

 import schedule from "./schedule.min.json";
 import workflow_call from "./workflow_call.min.json";
@@ -49,9 +50,22 @@ type Param = {
 };

 /**
- * A full {@link Param} or an index into the objects array for deduplicated parameters
+ * Compact format for params (written by update-webhooks.ts).
+ *
+ * Names can be interned (number = index into string table) or literal strings.
+ * Type-based dispatch:
+ *   - number                   - interned name only (index into string table)
+ *   - "name"                   - literal name only (singleton, not interned)
+ *   - [name, desc]             - name + description (name is number or string, desc is string)
+ *   - [name, [...children]]    - name + children (arr[1] is array)
+ *   - [name, desc, [...children]] - name + description + children
 */
-type DeduplicatedParam = Param | number;
+type InternedName = number | string;
+type CompactParam =
+  | InternedName
+  | [InternedName, string]
+  | [InternedName, CompactParam[]]
+  | [InternedName, string, CompactParam[]];

 type WebhookPayload = {
  descriptionHtml: string;
@@ -65,17 +79,33 @@ type Webhooks = {
  };
 };

-type DeduplicatedWebhooks = {
-  [name: string]: {
-    [action: string]: WebhookPayload & {
-      bodyParameters: DeduplicatedParam[];
-    };
-  };
+/**
+ * Webhooks data format after optimization:
+ * {
+ *   [event]: { [action]: { p: CompactParam[] } }
+ * }
+ *
+ * String table and objects are loaded from separate files.
+ */
+type WebhooksData = {
+  [key: string]: {[action: string]: {p: CompactParam[]}};
 };

 /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any */
-const dedupedWebhookPayloads: DeduplicatedWebhooks = webhooks as any;
-const objects: Param[] = webhookObjects as any;
+const webhooksJson: WebhooksData = webhooksData as any;
+const objectsJson: CompactParam[] = objectsData as any;
+
+// String table and objects are in separate files
+const stringTable: string[] = stringsData;
+const objects: CompactParam[] = objectsJson;
+
+// Build event payloads map (skip "//" comment key)
+const dedupedWebhookPayloads: {[event: string]: {[action: string]: {p: CompactParam[]}}} = {};
+for (const [key, value] of Object.entries(webhooksJson)) {
+  if (key !== "//" && typeof value === "object" && value !== null) {
+    dedupedWebhookPayloads[key] = value as {[action: string]: {p: CompactParam[]}};
+  }
+}
 /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any */

 // Hydrated webhook payloads
@@ -169,10 +199,14 @@ function getWebhookPayload(event: string, action: string): WebhookPayload | unde
    return undefined;
  }

+  // Get params from 'p' (compact format)
+  const dedupedParams = deduplicatedPayload.p || [];
+
  // Recreate the full payload and store it for reuse
-  const params = deduplicatedPayload.bodyParameters.map(p => fullParam(p));
+  const params = dedupedParams.map(p => fullParam(p));
  const payload = {
-    ...deduplicatedPayload,
+    descriptionHtml: "",
+    summaryHtml: "",
    bodyParameters: params
  };
  webhookPayloads[event] ||= {};
@@ -180,13 +214,65 @@ function getWebhookPayload(event: string, action: string): WebhookPayload | unde
  return payload;
 }

-function fullParam(dedupedParam: DeduplicatedParam): Param {
-  if (typeof dedupedParam === "number") {
-    if (dedupedParam >= objects.length) {
-      throw new Error(`Unknown object ${dedupedParam}`);
+/**
+ * Resolve an interned name (non-negative number -> string table lookup) or return literal string
+ */
+function resolveName(name: InternedName): string {
+  if (typeof name === "number") {
+    if (name < 0 || name >= stringTable.length) {
+      throw new Error(`Unknown interned name index ${name}`);
    }
-    return objects[dedupedParam];
+    return stringTable[name];
+  }
+  return name;
+}
+
+/**
+ * Convert a deduplicated param to a full Param.
+ *
+ * Compact format (type-based dispatch):
+ *   - negative number          - object index: -(n + 1) -> objects[-n - 1]
+ *   - non-negative number      - interned string index -> stringTable[n]
+ *   - "name"                   - literal name only (singleton, not interned)
+ *   - [name, desc]             - name + description (name can be number or string)
+ *   - [name, [...children]]    - name + children (arr[1] is array)
+ *   - [name, desc, [...children]] - name + description + children
+ */
+function fullParam(dedupedParam: CompactParam): Param {
+  // Negative number -> object index
+  if (typeof dedupedParam === "number" && dedupedParam < 0) {
+    const objectIndex = -(dedupedParam + 1);
+    if (objectIndex >= objects.length) {
+      throw new Error(`Unknown object index ${objectIndex} (from ${dedupedParam})`);
+    }
+    return fullParam(objects[objectIndex]);
  }

-  return dedupedParam;
+  // Non-negative number or literal string -> name only
+  if (typeof dedupedParam === "number" || typeof dedupedParam === "string") {
+    return {
+      name: resolveName(dedupedParam),
+      description: ""
+    } as Param;
+  }
+
+  // Compact array format -> convert to Param object
+  if (Array.isArray(dedupedParam)) {
+    const arr = dedupedParam;
+    const name = resolveName(arr[0]);
+
+    // Type-based dispatch: if arr[1] is string -> description, if array -> children
+    const description = typeof arr[1] === "string" ? arr[1] : "";
+    // arr[1] is children if it's an array, otherwise arr[2] is children (if it exists and is an array)
+    const childrenArr = Array.isArray(arr[1]) ? arr[1] : Array.isArray(arr[2]) ? arr[2] : undefined;
+    const childParamsGroups = childrenArr ? childrenArr.map(c => fullParam(c)) : undefined;
+
+    return {
+      name,
+      description,
+      childParamsGroups
+    } as Param;
+  }
+
+  throw new Error(`Unexpected param format: ${JSON.stringify(dedupedParam)}`);
 }
@@ -0,0 +1,416 @@
+[
+  "url",
+  "id",
+  "node_id",
+  "html_url",
+  "name",
+  "events_url",
+  "avatar_url",
+  "login",
+  "repos_url",
+  "type",
+  "gravatar_id",
+  "followers_url",
+  "following_url",
+  "gists_url",
+  "starred_url",
+  "subscriptions_url",
+  "organizations_url",
+  "received_events_url",
+  "site_admin",
+  "email",
+  "deleted",
+  "created_at",
+  "description",
+  "updated_at",
+  "href",
+  "labels_url",
+  "comments_url",
+  "number",
+  "user",
+  "statuses_url",
+  "owner",
+  "commits_url",
+  "state",
+  "open_issues",
+  "sha",
+  "title",
+  "ref",
+  "body",
+  "hooks_url",
+  "issues_url",
+  "full_name",
+  "private",
+  "fork",
+  "archive_url",
+  "assignees_url",
+  "blobs_url",
+  "branches_url",
+  "collaborators_url",
+  "compare_url",
+  "contents_url",
+  "contributors_url",
+  "deployments_url",
+  "downloads_url",
+  "forks_url",
+  "git_commits_url",
+  "git_refs_url",
+  "git_tags_url",
+  "issue_comment_url",
+  "issue_events_url",
+  "keys_url",
+  "languages_url",
+  "merges_url",
+  "milestones_url",
+  "notifications_url",
+  "pulls_url",
+  "releases_url",
+  "stargazers_url",
+  "subscribers_url",
+  "subscription_url",
+  "tags_url",
+  "teams_url",
+  "trees_url",
+  "slug",
+  "size",
+  "repo",
+  "closed_at",
+  "permissions",
+  "archived",
+  "comments",
+  "homepage",
+  "license",
+  "git_url",
+  "ssh_url",
+  "clone_url",
+  "mirror_url",
+  "svn_url",
+  "language",
+  "forks_count",
+  "stargazers_count",
+  "watchers_count",
+  "default_branch",
+  "open_issues_count",
+  "is_template",
+  "topics",
+  "has_issues",
+  "has_projects",
+  "has_wiki",
+  "has_pages",
+  "has_downloads",
+  "disabled",
+  "visibility",
+  "pushed_at",
+  "forks",
+  "delete_branch_on_merge",
+  "allow_forking",
+  "watchers",
+  "allow_rebase_merge",
+  "allow_squash_merge",
+  "allow_auto_merge",
+  "allow_update_branch",
+  "allow_merge_commit",
+  "from",
+  "web_commit_signoff_required",
+  "author_association",
+  "label",
+  "labels",
+  "key",
+  "admin",
+  "pull",
+  "triage",
+  "push",
+  "maintain",
+  "draft",
+  "public",
+  "commits",
+  "organization",
+  "spdx_id",
+  "master_branch",
+  "active_lock_reason",
+  "locked",
+  "review_comments",
+  "use_squash_pr_title_as_default",
+  "squash_merge_commit_title",
+  "squash_merge_commit_message",
+  "merge_commit_title",
+  "merge_commit_message",
+  "role_name",
+  "creator",
+  "stargazers",
+  "milestone",
+  "members_url",
+  "statuses",
+  "assignee",
+  "assignees",
+  "permission",
+  "privacy",
+  "repositories_url",
+  "base",
+  "status",
+  "head",
+  "reactions",
+  "+1",
+  "-1",
+  "confused",
+  "eyes",
+  "heart",
+  "hooray",
+  "laugh",
+  "rocket",
+  "total_count",
+  "diff_url",
+  "merged_at",
+  "patch_url",
+  "changes",
+  "due_on",
+  "repository_url",
+  "color",
+  "issue",
+  "closed_issues",
+  "pull_request",
+  "conclusion",
+  "default",
+  "_links",
+  "html",
+  "author",
+  "self",
+  "pull_requests",
+  "issue_url",
+  "has_discussions",
+  "metadata",
+  "date",
+  "review_comment",
+  "auto_merge",
+  "merge_commit_sha",
+  "requested_reviewers",
+  "requested_teams",
+  "review_comment_url",
+  "review_comments_url",
+  "starred_at",
+  "external_url",
+  "issues",
+  "checks",
+  "contents",
+  "deployments",
+  "events",
+  "head_sha",
+  "username",
+  "performed_via_github_app",
+  "timeline_url",
+  "additions",
+  "changed_files",
+  "deletions",
+  "maintainer_can_modify",
+  "mergeable",
+  "mergeable_state",
+  "merged",
+  "merged_by",
+  "rebaseable",
+  "head_branch",
+  "completed_at",
+  "started_at",
+  "parent",
+  "commit_message",
+  "commit_title",
+  "enabled_by",
+  "merge_method",
+  "pages",
+  "path",
+  "actions",
+  "administration",
+  "content_references",
+  "discussions",
+  "emails",
+  "environments",
+  "keys",
+  "members",
+  "organization_administration",
+  "organization_hooks",
+  "organization_packages",
+  "organization_plan",
+  "organization_projects",
+  "organization_secrets",
+  "organization_self_hosted_runners",
+  "organization_user_blocking",
+  "packages",
+  "repository_hooks",
+  "repository_projects",
+  "secret_scanning_alerts",
+  "secrets",
+  "security_events",
+  "security_scanning_alert",
+  "single_file",
+  "team_discussions",
+  "vulnerability_alerts",
+  "workflows",
+  "run_attempt",
+  "committer",
+  "message",
+  "prerelease",
+  "tag_name",
+  "target_commitish",
+  "repository",
+  "repository_id",
+  "head_commit",
+  "timestamp",
+  "tree_id",
+  "to",
+  "content_type",
+  "published_at",
+  "category",
+  "emoji",
+  "is_answerable",
+  "state_reason",
+  "affected_package_name",
+  "affected_range",
+  "external_identifier",
+  "external_reference",
+  "fixed_in",
+  "ghsa_id",
+  "severity",
+  "check_run_url",
+  "run_id",
+  "run_url",
+  "runner_group_id",
+  "runner_group_name",
+  "runner_id",
+  "runner_name",
+  "workflow_name",
+  "steps",
+  "installations_count",
+  "client_id",
+  "client_secret",
+  "webhook_secret",
+  "pem",
+  "after",
+  "before",
+  "answer_chosen_at",
+  "answer_chosen_by",
+  "answer_html_url",
+  "release",
+  "assets",
+  "assets_url",
+  "tarball_url",
+  "upload_url",
+  "zipball_url",
+  "app",
+  "environment",
+  "summary",
+  "actor",
+  "artifacts_url",
+  "cancel_url",
+  "check_suite_id",
+  "check_suite_node_id",
+  "check_suite_url",
+  "event",
+  "head_repository",
+  "jobs_url",
+  "logs_url",
+  "previous_attempt_url",
+  "referenced_workflows",
+  "rerun_url",
+  "run_number",
+  "run_started_at",
+  "triggering_actor",
+  "workflow_id",
+  "workflow_url",
+  "note",
+  "after_id",
+  "column_id",
+  "project_url",
+  "dismiss_reason",
+  "dismissed_at",
+  "dismisser",
+  "fix_reason",
+  "fixed_at",
+  "commit",
+  "workflow_job",
+  "action",
+  "temp_clone_token",
+  "subscribers_count",
+  "network_count",
+  "check_suite",
+  "deployment",
+  "task",
+  "original_environment",
+  "transient_environment",
+  "production_environment",
+  "payload",
+  "workflow_run",
+  "discussion",
+  "comment",
+  "child_comment_count",
+  "discussion_id",
+  "parent_id",
+  "column_url",
+  "commit_id",
+  "pull_request_url",
+  "browser_download_url",
+  "download_count",
+  "uploader",
+  "discussion_url",
+  "alert",
+  "manifest",
+  "installation_command",
+  "version",
+  "admin_enforced",
+  "authorized_actor_names",
+  "authorized_actors_only",
+  "authorized_dismissal_actors_only",
+  "linear_history_requirement_enforcement_level",
+  "required_status_checks",
+  "required_status_checks_enforcement_level",
+  "check_run",
+  "details_url",
+  "external_id",
+  "actions_meta",
+  "check_runs_url",
+  "latest_check_runs_count",
+  "rerequestable",
+  "runs_rerequestable",
+  "workflow",
+  "display_title",
+  "project_card",
+  "content_url",
+  "short_description",
+  "archived_at",
+  "reason",
+  "diff_hunk",
+  "in_reply_to_id",
+  "line",
+  "original_commit_id",
+  "original_line",
+  "original_position",
+  "original_start_line",
+  "position",
+  "pull_request_review_id",
+  "side",
+  "start_line",
+  "start_side",
+  "ref_type",
+  "target_url",
+  "new_repository",
+  "pusher",
+  "added",
+  "distinct",
+  "modified",
+  "removed",
+  "registry_package",
+  "ecosystem",
+  "namespace",
+  "package_type",
+  "package_version",
+  "body_html",
+  "docker_metadata",
+  "package_files",
+  "download_url",
+  "md5",
+  "sha1",
+  "sha256",
+  "package_url",
+  "rubygems_metadata",
+  "target_oid",
+  "registry",
+  "dismiss_comment"
+]
@@ -64,7 +64,7 @@ describe("matrix context", () => {
      expect(workflowContext.job).toBeUndefined();

      const context = getMatrixContext(workflowContext, Mode.Validation);
-      expect(context).toEqual(new data.Null());
+      expect(context).toEqual(new DescriptionDictionary());
    });

    it("strategy not defined", () => {
@@ -73,7 +73,7 @@ describe("matrix context", () => {
      expect(workflowContext.job!.strategy).toBeUndefined();

      const context = getMatrixContext(workflowContext, Mode.Validation);
-      expect(context).toEqual(new data.Null());
+      expect(context).toEqual(new DescriptionDictionary());
    });

    it("strategy is not a mapping token", () => {
@@ -81,7 +81,7 @@ describe("matrix context", () => {
      expect(workflowContext.job!.strategy).toBeDefined();

      const context = getMatrixContext(workflowContext, Mode.Validation);
-      expect(context).toEqual(new data.Null());
+      expect(context).toEqual(new DescriptionDictionary());
    });

    it("matrix is not defined", () => {
@@ -10,8 +10,7 @@ export function getMatrixContext(workflowContext: WorkflowContext, mode: Mode):
  // https://docs.github.com/en/actions/learn-github-actions/contexts#matrix-context
  const strategy = workflowContext.job?.strategy ?? workflowContext.reusableWorkflowJob?.strategy;
  if (!strategy || !isMapping(strategy)) {
-    // No strategy defined - matrix is null at runtime (not empty object)
-    return new data.Null();
+    return new DescriptionDictionary();
  }

  const matrix = strategy.find("matrix");
@@ -1,78 +0,0 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import {DescriptionDictionary, isDescriptionDictionary} from "@actions/expressions";
-import {WorkflowContext} from "../context/workflow-context";
-import {getStepsContext} from "./steps";
-
-function createWorkflowContext(stepIds: string[], currentStepId?: string): WorkflowContext {
-  return {
-    job: {
-      steps: stepIds.map(id => ({id}))
-    },
-    step: currentStepId ? {id: currentStepId} : undefined
-  } as WorkflowContext;
-}
-
-describe("steps context", () => {
-  it("returns empty dictionary when no job", () => {
-    const workflowContext = {} as WorkflowContext;
-    const context = getStepsContext(workflowContext);
-    expect(context.pairs().length).toBe(0);
-  });
-
-  it("returns empty dictionary when no steps", () => {
-    const workflowContext = {job: {}} as WorkflowContext;
-    const context = getStepsContext(workflowContext);
-    expect(context.pairs().length).toBe(0);
-  });
-
-  it("includes steps with user-defined ids", () => {
-    const workflowContext = createWorkflowContext(["step-a", "step-b"]);
-    const context = getStepsContext(workflowContext);
-
-    expect(context.get("step-a")).toBeDefined();
-    expect(context.get("step-b")).toBeDefined();
-  });
-
-  it("excludes generated step ids (starting with __)", () => {
-    const workflowContext = createWorkflowContext(["step-a", "__generated"]);
-    const context = getStepsContext(workflowContext);
-
-    expect(context.get("step-a")).toBeDefined();
-    expect(context.get("__generated")).toBeUndefined();
-  });
-
-  it("excludes current step and later steps", () => {
-    const workflowContext = createWorkflowContext(["step-a", "step-b", "step-c"], "step-b");
-    const context = getStepsContext(workflowContext);
-
-    expect(context.get("step-a")).toBeDefined();
-    expect(context.get("step-b")).toBeUndefined();
-    expect(context.get("step-c")).toBeUndefined();
-  });
-
-  describe("step outputs", () => {
-    it("outputs is a dictionary, not null", () => {
-      const workflowContext = createWorkflowContext(["step-a"]);
-      const context = getStepsContext(workflowContext);
-
-      const stepContext = context.get("step-a");
-      expect(stepContext).toBeDefined();
-      expect(isDescriptionDictionary(stepContext!)).toBe(true);
-
-      const outputs = (stepContext as DescriptionDictionary).get("outputs");
-      expect(outputs).toBeDefined();
-      expect(isDescriptionDictionary(outputs!)).toBe(true);
-    });
-
-    it("outputs is marked incomplete to allow dynamic outputs", () => {
-      const workflowContext = createWorkflowContext(["step-a"]);
-      const context = getStepsContext(workflowContext);
-
-      const stepContext = context.get("step-a") as DescriptionDictionary;
-      const outputs = stepContext.get("outputs") as DescriptionDictionary;
-
-      // Outputs should be incomplete since we can't know what outputs a step will produce
-      expect(outputs.complete).toBe(false);
-    });
-  });
-});
@@ -31,10 +31,7 @@ function stepContext(): DescriptionDictionary {
  // https://docs.github.com/en/actions/learn-github-actions/contexts#steps-context
  const d = new DescriptionDictionary();

-  // Step outputs are dynamic - actions can generate outputs based on their inputs
-  const outputs = new DescriptionDictionary();
-  outputs.complete = false;
-  d.add("outputs", outputs, getDescription("steps", "outputs"));
+  d.add("outputs", new data.Null(), getDescription("steps", "outputs"));

  // Can be "success", "failure", "cancelled", or "skipped"
  d.add("conclusion", new data.Null(), getDescription("steps", "conclusion"));
@@ -1,126 +0,0 @@
-import {data} from "@actions/expressions";
-import {Job} from "@actions/workflow-parser/model/workflow-template";
-import {BooleanToken} from "@actions/workflow-parser/templates/tokens/boolean-token";
-import {MappingToken} from "@actions/workflow-parser/templates/tokens/mapping-token";
-import {NumberToken} from "@actions/workflow-parser/templates/tokens/number-token";
-import {StringToken} from "@actions/workflow-parser/templates/tokens/string-token";
-import {TemplateToken} from "@actions/workflow-parser/templates/tokens/template-token";
-import {WorkflowContext} from "../context/workflow-context";
-import {getStrategyContext} from "./strategy";
-
-function stringToToken(value: string) {
-  return new StringToken(undefined, undefined, value, undefined);
-}
-
-function boolToToken(value: boolean) {
-  return new BooleanToken(undefined, undefined, value, undefined);
-}
-
-function numberToToken(value: number) {
-  return new NumberToken(undefined, undefined, value, undefined);
-}
-
-function contextFromStrategy(strategy?: TemplateToken) {
-  return {
-    job: {
-      strategy: strategy
-    }
-  } as WorkflowContext;
-}
-
-describe("strategy context", () => {
-  describe("no strategy defined", () => {
-    it("returns defaults when job is undefined", () => {
-      const workflowContext = {} as WorkflowContext;
-
-      const context = getStrategyContext(workflowContext);
-
-      expect(context.get("fail-fast")).toEqual(new data.BooleanData(true));
-      expect(context.get("job-index")).toEqual(new data.NumberData(0));
-      expect(context.get("job-total")).toEqual(new data.NumberData(1));
-      expect(context.get("max-parallel")).toEqual(new data.NumberData(1));
-    });
-
-    it("returns defaults when strategy is undefined", () => {
-      const job = {} as Job;
-      const workflowContext = {job} as WorkflowContext;
-
-      const context = getStrategyContext(workflowContext);
-
-      expect(context.get("fail-fast")).toEqual(new data.BooleanData(true));
-      expect(context.get("job-index")).toEqual(new data.NumberData(0));
-      expect(context.get("job-total")).toEqual(new data.NumberData(1));
-      expect(context.get("max-parallel")).toEqual(new data.NumberData(1));
-    });
-
-    it("returns defaults when strategy is not a mapping", () => {
-      const workflowContext = contextFromStrategy(stringToToken("hello"));
-
-      const context = getStrategyContext(workflowContext);
-
-      expect(context.get("fail-fast")).toEqual(new data.BooleanData(true));
-      expect(context.get("job-index")).toEqual(new data.NumberData(0));
-      expect(context.get("job-total")).toEqual(new data.NumberData(1));
-      expect(context.get("max-parallel")).toEqual(new data.NumberData(1));
-    });
-  });
-
-  describe("strategy defined with partial properties", () => {
-    it("uses specified fail-fast, defaults for others", () => {
-      const strategy = new MappingToken(undefined, undefined, undefined);
-      strategy.add(stringToToken("fail-fast"), boolToToken(false));
-      const workflowContext = contextFromStrategy(strategy);
-
-      const context = getStrategyContext(workflowContext);
-
-      expect(context.get("fail-fast")).toEqual(new data.BooleanData(false));
-      expect(context.get("job-index")).toEqual(new data.NumberData(0));
-      expect(context.get("job-total")).toEqual(new data.NumberData(1));
-      expect(context.get("max-parallel")).toEqual(new data.NumberData(1));
-    });
-
-    it("uses specified max-parallel, defaults for others", () => {
-      const strategy = new MappingToken(undefined, undefined, undefined);
-      strategy.add(stringToToken("max-parallel"), numberToToken(5));
-      const workflowContext = contextFromStrategy(strategy);
-
-      const context = getStrategyContext(workflowContext);
-
-      expect(context.get("fail-fast")).toEqual(new data.BooleanData(true));
-      expect(context.get("job-index")).toEqual(new data.NumberData(0));
-      expect(context.get("job-total")).toEqual(new data.NumberData(1));
-      expect(context.get("max-parallel")).toEqual(new data.NumberData(5));
-    });
-
-    it("only has matrix defined, all strategy properties use defaults", () => {
-      const strategy = new MappingToken(undefined, undefined, undefined);
-      const matrix = new MappingToken(undefined, undefined, undefined);
-      strategy.add(stringToToken("matrix"), matrix);
-      const workflowContext = contextFromStrategy(strategy);
-
-      const context = getStrategyContext(workflowContext);
-
-      expect(context.get("fail-fast")).toEqual(new data.BooleanData(true));
-      expect(context.get("job-index")).toEqual(new data.NumberData(0));
-      expect(context.get("job-total")).toEqual(new data.NumberData(1));
-      expect(context.get("max-parallel")).toEqual(new data.NumberData(1));
-    });
-  });
-
-  describe("strategy with all properties defined", () => {
-    it("uses all specified values", () => {
-      const strategy = new MappingToken(undefined, undefined, undefined);
-      strategy.add(stringToToken("fail-fast"), boolToToken(false));
-      strategy.add(stringToToken("max-parallel"), numberToToken(3));
-      const workflowContext = contextFromStrategy(strategy);
-
-      const context = getStrategyContext(workflowContext);
-
-      expect(context.get("fail-fast")).toEqual(new data.BooleanData(false));
-      // job-index and job-total are runtime values, not specified in YAML
-      expect(context.get("job-index")).toEqual(new data.NumberData(0));
-      expect(context.get("job-total")).toEqual(new data.NumberData(1));
-      expect(context.get("max-parallel")).toEqual(new data.NumberData(3));
-    });
-  });
-});
@@ -3,24 +3,15 @@ import {isMapping, isScalar, isString} from "@actions/workflow-parser";
 import {WorkflowContext} from "../context/workflow-context";
 import {scalarToData} from "../utils/scalar-to-data";

-// Default strategy values when no strategy block is defined
-const DEFAULT_STRATEGY = {
-  "fail-fast": new data.BooleanData(true),
-  "job-index": new data.NumberData(0),
-  "job-total": new data.NumberData(1),
-  "max-parallel": new data.NumberData(1)
-};
-
 export function getStrategyContext(workflowContext: WorkflowContext): DescriptionDictionary {
  // https://docs.github.com/en/actions/learn-github-actions/contexts#strategy-context
  const keys = ["fail-fast", "job-index", "job-total", "max-parallel"];

  const strategy = workflowContext.job?.strategy ?? workflowContext.reusableWorkflowJob?.strategy;
  if (!strategy || !isMapping(strategy)) {
-    // No strategy defined - return defaults that match runtime behavior
    return new DescriptionDictionary(
      ...keys.map(key => {
-        return {key, value: DEFAULT_STRATEGY[key as keyof typeof DEFAULT_STRATEGY]};
+        return {key, value: new data.Null()};
      })
    );
  }
@@ -40,8 +31,7 @@ export function getStrategyContext(workflowContext: WorkflowContext): Descriptio

  for (const key of keys) {
    if (!strategyContext.get(key)) {
-      // Use default value for missing properties
-      strategyContext.add(key, DEFAULT_STRATEGY[key as keyof typeof DEFAULT_STRATEGY]);
+      strategyContext.add(key, new data.Null());
    }
  }

@@ -0,0 +1,15 @@
+import {TokenRange} from "@actions/workflow-parser/templates/tokens/token-range";
+import {Position} from "vscode-languageserver-textdocument";
+import {mapRange} from "./range";
+
+export function getRelCharOffset(tokenRange: TokenRange, currentInput: string, pos: Position): number {
+  const range = mapRange(tokenRange);
+  if (range.start.line !== range.end.line) {
+    const lines = currentInput.split("\n");
+    const lineDiff = pos.line - range.start.line - 1;
+    const linesBeforeCusor = lines.slice(0, lineDiff);
+    return linesBeforeCusor.join("\n").length + pos.character + 1;
+  } else {
+    return pos.character - range.start.character;
+  }
+}
@@ -1,245 +0,0 @@
-import {DiagnosticSeverity} from "vscode-languageserver-types";
-import {validate} from "./validate";
-import {createDocument} from "./test-utils/document";
-import {clearCache} from "./utils/workflow-cache";
-
-beforeEach(() => {
-  clearCache();
-});
-
-describe("validate concurrency deadlock", () => {
-  describe("should error on matching concurrency groups", () => {
-    it("simple string match", async () => {
-      const input = `
-on: push
-concurrency: test
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: test
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(2);
-
-      // Workflow-level warning
-      expect(concurrencyErrors[0]).toMatchObject({
-        message: "Concurrency group 'test' is also used by job 'job1'. This will cause a deadlock.",
-        severity: DiagnosticSeverity.Error
-      });
-
-      // Job-level warning
-      expect(concurrencyErrors[1]).toMatchObject({
-        message: "Concurrency group 'test' is also defined at the workflow level. This will cause a deadlock.",
-        severity: DiagnosticSeverity.Error
-      });
-    });
-
-    it("workflow mapping form, job string form", async () => {
-      const input = `
-on: push
-concurrency:
-  group: my-group
-  cancel-in-progress: true
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    concurrency: my-group
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(2);
-      expect(concurrencyErrors[0].message).toContain("my-group");
-      expect(concurrencyErrors[0].message).toContain("deploy");
-    });
-
-    it("workflow string form, job mapping form", async () => {
-      const input = `
-on: push
-concurrency: deploy-group
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: deploy-group
-      cancel-in-progress: true
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(2);
-      expect(concurrencyErrors[0].message).toContain("deploy-group");
-    });
-
-    it("both mapping forms", async () => {
-      const input = `
-on: push
-concurrency:
-  group: shared
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: shared
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(2);
-    });
-
-    it("multiple jobs with matching concurrency", async () => {
-      const input = `
-on: push
-concurrency: shared
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: shared
-    steps:
-      - run: echo hi
-  job2:
-    runs-on: ubuntu-latest
-    concurrency: shared
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      // Should have 2 warnings per job (workflow + job) = 4 total, but workflow is only warned once per match
-      // Actually: 1 workflow warning per matching job + 1 job warning per matching job = 4 total
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(4);
-    });
-  });
-
-  describe("should not warn", () => {
-    it("different concurrency groups", async () => {
-      const input = `
-on: push
-concurrency: workflow-group
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: job-group
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(0);
-    });
-
-    it("workflow concurrency is an expression", async () => {
-      const input = `
-on: push
-concurrency: \${{ github.ref }}
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: test
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(0);
-    });
-
-    it("job concurrency is an expression", async () => {
-      const input = `
-on: push
-concurrency: test
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: \${{ github.ref }}
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(0);
-    });
-
-    it("no workflow-level concurrency", async () => {
-      const input = `
-on: push
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: test
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(0);
-    });
-
-    it("no job-level concurrency", async () => {
-      const input = `
-on: push
-concurrency: test
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(0);
-    });
-
-    it("case sensitive - different case is different group", async () => {
-      const input = `
-on: push
-concurrency: Test
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: test
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(0);
-    });
-
-    it("workflow concurrency group in mapping is an expression", async () => {
-      const input = `
-on: push
-concurrency:
-  group: \${{ github.ref }}
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    concurrency: test
-    steps:
-      - run: echo hi`;
-
-      const result = await validate(createDocument("wf.yaml", input));
-
-      const concurrencyErrors = result.filter(d => d.message.includes("deadlock"));
-      expect(concurrencyErrors).toHaveLength(0);
-    });
-  });
-});
@@ -681,8 +681,7 @@ jobs:

      const result = await validate(createDocument("wf.yaml", input));

-      // Strategy context is always available with default values
-      expect(result).toEqual([]);
+      expect(result).not.toEqual([]);
    });

    it("invalid strategy property", async () => {
@@ -997,8 +996,22 @@ jobs:

      const result = await validate(createDocument("wf.yaml", input));

-      // Matrix is null when no strategy is defined, accessing properties on null is valid
-      expect(result).toEqual([]);
+      expect(result).toEqual([
+        {
+          message: "Context access might be invalid: matrix",
+          range: {
+            end: {
+              character: 36,
+              line: 8
+            },
+            start: {
+              character: 18,
+              line: 8
+            }
+          },
+          severity: DiagnosticSeverity.Warning
+        }
+      ]);
    });

    it("basic matrix", async () => {
@@ -1596,48 +1609,6 @@ jobs:
        expect(result).toEqual([]);
      });

-      it("allows runner.environment context", async () => {
-        const input = `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - if: runner.environment == 'github-hosted'
-        run: echo hello`;
-
-        const result = await validate(createDocument("wf.yaml", input));
-        expect(result).toEqual([]);
-      });
-
-      it("allows runner.debug context", async () => {
-        const input = `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - if: runner.debug == '1'
-        run: echo hello`;
-
-        const result = await validate(createDocument("wf.yaml", input));
-        expect(result).toEqual([]);
-      });
-
-      it("allows runner.workspace context", async () => {
-        const input = `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - if: runner.workspace != ''
-        run: echo hello`;
-
-        const result = await validate(createDocument("wf.yaml", input));
-        expect(result).toEqual([]);
-      });
-
      it("allows env context", async () => {
        const input = `
 on: push
@@ -1,152 +0,0 @@
-/**
- * Test validation behavior when no context providers are configured.
- *
- * When contextProviderConfig is not provided (or returns incomplete data),
- * we should skip validation for secrets/vars rather than showing false
- * positive "Context access might be invalid" warnings.
- *
- * This is important for offline/disconnected scenarios where API calls
- * to fetch secrets/vars are not possible.
- */
-
-import {validate} from "./validate";
-import {createDocument} from "./test-utils/document";
-import {clearCache} from "./utils/workflow-cache";
-
-beforeEach(() => {
-  clearCache();
-});
-
-describe("validation without context providers", () => {
-  describe("secrets context", () => {
-    it("should not warn on secrets.GITHUB_TOKEN", async () => {
-      const doc = createDocument(
-        "wf.yaml",
-        `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "test"
-        env:
-          GH_TOKEN: \${{ secrets.GITHUB_TOKEN }}
-`
-      );
-      const result = await validate(doc);
-      expect(result).toEqual([]);
-    });
-
-    it("should not warn on custom secrets when no provider configured", async () => {
-      const doc = createDocument(
-        "wf.yaml",
-        `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "test"
-        env:
-          API_KEY: \${{ secrets.MY_API_KEY }}
-`
-      );
-      const result = await validate(doc);
-      expect(result).toEqual([]);
-    });
-
-    it("should not warn on secrets with environment", async () => {
-      const doc = createDocument(
-        "wf.yaml",
-        `
-on: push
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - run: echo "test"
-        env:
-          API_KEY: \${{ secrets.API_KEY }}
-`
-      );
-      const result = await validate(doc);
-      expect(result).toEqual([]);
-    });
-  });
-
-  describe("vars context", () => {
-    it("should not warn on vars when no provider configured", async () => {
-      const doc = createDocument(
-        "wf.yaml",
-        `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "\${{ vars.ENVIRONMENT }}"
-`
-      );
-      const result = await validate(doc);
-      expect(result).toEqual([]);
-    });
-
-    it("should not warn on vars with environment", async () => {
-      const doc = createDocument(
-        "wf.yaml",
-        `
-on: push
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - run: echo "\${{ vars.API_URL }}"
-`
-      );
-      const result = await validate(doc);
-      expect(result).toEqual([]);
-    });
-
-    it("should not warn on vars with fallback pattern", async () => {
-      const doc = createDocument(
-        "wf.yaml",
-        `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "\${{ vars.OPTIONAL_VAR || 'default-value' }}"
-`
-      );
-      const result = await validate(doc);
-      expect(result).toEqual([]);
-    });
-  });
-
-  describe("combined secrets and vars", () => {
-    it("should not warn on workflow using both secrets and vars", async () => {
-      const doc = createDocument(
-        "wf.yaml",
-        `
-on: push
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - run: |
-          echo "Deploying to \${{ vars.API_URL }}"
-          echo "Using region \${{ vars.AWS_REGION }}"
-        env:
-          API_KEY: \${{ secrets.API_KEY }}
-          AWS_SECRET: \${{ secrets.AWS_SECRET_ACCESS_KEY }}
-`
-      );
-      const result = await validate(doc);
-      expect(result).toEqual([]);
-    });
-  });
-});
@@ -385,31 +385,4 @@ jobs:
      expect(result).toEqual([]);
    });
  });
-
-  describe("workflow_dispatch", () => {
-    it("allows empty string in choice options", async () => {
-      const result = await validate(
-        createDocument(
-          "wf.yaml",
-          `on:
-  workflow_dispatch:
-    inputs:
-      plugin-name:
-        description: Specific plugin to build
-        type: choice
-        options:
-          - ''
-          - foo
-          - bar
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo`
-        )
-      );
-
-      expect(result).toEqual([]);
-    });
-  });
 });
@@ -1,6 +1,6 @@
 import {Lexer, Parser, data} from "@actions/expressions";
 import {Expr, FunctionCall, Literal, Logical} from "@actions/expressions/ast";
-import {ParseWorkflowResult, WorkflowTemplate, isBasicExpression, isMapping, isString} from "@actions/workflow-parser";
+import {ParseWorkflowResult, WorkflowTemplate, isBasicExpression, isString} from "@actions/workflow-parser";
 import {ErrorPolicy} from "@actions/workflow-parser/model/convert";
 import {getCronDescription, hasCronIntervalLessThan5Minutes} from "@actions/workflow-parser/model/converter/cron";
 import {ensureStatusFunction} from "@actions/workflow-parser/model/converter/if-condition";
@@ -209,9 +209,6 @@ async function additionalValidations(
      }
    }
  }
-
-  // Validate concurrency deadlock between workflow and job levels
-  validateConcurrencyDeadlock(diagnostics, template);
 }

 function invalidValue(diagnostics: Diagnostic[], token: StringToken, kind: ValueProviderKind) {
@@ -715,71 +712,3 @@ async function validateExpression(
    );
  }
 }
-
-/**
- * Validates that workflow-level and job-level concurrency groups don't match,
- * which would cause a deadlock at runtime.
- */
-function validateConcurrencyDeadlock(diagnostics: Diagnostic[], template: WorkflowTemplate): void {
-  const workflowGroup = getStaticConcurrencyGroup(template.concurrency);
-  if (!workflowGroup) {
-    return; // No workflow-level concurrency or it's an expression
-  }
-
-  for (const job of template.jobs || []) {
-    if (!job.concurrency) {
-      continue;
-    }
-
-    const jobGroup = getStaticConcurrencyGroup(job.concurrency);
-    if (!jobGroup) {
-      continue; // Job concurrency is an expression
-    }
-
-    if (workflowGroup.value === jobGroup.value) {
-      // Error on workflow-level concurrency
-      if (template.concurrency.range) {
-        diagnostics.push({
-          message: `Concurrency group '${workflowGroup.value}' is also used by job '${job.id.value}'. This will cause a deadlock.`,
-          range: mapRange(template.concurrency.range),
-          severity: DiagnosticSeverity.Error
-        });
-      }
-
-      // Error on job-level concurrency
-      if (job.concurrency.range) {
-        diagnostics.push({
-          message: `Concurrency group '${jobGroup.value}' is also defined at the workflow level. This will cause a deadlock.`,
-          range: mapRange(job.concurrency.range),
-          severity: DiagnosticSeverity.Error
-        });
-      }
-    }
-  }
-}
-
-/**
- * Extracts the static concurrency group name from a concurrency token.
- * Returns undefined if the token is an expression or doesn't have a static group.
- */
-function getStaticConcurrencyGroup(token: TemplateToken | undefined): StringToken | undefined {
-  if (!token || token.isExpression) {
-    return undefined;
-  }
-
-  // Simple string form: concurrency: "test"
-  if (isString(token)) {
-    return token;
-  }
-
-  // Mapping form: concurrency: { group: "test", cancel-in-progress: true }
-  if (isMapping(token)) {
-    for (const pair of token) {
-      if (isString(pair.key) && pair.key.value === "group" && isString(pair.value) && !pair.value.isExpression) {
-        return pair.value;
-      }
-    }
-  }
-
-  return undefined;
-}
@@ -1,202 +0,0 @@
-import {validate} from "./validate";
-import {createDocument} from "./test-utils/document";
-import {clearCache} from "./utils/workflow-cache";
-
-beforeEach(() => {
-  clearCache();
-});
-
-describe("YAML anchors and aliases", () => {
-  it("should handle anchors and aliases in env", async () => {
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    env: &env
-      ENV1: env1
-      ENV2: env2
-    steps:
-      - run: exit 0
-  job2:
-    runs-on: ubuntu-latest
-    env: *env
-    steps:
-      - run: exit 0
-`
-    );
-    const result = await validate(doc);
-    expect(result).toEqual([]);
-  });
-
-  it("should handle multiple aliases to the same anchor", async () => {
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-env: &shared
-  SHARED: true
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    env: *shared
-    steps:
-      - run: exit 0
-  job2:
-    runs-on: ubuntu-latest
-    env: *shared
-    steps:
-      - run: exit 0
-  job3:
-    runs-on: ubuntu-latest
-    env: *shared
-    steps:
-      - run: exit 0
-`
-    );
-    const result = await validate(doc);
-    expect(result).toEqual([]);
-  });
-
-  it("should handle anchors in matrix strategy", async () => {
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include: &matrix-include
-          - os: ubuntu-latest
-            node: 18
-          - os: windows-latest
-            node: 20
-    steps:
-      - run: exit 0
-  test2:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include: *matrix-include
-    steps:
-      - run: exit 0
-`
-    );
-    const result = await validate(doc);
-    expect(result).toEqual([]);
-  });
-
-  it("should handle anchors in steps", async () => {
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - &checkout
-        uses: actions/checkout@v4
-      - run: npm test
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - *checkout
-      - run: npm run deploy
-`
-    );
-    const result = await validate(doc);
-    expect(result).toEqual([]);
-  });
-
-  it("should handle scalar anchors", async () => {
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-jobs:
-  build:
-    runs-on: &runner ubuntu-latest
-    steps:
-      - run: exit 0
-  test:
-    runs-on: *runner
-    steps:
-      - run: exit 0
-`
-    );
-    const result = await validate(doc);
-    expect(result).toEqual([]);
-  });
-
-  it("should work without anchors (control test)", async () => {
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    env:
-      ENV1: env1
-      ENV2: env2
-    steps:
-      - run: exit 0
-  job2:
-    runs-on: ubuntu-latest
-    env:
-      ENV1: env1
-      ENV2: env2
-    steps:
-      - run: exit 0
-`
-    );
-    const result = await validate(doc);
-    expect(result).toEqual([]);
-  });
-
-  it("should handle circular aliases without hanging", async () => {
-    // This is an invalid use case (alias referencing parent) but should not hang
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env: &myenv
-      FOO: bar
-      nested: *myenv
-    steps:
-      - run: exit 0
-`
-    );
-    // Should complete without hanging - circular portion is silently ignored
-    // which may cause downstream validation errors, but that's acceptable
-    const result = await validate(doc);
-    expect(result).toBeDefined();
-  });
-
-  it("should handle undefined alias references", async () => {
-    // Reference to non-existent anchor - yaml library should report error
-    const doc = createDocument(
-      "wf.yaml",
-      `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env: *nonexistent
-    steps:
-      - run: exit 0
-`
-    );
-    const result = await validate(doc);
-    expect(result).toBeDefined();
-    expect(result.length).toBeGreaterThan(0);
-  });
-});
@@ -6,5 +6,5 @@
    "languageservice",
    "languageserver"
  ],
-  "version": "0.3.25"
+  "version": "0.3.23"
 }
@@ -135,7 +135,7 @@
    },
    "expressions": {
      "name": "@actions/expressions",
-      "version": "0.3.25",
+      "version": "0.3.23",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.0.3",
@@ -151,7 +151,7 @@
        "typescript": "^4.7.4"
      },
      "engines": {
-        "node": ">= 18"
+        "node": ">= 16.15"
      }
    },
    "expressions/node_modules/@eslint/eslintrc": {
@@ -395,11 +395,11 @@
    },
    "languageserver": {
      "name": "@actions/languageserver",
-      "version": "0.3.25",
+      "version": "0.3.23",
      "license": "MIT",
      "dependencies": {
-        "@actions/languageservice": "^0.3.25",
-        "@actions/workflow-parser": "^0.3.25",
+        "@actions/languageservice": "^0.3.23",
+        "@actions/workflow-parser": "^0.3.23",
        "@octokit/rest": "^21.1.1",
        "@octokit/types": "^9.0.0",
        "vscode-languageserver": "^8.0.2",
@@ -421,7 +421,7 @@
        "typescript": "^4.8.4"
      },
      "engines": {
-        "node": ">= 18"
+        "node": ">= 16.15"
      }
    },
    "languageserver/node_modules/@eslint/eslintrc": {
@@ -921,11 +921,11 @@
    },
    "languageservice": {
      "name": "@actions/languageservice",
-      "version": "0.3.25",
+      "version": "0.3.23",
      "license": "MIT",
      "dependencies": {
-        "@actions/expressions": "^0.3.25",
-        "@actions/workflow-parser": "^0.3.25",
+        "@actions/expressions": "^0.3.23",
+        "@actions/workflow-parser": "^0.3.23",
        "vscode-languageserver-textdocument": "^1.0.7",
        "vscode-languageserver-types": "^3.17.2",
        "vscode-uri": "^3.0.8",
@@ -947,7 +947,7 @@
        "typescript": "^4.8.4"
      },
      "engines": {
-        "node": ">= 18"
+        "node": ">= 16.15"
      }
    },
    "languageservice/node_modules/@eslint/eslintrc": {
@@ -12834,10 +12834,10 @@
    },
    "workflow-parser": {
      "name": "@actions/workflow-parser",
-      "version": "0.3.25",
+      "version": "0.3.23",
      "license": "MIT",
      "dependencies": {
-        "@actions/expressions": "^0.3.25",
+        "@actions/expressions": "^0.3.23",
        "cronstrue": "^2.21.0",
        "yaml": "^2.0.0-8"
      },
@@ -12855,7 +12855,7 @@
        "typescript": "^4.8.4"
      },
      "engines": {
-        "node": ">= 18"
+        "node": ">= 16.15"
      }
    }
  }
@@ -0,0 +1,98 @@
+# Workflow Schema Optimization Plan
+
+## Current State (Commit 7660f61)
+
+### What's Implemented
+
+1. **Original schema preserved**: `workflow-v1.0.json` remains source of truth with 291 definitions
+2. **Optimization script**: `script/optimize-workflow-schema.js` prunes unused definitions
+3. **Generated files** (gitignored):
+   - `workflow-v1.0.optimized.json` - 281 definitions (pruned)
+   - `workflow-v1.0.optimized.min.json` - minified version loaded at runtime
+4. **Build pipeline**: `npm run minify-json` chains optimize → minify
+5. **Tests**: `workflow-schema.test.ts` validates schema integrity
+
+### 10 Pruned Definitions
+
+These are unreachable from `workflow-root-strict` entry point:
+
+- `workflow-root` (non-strict variant)
+- `on` (non-strict variant)
+- `on-mapping` (non-strict variant)
+- `job-if-result`
+- `step-if-result`
+- `boolean-needs-context`
+- `number-needs-context`
+- `string-needs-context`
+- `boolean-steps-context`
+- `number-steps-context`
+
+### Size Savings
+
+| Metric | Original | Optimized | Savings |
+|--------|----------|-----------|---------|
+| Definitions | 291 | 281 | 10 removed |
+| Minified | 71,061 B | 69,022 B | 2.9% |
+| Gzipped | 12,318 B | 12,172 B | 1.2% |
+
+## Optimization Strategies Evaluated
+
+### ✅ Pruning Unused Definitions (IMPLEMENTED)
+- Removes definitions not reachable from entry point
+- 1.2% gzip savings
+- Low complexity, no runtime overhead
+
+### ❌ Key Shortening
+- Replace long keys with short codes (e.g., `description` → `d`)
+- 1.5% gzip savings
+- NOT WORTH IT: Adds complexity, minimal benefit after gzip
+
+### ❌ String Interning
+- Deduplicate repeated strings into lookup table
+- Makes gzip WORSE (-0.5%)
+- NOT WORTH IT: Gzip already handles repetition
+
+### ❌ Compact Format (like webhooks)
+- Restructure to array-based format
+- Makes gzip WORSE (-0.4%)
+- NOT WORTH IT: Schema structure doesn't benefit
+
+### ❌ Split Descriptions
+- Separate file for descriptions
+- Adds 791 bytes when both files gzipped
+- NOT WORTH IT: Worse total size
+
+## Future Work
+
+### Update from Server
+The current schema may be missing some definitions from the latest server version. A future PR should:
+1. Fetch latest `workflow-v1.0.json` from dotcom server
+2. Update the source file
+3. Verify tests still pass
+4. Note: Server version had issues last checked (e.g., `coerce-raw`, missing `branches` on merge-group)
+
+### Entry Point
+- Entry point: `workflow-root-strict` (defined in `workflow-constants.ts`)
+- Non-strict `workflow-root` exists but is unused in this codebase
+
+## Files
+
+```
+workflow-parser/
+├── src/
+│   ├── workflow-v1.0.json              # Source of truth (tracked, 291 defs)
+│   ├── workflow-v1.0.optimized.json    # Pruned (gitignored, 281 defs)
+│   ├── workflow-v1.0.optimized.min.json # Minified (gitignored)
+│   └── workflows/
+│       ├── workflow-schema.ts          # Loader (imports optimized.min.json)
+│       └── workflow-schema.test.ts     # Schema integrity tests
+└── script/
+    └── optimize-workflow-schema.js     # Pruning script
+```
+
+## Test Coverage
+
+- `workflow-schema.test.ts`:
+  1. Schema loads from workflow-root-strict
+  2. All referenced definitions are reachable
+  3. Critical definitions exist (jobs, steps, runs-on, etc.)
@@ -1,6 +1,6 @@
 {
  "name": "@actions/workflow-parser",
-  "version": "0.3.25",
+  "version": "0.3.23",
  "license": "MIT",
  "type": "module",
  "source": "./src/index.ts",
@@ -38,7 +38,8 @@
    "format-check": "prettier --check '**/*.ts'",
    "lint": "eslint 'src/**/*.ts'",
    "lint-fix": "eslint --fix 'src/**/*.ts'",
-    "minify-json": "node ../script/minify-json.js src/workflow-v1.0.json",
+    "optimize-schema": "node script/optimize-workflow-schema.js",
+    "minify-json": "npm run optimize-schema && node ../script/minify-json.js src/workflow-v1.0.optimized.json",
    "prebuild": "npm run minify-json",
    "prepublishOnly": "npm run build && npm run test",
    "pretest": "npm run minify-json",
@@ -48,7 +49,7 @@
    "watch": "tsc --build tsconfig.build.json --watch"
  },
  "dependencies": {
-    "@actions/expressions": "^0.3.25",
+    "@actions/expressions": "^0.3.23",
    "cronstrue": "^2.21.0",
    "yaml": "^2.0.0-8"
  },
@@ -0,0 +1,114 @@
+#!/usr/bin/env node
+/**
+ * Optimizes workflow-v1.0.json by pruning unused definitions.
+ *
+ * Removes definitions not reachable from the entry point (workflow-root-strict).
+ * Output is then minified by minify-json.js to produce the final .min.json file.
+ *
+ * Usage: node script/optimize-workflow-schema.js
+ */
+
+import {promises as fs} from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const ENTRY_POINT = "workflow-root-strict";
+
+const inputPath = path.join(__dirname, "..", "src", "workflow-v1.0.json");
+const outputPath = path.join(__dirname, "..", "src", "workflow-v1.0.optimized.json");
+
+/**
+ * Find all type references in a definition.
+ */
+function findRefs(obj) {
+  const refs = [];
+
+  function visit(node) {
+    if (!node || typeof node !== "object") return;
+
+    if (Array.isArray(node)) {
+      for (const item of node) {
+        if (typeof item === "string") refs.push(item);
+        else visit(item);
+      }
+      return;
+    }
+
+    for (const [key, value] of Object.entries(node)) {
+      if (["type", "item-type", "loose-key-type", "loose-value-type"].includes(key)) {
+        if (typeof value === "string") refs.push(value);
+      } else if (key === "one-of") {
+        visit(value);
+      } else if (key === "properties") {
+        for (const propValue of Object.values(value)) {
+          if (typeof propValue === "string") refs.push(propValue);
+          else if (propValue && typeof propValue === "object") visit(propValue);
+        }
+      } else if (["mapping", "sequence", "string"].includes(key)) {
+        visit(value);
+      }
+    }
+  }
+
+  visit(obj);
+  return refs;
+}
+
+/**
+ * Find all definitions reachable from entry point.
+ */
+function findReachable(schema, entryPoint) {
+  const reachable = new Set();
+  const queue = [entryPoint];
+
+  while (queue.length > 0) {
+    const name = queue.shift();
+    if (reachable.has(name) || !schema.definitions[name]) continue;
+    reachable.add(name);
+
+    const refs = findRefs(schema.definitions[name]);
+    for (const ref of refs) {
+      if (!reachable.has(ref) && schema.definitions[ref]) {
+        queue.push(ref);
+      }
+    }
+  }
+
+  return reachable;
+}
+
+async function main() {
+  const content = await fs.readFile(inputPath, "utf8");
+  const schema = JSON.parse(content);
+
+  const reachable = findReachable(schema, ENTRY_POINT);
+  const allDefs = Object.keys(schema.definitions);
+  const unused = allDefs.filter((name) => !reachable.has(name));
+
+  console.log(`Entry point: ${ENTRY_POINT}`);
+  console.log(`Definitions: ${allDefs.length} -> ${reachable.size} (${unused.length} pruned)`);
+
+  if (unused.length > 0) {
+    console.log("\nPruned:");
+    unused.forEach((name) => console.log(`  - ${name}`));
+  }
+
+  // Create pruned schema preserving definition order
+  const pruned = {version: schema.version, definitions: {}};
+  for (const name of allDefs) {
+    if (reachable.has(name)) {
+      pruned.definitions[name] = schema.definitions[name];
+    }
+  }
+
+  // Write output (will be minified by minify-json.js)
+  await fs.writeFile(outputPath, JSON.stringify(pruned));
+
+  console.log(`\nOutput: ${outputPath}`);
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
@@ -1,183 +0,0 @@
-import * as fs from "fs";
-
-/**
- * This test ensures that activity types in workflow-v1.0.json stay in sync with
- * the webhooks.json file from the languageservice package.
- *
- * When this test fails, it means new activity types were added to webhooks.json
- * that need to be handled. See docs/json-data-files.md for detailed instructions.
- *
- * Quick reference for fixing failures:
- * 1. Check https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows
- *    Find the event and look at its "Activity types" table to see if the type is a valid workflow trigger.
- * 2. If the activity type IS a valid workflow trigger:
- *    → Add it to the corresponding *-activity-type definition in workflow-v1.0.json
- * 3. If the activity type is webhook-only (not in workflow docs):
- *    → Add it to the WEBHOOK_ONLY list below
- * 4. If there's a naming difference between webhook and schema:
- *    → Add it to the NAME_MAPPINGS list below
- * 5. If the schema has a type not in webhooks.json:
- *    → Add it to the SCHEMA_ONLY list below
- */
-
-describe("schema-sync", () => {
-  // Activity types that exist in webhooks.json but are intentionally NOT
-  // supported as workflow triggers. These will be ignored when checking
-  // webhooks → schema direction.
-  const WEBHOOK_ONLY: Record<string, string[]> = {
-    // check_suite: requested and rerequested are webhook-only, not valid workflow triggers
-    // See: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#check_suite
-    check_suite: ["requested", "rerequested"],
-
-    // registry_package: "default" is a webhook concept, not a workflow trigger type
-    registry_package: ["default"]
-  };
-
-  // Activity types that exist in workflow schema but are intentionally NOT
-  // in webhooks.json (schema-only types). These will be ignored when checking
-  // schema → webhooks direction.
-  const SCHEMA_ONLY: Record<string, string[]> = {
-    // registry_package: "updated" is a valid workflow trigger per GitHub docs
-    // but doesn't exist in webhooks.json (webhooks only has "published" and "default")
-    // See: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#registry_package
-    registry_package: ["updated"]
-  };
-
-  // Known naming differences between webhooks.json and workflow-v1.0.json.
-  // Key: event name, Value: { webhook: "webhookName", schema: "schemaName" }
-  // These are treated as equivalent when comparing in both directions.
-  const NAME_MAPPINGS: Record<string, Array<{webhook: string; schema: string}>> = {
-    // project_column: webhooks.json uses "edited" but workflow triggers use "updated"
-    // This is a known naming difference - they represent the same action
-    project_column: [{webhook: "edited", schema: "updated"}]
-  };
-
-  it("activity types in workflow-v1.0.json match webhooks.json", () => {
-    // Load webhooks.json (relative path from the test runner CWD which is the package root)
-    const webhooksPath = "../languageservice/src/context-providers/events/webhooks.json";
-    const webhooks = JSON.parse(fs.readFileSync(webhooksPath, "utf-8")) as Record<string, Record<string, unknown>>;
-
-    // Load workflow-v1.0.json
-    const schemaPath = "./src/workflow-v1.0.json";
-    const schema = JSON.parse(fs.readFileSync(schemaPath, "utf-8")) as {
-      definitions: Record<string, {"allowed-values"?: string[]; description?: string}>;
-    };
-
-    const mismatches: string[] = [];
-
-    // Build mapping helpers for each event
-    const getWebhookToSchemaMapping = (eventName: string): Map<string, string> => {
-      const map = new Map<string, string>();
-      for (const mapping of NAME_MAPPINGS[eventName] || []) {
-        map.set(mapping.webhook, mapping.schema);
-      }
-      return map;
-    };
-
-    const getSchemaToWebhookMapping = (eventName: string): Map<string, string> => {
-      const map = new Map<string, string>();
-      for (const mapping of NAME_MAPPINGS[eventName] || []) {
-        map.set(mapping.schema, mapping.webhook);
-      }
-      return map;
-    };
-
-    // Check both directions for each event
-    for (const [eventName, eventData] of Object.entries(webhooks)) {
-      const webhookTypes = Object.keys(eventData);
-      if (webhookTypes.length === 0) continue;
-
-      const schemaTypeName = `${eventName.replace(/_/g, "-")}-activity-type`;
-      const schemaDef = schema.definitions[schemaTypeName];
-
-      // If there's no activity type definition in the schema, this event
-      // doesn't support activity types in workflows (e.g., push, pull)
-      if (!schemaDef || !schemaDef["allowed-values"]) continue;
-
-      const schemaTypes = new Set(schemaDef["allowed-values"]);
-      const webhookOnly = new Set(WEBHOOK_ONLY[eventName] || []);
-      const schemaOnly = new Set(SCHEMA_ONLY[eventName] || []);
-      const webhookToSchema = getWebhookToSchemaMapping(eventName);
-      const schemaToWebhook = getSchemaToWebhookMapping(eventName);
-
-      // Direction 1: webhooks → schema
-      // Check that each webhook type exists in schema (or has a mapping, or is webhook-only)
-      for (const webhookType of webhookTypes) {
-        if (webhookOnly.has(webhookType)) continue;
-
-        const mappedSchemaType = webhookToSchema.get(webhookType);
-        if (mappedSchemaType) {
-          // Has a mapping - check the mapped name exists in schema
-          if (!schemaTypes.has(mappedSchemaType)) {
-            mismatches.push(
-              `Event "${eventName}": webhook type "${webhookType}" maps to "${mappedSchemaType}" but "${mappedSchemaType}" not found in schema`
-            );
-          }
-        } else {
-          // No mapping - check the type exists directly
-          if (!schemaTypes.has(webhookType)) {
-            mismatches.push(
-              `Event "${eventName}": missing activity type "${webhookType}" in workflow-v1.0.json (exists in webhooks.json)`
-            );
-          }
-        }
-      }
-
-      // Direction 2: schema → webhooks
-      // Check that each schema type exists in webhooks (or has a mapping, or is schema-only)
-      const webhookTypesSet = new Set(webhookTypes);
-      for (const schemaType of schemaTypes) {
-        if (schemaOnly.has(schemaType)) continue;
-
-        const mappedWebhookType = schemaToWebhook.get(schemaType);
-        if (mappedWebhookType) {
-          // Has a mapping - check the mapped name exists in webhooks
-          if (!webhookTypesSet.has(mappedWebhookType)) {
-            mismatches.push(
-              `Event "${eventName}": schema type "${schemaType}" maps to "${mappedWebhookType}" but "${mappedWebhookType}" not found in webhooks.json`
-            );
-          }
-        } else {
-          // No mapping - check the type exists directly
-          if (!webhookTypesSet.has(schemaType)) {
-            mismatches.push(
-              `Event "${eventName}": extra activity type "${schemaType}" in workflow-v1.0.json (not in webhooks.json)`
-            );
-          }
-        }
-      }
-
-      // Check that the description mentions all allowed values
-      const activityDefName = `${eventName.replace(/_/g, "-")}-activity`;
-      const activityDef = schema.definitions[activityDefName];
-      if (activityDef?.description) {
-        for (const schemaType of schemaTypes) {
-          if (!activityDef.description.includes(`\`${schemaType}\``)) {
-            mismatches.push(
-              `Event "${eventName}": description in "${activityDefName}" is missing activity type \`${schemaType}\``
-            );
-          }
-        }
-      }
-    }
-
-    if (mismatches.length > 0) {
-      const errorMessage = [
-        "Activity type mismatches found between webhooks.json and workflow-v1.0.json:",
-        "",
-        ...mismatches,
-        "",
-        "To fix these mismatches:",
-        "1. Check GitHub docs: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows",
-        "2. Verify the activity type is valid for workflow triggers",
-        "3. Update the *-activity-type definition in workflow-parser/src/workflow-v1.0.json",
-        "4. Update the description to list all supported activity types",
-        "5. If there's a naming difference, add it to NAME_MAPPINGS in schema-sync.test.ts",
-        "6. If the type is webhook-only, add it to WEBHOOK_ONLY",
-        "7. If the type is schema-only, add it to SCHEMA_ONLY"
-      ].join("\n");
-
-      throw new Error(errorMessage);
-    }
-  });
-});
@@ -856,7 +856,7 @@
      }
    },
    "pull-request-activity": {
-      "description": "The types of pull request activity that trigger the workflow. Supported activity types: `assigned`, `unassigned`, `labeled`, `unlabeled`, `opened`, `edited`, `closed`, `reopened`, `synchronize`, `converted_to_draft`, `locked`, `unlocked`, `enqueued`, `dequeued`, `milestoned`, `demilestoned`, `ready_for_review`, `review_requested`, `review_request_removed`, `auto_merge_enabled`, `auto_merge_disabled`.",
+      "description": "The types of pull request activity that trigger the workflow. Supported activity types: `assigned`, `unassigned`, `labeled`, `unlabeled`, `opened`, `edited`, `closed`, `reopened`, `synchronize`, `converted_to_draft`, `ready_for_review`, `locked`, `unlocked`, `review_requested`, `review_request_removed`, `auto_merge_enabled`, `auto_merge_disabled`.",
      "one-of": [
        "pull-request-activity-type",
        "pull-request-activity-types"
@@ -879,13 +879,9 @@
        "reopened",
        "synchronize",
        "converted_to_draft",
+        "ready_for_review",
        "locked",
        "unlocked",
-        "enqueued",
-        "dequeued",
-        "milestoned",
-        "demilestoned",
-        "ready_for_review",
        "review_requested",
        "review_request_removed",
        "auto_merge_enabled",
@@ -1008,7 +1004,7 @@
      }
    },
    "pull-request-target-activity": {
-      "description": "The types of pull request activity that trigger the workflow. Supported activity types: `assigned`, `unassigned`, `labeled`, `unlabeled`, `opened`, `edited`, `closed`, `reopened`, `synchronize`, `converted_to_draft`, `locked`, `unlocked`, `enqueued`, `dequeued`, `milestoned`, `demilestoned`, `ready_for_review`, `review_requested`, `review_request_removed`, `auto_merge_enabled`, `auto_merge_disabled`.",
+      "description": "The types of pull request activity that trigger the workflow. Supported activity types: `assigned`, `unassigned`, `labeled`, `unlabeled`, `opened`, `edited`, `closed`, `reopened`, `synchronize`, `converted_to_draft`, `ready_for_review`, `locked`, `unlocked`, `review_requested`, `review_request_removed`, `auto_merge_enabled`, `auto_merge_disabled`.",
      "one-of": [
        "pull-request-target-activity-type",
        "pull-request-target-activity-types"
@@ -1031,13 +1027,9 @@
        "reopened",
        "synchronize",
        "converted_to_draft",
+        "ready_for_review",
        "locked",
        "unlocked",
-        "enqueued",
-        "dequeued",
-        "milestoned",
-        "demilestoned",
-        "ready_for_review",
        "review_requested",
        "review_request_removed",
        "auto_merge_enabled",
@@ -1547,7 +1539,7 @@
          },
          "default": "workflow-dispatch-input-default",
          "options": {
-            "type": "sequence-of-string",
+            "type": "sequence-of-non-empty-string",
            "description": "The options of the dropdown list, if the type is a choice."
          }
        }
@@ -2427,11 +2419,6 @@
        "item-type": "non-empty-string"
      }
    },
-    "sequence-of-string": {
-      "sequence": {
-        "item-type": "string"
-      }
-    },
    "boolean-needs-context": {
      "context": [
        "github",
@@ -0,0 +1,85 @@
+import {getWorkflowSchema} from "./workflow-schema";
+
+describe("workflow-schema", () => {
+  it("loads successfully from workflow-root-strict entry point", () => {
+    const schema = getWorkflowSchema();
+    expect(schema).toBeDefined();
+
+    // Verify entry point exists
+    const rootDef = schema.getDefinition("workflow-root-strict");
+    expect(rootDef).toBeDefined();
+  });
+
+  it("has all referenced definitions reachable from workflow-root-strict", () => {
+    const schema = getWorkflowSchema();
+    const definitions = schema.definitions;
+
+    // Collect all type references from all definitions
+    const referencedTypes = new Set<string>();
+    const definedTypes = new Set<string>();
+
+    for (const name of Object.keys(definitions)) {
+      definedTypes.add(name);
+      collectReferences(definitions[name], referencedTypes);
+    }
+
+    // Every referenced type should be defined
+    const missingDefinitions: string[] = [];
+    for (const ref of referencedTypes) {
+      // Skip built-in types
+      if (isBuiltInType(ref)) continue;
+
+      if (!definedTypes.has(ref)) {
+        missingDefinitions.push(ref);
+      }
+    }
+
+    expect(missingDefinitions).toEqual([]);
+  });
+
+  it("can resolve key workflow definitions", () => {
+    const schema = getWorkflowSchema();
+
+    // These are critical definitions that must exist
+    const criticalDefinitions = [
+      "workflow-root-strict",
+      "jobs",
+      "steps",
+      "runs-on",
+      "step-uses",
+      "job-env",
+      "step-env",
+    ];
+
+    for (const defName of criticalDefinitions) {
+      const def = schema.getDefinition(defName);
+      expect(def).toBeDefined();
+    }
+  });
+});
+
+function collectReferences(obj: unknown, refs: Set<string>): void {
+  if (!obj || typeof obj !== "object") return;
+
+  if (Array.isArray(obj)) {
+    for (const item of obj) {
+      if (typeof item === "string") refs.add(item);
+      else collectReferences(item, refs);
+    }
+    return;
+  }
+
+  const record = obj as Record<string, unknown>;
+  for (const [key, value] of Object.entries(record)) {
+    if (["type", "item-type", "loose-key-type", "loose-value-type"].includes(key)) {
+      if (typeof value === "string") refs.add(value);
+    } else if (key === "one-of" || key === "properties" || key === "mapping" || key === "sequence") {
+      collectReferences(value, refs);
+    }
+  }
+}
+
+function isBuiltInType(typeName: string): boolean {
+  const builtIns = ["null", "boolean", "number", "string", "sequence", "mapping", "any"];
+  return builtIns.includes(typeName);
+}
@@ -1,6 +1,6 @@
 import {JSONObjectReader} from "../templates/json-object-reader";
 import {TemplateSchema} from "../templates/schema";
-import WorkflowSchema from "../workflow-v1.0.min.json";
+import WorkflowSchema from "../workflow-v1.0.optimized.min.json";

 let schema: TemplateSchema;

@@ -1,16 +1,4 @@
-import {
-  isAlias,
-  isCollection,
-  isDocument,
-  isMap,
-  isPair,
-  isScalar,
-  isSeq,
-  LineCounter,
-  parseDocument,
-  Scalar
-} from "yaml";
-import type {Document} from "yaml";
+import {isCollection, isDocument, isMap, isPair, isScalar, isSeq, LineCounter, parseDocument, Scalar} from "yaml";
 import type {LinePos} from "yaml/dist/errors";
 import type {NodeBase} from "yaml/dist/nodes/Node";
 import {ObjectReader} from "../templates/object-reader";
@@ -34,31 +22,30 @@ export type YamlError = {
 export class YamlObjectReader implements ObjectReader {
  private readonly _generator: Generator<ParseEvent>;
  private _current!: IteratorResult<ParseEvent>;
-  private readonly doc: Document;
  private fileId?: number;
  private lineCounter = new LineCounter();

  public errors: YamlError[] = [];

  constructor(fileId: number | undefined, content: string) {
-    this.doc = parseDocument(content, {
+    const doc = parseDocument(content, {
      lineCounter: this.lineCounter,
      keepSourceTokens: true,
      uniqueKeys: false // Uniqueness is validated by the template reader
    });
-    for (const err of this.doc.errors) {
+    for (const err of doc.errors) {
      this.errors.push({message: err.message, range: rangeFromLinePos(err.linePos)});
    }
-    this._generator = this.getNodes(this.doc, new Set());
+    this._generator = this.getNodes(doc);
    this.fileId = fileId;
  }

-  private *getNodes(node: unknown, aliasResolutionStack: Set<unknown>): Generator<ParseEvent, void> {
+  private *getNodes(node: unknown): Generator<ParseEvent, void> {
    let range = this.getRange(node as NodeBase | undefined);

    if (isDocument(node)) {
      yield new ParseEvent(EventType.DocumentStart);
-      for (const item of this.getNodes(node.contents, new Set())) {
+      for (const item of this.getNodes(node.contents)) {
        yield item;
      }
      yield new ParseEvent(EventType.DocumentEnd);
@@ -72,7 +59,7 @@ export class YamlObjectReader implements ObjectReader {
      }

      for (const item of node.items) {
-        for (const child of this.getNodes(item, aliasResolutionStack)) {
+        for (const child of this.getNodes(item)) {
          yield child;
        }
      }
@@ -87,32 +74,12 @@ export class YamlObjectReader implements ObjectReader {
      yield new ParseEvent(EventType.Literal, YamlObjectReader.getLiteralToken(this.fileId, range, node));
    }

-    // Handle YAML aliases - resolve to the anchored value
-    if (isAlias(node)) {
-      const resolved = node.resolve(this.doc);
-      if (resolved) {
-        // Prevent infinite recursion from circular aliases
-        if (aliasResolutionStack.has(resolved)) {
-          // Silently ignore circular reference - the missing content will cause
-          // downstream validation errors which is acceptable for this edge case
-          return;
-        }
-        // Track this node in the alias resolution stack
-        const newStack = new Set(aliasResolutionStack);
-        newStack.add(resolved);
-        // Yield the resolved node's contents
-        yield* this.getNodes(resolved, newStack);
-      }
-      // If unresolved, the yaml library already reports an error
-      return;
-    }
-
    if (isPair(node)) {
      const scalarKey = node.key as Scalar;
      range = this.getRange(scalarKey);
      const key = scalarKey.value as string;
      yield new ParseEvent(EventType.Literal, new StringToken(this.fileId, range, key, undefined));
-      for (const child of this.getNodes(node.value, aliasResolutionStack)) {
+      for (const child of this.getNodes(node.value)) {
        yield child;
      }
    }
@@ -120,8 +120,6 @@ on:
      - unassigned
      - labeled
      - unlabeled
-      - milestoned
-      - demilestoned
      - opened
      - edited
      - closed
@@ -131,8 +129,6 @@ on:
      - ready_for_review
      - locked
      - unlocked
-      - enqueued
-      - dequeued
      - review_requested
      - review_request_removed
      - auto_merge_enabled
@@ -164,8 +160,6 @@ on:
      - unassigned
      - labeled
      - unlabeled
-      - milestoned
-      - demilestoned
      - opened
      - edited
      - closed
@@ -175,8 +169,6 @@ on:
      - ready_for_review
      - locked
      - unlocked
-      - enqueued
-      - dequeued
      - review_requested
      - review_request_removed
      - auto_merge_enabled
@@ -394,8 +386,6 @@ jobs:
        "unassigned",
        "labeled",
        "unlabeled",
-        "milestoned",
-        "demilestoned",
        "opened",
        "edited",
        "closed",
@@ -405,8 +395,6 @@ jobs:
        "ready_for_review",
        "locked",
        "unlocked",
-        "enqueued",
-        "dequeued",
        "review_requested",
        "review_request_removed",
        "auto_merge_enabled",
@@ -453,8 +441,6 @@ jobs:
        "unassigned",
        "labeled",
        "unlabeled",
-        "milestoned",
-        "demilestoned",
        "opened",
        "edited",
        "closed",
@@ -464,8 +450,6 @@ jobs:
        "ready_for_review",
        "locked",
        "unlocked",
-        "enqueued",
-        "dequeued",
        "review_requested",
        "review_request_removed",
        "auto_merge_enabled",