@dbx-tools/projen 0.9.40 → 0.9.43

package/README.md

@@ -58,8 +58,8 @@ workflow.
 Repository policy stays in the consuming `.projenrc.ts`:
 
 - `releaseDocs` supplies repository-defined preparation and build steps plus
-  the Pages artifact path. The engine adds release checkout, Bun caching,
-  artifact upload, and deployment without naming a docs script or output tree.
+  the Pages artifact path. The engine adds release checkout, artifact upload,
+  and deployment without naming a docs script or output tree.
 - `releasePythonRoot` passes the actual Python package root to local release
   preparation. Omit it when the workspace has no standard Python packages.
 - `releaseValidationTasks` names repository tasks that must pass in tag CI
@@ -68,8 +68,6 @@ Repository policy stays in the consuming `.projenrc.ts`:
   shared release job before the validation tasks run.
 - `pullRequestTitlePolicy` configures semantic title types and scope policy.
   Omit it or pass `false` to disable the title job.
-- `workflowCacheIgnorePaths` excludes generated output trees that may contain
-  package manifests from the dependency-only Bun cache key.
 - `extraWorkspaceMembers` declares self-synthesizing tooling packages outside
   `packageRoots`. Their version, generated entrypoint, formatting, linting, and
   workspace membership are derived from that declaration.
@@ -389,10 +387,10 @@ diverged. From `main`, it calls the existing `bump` task, commits the generated
 version changes, pushes `main`, and pushes the matching annotated `vX.Y.Z` tag.
 Pass `--no-bump` only to release an existing synchronized local bump. The tag
 workflow verifies that the tag points at the exact `origin/main` commit. One
-`build-release` job restores the Bun cache and installs workspace dependencies,
-runs validation, packs the npm archives, builds all Python distributions, and
-builds the documentation site. Install validation prerequisites through
-`releaseSetupSteps`; `releaseDocs.prepareSteps` runs after validation.
+`build-release` job installs workspace dependencies, runs validation, packs the
+npm archives, builds all Python distributions, and builds the documentation
+site. Install validation prerequisites through `releaseSetupSteps`;
+`releaseDocs.prepareSteps` runs after validation.
 
 Publication jobs download the resulting artifacts rather than rebuilding the
 workspace. Each Python package retains its own publishing environment and waits
@@ -458,33 +456,32 @@ workflow order without introducing another version owner.
 
 ### `release`
 
-```text
-Usage: release [options]
-
 Prepare an annotated release and select its build and publication steps
 
-Options:
-  --root <path>                      repository root
-  --branch <name>                    release branch (default: "main")
-  --prefix <prefix>                  release tag prefix (default: "v")
-  --remote <name>                    git remote (default: "origin")
-  --python-root <path>               Python package root for local publish (default: "packages/py")
-  --validate <task>                  task to run before pushing (default: [])
-  --no-bump                          use an existing synchronized local version bump
-  --publish <target>                 publication scope (choices: "auto", "npm", "pypi", "local",
-                                     "none", default: "auto")
-  --install <mode>                   local workspace dependency installation (choices: "auto",
-                                     "always", "never", default: "auto")
-  --no-npm                           skip npm build and publication, including local npm publication
-  --no-pypi                          skip Python build and publication, including local Python
-                                     publication
-  --docs                             build and deploy docs for a selected scope
-  --no-docs                          skip documentation build and deployment
-  --no-validation                    skip optional release validation tasks; version/source checks
-                                     remain mandatory
-  --no-local-publish                 skip publishing to configured local registries
-  --local-registry <auto|false|url>  local npm registry selection (default: "auto")
-  --local-pypi <auto|false|url>      local devpi registry selection (default: "auto")
+```sh
+release [options]
 ```
 
+#### Options
+
+| Option                                | Description                                                                                   |
+| ------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `--root <path>`                       | repository root                                                                               |
+| `--branch <name>`                     | release branch (default: "main")                                                              |
+| `--prefix <prefix>`                   | release tag prefix (default: "v")                                                             |
+| `--remote <name>`                     | git remote (default: "origin")                                                                |
+| `--python-root <path>`                | Python package root for local publish (default: "packages/py")                                |
+| `--validate <task>`                   | task to run before pushing (default: [])                                                      |
+| `--no-bump`                           | use an existing synchronized local version bump                                               |
+| `--publish <target>`                  | publication scope (choices: "auto", "npm", "pypi", "local", "none", default: "auto")          |
+| `--install <mode>`                    | local workspace dependency installation (choices: "auto", "always", "never", default: "auto") |
+| `--no-npm`                            | skip npm build and publication, including local npm publication                               |
+| `--no-pypi`                           | skip Python build and publication, including local Python publication                         |
+| `--docs`                              | build and deploy docs for a selected scope                                                    |
+| `--no-docs`                           | skip documentation build and deployment                                                       |
+| `--no-validation`                     | skip optional release validation tasks; version/source checks remain mandatory                |
+| `--no-local-publish`                  | skip publishing to configured local registries                                                |
+| `--local-registry <auto\|false\|url>` | local npm registry selection (default: "auto")                                                |
+| `--local-pypi <auto\|false\|url>`     | local devpi registry selection (default: "auto")                                              |
+
 <!-- cli-reference:end -->

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/projen";
-export const PACKAGE_VERSION = "0.9.40";
+export const PACKAGE_VERSION = "0.9.43";
 export * as barrels from "./src/barrels.ts";
 export * as bunApp from "./src/bun-app.ts";
 export * as bunWorkflow from "./src/bun-workflow.ts";
@@ -37,7 +37,6 @@ export * as workspaceLock from "./src/workspace-lock.ts";
 export * as workspaceVersion from "./src/workspace-version.ts";
 export { BUN_DEV_OVERRIDE, BUN_BUILD_OVERRIDE, BUN_APP_OVERRIDES, RootBunfigFile, BunfigFile, BunDevServerFile, BunBuildFile } from "./src/bun-app.ts";
 export { BUN_VERSION } from "./src/bun-workflow.ts";
-export type { BunWorkflowCacheOptions } from "./src/bun-workflow.ts";
 export { DBXToolsConfig } from "./src/dbx-tools-config.ts";
 export type { DBXToolsConfigOptions } from "./src/dbx-tools-config.ts";
 export { resolvePkgRoot } from "./src/engine-root.ts";

package/package.json

@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@dbx-tools/core": "^0.9.40",
-    "@dbx-tools/path": "^0.9.40",
-    "@dbx-tools/shared-core": "^0.9.40",
+    "@dbx-tools/core": "^0.9.43",
+    "@dbx-tools/path": "^0.9.43",
+    "@dbx-tools/shared-core": "^0.9.43",
     "commander": "^15.0.0",
     "concurrently": "^10.0.3",
     "constructs": "^10.6.0",
@@ -56,7 +56,7 @@
   },
   "main": "index.ts",
   "license": "Apache-2.0",
-  "version": "0.9.40",
+  "version": "0.9.43",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/bun-workflow.ts

@@ -1,172 +1,12 @@
-/** Shared Bun setup and package-cache steps for generated workflows. */
-import { stringUtils } from "@dbx-tools/shared-core";
-import { TextFile, javascript } from "projen";
+/** Shared Bun setup for generated workflows. */
 
 export const BUN_VERSION = "1.3.14";
 
-const DEFAULT_CACHE_IGNORE_PATHS = [
-  ".git",
-  ".venv",
-  ".worktrees",
-  "coverage",
-  "dist",
-  "lib",
-  "node_modules",
-  "target",
-] as const;
-
-function cacheKeyScript(extraIgnorePaths: readonly string[]): string {
-  const ignorePaths = [...new Set(extraIgnorePaths)].sort();
-  // prettier-ignore
-  const source = (
-    // ============================================================================
-    /*js*/`
-  #!/usr/bin/env node
-  import { createHash } from "node:crypto";
-  import { readdirSync, readFileSync } from "node:fs";
-  import { join, sep } from "node:path";
-
-  const root = process.cwd();
-  const ignoredNames = new Set(${JSON.stringify(DEFAULT_CACHE_IGNORE_PATHS)});
-  const ignoredPaths = new Set(${JSON.stringify(ignorePaths)});
-  const manifests = [];
-  const walk = (directory) => {
-    for (const entry of readdirSync(directory, { withFileTypes: true })) {
-      const path = join(directory, entry.name);
-      const relativePath = path.slice(root.length + 1).split(sep).join("/");
-      if (ignoredNames.has(entry.name) || ignoredPaths.has(relativePath)) continue;
-      if (entry.isDirectory()) walk(path);
-      else if (entry.name === "package.json") manifests.push(path);
-    }
-  };
-  walk(root);
-
-  const dependencyFields = [
-    "catalog",
-    "dependencies",
-    "devDependencies",
-    "optionalDependencies",
-    "overrides",
-    "peerDependencies",
-    "peerDependenciesMeta",
-    "resolutions",
-    "trustedDependencies",
-  ];
-  const canonical = (value) => {
-    if (Array.isArray(value)) return value.map(canonical);
-    if (!value || typeof value !== "object") return value;
-    return Object.fromEntries(
-      Object.entries(value)
-        .sort(([left], [right]) => left.localeCompare(right))
-        .map(([key, child]) => [key, canonical(child)]),
-    );
-  };
-  const dependencies = manifests
-    .sort()
-    .map((path) => {
-      const manifest = JSON.parse(readFileSync(path, "utf8"));
-      return [
-        path.slice(root.length + 1),
-        Object.fromEntries(
-          dependencyFields
-            .filter((field) => manifest[field] !== undefined)
-            .map((field) => [field, canonical(manifest[field])]),
-        ),
-      ];
-    });
-  process.stdout.write(createHash("sha256").update(JSON.stringify(dependencies)).digest("hex"));
-  `
-    // ============================================================================
-  );
-  return stringUtils.dedent(source, { trimEnd: false });
-}
-
-const configured = new WeakMap<javascript.NodeProject, string>();
-
-function ensureCacheKeyScript(
-  project: javascript.NodeProject,
-  ignorePaths: readonly string[],
-): void {
-  const root = project.root as javascript.NodeProject;
-  const key = JSON.stringify([...new Set(ignorePaths)].sort());
-  const existing = configured.get(root);
-  if (existing !== undefined) {
-    if (existing !== key) {
-      throw new Error("Bun workflow cache ignore paths must be consistent across one project");
-    }
-    return;
-  }
-  new TextFile(root, ".projen/bun-cache-key.mjs", {
-    lines: cacheKeyScript(ignorePaths).trimEnd().split("\n"),
-  });
-  configured.set(root, key);
-}
-
-function stepCondition(condition: string | undefined, cacheMiss = false): string | undefined {
-  const expressions = [
-    condition,
-    ...(cacheMiss ? ["steps.bun_cache.outputs.cache-hit != 'true'"] : []),
-  ].filter(Boolean);
-  return expressions.length ? `\${{ ${expressions.join(" && ")} }}` : undefined;
-}
-
-export interface BunWorkflowCacheOptions {
-  readonly setupCondition?: string;
-  readonly condition?: string;
-  /** Repository-relative output paths excluded from dependency manifest hashing. */
-  readonly ignorePaths?: readonly string[];
-}
-
-/** Set up Bun and restore its global package cache. */
-export function bunCacheRestoreSteps(
-  project: javascript.NodeProject,
-  options: BunWorkflowCacheOptions = {},
-): readonly Record<string, unknown>[] {
-  ensureCacheKeyScript(project, options.ignorePaths ?? []);
-  const condition = stepCondition(options.condition);
-  const setupCondition = stepCondition(options.setupCondition);
-  return [
-    {
-      name: "Setup Bun",
-      ...(setupCondition ? { if: setupCondition } : {}),
-      uses: "oven-sh/setup-bun@v2",
-      with: { "bun-version": "${{ env.BUN_VERSION }}" },
-    },
-    {
-      name: "Resolve Bun cache",
-      id: "bun_cache_metadata",
-      ...(condition ? { if: condition } : {}),
-      shell: "bash",
-      run: [
-        'echo "path=$(bun pm cache)" >> "$GITHUB_OUTPUT"',
-        'echo "dependency_hash=$(node .projen/bun-cache-key.mjs)" >> "$GITHUB_OUTPUT"',
-      ].join("\n"),
-    },
-    {
-      name: "Restore Bun cache",
-      id: "bun_cache",
-      ...(condition ? { if: condition } : {}),
-      uses: "actions/cache/restore@v5",
-      with: {
-        path: "${{ steps.bun_cache_metadata.outputs.path }}",
-        key: `bun-\${{ runner.os }}-\${{ runner.arch }}-\${{ env.BUN_VERSION }}-\${{ steps.bun_cache_metadata.outputs.dependency_hash }}`,
-        "restore-keys": `bun-\${{ runner.os }}-\${{ runner.arch }}-\${{ env.BUN_VERSION }}-`,
-      },
-    },
-  ];
-}
-
-/** Save Bun's global package cache immediately after installation. */
-export function bunCacheSaveStep(
-  options: BunWorkflowCacheOptions = {},
-): Readonly<Record<string, unknown>> {
+/** Install the pinned Bun version. */
+export function bunSetupStep(): Readonly<Record<string, unknown>> {
   return {
-    name: "Save Bun cache",
-    if: stepCondition(options.condition, true),
-    uses: "actions/cache/save@v5",
-    with: {
-      path: "${{ steps.bun_cache_metadata.outputs.path }}",
-      key: "${{ steps.bun_cache.outputs.cache-primary-key }}",
-    },
+    name: "Setup Bun",
+    uses: "oven-sh/setup-bun@v2",
+    with: { "bun-version": "${{ env.BUN_VERSION }}" },
   };
 }

package/src/codegen.ts

@@ -316,9 +316,9 @@ function generatePackage(
     const sourceText = preprocess(stripImports(tsRuntime, sourcePath));
     const { getZodSchemasFile, getInferredTypes, errors } = generate({
       sourceText,
-      // Carry JSDoc through so the `@description` tag stays visible alongside
-      // the matching `.describe(...)`.
-      keepComments: true,
+      // JSDoc is rewritten to `@description` so ts-to-zod emits `.describe()`.
+      // Keep the generated module comment-free; Zod owns the prose.
+      keepComments: false,
     });
     if (errors.length) {
       for (const err of errors) logger.warn(`${destination} from ${source}: ${err}`);

package/src/project-js.ts

@@ -18,7 +18,7 @@ import type { ReleaseProjectOptions } from "projen/lib/release";
 import { generateBarrels } from "./barrels.ts";
 
 import { BUN_APP_OVERRIDES, RootBunfigFile } from "./bun-app.ts";
-import { BUN_VERSION, bunCacheRestoreSteps, bunCacheSaveStep } from "./bun-workflow.ts";
+import { BUN_VERSION, bunSetupStep } from "./bun-workflow.ts";
 import { codegenModulePaths, generateCodegen } from "./codegen.ts";
 import { DBXToolsConfig, type DBXToolsConfigOptions } from "./dbx-tools-config.ts";
 import { resolvePkgRoot } from "./engine-root.ts";
@@ -61,8 +61,6 @@ export interface DBXToolsJavaScriptProject extends DBXToolsProject, javascript.N
   pnpmWorkspace?: PnpmWorkspaceState;
   /** Root projenrc tsconfigs - only a tree ROOT has one. */
   rootTsconfig?: DBXToolsRootTsconfig;
-  /** Repository outputs excluded from generated workflow dependency-cache hashing. */
-  readonly workflowCacheIgnorePaths: readonly string[];
 }
 
 /** Parsed npm package identifier: optional scope plus the unscoped package name. */
@@ -581,8 +579,6 @@ export type DBXToolsJavaScriptProjectOptions = CommonProjectOptions &
     readonly releaseMode?: DBXToolsReleaseMode;
     /** Prefix for generated release tags. Defaults to `v`. */
     readonly releaseTagPrefix?: string;
-    /** Repository output paths excluded from generated workflow dependency-cache hashing. */
-    readonly workflowCacheIgnorePaths?: readonly string[];
     /**
      * Extra workspace member paths (repo-relative, POSIX) to list in the workspace
      * config ALONGSIDE the discovered `packageRoots` members - for a package that
@@ -609,16 +605,6 @@ export type DBXToolsTypeScriptProjectOptions = Partial<
 > &
   DBXToolsJavaScriptProjectOptions;
 
-const initializingWorkflowCachePaths = new Map<string, readonly string[]>();
-
-function configuredOutdir(
-  options: Pick<DBXToolsJavaScriptProjectOptions, "parent" | "outdir">,
-): string {
-  return options.parent
-    ? resolve(options.parent.outdir, options.outdir ?? ".")
-    : resolve(options.outdir ?? process.cwd());
-}
-
 /**
  * A monorepo root. Scans `packageRoots` and appends a
  * {@link DBXToolsTypeScriptProject} per `src`-bearing folder, then emits the
@@ -635,7 +621,6 @@ export class DBXToolsNodeProject
   rootTsconfig?: DBXToolsRootTsconfig;
   readonly extraWorkspaceMembers: readonly string[];
   readonly releaseBranch: string;
-  readonly workflowCacheIgnorePaths: readonly string[];
   private readonly rootInstallOnly: boolean;
 
   constructor(options: DBXToolsJavaScriptProjectOptions = {}) {
@@ -648,8 +633,6 @@ export class DBXToolsNodeProject
     // into `package.json` (`workspaces`/`catalog`) for bun to read. The
     // `pnpm-workspace.yaml` is still emitted for the Databricks Apps pnpm install.
     const pnpmWorkspace = new PnpmWorkspaceState(options);
-    const outdir = configuredOutdir(options);
-    initializingWorkflowCachePaths.set(outdir, options.workflowCacheIgnorePaths ?? []);
     super({
       ...defaultProjectOptions(options),
       pnpmOptions: {
@@ -668,8 +651,6 @@ export class DBXToolsNodeProject
     this.scope = scope;
     this.extraWorkspaceMembers = options.extraWorkspaceMembers ?? [];
     this.releaseBranch = options.defaultReleaseBranch ?? "main";
-    this.workflowCacheIgnorePaths = options.workflowCacheIgnorePaths ?? [];
-    initializingWorkflowCachePaths.delete(outdir);
     this.rootInstallOnly = options.rootInstallOnly !== false;
     this.dbxToolsConfig = new DBXToolsConfig(this, options);
     initProject(this, options);
@@ -678,28 +659,10 @@ export class DBXToolsNodeProject
   public override renderWorkflowSetup(options?: javascript.RenderWorkflowSetupOptions): JobStep[] {
     const steps = super.renderWorkflowSetup(options);
     if (this.parent) return steps;
-    return steps.flatMap((step) => {
-      if (step.uses?.startsWith("oven-sh/setup-bun@")) {
-        return [
-          ...bunCacheRestoreSteps(this, {
-            ignorePaths:
-              this.workflowCacheIgnorePaths ??
-              initializingWorkflowCachePaths.get(resolve(this.outdir)) ??
-              [],
-          }),
-        ];
-      }
-      if (step.run?.startsWith("bun install")) {
-        return [
-          step,
-          bunCacheSaveStep({
-            condition:
-              "github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository",
-          }),
-        ];
-      }
-      return [step];
-    }) as JobStep[];
+    return [
+      bunSetupStep() as JobStep,
+      ...steps.filter((step) => !step.uses?.startsWith("oven-sh/setup-bun@")),
+    ];
   }
 
   public override preSynthesize(): void {
@@ -754,7 +717,6 @@ export class DBXToolsTypeScriptProject
   rootTsconfig?: DBXToolsRootTsconfig;
   readonly extraWorkspaceMembers: readonly string[];
   readonly releaseBranch: string;
-  readonly workflowCacheIgnorePaths: readonly string[];
   private readonly rootInstallOnly: boolean;
 
   constructor(options: DBXToolsTypeScriptProjectOptions) {
@@ -795,7 +757,6 @@ export class DBXToolsTypeScriptProject
     this.scope = scope;
     this.extraWorkspaceMembers = options.extraWorkspaceMembers ?? [];
     this.releaseBranch = options.defaultReleaseBranch ?? "main";
-    this.workflowCacheIgnorePaths = options.workflowCacheIgnorePaths ?? [];
     this.rootInstallOnly = options.rootInstallOnly !== false;
     // Pairs with `jsx` in SHARED_COMPILER_OPTIONS: projen's default `include` is
     // `src/**/*.ts` only, which silently omits a `.tsx` file from the program

package/src/project-py.ts

@@ -87,6 +87,8 @@ export interface DBXToolsPythonWorkspaceOptions {
   readonly devDependencies?: readonly string[];
   readonly testPaths?: readonly string[];
   readonly lintPaths?: readonly string[];
+  /** Repository-relative paths Ruff must not lint or format. */
+  readonly ruffExcludes?: readonly string[];
   readonly ruffPerFileIgnores?: Readonly<Record<string, readonly string[]>>;
   /** Generated Python implementation files Pyrefly should resolve but not type-check. */
   readonly pyreflyProjectExcludes?: readonly string[];
@@ -347,6 +349,17 @@ export class DBXToolsPythonWorkspace extends Component {
     if (options.indexStrategy) {
       file.addOverride("tool.uv.index-strategy", options.indexStrategy);
     }
+    const ruffExcludes = [
+      ...(options.ruffExcludes ?? []),
+      ...options.packages.flatMap((pkg) =>
+        pythonNodeGeneratedSources(pkg).map(
+          (source) => `${this.repository.root}/${pkg.directory}/${source}`,
+        ),
+      ),
+    ];
+    if (ruffExcludes.length) {
+      file.addOverride("tool.ruff.exclude", [...new Set(ruffExcludes)]);
+    }
     file.addOverride("tool.pyrefly.ignore-errors-in-generated-code", true);
     const projectExcludes = [
       ...(options.pyreflyProjectExcludes ?? []),

package/src/release.ts

@@ -92,15 +92,11 @@ export function nodeReleaseSetupSteps(): readonly JobStep[] {
   ];
 }
 
-/** Install uv and restore its download/build cache using Python manifests. */
+/** Install uv for Python release builds. */
 export function uvSetupStep(): JobStep {
   return {
     name: "Setup uv",
     uses: "astral-sh/setup-uv@v7",
-    with: {
-      "enable-cache": true,
-      "cache-dependency-glob": "**/pyproject.toml",
-    },
   };
 }
 
@@ -299,7 +295,7 @@ export class DBXToolsRelease extends Component {
     super(project);
     project.addGitIgnore(".release/");
     const installCondition =
-      'node -e "process.exit(process.env.DBX_TOOLS_RELEASE_INSTALL === \'never\' ? 1 : 0)"';
+      "node -e \"process.exit(process.env.DBX_TOOLS_RELEASE_INSTALL === 'never' ? 1 : 0)\"";
     project.package.installTask.addCondition(installCondition);
     project.package.installCiTask.addCondition(installCondition);
     const tagPrefix = options.tagPrefix ?? "v";

package/tasks/lib/python-node-bindings.ts

@@ -270,6 +270,11 @@ export async function main(args: string[] = process.argv.slice(2)): Promise<void
         };
       });
       build.onResolve({ filter: /.*/ }, ({ path }) => {
+        if (path === "zod") {
+          return {
+            path: resolve(dirname(Bun.resolveSync("zod/package.json", root)), "index.cjs"),
+          };
+        }
         if (overridesByModule.has(path)) {
           return { path, namespace: functionOverrideNamespace };
         }
@@ -586,7 +591,13 @@ export async function main(args: string[] = process.argv.slice(2)): Promise<void
         }
         const parameterType = withoutUndefined(checker.getTypeAtLocation(parameter));
         const path = `${exported.sourceName}.${parameter.name.text}`;
-        const record = pythonRecordType(checker, parameterType, records, path);
+        const record = pythonRecordType(
+          checker,
+          parameterType,
+          records,
+          path,
+          declaredTypeName(parameter.type),
+        );
         const required = !parameter.questionToken && !parameter.initializer;
         return {
           javascriptName: parameter.name.text,
@@ -606,6 +617,7 @@ export async function main(args: string[] = process.argv.slice(2)): Promise<void
         responses,
         protocols,
         `${exported.sourceName}.return`,
+        declaredTypeName(declaration.type),
       );
       typesByFunction.set(`${exported.sourceFile}#${exported.sourceName}`, {
         parameters,
@@ -636,8 +648,10 @@ export async function main(args: string[] = process.argv.slice(2)): Promise<void
     type: ts.Type,
     records: Map<string, PythonRecord>,
     path: string,
+    preferredName?: string,
   ): PythonRecord {
-    const name = type.aliasSymbol?.getName() ?? type.getSymbol()?.getName();
+    const symbolName = type.aliasSymbol?.getName() ?? type.getSymbol()?.getName();
+    const name = symbolName && symbolName !== "__type" ? symbolName : preferredName;
     if (!name || name === "__type") throw new Error(`${path} must reference a named object type`);
     const existing = records.get(name);
     if (existing) return existing;
@@ -665,13 +679,23 @@ export async function main(args: string[] = process.argv.slice(2)): Promise<void
     type: ts.Type,
     records: Map<string, PythonRecord>,
     path: string,
+    preferredName?: string,
   ): PythonRecord | undefined {
     if (!(type.flags & ts.TypeFlags.Object)) return undefined;
     if (checker.isArrayType(type) || type.getCallSignatures().length > 0) return undefined;
     if (checker.getIndexTypeOfType(type, ts.IndexKind.String)) return undefined;
-    const name = type.aliasSymbol?.getName() ?? type.getSymbol()?.getName();
+    const symbolName = type.aliasSymbol?.getName() ?? type.getSymbol()?.getName();
+    const name = symbolName && symbolName !== "__type" ? symbolName : preferredName;
     if (!name || name === "__type") return undefined;
-    return pythonRecord(checker, type, records, path);
+    return pythonRecord(checker, type, records, path, preferredName);
+  }
+
+  function declaredTypeName(node: ts.TypeNode | undefined): string | undefined {
+    if (!node) return undefined;
+    if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName)) {
+      return node.typeName.text;
+    }
+    return undefined;
   }
 
   function pythonType(
@@ -715,6 +739,7 @@ export async function main(args: string[] = process.argv.slice(2)): Promise<void
     responses: Map<string, PythonResponse>,
     protocols: Map<string, PythonProtocol>,
     path: string,
+    preferredName?: string,
   ): string {
     if (type.isUnion()) {
       return pythonUnion(
@@ -839,7 +864,7 @@ export async function main(args: string[] = process.argv.slice(2)): Promise<void
       protocols.set(name, { name, methods: protocolMethods, properties: protocolProperties });
       return name;
     }
-    const name = `${pythonObjectName(type, path, "Result")}Response`;
+    const name = `${preferredName ?? pythonObjectName(type, path, "Result")}Response`;
     if (responses.has(name)) return name;
     responses.set(name, { name, fields: [] });
     const fields = properties.map((property) => {

package/tasks/lib/release.ts

@@ -10,7 +10,6 @@ import {
   runTaskCommand,
   taskCommandSucceeds,
 } from "../../src/_task-command.ts";
-import { readWorkspaceVersion } from "../../src/workspace-version.ts";
 import {
   RELEASE_INSTALL_MODES,
   RELEASE_PUBLISH_TARGETS,
@@ -20,6 +19,7 @@ import {
   type ReleaseInstallMode,
   type ReleaseSelectionOptions,
 } from "../../src/release-options.ts";
+import { readWorkspaceVersion } from "../../src/workspace-version.ts";
 
 const logger = log.logger("projen:release");