fix merge conflicts

.changeset/bright-apples-bake.md

@@ -0,0 +1,5 @@
+---
+"@osdk/foundry-sdk-generator": patch
+---
+
+Actually fix the script to run

.changeset/config.json

@@ -14,8 +14,7 @@
     "@osdk/examples.*",
     "@osdk/tests.*",
     "@osdk/version-updater",
-    "mytsup",
-    "tsconfig"
+    "@osdk/monorepo.*"
   ],
   "bumpVersionsWithWorkspaceProtocolOnly": true,
   "snapshot": {

.changeset/famous-suns-run.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/funny-days-sneeze.md

@@ -0,0 +1,5 @@
+---
+"@osdk/foundry-sdk-generator": minor
+---
+
+Add interface support

.changeset/gentle-hairs-decide.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/lazy-tools-hear.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/olive-tigers-sniff.md

@@ -0,0 +1,7 @@
+---
+"@osdk/generator-converters": minor
+"@osdk/client.api": minor
+"@osdk/api": minor
+---
+
+Fix primary key types

.changeset/plenty-berries-add.md

@@ -0,0 +1,10 @@
+---
+"@osdk/legacy-client": minor
+"@osdk/shared.test": minor
+"@osdk/client.api": minor
+"@osdk/generator": minor
+"@osdk/client": minor
+"@osdk/api": minor
+---
+
+Add support for queries in 2.0

.changeset/pre.json

@@ -2,16 +2,16 @@
   "mode": "pre",
   "tag": "beta",
   "initialVersions": {
-    "@osdk/examples.basic.cli": "0.0.0",
-    "@osdk/examples.basic.sdk": "0.0.0",
+    "@osdk/e2e.sandbox.catchall": "0.0.0",
+    "@osdk/e2e.generated.catchall": "0.0.0",
     "@osdk/examples.docs.example": "0.0.1",
-    "@osdk/examples.one.dot.one": "0.0.17",
-    "@osdk/examples.todoapp": "0.0.10",
+    "@osdk/e2e.generated.1.1.x": "0.0.17",
+    "@osdk/e2e.sandbox.todoappapp": "0.0.10",
     "@osdk/examples.next-static-export": "0.0.0",
     "@osdk/examples.react": "0.0.0",
     "@osdk/examples.tutorial-todo-app": "0.0.0",
     "@osdk/examples.vue": "0.0.0",
-    "mytsup": "0.0.0",
+    "@osdk/monorepo.tsup": "0.0.0",
     "tsconfig": "0.0.0",
     "@osdk/api": "1.8.0",
     "@osdk/cli": "0.21.0",
@@ -55,9 +55,24 @@
     "@osdk/tests.verify-fallback-package-v2": "0.0.3",
     "@osdk/examples.tutorial-todo-aip-app": "0.0.0",
     "@osdk/client.unstable": "0.0.0",
-    "@osdk/client.unstable.osw": "0.0.0"
+    "@osdk/client.unstable.osw": "0.0.0",
+    "@osdk/create-app.template-packager": "0.0.0",
+    "@osdk/create-app.template.next-static-export": "0.17.0-beta.2",
+    "@osdk/create-app.template.react": "0.17.0-beta.2",
+    "@osdk/create-app.template.tutorial-todo-aip-app": "0.17.0-beta.2",
+    "@osdk/create-app.template.tutorial-todo-app": "0.17.0-beta.2",
+    "@osdk/create-app.template.vue": "0.17.0-beta.2",
+    "@osdk/e2e.sandbox.todoapp": "0.0.10",
+    "@osdk/monorepo.api-extractor": "0.0.0",
+    "@osdk/monorepo.cspell": "0.0.0",
+    "@osdk/monorepo.tool.attw": "0.0.0",
+    "@osdk/monorepo.tool.transpile": "0.0.0",
+    "@osdk/monorepo.tool.typecheck": "0.0.0",
+    "@osdk/monorepo.tsconfig": "0.0.0",
+    "@osdk/e2e.test.foundry-sdk-generator": "0.0.0"
   },
   "changesets": [
+    "bright-apples-bake",
     "calm-pillows-collect",
     "chilly-mayflies-vanish",
     "chilly-melons-hammer",
@@ -68,45 +83,60 @@
     "dirty-hotels-build",
     "early-coats-sip",
     "eight-hats-joke",
+    "famous-suns-run",
     "fast-parents-learn",
     "four-ways-add",
+    "funny-days-sneeze",
+    "gentle-hairs-decide",
     "great-geese-fail",
     "green-chefs-speak",
     "healthy-nails-relax",
     "itchy-radios-own",
     "khaki-plants-sort",
     "large-ads-listen",
     "lazy-jobs-attend",
+    "lazy-tools-hear",
     "lovely-mice-beg",
     "moody-bats-hear",
     "moody-crews-ring",
     "nervous-parrots-admire",
     "nervous-pets-return",
+    "new-points-sing",
     "ninety-avocados-unite",
+    "odd-hornets-protect",
     "old-kiwis-marry",
     "orange-icons-battle",
     "pink-insects-itch",
+    "plenty-berries-add",
     "plenty-peaches-scream",
     "pretty-cherries-hunt",
     "pretty-dingos-smash",
     "purple-cameras-invite",
     "purple-pots-fold",
     "purple-trainers-laugh",
+    "quiet-cars-hear",
+    "rare-timers-care",
     "rotten-lamps-protect",
     "rotten-shirts-cross",
     "serious-camels-rest",
     "serious-glasses-try",
     "sharp-penguins-double",
     "shy-cougars-remain",
+    "sixty-rules-attend",
     "smart-feet-chew",
     "spicy-roses-compete",
+    "strange-dots-leave",
     "tame-wolves-juggle",
     "tasty-kiwis-attack",
     "thin-eggs-prove",
     "tough-hats-push",
+    "unlucky-geese-hug",
     "unlucky-moose-lay",
     "unlucky-wombats-switch",
+    "weak-dragons-wonder",
+    "weak-flies-do",
     "wild-plums-yell",
+    "wild-shrimps-join",
     "young-fireants-repair"
   ]
 }

.changeset/quiet-cars-hear.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/rare-timers-care.md

@@ -0,0 +1,5 @@
+---
+"@osdk/client": patch
+---
+
+Fix asyncIter to fetch subsequent pages

.changeset/sixty-rules-attend.md

@@ -0,0 +1,41 @@
+---
+"@osdk/foundry.thirdpartyapplications": patch
+"@osdk/internal.foundry.ontologiesv2": patch
+"@osdk/internal.foundry.ontologies": patch
+"@osdk/internal.foundry.datasets": patch
+"@osdk/internal.foundry.models": patch
+"@osdk/platform-sdk-generator": patch
+"@osdk/shared.net.platformapi": patch
+"@osdk/foundry-sdk-generator": patch
+"@osdk/internal.foundry.core": patch
+"@osdk/client.test.ontology": patch
+"@osdk/generator-converters": patch
+"@osdk/client.unstable.osw": patch
+"@osdk/cli.cmd.typescript": patch
+"@osdk/shared.client.impl": patch
+"@osdk/example-generator": patch
+"@osdk/gateway-generator": patch
+"@osdk/shared.net.errors": patch
+"@osdk/foundry.security": patch
+"@osdk/internal.foundry": patch
+"@osdk/shared.net.fetch": patch
+"@osdk/client.unstable": patch
+"@osdk/legacy-client": patch
+"@osdk/foundry.core": patch
+"@osdk/tool.release": patch
+"@osdk/shared.test": patch
+"@osdk/cli.common": patch
+"@osdk/client.api": patch
+"@osdk/create-app": patch
+"@osdk/shared.net": patch
+"@osdk/generator": patch
+"@osdk/foundry": patch
+"@osdk/gateway": patch
+"@osdk/client": patch
+"@osdk/maker": patch
+"@osdk/oauth": patch
+"@osdk/api": patch
+"@osdk/cli": patch
+---
+
+Spelling fixes and spell check in CI

.changeset/smart-feet-chew.md

@@ -2,4 +2,4 @@
 "@osdk/client": patch
 ---
 
-Fixes link direction for experiental bulk loads
+Fixes link direction for experimental bulk loads

.changeset/strange-dots-leave.md

@@ -0,0 +1,5 @@
+---
+"@osdk/generator": patch
+---
+
+Interface inherited properties are now generated

.changeset/strange-mails-drop.md

@@ -0,0 +1,6 @@
+---
+"@osdk/client.api": patch
+"@osdk/client": patch
+---
+
+Add final method call to request context header

.changeset/unlucky-geese-hug.md

@@ -0,0 +1,5 @@
+---
+"@osdk/foundry-sdk-generator": patch
+---
+
+Fixes bin script being interpreted as esm

.changeset/weak-dragons-wonder.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/weak-flies-do.md

@@ -0,0 +1,2 @@
+---
+---

.github/workflows/ci.yml

@@ -13,6 +13,30 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
+  cspell:
+    name: Check spelling
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Check spelling
+        run: pnpm exec turbo run ci:cspell
+
   changesets:
     name: Check for changesets
     if: ${{ github.event_name == 'pull_request' }}
@@ -25,8 +49,6 @@ jobs:
           fetch-depth: 0
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: 8.7.4
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
@@ -63,8 +85,6 @@ jobs:
           fetch-depth: 2
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: 8.7.4
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4

.github/workflows/release.yml

@@ -26,8 +26,6 @@ jobs:
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v4
-        with:
-          version: 8.7.4
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4

.gitignore

@@ -27,6 +27,7 @@ tsconfig.tsbuildinfo
 packages/client/src/generatedNoCheck
 packages/client.test.ontology/src/generatedNoCheck
 packages/legacy-client/src/generatedNoCheck
+packages/create-app.template.*/src/generatedNoCheck
 
 .log
 pnpm-publish-summary.json

.lintstagedrc.mjs

@@ -2,6 +2,8 @@
 
 import micromatch from "micromatch";
 
+const CSPELL_CMD = "cspell --quiet --no-must-find-files";
+
 /*
  * Overview:
  *  - Fixes lint rules and formatting for code
@@ -12,23 +14,33 @@ import micromatch from "micromatch";
  * @type {import("lint-staged").Config}
  */
 export default {
-  "monorepo/**/*.{js,jsx,ts,tsx,mjs,cjs}": [
+  "packages/monorepo.*/**/*.{js,jsx,ts,tsx,mjs,cjs}": [
     "dprint fmt",
+    CSPELL_CMD,
   ],
-  "{packages,examples-extra/basic}/**/*.{js,jsx,ts,tsx,mjs,cjs}": (
+  "*.md": [CSPELL_CMD],
+  "packages/**/*.{js,jsx,ts,tsx,mjs,cjs}": (
     files,
   ) => {
     const match = micromatch.not(
       files,
-      ["**/templates/**/*", "**/generatedNoCheck/**/*"],
+      [
+        "**/templates/**/*",
+        "**/generatedNoCheck/**/*",
+        "**/generatedNoCheck2/**/*",
+      ],
     );
     if (match.length === 0) return [];
     return [
       `dprint fmt ${match.join(" ")}`,
       `eslint --fix  ${match.join(" ")}`,
+      `${CSPELL_CMD} ${match.join(" ")}`,
     ];
   },
-  "(.lintstagedrc.mjs|.monorepolint.config.mjs)": ["dprint fmt"],
+  "(.lintstagedrc.mjs|.monorepolint.config.mjs)": [
+    "dprint fmt",
+    CSPELL_CMD,
+  ],
   "*": (files) => {
     const mrlFiles = micromatch(files, [
       "package.json",